Changed the examples test on tux to use insure.

Fixed the 'base' file for example 10.
This commit is contained in:
falgout 2011-01-12 01:34:08 +00:00
parent fe9042ac62
commit 4c08ad0908
3 changed files with 65 additions and 25 deletions

View File

@ -49,6 +49,10 @@ shift
./test.sh debug.sh $src_dir --with-insure
mv -f debug.??? $output_dir
# Test examples
./test.sh examples.sh $src_dir/examples
mv -f examples.??? $output_dir
# Test babel build (only if 'babel-runtime' directory is present)
if [ -d $src_dir/babel-runtime ]; then
opt="--with-babel"
@ -98,10 +102,6 @@ mv -f make.??? $output_subdir
./test.sh run.sh $src_dir
mv -f run.??? $output_subdir
# Test examples
./test.sh examples.sh $src_dir/examples
mv -f examples.??? $output_dir
# Test documentation build (only if 'docs_misc' directory is present)
if [ -d $src_dir/docs_misc ]; then
./test.sh docs.sh $src_dir

View File

@ -21,36 +21,36 @@
# differences (except for timings) indicate errors
#=============================================================================
diff -bI"time" ex1.base default.out.1 >&2
diff -U3 -bI"time" ex1.base default.out.1 >&2
diff -bI"time" ex2.base default.out.2 >&2
diff -U3 -bI"time" ex2.base default.out.2 >&2
diff -bI"time" ex3.base default.out.3 >&2
diff -U3 -bI"time" ex3.base default.out.3 >&2
diff -bI"time" ex4.base default.out.4 >&2
diff -U3 -bI"time" ex4.base default.out.4 >&2
diff -bI"time" ex5.base default.out.5 >&2
diff -U3 -bI"time" ex5.base default.out.5 >&2
diff -bI"time" ex5f.base default.out.5f >&2
diff -U3 -bI"time" ex5f.base default.out.5f >&2
diff -bI"time" ex6.base default.out.6 >&2
diff -U3 -bI"time" ex6.base default.out.6 >&2
diff -bI"time" ex7.base default.out.7 >&2
diff -U3 -bI"time" ex7.base default.out.7 >&2
diff -bI"time" ex8.base default.out.8 >&2
diff -U3 -bI"time" ex8.base default.out.8 >&2
diff -bI"time" ex9.base default.out.9 >&2
diff -U3 -bI"time" ex9.base default.out.9 >&2
diff -bI"time" ex10.base default.out.10 >&2
diff -U3 -bI"time" ex10.base default.out.10 >&2
diff -bI"time" ex11.base default.out.11 >&2
diff -U3 -bI"time" ex11.base default.out.11 >&2
diff -bI"time" ex12.base default.out.12 >&2
diff -U3 -bI"time" ex12.base default.out.12 >&2
diff -bI"time" ex12f.base default.out.12f >&2
diff -U3 -bI"time" ex12f.base default.out.12f >&2
diff -bI"time" ex13.base default.out.13 >&2
diff -U3 -bI"time" ex13.base default.out.13 >&2
diff -bI"time" ex14.base default.out.14 >&2
diff -U3 -bI"time" ex14.base default.out.14 >&2
diff -bI"time" ex15.base default.out.15 >&2
diff -U3 -bI"time" ex15.base default.out.15 >&2

View File

@ -1,4 +1,44 @@
p0_5858: p4_error: : 9039
p0_5857: p4_error: : 9039
p0_5859: p4_error: : 9039
p0_5860: p4_error: : 9039
***************************************************
* Preconditioned Conjugate Gradient solver
* maximum no. of iterations = 100
* convergence tolerance = 1.000000e-06
*--------------------------------------------------
AMG max levels = 30
AMG coarsen type = 6
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 2.362072e-03 0.285831 2.858306e-01
2 1.590804e-04 0.067348 1.925006e-02
3 1.087675e-05 0.068373 1.316178e-03
4 4.417991e-07 0.040619 5.346141e-05
5 1.281097e-08 0.028997 1.550235e-06
6 5.026712e-10 0.039238 6.082744e-08
***************************************************
* Solver Statistics *
*-------------------------------------------------*
** HYPRE preconditioner setup time = 3.092300e-02
** HYPRE solution time = 2.983800e-02
** HYPRE total time = 6.076100e-02
** HYPRE number of iterations = 6
** HYPRE final residual norm = 5.026712e-10
***************************************************