converts ref_driver to ref adapt cube-cyl and pencil

nasa · Feb 2, 2022 · adcdce1 · adcdce1
1 parent e661f6e
commit adcdce1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/acceptance/cube-cylinder/linear/accept-cube-cylinder-linear.sh b/acceptance/cube-cylinder/linear/accept-cube-cylinder-linear.sh
@@ -19,7 +19,7 @@ function adapt_cycle {
     outproj=$2
     sweeps=$3
 
-    ${two}/ref_driver -i ${inproj}.meshb -g ega.egads -m ${inproj}.metric -o ${outproj} -s ${sweeps}
+    ${two}/ref adapt ${inproj}.meshb -g ega.egads -m ${inproj}.metric -o ${outproj}.meshb -s ${sweeps}
     ${two}/ref_acceptance -ugawg ${field} ${outproj}.meshb ${outproj}.metric
     ${two}/ref_metric_test ${outproj}.meshb ${outproj}.metric > ${outproj}.status
 

diff --git a/acceptance/cube-cylinder/uniform/accept-cube-cylinder-uniform-valgrind-mpi.sh b/acceptance/cube-cylinder/uniform/accept-cube-cylinder-uniform-valgrind-mpi.sh
@@ -27,4 +27,4 @@ valgrind --quiet  --error-exitcode=1 --leak-check=full \
 --suppressions=../../../misc/valgrind_suppressions_intel_17 \
 --suppressions=../../../misc/valgrind_suppressions_openmpi \
 --suppressions=../../../misc/valgrind_suppressions_zoltan \
-         ${two}/ref_driver -i ega.meshb -g ${geomfile} -m ega.metric -o ref_driver1 -s 2
+         ${two}/ref adapt -i ega.meshb -g ${geomfile} -m ega.metric -o ega1.meshb -s 2
diff --git a/acceptance/cube-cylinder/uniform/accept-cube-cylinder-uniform-valgrind.sh b/acceptance/cube-cylinder/uniform/accept-cube-cylinder-uniform-valgrind.sh
@@ -22,6 +22,6 @@ valgrind --quiet  --error-exitcode=1 --leak-check=full \
 --suppressions=../../../misc/valgrind_suppressions_occ \
 --suppressions=../../../misc/valgrind_suppressions_intel_17 \
 --suppressions=../../../misc/valgrind_suppressions_openmpi \
-         ${two}/ref_driver -i ega.meshb -g ${geomfile} -m ega.metric -o ref_driver1 -s 2
+         ${two}/ref adapt -i ega.meshb -g ${geomfile} -m ega.metric -x ega1.meshb -s 2
 
 
diff --git a/acceptance/cube-cylinder/uniform/accept-cube-cylinder-uniform.sh b/acceptance/cube-cylinder/uniform/accept-cube-cylinder-uniform.sh
@@ -17,15 +17,15 @@ geomfile=ega.egads
 # ${two}/ref_geom_test ${geomfile} ega.meshb
 
 ${two}/ref_acceptance ega.meshb ega.metric 0.1
-${two}/ref_driver -i ega.meshb -g ${geomfile} -m ega.metric -o ref_driver1 -t
-mv ref_gather_movie.tec ref_driver1_movie.tec
-${two}/ref_acceptance ref_driver1.meshb ref_driver1.metric 0.1
-${two}/ref_metric_test ref_driver1.meshb ref_driver1.metric > accept-cube-cylinder-uniform-01.status
-
-${two}/ref_driver -i ref_driver1.meshb -g ${geomfile} -m ref_driver1.metric -o ref_driver2 -t
-mv ref_gather_movie.tec ref_driver2_movie.tec
-${two}/ref_acceptance ref_driver2.meshb ref_driver2.metric 0.1
-${two}/ref_metric_test ref_driver2.meshb ref_driver2.metric > accept-cube-cylinder-uniform-02.status
+${two}/ref adapt ega.meshb -g ${geomfile} -m ega.metric -o ega1.meshb -t
+mv ref_gather_movie.tec ega1_movie.tec
+${two}/ref_acceptance ega1.meshb ega1.metric 0.1
+${two}/ref_metric_test ega1.meshb ega1.metric > accept-cube-cylinder-uniform-01.status
+
+${two}/ref adapt ega1.meshb -g ${geomfile} -m ega1.metric -o ega2.meshb -t
+mv ref_gather_movie.tec ega2_movie.tec
+${two}/ref_acceptance ega2.meshb ega2.metric 0.1
+${two}/ref_metric_test ega2.meshb ega2.metric > accept-cube-cylinder-uniform-02.status
 
 cat accept-cube-cylinder-uniform-02.status
 ../../check.rb accept-cube-cylinder-uniform-02.status 0.3 3.0

diff --git a/acceptance/revolve-pencil/curve/revolve-pencil-curve.sh b/acceptance/revolve-pencil/curve/revolve-pencil-curve.sh
@@ -12,11 +12,10 @@ else
     two=${HOME}/refine/egads/src
 fi
 
-${two}/ref_driver \
-    -i pencil.meshb \
+${two}/ref adapt \
+    pencil.meshb \
     -g ../gen/pencil.egads \
-    -r 2 \
-    -o pencil-curve \
+    -o pencil-curve.meshb \
     -t \
     > accept-annulus-uniform.out