From 6d3c610041796cb1a6777ea6bb42b69d38363460 Mon Sep 17 00:00:00 2001
From: Sigfried Haering <shaering@oden.utexas.edu>
Date: Fri, 21 Jun 2024 12:24:47 -0700
Subject: [PATCH] switched tolerances of test checks to be consitent with
 default lin-sol tol and replacing ref soln.  numerical-integ defaults to
 false now

---
 test/autoPeriodic.test                        |  2 ++
 test/aveLoMach.test                           |  2 ++
 test/heatEq.test                              |  4 +++-
 test/interpInlet.test                         |  4 +++-
 test/lomach-flow.test                         | 22 ++++++++++++-------
 test/lomach-lequere.test                      |  8 ++++---
 .../ref_solns/aveLoMach/restart_output.sol.h5 |  2 +-
 .../ref_solns/heatedBox/restart_output.sol.h5 |  2 +-
 .../interpInlet/restart_output.sol.h5         |  4 ++--
 .../reference-lequere-varmu.sol.h5            |  2 +-
 .../pipe/restart_output-pipe-lam.sol.h5       |  4 ++--
 .../ref_solns/sgsLoMach/restart_output.sol.h5 |  2 +-
 test/sgsLoMach.test                           |  4 +++-
 13 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/test/autoPeriodic.test b/test/autoPeriodic.test
