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

Added prints of iterations and residual for BoomerAMG to ij (same as in new_ij).

Browse Source 
Fixed regression tests due to the changed output.
This commit is contained in:
falgout 2012-10-19 15:41:49 +00:00
parent e1bcab4710
commit bdf887ff01
8 changed files with 33 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/TEST_ij/coarsening.sh
View File

@ -11,10 +11,6 @@
# $Revision$
#EHEADER**********************************************************************
TNAME=`basename $0 .sh`
#=============================================================================
@ -33,7 +29,7 @@ FILES="\
for i in $FILES
do
echo "# Output file: $i"
tail -17 $i | head -6
tail -21 $i | head -6
done > ${TNAME}.out
FILES="\

6
test/TEST_ij/default.sh
View File

@ -11,10 +11,6 @@
# $Revision$
#EHEADER**********************************************************************
TNAME=`basename $0 .sh`
#=============================================================================
@ -47,7 +43,7 @@ FILES="\
for i in $FILES
do
echo "# Output file: $i"
tail -17 $i | head -6
tail -21 $i | head -6
done > ${TNAME}.out
# Make sure that the output files are reasonable

6
test/TEST_ij/interp.sh
View File

@ -11,10 +11,6 @@
# $Revision$
#EHEADER**********************************************************************
TNAME=`basename $0 .sh`
#=============================================================================
@ -33,7 +29,7 @@ FILES="\
for i in $FILES
do
echo "# Output file: $i"
tail -17 $i | head -6
tail -21 $i | head -6
done > ${TNAME}.out
# Make sure that the output files are reasonable

6
test/TEST_ij/matrix.sh
View File

@ -11,10 +11,6 @@
# $Revision$
#EHEADER**********************************************************************
TNAME=`basename $0 .sh`
#=============================================================================
@ -46,7 +42,7 @@ FILES="\
for i in $FILES
do
echo "# Output file: $i"
tail -17 $i | head -6
tail -21 $i | head -6
done > ${TNAME}.out
# Make sure that the output files are reasonable

21
test/TEST_ij/smoother.saved
View File

@ -27,23 +27,14 @@
cycle = 7.180720
# Output file: smoother.out.4
4 3.190858e-07 0.030839 3.190858e-07
5 9.891191e-09 0.030999 9.891191e-09
Iterations = 5
Final Relative Residual Norm = 9.891191e-09
=============================================
Solve phase times:
# Output file: smoother.out.5
35 1.734949e-08 0.566238 1.734949e-08
36 9.189342e-09 0.529661 9.189342e-09
Iterations = 36
Final Relative Residual Norm = 9.189342e-09
=============================================
Solve phase times:
# Output file: smoother.out.6
7 1.057086e-08 0.080289 1.057086e-08
8 8.817485e-10 0.083413 8.817485e-10
Iterations = 8
Final Relative Residual Norm = 8.817485e-10
=============================================
Solve phase times:

17
test/TEST_ij/smoother.sh
View File

@ -11,10 +11,6 @@
# $Revision$
#EHEADER**********************************************************************
TNAME=`basename $0 .sh`
#=============================================================================
@ -26,6 +22,15 @@ FILES="\
${TNAME}.out.1\
${TNAME}.out.2\
${TNAME}.out.3\
"
for i in $FILES
do
echo "# Output file: $i"
tail -21 $i | head -6
done > ${TNAME}.out
FILES="\
${TNAME}.out.4\
${TNAME}.out.5\
${TNAME}.out.6\
@ -34,8 +39,8 @@ FILES="\
for i in $FILES
do
echo "# Output file: $i"
tail -17 $i | head -6
done > ${TNAME}.out
tail -3 $i
done >> ${TNAME}.out
# Make sure that the output files are reasonable
CHECK_LINE="Complexity"

8
test/TEST_ij/solvers.sh
View File

@ -11,10 +11,6 @@
# $Revision$
#EHEADER**********************************************************************
TNAME=`basename $0 .sh`
#=============================================================================
@ -78,10 +74,9 @@ FILES="\
for i in $FILES
do
echo "# Output file: $i"
tail -17 $i | head -6
tail -21 $i | head -6
done >> ${TNAME}.out
FILES="\
${TNAME}.out.101\
${TNAME}.out.102\
@ -96,7 +91,6 @@ do
tail -3 $i
done >> ${TNAME}.out
# Make sure that the output files are reasonable
CHECK_LINE="Complexity"
OUT_COUNT=`grep "$CHECK_LINE" ${TNAME}.out | wc -l`

11
test/ij.c
View File

@ -1926,6 +1926,17 @@ main( hypre_int argc,
hypre_FinalizeTiming(time_index);
hypre_ClearTiming();
HYPRE_BoomerAMGGetNumIterations(amg_solver, &num_iterations);
HYPRE_BoomerAMGGetFinalRelativeResidualNorm(amg_solver, &final_res_norm);
if (myid == 0)
{
hypre_printf("\n");
hypre_printf("BoomerAMG Iterations = %d\n", num_iterations);
hypre_printf("Final Relative Residual Norm = %e\n", final_res_norm);
hypre_printf("\n");
}
#if SECOND_TIME
/* run a second time to check for memory leaks */
HYPRE_ParVectorSetRandomValues(x, 775);