Brought Basis test setup up to date with the develop so the docker

test contain can be run.
LLNL · Jan 12, 2025 · 7782322 · 7782322
1 parent d2d70fb
commit 7782322
Show file tree

Hide file tree

Showing 105 changed files with 818 additions and 6 deletions.
diff --git a/builder/dsys b/builder/dsys
@@ -44,7 +44,7 @@ f_config() { $BASIS_ROOT/bin/mio -a $*; }
 # Run test suite.
 f_test() {
   for n in 1 2 3; do
-    [ -x ../test/level_$n/do-test ] && (cd ../test/level_$n && ./do-test $*)
+    [ -x ./test/level_$n/do-test ] && (cd ./test/level_$n && ./do-test $*)
   done
 }
 
@@ -64,7 +64,7 @@ case "$1" in
             b=`basename $i`
             if [ "$b" = pck -o -f "../$b/pre-Make" ]; then
               xop $RM -rf $b
-              $RM -rf ../dev/$b ../test/level_?/$b debuggable.$b optimized.$b
+              $RM -rf ../dev/$b ./test/level_?/$b debuggable.$b optimized.$b
               echo "$b deleted"
             elif [ "$b" = "*" ]; then # ../dev is empty: Do nothing.
               :

diff --git a/...es/Forthon_case1/output_forthon_case1.rtf → ...es/Forthon_case1/output_forthon_case1.rtf b/...es/Forthon_case1/output_forthon_case1.rtf → ...es/Forthon_case1/output_forthon_case1.rtf
diff --git a/...n_cases/Forthon_case1/rd_forthon_case1.py → ...n_cases/Forthon_case1/rd_forthon_case1.py b/...n_cases/Forthon_case1/rd_forthon_case1.py → ...n_cases/Forthon_case1/rd_forthon_case1.py
diff --git a/test/Forthon_cases/Forthon_case2/aeqdskd3d → ...est/Forthon_cases/Forthon_case2/aeqdskd3d b/test/Forthon_cases/Forthon_case2/aeqdskd3d → ...est/Forthon_cases/Forthon_case2/aeqdskd3d
diff --git a/test/Forthon_cases/Forthon_case2/ehr2.dat → ...test/Forthon_cases/Forthon_case2/ehr2.dat b/test/Forthon_cases/Forthon_case2/ehr2.dat → ...test/Forthon_cases/Forthon_case2/ehr2.dat
diff --git a/...Forthon_cases/Forthon_case2/h5d3d_ex.16x8 → ...Forthon_cases/Forthon_case2/h5d3d_ex.16x8 b/...Forthon_cases/Forthon_case2/h5d3d_ex.16x8 → ...Forthon_cases/Forthon_case2/h5d3d_ex.16x8
diff --git a/test/Forthon_cases/Forthon_case2/neqdskd3d → ...est/Forthon_cases/Forthon_case2/neqdskd3d b/test/Forthon_cases/Forthon_case2/neqdskd3d → ...est/Forthon_cases/Forthon_case2/neqdskd3d
diff --git a/...es/Forthon_case2/output_forthon_case2.rtf → ...es/Forthon_case2/output_forthon_case2.rtf b/...es/Forthon_case2/output_forthon_case2.rtf → ...es/Forthon_case2/output_forthon_case2.rtf
diff --git a/...Forthon_cases/Forthon_case2/pfd3d_ex.16x8 → ...Forthon_cases/Forthon_case2/pfd3d_ex.16x8 b/...Forthon_cases/Forthon_case2/pfd3d_ex.16x8 → ...Forthon_cases/Forthon_case2/pfd3d_ex.16x8
diff --git a/...n_cases/Forthon_case2/rd_forthon_case2.py → ...n_cases/Forthon_case2/rd_forthon_case2.py b/...n_cases/Forthon_case2/rd_forthon_case2.py → ...n_cases/Forthon_case2/rd_forthon_case2.py
diff --git a/test/Forthon_cases/Forthon_case3/aeqdskd3d → ...est/Forthon_cases/Forthon_case3/aeqdskd3d b/test/Forthon_cases/Forthon_case3/aeqdskd3d → ...est/Forthon_cases/Forthon_case3/aeqdskd3d
diff --git a/test/Forthon_cases/Forthon_case3/ehr2.dat → ...test/Forthon_cases/Forthon_case3/ehr2.dat b/test/Forthon_cases/Forthon_case3/ehr2.dat → ...test/Forthon_cases/Forthon_case3/ehr2.dat
diff --git a/test/Forthon_cases/Forthon_case3/neqdskd3d → ...est/Forthon_cases/Forthon_case3/neqdskd3d b/test/Forthon_cases/Forthon_case3/neqdskd3d → ...est/Forthon_cases/Forthon_case3/neqdskd3d
diff --git a/...es/Forthon_case3/output_forthon_case3.rtf → ...es/Forthon_case3/output_forthon_case3.rtf b/...es/Forthon_case3/output_forthon_case3.rtf → ...es/Forthon_case3/output_forthon_case3.rtf
diff --git a/...n_cases/Forthon_case3/pfd3d_ex_upg.64x32m → ...n_cases/Forthon_case3/pfd3d_ex_upg.64x32m b/...n_cases/Forthon_case3/pfd3d_ex_upg.64x32m → ...n_cases/Forthon_case3/pfd3d_ex_upg.64x32m
diff --git a/...n_cases/Forthon_case3/rd_forthon_case3.py → ...n_cases/Forthon_case3/rd_forthon_case3.py b/...n_cases/Forthon_case3/rd_forthon_case3.py → ...n_cases/Forthon_case3/rd_forthon_case3.py
diff --git a/...Forthon_cases/Forthon_case4/aeq_iter-feat → ...Forthon_cases/Forthon_case4/aeq_iter-feat b/...Forthon_cases/Forthon_case4/aeq_iter-feat → ...Forthon_cases/Forthon_case4/aeq_iter-feat
diff --git a/test/Forthon_cases/Forthon_case4/ehr2.dat → ...test/Forthon_cases/Forthon_case4/ehr2.dat b/test/Forthon_cases/Forthon_case4/ehr2.dat → ...test/Forthon_cases/Forthon_case4/ehr2.dat
diff --git a/...Forthon_cases/Forthon_case4/geq_iter-feat → ...Forthon_cases/Forthon_case4/geq_iter-feat b/...Forthon_cases/Forthon_case4/geq_iter-feat → ...Forthon_cases/Forthon_case4/geq_iter-feat
diff --git a/test/Forthon_cases/Forthon_case4/mist.dat → ...test/Forthon_cases/Forthon_case4/mist.dat b/test/Forthon_cases/Forthon_case4/mist.dat → ...test/Forthon_cases/Forthon_case4/mist.dat
diff --git a/...es/Forthon_case4/output_forthon_case4.rtf → ...es/Forthon_case4/output_forthon_case4.rtf b/...es/Forthon_case4/output_forthon_case4.rtf → ...es/Forthon_case4/output_forthon_case4.rtf
diff --git a/.../Forthon_cases/Forthon_case4/pfiter_ffC.5 → .../Forthon_cases/Forthon_case4/pfiter_ffC.5 b/.../Forthon_cases/Forthon_case4/pfiter_ffC.5 → .../Forthon_cases/Forthon_case4/pfiter_ffC.5
diff --git a/...on_cases/Forthon_case4/plate.iter-feat.py → ...on_cases/Forthon_case4/plate.iter-feat.py b/...on_cases/Forthon_case4/plate.iter-feat.py → ...on_cases/Forthon_case4/plate.iter-feat.py
diff --git a/...n_cases/Forthon_case4/rd_forthon_case4.py → ...n_cases/Forthon_case4/rd_forthon_case4.py b/...n_cases/Forthon_case4/rd_forthon_case4.py → ...n_cases/Forthon_case4/rd_forthon_case4.py
diff --git a/.../Forthon_cases/Forthon_case5/C_rates.adas → .../Forthon_cases/Forthon_case5/C_rates.adas b/.../Forthon_cases/Forthon_case5/C_rates.adas → .../Forthon_cases/Forthon_case5/C_rates.adas
diff --git a/...Forthon_cases/Forthon_case5/aeq_iter-feat → ...Forthon_cases/Forthon_case5/aeq_iter-feat b/...Forthon_cases/Forthon_case5/aeq_iter-feat → ...Forthon_cases/Forthon_case5/aeq_iter-feat
diff --git a/test/Forthon_cases/Forthon_case5/ehr2.dat → ...test/Forthon_cases/Forthon_case5/ehr2.dat b/test/Forthon_cases/Forthon_case5/ehr2.dat → ...test/Forthon_cases/Forthon_case5/ehr2.dat
diff --git a/...Forthon_cases/Forthon_case5/geq_iter-feat → ...Forthon_cases/Forthon_case5/geq_iter-feat b/...Forthon_cases/Forthon_case5/geq_iter-feat → ...Forthon_cases/Forthon_case5/geq_iter-feat
diff --git a/...es/Forthon_case5/output_forthon_case5.rtf → ...es/Forthon_case5/output_forthon_case5.rtf b/...es/Forthon_case5/output_forthon_case5.rtf → ...es/Forthon_case5/output_forthon_case5.rtf
diff --git a/...Forthon_cases/Forthon_case5/pfiter_msC.15 → ...Forthon_cases/Forthon_case5/pfiter_msC.15 b/...Forthon_cases/Forthon_case5/pfiter_msC.15 → ...Forthon_cases/Forthon_case5/pfiter_msC.15
diff --git a/...on_cases/Forthon_case5/plate.iter-feat.py → ...on_cases/Forthon_case5/plate.iter-feat.py b/...on_cases/Forthon_case5/plate.iter-feat.py → ...on_cases/Forthon_case5/plate.iter-feat.py
diff --git a/...n_cases/Forthon_case5/rd_forthon_case5.py → ...n_cases/Forthon_case5/rd_forthon_case5.py b/...n_cases/Forthon_case5/rd_forthon_case5.py → ...n_cases/Forthon_case5/rd_forthon_case5.py
diff --git a/.../Forthon_cases/Forthon_case6/README_CASE6 → .../Forthon_cases/Forthon_case6/README_CASE6 b/.../Forthon_cases/Forthon_case6/README_CASE6 → .../Forthon_cases/Forthon_case6/README_CASE6
diff --git a/test/Forthon_cases/Forthon_case6/aeqdsk → ...r/test/Forthon_cases/Forthon_case6/aeqdsk b/test/Forthon_cases/Forthon_case6/aeqdsk → ...r/test/Forthon_cases/Forthon_case6/aeqdsk
diff --git a/test/Forthon_cases/Forthon_case6/ehr2.dat → ...test/Forthon_cases/Forthon_case6/ehr2.dat b/test/Forthon_cases/Forthon_case6/ehr2.dat → ...test/Forthon_cases/Forthon_case6/ehr2.dat
diff --git a/test/Forthon_cases/Forthon_case6/neqdsk → ...r/test/Forthon_cases/Forthon_case6/neqdsk b/test/Forthon_cases/Forthon_case6/neqdsk → ...r/test/Forthon_cases/Forthon_case6/neqdsk
diff --git a/...on_cases/Forthon_case6/output_rdtimedpd_1 → ...on_cases/Forthon_case6/output_rdtimedpd_1 b/...on_cases/Forthon_case6/output_rdtimedpd_1 → ...on_cases/Forthon_case6/output_rdtimedpd_1
diff --git a/...on_cases/Forthon_case6/output_rdtimedpd_2 → ...on_cases/Forthon_case6/output_rdtimedpd_2 b/...on_cases/Forthon_case6/output_rdtimedpd_2 → ...on_cases/Forthon_case6/output_rdtimedpd_2
diff --git a/...Forthon_cases/Forthon_case6/pfd3d_ex.16x8 → ...Forthon_cases/Forthon_case6/pfd3d_ex.16x8 b/...Forthon_cases/Forthon_case6/pfd3d_ex.16x8 → ...Forthon_cases/Forthon_case6/pfd3d_ex.16x8
diff --git a/...orthon_cases/Forthon_case6/rdtimedpd_1.py → ...orthon_cases/Forthon_case6/rdtimedpd_1.py b/...orthon_cases/Forthon_case6/rdtimedpd_1.py → ...orthon_cases/Forthon_case6/rdtimedpd_1.py
diff --git a/...orthon_cases/Forthon_case6/rdtimedpd_2.py → ...orthon_cases/Forthon_case6/rdtimedpd_2.py b/...orthon_cases/Forthon_case6/rdtimedpd_2.py → ...orthon_cases/Forthon_case6/rdtimedpd_2.py
diff --git a/test/Forthon_cases/README-FORTHON-tests → ...r/test/Forthon_cases/README-FORTHON-tests b/test/Forthon_cases/README-FORTHON-tests → ...r/test/Forthon_cases/README-FORTHON-tests
diff --git a/test/README → builder/test/README b/test/README → builder/test/README
diff --git a/test/facets/aeqdsk → builder/test/facets/aeqdsk b/test/facets/aeqdsk → builder/test/facets/aeqdsk
diff --git a/test/facets/aeqdskd3d → builder/test/facets/aeqdskd3d b/test/facets/aeqdskd3d → builder/test/facets/aeqdskd3d
diff --git a/test/facets/ehr2.dat → builder/test/facets/ehr2.dat b/test/facets/ehr2.dat → builder/test/facets/ehr2.dat
diff --git a/test/facets/example.py → builder/test/facets/example.py b/test/facets/example.py → builder/test/facets/example.py
diff --git a/test/facets/flx-grd → builder/test/facets/flx-grd b/test/facets/flx-grd → builder/test/facets/flx-grd
diff --git a/test/facets/gridue → builder/test/facets/gridue b/test/facets/gridue → builder/test/facets/gridue
diff --git a/test/facets/neqdsk → builder/test/facets/neqdsk b/test/facets/neqdsk → builder/test/facets/neqdsk
diff --git a/test/facets/neqdskd3d → builder/test/facets/neqdskd3d b/test/facets/neqdskd3d → builder/test/facets/neqdskd3d
diff --git a/test/facets/pfd3d_ex.16x8 → builder/test/facets/pfd3d_ex.16x8 b/test/facets/pfd3d_ex.16x8 → builder/test/facets/pfd3d_ex.16x8
diff --git a/test/facets/runit → builder/test/facets/runit b/test/facets/runit → builder/test/facets/runit
diff --git a/test/facets/testin.py → builder/test/facets/testin.py b/test/facets/testin.py → builder/test/facets/testin.py
diff --git a/test/level_1/aprar1 → builder/test/level_1/aprar1 b/test/level_1/aprar1 → builder/test/level_1/aprar1
diff --git a/test/level_1/aprar2 → builder/test/level_1/aprar2 b/test/level_1/aprar2 → builder/test/level_1/aprar2
diff --git a/test/level_1/aprsc → builder/test/level_1/aprsc b/test/level_1/aprsc → builder/test/level_1/aprsc
diff --git a/test/level_1/data/seedranf → builder/test/level_1/data/seedranf b/test/level_1/data/seedranf → builder/test/level_1/data/seedranf
diff --git a/test/level_1/data/testltab → builder/test/level_1/data/testltab b/test/level_1/data/testltab → builder/test/level_1/data/testltab
diff --git a/test/level_1/do-test → builder/test/level_1/do-test b/test/level_1/do-test → builder/test/level_1/do-test
@@ -21,11 +21,12 @@ set Arch = `$BASIS_ROOT/bin/cfgman use`
 set Base = `pwd`
 set Base = $Base:h
 set Base = $Base:h
