CFD/hypre
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed FEI test example and fixed a fortran header

Browse Source
This commit is contained in:
Rob Falgout 2019-07-08 18:10:20 -07:00
parent 16afb15d0c
commit 1972fa301d
5 changed files with 5 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/HYPREf.h
View File

@ -1,9 +1,7 @@
/******************************************************************************
* Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
* HYPRE Project Developers. See the top-level COPYRIGHT file for details.
*
* SPDX-License-Identifier: (Apache-2.0 OR MIT)
******************************************************************************/
c Copyright 1998-2019 Lawrence Livermore National Security, LLC and other
c HYPRE Project Developers. See the top-level COPYRIGHT file for details.
c
c SPDX-License-Identifier: (Apache-2.0 OR MIT)
! -*- fortran -*-
!******************************************************************************

2
src/examples/Makefile
View File

@ -59,7 +59,7 @@ LFLAGS90 =
########################################################################
# List of all programs to be compiled
########################################################################
ALLPROGS = ex1 ex2 ex3 ex4 ex5 ex5f ex6 ex7 ex8 ex9 ex10 ex11 ex12 ex12f \
ALLPROGS = ex1 ex2 ex3 ex4 ex5 ex5f ex6 ex7 ex8 ex9 ex11 ex12 ex12f \
ex13 ex14 ex15 ex16
BIGINTPROGS = ex5big ex15big
FORTRANPROGS = ex5f ex12f

2
src/test/TEST_examples/default.jobs
View File

@ -28,8 +28,6 @@ mpirun -np 2 ./ex8 > default.out.8
mpirun -np 16 ./ex9 -n 33 -solver 0 -v 1 1 > default.out.9
mpirun -np 4 ./ex10 -n 120 -solver 2 > default.out.10
mpirun -np 4 ./ex11 > default.out.11
mpirun -np 2 ./ex12 -pfmg > default.out.12

48
src/test/TEST_examples/default.saved
View File

@ -361,54 +361,6 @@ Final L2 norm of residual: 4.903805e-09
Iterations = 9
Final Relative Residual Norm = 6.57147e-07
# Output file: default.out.10
***************************************************
* Preconditioned Conjugate Gradient solver
* maximum no. of iterations = 100
* convergence tolerance = 1.000000e-06
*--------------------------------------------------
AMG max levels = 30
AMG coarsen type = 10
AMG measure type = 0
AMG threshold = 2.500000e-01
AMG numsweeps = 1
AMG relax type = 6
AMG relax weight = 1.000000e+00
AMG relax omega = 1.000000e+00
AMG system size = 1
AMG smooth type = 0
AMG smooth numlevels = 0
AMG smooth numsweeps = 1
AMG Schwarz variant = 0
AMG Schwarz overlap = 1
AMG Schwarz domain type = 2
AMG Schwarz relax weight = 1.000000e+00
***************************************************
<b,b>: 6.829186e-05
Iters ||r||_2 conv.rate ||r||_2/||b||_2
----- ------------ --------- ------------
1 6.568705e-03 0.794868 7.948685e-01
2 2.229023e-03 0.339340 2.697305e-01
3 4.395103e-04 0.197176 5.318444e-02
4 6.154722e-05 0.140036 7.447730e-03
5 9.106693e-06 0.147963 1.101986e-03
6 1.448916e-06 0.159105 1.753310e-04
7 2.542814e-07 0.175498 3.077019e-05
8 3.559798e-08 0.139994 4.307655e-06
9 5.739829e-09 0.161240 6.945675e-07
***************************************************
* Solver Statistics *
*-------------------------------------------------*
** HYPRE preconditioner setup time = 1.199627e-02
** HYPRE solution time = 1.896429e-02
** HYPRE total time = 3.096056e-02
** HYPRE number of iterations = 9
** HYPRE final residual norm = 5.739829e-09
***************************************************
# Output file: default.out.11
2 132 x 29 0 4 3.5 5.687e-03 5.328e-01 0.000e+00 1.000e+00
3 29 x 4 1 4 2.7 6.881e-03 4.675e-01 7.079e-02 1.000e+00

1
src/test/TEST_examples/default.sh
View File

@ -21,7 +21,6 @@ FILES="\
${TNAME}.out.7\
${TNAME}.out.8\
${TNAME}.out.9\
${TNAME}.out.10\
${TNAME}.out.11\
${TNAME}.out.12\
${TNAME}.out.12f\