index 3a46235e2..9ae901de6 100755
--- a/test/autoPeriodic.test
+++ b/test/autoPeriodic.test
@@ -9,6 +9,7 @@ RESTART="ref_solns/sgsLoMach/restart_output.sol.h5"
 setup() {
     SOLN_FILE=restart_output.sol.h5
     REF_FILE=ref_solns/sgsLoMach/restart_output.sol.h5
+    OUT_FILE=output_solns/restart_output_autoPeriodic.sol.h5    
 }
 
 @test "[$TEST] check for input file $RUNFILE" {
@@ -27,4 +28,5 @@ setup() {
     test -s $SOLN_FILE
     test -s $REF_FILE
     h5diff -r --delta=1e-10 $SOLN_FILE $REF_FILE /velocity
+    cp $SOLN_FILE $OUT_FILE
 }
diff --git a/test/aveLoMach.test b/test/aveLoMach.test
index 283146d62..8333dbb51 100755
--- a/test/aveLoMach.test
+++ b/test/aveLoMach.test
@@ -9,6 +9,7 @@ RESTART="ref_solns/aveLoMach/restart_output.sol.h5"
 setup() {
     SOLN_FILE=restart_output.sol.h5
     REF_FILE=ref_solns/aveLoMach/restart_output.sol.h5
+    OUT_FILE=output_solns/restart_output_aveLoMach.sol.h5    
 }
 
 @test "[$TEST] check for input file $RUNFILE" {
@@ -27,4 +28,5 @@ setup() {
     test -s $SOLN_FILE
     test -s $REF_FILE
     h5diff -r --delta=1e-11 $SOLN_FILE $REF_FILE meanVel
+    cp $SOLN_FILE $OUT_FILE
 }
diff --git a/test/heatEq.test b/test/heatEq.test
index 771aa9296..4ddacbe54 100755
--- a/test/heatEq.test
+++ b/test/heatEq.test
@@ -9,6 +9,7 @@ RESTART="ref_solns/heatedBox/restart_output.sol.h5"
 setup() {
     SOLN_FILE=restart_output.sol.h5
     REF_FILE=ref_solns/heatedBox/restart_output.sol.h5
+    OUT_FILE=output_solns/restart_output_heatedBox.sol.h5    
 }
 
 @test "[$TEST] check for input file $RUNFILE" {
@@ -25,5 +26,6 @@ setup() {
 @test "[$TEST] verify tps output with input -> $RUNFILE" {
     test -s $SOLN_FILE
     test -s $REF_FILE
-    h5diff -r --relative=1e-13 $SOLN_FILE $REF_FILE /temperature/temperature
+    h5diff -r --relative=1e-10 $SOLN_FILE $REF_FILE /temperature/temperature
+    cp $SOLN_FILE $OUT_FILE
 }
diff --git a/test/interpInlet.test b/test/interpInlet.test
index 3e1234ae6..ab48232b2 100755
--- a/test/interpInlet.test
+++ b/test/interpInlet.test
@@ -9,6 +9,7 @@ RESTART=
 setup() {
     SOLN_FILE=restart_output.sol.h5
     REF_FILE=ref_solns/interpInlet/restart_output.sol.h5
+    OUT_FILE=output_solns/restart_output_interpInlet.sol.h5    
 }
 
 @test "[$TEST] check for input file $RUNFILE" {
@@ -33,5 +34,6 @@ setup() {
 @test "[$TEST] verify tps output with input -> $RUNFILE" {
     test -s $SOLN_FILE
     test -s $REF_FILE
-    h5diff -r --relative=1e-9 $SOLN_FILE $REF_FILE /temperature/temperature
+    h5diff -r --relative=1e-10 $SOLN_FILE $REF_FILE /temperature/temperature
+    cp $SOLN_FILE $OUT_FILE
 }
diff --git a/test/lomach-flow.test b/test/lomach-flow.test
index fb6b6f536..497f59c5e 100755
--- a/test/lomach-flow.test
+++ b/test/lomach-flow.test
@@ -16,12 +16,15 @@ setup() {
 
     RUNFILE_PIPE="inputs/lomach.pipe.ini"
     REF_SOLN_PIPE="ref_solns/pipe/restart_output-pipe-lam.sol.h5"
+    OUT_SOLN_PIPE="output_solns/restart_output-pipe-lam.sol.h5"    
 
     RUNFILE_TC="inputs/lomach.taylor.couette.ini"
     REF_SOLN_TC="ref_solns/taylor-couette/restart_output-tc.Re100.h5"
+    OUT_SOLN_TC="output_solns/restart_output-tc.Re100.h5"    
 
     RUNFILE_PIPE_ARANS="inputs/lomach.pipe.arans.ini"
     REF_SOLN_PIPE_ARANS="ref_solns/pipe/restart_output-pipe-arans.sol.h5"
+    OUT_SOLN_PIPE_ARANS="output_solns/restart_output-pipe-arans.sol.h5"    
 
     MPIRUN=`./sniff_mpirun.sh`
 }
@@ -109,8 +112,8 @@ setup() {
     [[ ${status} -eq 0 ]]
 
     # check solutions are the same!
-    h5diff -r --delta=1e-11 restart_output-lid.sol.h5 restart_output-lid.sol.2.h5
-
+    h5diff -r --delta=1e-11 restart_output-lid.sol.h5 restart_output-lid.sol.2.h5  
+    
     # delete intermediate files
     rm -f restart_output-lid*.h5
     rm $RUNFILE_LID_MOD
@@ -149,22 +152,25 @@ setup() {
     run $EXE --runFile $RUNFILE_PIPE
     [[ ${status} -eq 0 ]]
     test -s restart_output-pipe-lam.sol.h5
-    h5diff -r --delta=1e-8 restart_output-pipe-lam.sol.h5 $REF_SOLN_PIPE /velocity
-    h5diff -r --delta=1e-8 restart_output-pipe-lam.sol.h5 $REF_SOLN_PIPE /swirl
+    h5diff -r --delta=1e-10 restart_output-pipe-lam.sol.h5 $REF_SOLN_PIPE /velocity
+    h5diff -r --delta=1e-10 restart_output-pipe-lam.sol.h5 $REF_SOLN_PIPE /swirl
+    cp restart_output-pipe-lam.sol.h5 $OUT_SOLN_PIPE
 }
 
 @test "[$TEST] check that Taylor-Couette (axisymmetric, with swirl) runs and verify result" {
     run $EXE --runFile $RUNFILE_TC
     [[ ${status} -eq 0 ]]
     test -s restart_output-tc.sol.h5
-    h5diff -r --delta=1e-8 restart_output-tc.sol.h5 $REF_SOLN_TC /velocity
-    h5diff -r --delta=1e-8 restart_output-tc.sol.h5 $REF_SOLN_TC /swirl
+    h5diff -r --delta=1e-10 restart_output-tc.sol.h5 $REF_SOLN_TC /velocity
+    h5diff -r --delta=1e-10 restart_output-tc.sol.h5 $REF_SOLN_TC /swirl
+    cp restart_output-tc.sol.h5 $OUT_SOLN_TC    
 }
 
 @test "[$TEST] check pipe (axisymmetric) flow with algebraic rans model" {
     run $EXE --runFile $RUNFILE_PIPE_ARANS
     [[ ${status} -eq 0 ]]
     test -s restart_output-pipe-arans.sol.h5
-    h5diff -r --delta=1e-8 restart_output-pipe-arans.sol.h5 $REF_SOLN_PIPE_ARANS /velocity
-    h5diff -r --delta=1e-8 restart_output-pipe-arans.sol.h5 $REF_SOLN_PIPE_ARANS /swirl
+    h5diff -r --delta=1e-10 restart_output-pipe-arans.sol.h5 $REF_SOLN_PIPE_ARANS /velocity
+    h5diff -r --delta=1e-10 restart_output-pipe-arans.sol.h5 $REF_SOLN_PIPE_ARANS /swirl
+    cp restart_output-pipe-arans.sol.h5 $OUT_SOLN_PIPE_ARANS
 }
diff --git a/test/lomach-lequere.test b/test/lomach-lequere.test
index 582aa3072..70d9fba63 100755
--- a/test/lomach-lequere.test
+++ b/test/lomach-lequere.test
@@ -10,6 +10,7 @@ setup() {
     RUNFILE="inputs/lomach.lequere.varmu.ini"
     REF_SOLN="ref_solns/lequere-varmu/reference-lequere-varmu.sol.h5"
     SOLN_FILE="restart_output-lequere-varmu.sol.h5"
+    OUT_SOLN="output_solns/reference-lequere-varmu.sol.h5"   
 }
 
 @test "[$TEST] Le Quere low Mach, thermally-driven cavity regression with variable viscosity" {
@@ -24,8 +25,9 @@ setup() {
     $EXE --runFile $RUNFILE
 
     # check
-    h5diff -r --relative=1e-8 $SOLN_FILE $REF_SOLN /temperature/temperature
-    h5diff -r --delta=1e-8 $SOLN_FILE $REF_SOLN /velocity/x-comp
-    h5diff -r --delta=1e-8 $SOLN_FILE $REF_SOLN /velocity/y-comp
+    h5diff -r --relative=1e-10 $SOLN_FILE $REF_SOLN /temperature/temperature
+    h5diff -r --delta=1e-10 $SOLN_FILE $REF_SOLN /velocity/x-comp
+    h5diff -r --delta=1e-10 $SOLN_FILE $REF_SOLN /velocity/y-comp
+    cp $SOLN_FILE $OUT_SOLN
 }
 
diff --git a/test/ref_solns/aveLoMach/restart_output.sol.h5 b/test/ref_solns/aveLoMach/restart_output.sol.h5
index 48d9b67a7..fc8a71bcd 100644
--- a/test/ref_solns/aveLoMach/restart_output.sol.h5
+++ b/test/ref_solns/aveLoMach/restart_output.sol.h5
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c3d84bab6ef05f42cdad7b3e28a758b3a1f32b0eaaf55ec3cdf0a7b04a47fec0
+oid sha256:15bb2ec395f79dc7d28324a61467760e675f3501b5582b56ff7a294146cb337d
 size 382040
diff --git a/test/ref_solns/heatedBox/restart_output.sol.h5 b/test/ref_solns/heatedBox/restart_output.sol.h5
index a70ced5fd..cf108bb26 100644
--- a/test/ref_solns/heatedBox/restart_output.sol.h5
+++ b/test/ref_solns/heatedBox/restart_output.sol.h5
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d81816aaa43491b582aff0937a16c2bd1037340378c59bbecc3203c9ad26e78e
+oid sha256:02d366574f35b75cc97fdfe330450832cdb98937bcbdf3fd39f4f79921a6bab9
 size 3568
diff --git a/test/ref_solns/interpInlet/restart_output.sol.h5 b/test/ref_solns/interpInlet/restart_output.sol.h5
index 5fc3e60c0..78a7f4a38 100644
--- a/test/ref_solns/interpInlet/restart_output.sol.h5
+++ b/test/ref_solns/interpInlet/restart_output.sol.h5
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c782a4cdbb7228c7ffd19f262ba1f2440ed132ca055e2e76b54c3a3c2630c5d
-size 8664
+oid sha256:c0639671f8f1f9496eb313f87d4fa40bcada3713d9d6f4bbd67b4bbf81405a32
+size 8728
diff --git a/test/ref_solns/lequere-varmu/reference-lequere-varmu.sol.h5 b/test/ref_solns/lequere-varmu/reference-lequere-varmu.sol.h5
index 13e2013d8..b62cc8878 100644
--- a/test/ref_solns/lequere-varmu/reference-lequere-varmu.sol.h5
+++ b/test/ref_solns/lequere-varmu/reference-lequere-varmu.sol.h5
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:992d58bb5010f3576f13fd076f2b2ab67b4ead1536b627d7e05649c6acfccc87
+oid sha256:222e94021b4b7ed239f24c8b486a45b89a7bf7d7a15d621273f2b504bf14900a
 size 106416
diff --git a/test/ref_solns/pipe/restart_output-pipe-lam.sol.h5 b/test/ref_solns/pipe/restart_output-pipe-lam.sol.h5
index 636445c61..953709889 100644
--- a/test/ref_solns/pipe/restart_output-pipe-lam.sol.h5
+++ b/test/ref_solns/pipe/restart_output-pipe-lam.sol.h5
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7fe39fdee999551ea2e82c2e492f0cafd8567e9c0bae0066a02063e05cac8bc4
-size 18416
+oid sha256:3af1089c90ac4118d913cf80d7e9e9ee260e2ad94e0a5c0310a2fde4ae63c574
+size 18480
diff --git a/test/ref_solns/sgsLoMach/restart_output.sol.h5 b/test/ref_solns/sgsLoMach/restart_output.sol.h5
index eb91f9a10..c56fe05a7 100644
--- a/test/ref_solns/sgsLoMach/restart_output.sol.h5
+++ b/test/ref_solns/sgsLoMach/restart_output.sol.h5
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c6c9716c42370668ad883e258709b93083b2d7f25c6f8afdc547b680611fc73
+oid sha256:663299c7c61d64043b0e02a6da2e6c315bf0ff9d63736bbc7ba8ec27b64a4840
 size 78744
diff --git a/test/sgsLoMach.test b/test/sgsLoMach.test
index 0309c3755..e317f0e56 100755
--- a/test/sgsLoMach.test
+++ b/test/sgsLoMach.test
@@ -9,6 +9,7 @@ RESTART="ref_solns/sgsLoMach/restart_output.sol.h5"
 setup() {
     SOLN_FILE=restart_output.sol.h5
     REF_FILE=ref_solns/sgsLoMach/restart_output.sol.h5
+    OUT_FILE=output_solns/restart_output_sgsLoMach.sol.h5    
 }
 
 @test "[$TEST] check for input file $RUNFILE" {
@@ -26,5 +27,6 @@ setup() {
 @test "[$TEST] verify tps output with input -> $RUNFILE" {
     test -s $SOLN_FILE
     test -s $REF_FILE
-    h5diff -r --delta=1e-11 $SOLN_FILE $REF_FILE /velocity
+    h5diff -r --delta=1e-10 $SOLN_FILE $REF_FILE /velocity
+    cp $SOLN_FILE $OUT_FILE
 }