+set Base = $Base:h
 set Root = $Base/dev/$Arch
 set BinD = $Root/bin
 
-setenv UEDGE $Base/test
-setenv UEDGE_SCRIPTS $Base/test/scripts
+setenv UEDGE $Base/builder/test
+setenv UEDGE_SCRIPTS $Base/builder/test/scripts
 
 if (-e $BinD/xuedge) then
    set Code = $BinD/xuedge

diff --git a/test/level_1/math1 → builder/test/level_1/math1 b/test/level_1/math1 → builder/test/level_1/math1
diff --git a/test/level_1/math2 → builder/test/level_1/math2 b/test/level_1/math2 → builder/test/level_1/math2
diff --git a/test/level_1/math3 → builder/test/level_1/math3 b/test/level_1/math3 → builder/test/level_1/math3
diff --git a/test/level_1/math4 → builder/test/level_1/math4 b/test/level_1/math4 → builder/test/level_1/math4
diff --git a/test/level_1/mathm → builder/test/level_1/mathm b/test/level_1/mathm → builder/test/level_1/mathm
diff --git a/test/level_1/mathr → builder/test/level_1/mathr b/test/level_1/mathr → builder/test/level_1/mathr
diff --git a/test/level_1/ref/aprar1 → builder/test/level_1/ref/aprar1 b/test/level_1/ref/aprar1 → builder/test/level_1/ref/aprar1
diff --git a/test/level_1/ref/aprar2 → builder/test/level_1/ref/aprar2 b/test/level_1/ref/aprar2 → builder/test/level_1/ref/aprar2
diff --git a/test/level_1/ref/aprsc → builder/test/level_1/ref/aprsc b/test/level_1/ref/aprsc → builder/test/level_1/ref/aprsc
diff --git a/test/level_1/ref/math1 → builder/test/level_1/ref/math1 b/test/level_1/ref/math1 → builder/test/level_1/ref/math1
diff --git a/test/level_1/ref/math2 → builder/test/level_1/ref/math2 b/test/level_1/ref/math2 → builder/test/level_1/ref/math2
diff --git a/test/level_1/ref/math3 → builder/test/level_1/ref/math3 b/test/level_1/ref/math3 → builder/test/level_1/ref/math3
diff --git a/test/level_1/ref/math4 → builder/test/level_1/ref/math4 b/test/level_1/ref/math4 → builder/test/level_1/ref/math4
diff --git a/test/level_1/ref/mathm → builder/test/level_1/ref/mathm b/test/level_1/ref/mathm → builder/test/level_1/ref/mathm
diff --git a/test/level_1/ref/mathr → builder/test/level_1/ref/mathr b/test/level_1/ref/mathr → builder/test/level_1/ref/mathr
diff --git a/test/level_2/data/aeqdskd3d → builder/test/level_2/data/aeqdskd3d b/test/level_2/data/aeqdskd3d → builder/test/level_2/data/aeqdskd3d
diff --git a/test/level_2/data/d3d_cfdupg.h5 → builder/test/level_2/data/d3d_cfdupg.h5 b/test/level_2/data/d3d_cfdupg.h5 → builder/test/level_2/data/d3d_cfdupg.h5
diff --git a/test/level_2/data/neqdskd3d → builder/test/level_2/data/neqdskd3d b/test/level_2/data/neqdskd3d → builder/test/level_2/data/neqdskd3d
diff --git a/test/level_2/data/pfd3d_cfdupg → builder/test/level_2/data/pfd3d_cfdupg b/test/level_2/data/pfd3d_cfdupg → builder/test/level_2/data/pfd3d_cfdupg
diff --git a/test/level_2/do-test → builder/test/level_2/do-test b/test/level_2/do-test → builder/test/level_2/do-test
@@ -22,11 +22,12 @@ set Arch = `$BASIS_ROOT/bin/cfgman use`
 set Base = `pwd`
 set Base = $Base:h
 set Base = $Base:h
+set Base = $Base:h
 set Root = $Base/dev/$Arch
 set BinD = $Root/bin
 
-setenv UEDGE $Base/test
-setenv UEDGE_SCRIPTS $Base/test/scripts
+setenv UEDGE $Base/builder/test
+setenv UEDGE_SCRIPTS $Base/builder/test/scripts
 
 if (-e $BinD/xuedge) then
    set Code = $BinD/xuedge

diff --git a/test/rognlien/aeqdskd3d → builder/test/level_2/lnx-unk-o/aeqdsk b/test/rognlien/aeqdskd3d → builder/test/level_2/lnx-unk-o/aeqdsk
diff --git a/builder/test/level_2/lnx-unk-o/gridue b/builder/test/level_2/lnx-unk-o/gridue
diff --git a/test/rognlien/neqdskd3d → builder/test/level_2/lnx-unk-o/neqdsk b/test/rognlien/neqdskd3d → builder/test/level_2/lnx-unk-o/neqdsk
diff --git a/test/level_2/rdd3d_cfdupg.8x4 → builder/test/level_2/rdd3d_cfdupg.8x4 b/test/level_2/rdd3d_cfdupg.8x4 → builder/test/level_2/rdd3d_cfdupg.8x4
diff --git a/test/level_2/ref/rdd3d_cfdupg.8x4.pdb → ...der/test/level_2/ref/rdd3d_cfdupg.8x4.pdb b/test/level_2/ref/rdd3d_cfdupg.8x4.pdb → ...der/test/level_2/ref/rdd3d_cfdupg.8x4.pdb
diff --git a/test/rensink/dnull/a105335.05200 → builder/test/rensink/dnull/a105335.05200 b/test/rensink/dnull/a105335.05200 → builder/test/rensink/dnull/a105335.05200
diff --git a/test/rensink/dnull/a118334.04000 → builder/test/rensink/dnull/a118334.04000 b/test/rensink/dnull/a118334.04000 → builder/test/rensink/dnull/a118334.04000
diff --git a/test/rensink/dnull/dnull_index.pdf → builder/test/rensink/dnull/dnull_index.pdf b/test/rensink/dnull/dnull_index.pdf → builder/test/rensink/dnull/dnull_index.pdf
diff --git a/test/rensink/dnull/g105335.05200 → builder/test/rensink/dnull/g105335.05200 b/test/rensink/dnull/g105335.05200 → builder/test/rensink/dnull/g105335.05200
diff --git a/test/rensink/dnull/g118334.04000 → builder/test/rensink/dnull/g118334.04000 b/test/rensink/dnull/g118334.04000 → builder/test/rensink/dnull/g118334.04000
diff --git a/test/rensink/dnull/makemesh_dRsep_m1 → builder/test/rensink/dnull/makemesh_dRsep_m1 b/test/rensink/dnull/makemesh_dRsep_m1 → builder/test/rensink/dnull/makemesh_dRsep_m1
diff --git a/test/rensink/dnull/makemesh_dRsep_p1 → builder/test/rensink/dnull/makemesh_dRsep_p1 b/test/rensink/dnull/makemesh_dRsep_p1 → builder/test/rensink/dnull/makemesh_dRsep_p1
diff --git a/test/rensink/dnull/plate.d3d_bot → builder/test/rensink/dnull/plate.d3d_bot b/test/rensink/dnull/plate.d3d_bot → builder/test/rensink/dnull/plate.d3d_bot
diff --git a/test/rensink/dnull/plate.d3d_top → builder/test/rensink/dnull/plate.d3d_top b/test/rensink/dnull/plate.d3d_top → builder/test/rensink/dnull/plate.d3d_top
diff --git a/test/rensink/dnull/rdmesh.dnull.bot → builder/test/rensink/dnull/rdmesh.dnull.bot b/test/rensink/dnull/rdmesh.dnull.bot → builder/test/rensink/dnull/rdmesh.dnull.bot
diff --git a/test/rensink/dnull/rdmesh.dnull.top → builder/test/rensink/dnull/rdmesh.dnull.top b/test/rensink/dnull/rdmesh.dnull.top → builder/test/rensink/dnull/rdmesh.dnull.top
diff --git a/test/rensink/genbm1 → builder/test/rensink/genbm1 b/test/rensink/genbm1 → builder/test/rensink/genbm1
diff --git a/test/rensink/inbm1 → builder/test/rensink/inbm1 b/test/rensink/inbm1 → builder/test/rensink/inbm1
diff --git a/test/rensink/runbm1 → builder/test/rensink/runbm1 b/test/rensink/runbm1 → builder/test/rensink/runbm1
diff --git a/test/rognlien/README → builder/test/rognlien/README b/test/rognlien/README → builder/test/rognlien/README
diff --git a/builder/test/rognlien/aeqdskd3d b/builder/test/rognlien/aeqdskd3d
diff --git a/builder/test/rognlien/neqdskd3d b/builder/test/rognlien/neqdskd3d
diff --git a/test/rognlien/pfd3d_ex.8x4 → builder/test/rognlien/pfd3d_ex.8x4 b/test/rognlien/pfd3d_ex.8x4 → builder/test/rognlien/pfd3d_ex.8x4
diff --git a/test/rognlien/rdd3d_ex1.8x4 → builder/test/rognlien/rdd3d_ex1.8x4 b/test/rognlien/rdd3d_ex1.8x4 → builder/test/rognlien/rdd3d_ex1.8x4
diff --git a/test/rognlien/rdd3d_ex2.8x4 → builder/test/rognlien/rdd3d_ex2.8x4 b/test/rognlien/rdd3d_ex2.8x4 → builder/test/rognlien/rdd3d_ex2.8x4