From 6c7d4ead887ec960038a197dc2c94bae199d8ae0 Mon Sep 17 00:00:00 2001 From: Mike Park Date: Wed, 2 Feb 2022 09:16:37 -0500 Subject: [PATCH] removes last use of ref_driver --- .../annulus/uniform/accept-annulus-uniform.sh | 18 +++++++++--------- .../uniform/accept-cone-cone-uniform.sh | 18 +++++++++--------- acceptance/inflate/box.sh | 2 +- .../om6/bootstrap/accept-om6-bootstrap.sh | 7 ++++--- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/acceptance/annulus/uniform/accept-annulus-uniform.sh b/acceptance/annulus/uniform/accept-annulus-uniform.sh index 04474f011..a9dcabb41 100755 --- a/acceptance/annulus/uniform/accept-annulus-uniform.sh +++ b/acceptance/annulus/uniform/accept-annulus-uniform.sh @@ -17,15 +17,15 @@ geomfile=annulus.egads # ${two}/ref_geom_test ${geomfile} annulus.meshb ${two}/ref_acceptance -ugawg polar-2 annulus.meshb annulus-metric.solb -${two}/ref_driver -i annulus.meshb -g ${geomfile} -m annulus-metric.solb -o ref_driver1 -t -f ref_driver1-final.tec -mv ref_gather_movie.tec ref_driver1_movie.tec -${two}/ref_acceptance -ugawg polar-2 ref_driver1.meshb ref_driver1-metric.solb -${two}/ref_metric_test ref_driver1.meshb ref_driver1-metric.solb > accept-annulus-uniform-01.status - -${two}/ref_driver -i ref_driver1.meshb -g ${geomfile} -m ref_driver1-metric.solb -o ref_driver2 -t -f ref_driver2-final.tec -mv ref_gather_movie.tec ref_driver2_movie.tec -${two}/ref_acceptance -ugawg polar-2 ref_driver2.meshb ref_driver2-metric.solb -${two}/ref_metric_test ref_driver2.meshb ref_driver2-metric.solb > accept-annulus-uniform-02.status +${two}/ref adapt annulus.meshb -g ${geomfile} -m annulus-metric.solb -x annulus1.meshb -t -f annulus1-final.tec +mv ref_gather_movie.tec annulus1_movie.tec +${two}/ref_acceptance -ugawg polar-2 annulus1.meshb annulus1-metric.solb +${two}/ref_metric_test annulus1.meshb annulus1-metric.solb > accept-annulus-uniform-01.status + +${two}/ref adapt annulus1.meshb -g ${geomfile} -m annulus1-metric.solb -x annulus2.meshb -t -f annulus2-final.tec +mv ref_gather_movie.tec annulus2_movie.tec +${two}/ref_acceptance -ugawg polar-2 annulus2.meshb annulus2-metric.solb +${two}/ref_metric_test annulus2.meshb annulus2-metric.solb > accept-annulus-uniform-02.status cat accept-annulus-uniform-02.status ../../check.rb accept-annulus-uniform-02.status 0.3 3.0 diff --git a/acceptance/cone-cone/uniform/accept-cone-cone-uniform.sh b/acceptance/cone-cone/uniform/accept-cone-cone-uniform.sh index 7d242511c..e54b47670 100755 --- a/acceptance/cone-cone/uniform/accept-cone-cone-uniform.sh +++ b/acceptance/cone-cone/uniform/accept-cone-cone-uniform.sh @@ -17,15 +17,15 @@ geomfile=cone-cone.egads # ${two}/ref_geom_test ${geomfile} cone-cone.meshb ${two}/ref_acceptance cone-cone.meshb cone-cone.metric 0.1 -${two}/ref_driver -i cone-cone.meshb -g ${geomfile} -m cone-cone.metric -o ref_driver1 -t -r 1 -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-final-metric.solb > accept-cone-cone-uniform-01.status - -${two}/ref_driver -i ref_driver1.meshb -g ${geomfile} -m ref_driver1.metric -o ref_driver2 -t -r 1 -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-final-metric.solb > accept-cone-cone-uniform-02.status +${two}/ref adapt cone-cone.meshb -g ${geomfile} -m cone-cone.metric -x cone-cone1.meshb -t +mv ref_gather_movie.tec cone-cone1_movie.tec +${two}/ref_acceptance cone-cone1.meshb cone-cone1.metric 0.1 +${two}/ref_metric_test cone-cone1.meshb cone-cone1-final-metric.solb > accept-cone-cone-uniform-01.status + +${two}/ref adapt cone-cone1.meshb -g ${geomfile} -m cone-cone1.metric -x cone-cone2.meshb -t +mv ref_gather_movie.tec cone-cone2_movie.tec +${two}/ref_acceptance cone-cone2.meshb cone-cone2.metric 0.1 +${two}/ref_metric_test cone-cone2.meshb cone-cone2-final-metric.solb > accept-cone-cone-uniform-02.status cat accept-cone-cone-uniform-02.status ../../check.rb accept-cone-cone-uniform-02.status 0.20 6.0 diff --git a/acceptance/inflate/box.sh b/acceptance/inflate/box.sh index f9ca00981..85843894a 100755 --- a/acceptance/inflate/box.sh +++ b/acceptance/inflate/box.sh @@ -6,7 +6,7 @@ rm -f box-vol.meshb ref bootstrap box.egads | tee box-boot.txt rm -f box01.meshb -ref_driver -i box-vol.meshb \ +ref adapt box-vol.meshb \ -g box.egads \ -x box.meshb | tee box-crv.txt diff --git a/acceptance/om6/bootstrap/accept-om6-bootstrap.sh b/acceptance/om6/bootstrap/accept-om6-bootstrap.sh index 469371a5b..1d0be69d8 100755 --- a/acceptance/om6/bootstrap/accept-om6-bootstrap.sh +++ b/acceptance/om6/bootstrap/accept-om6-bootstrap.sh @@ -16,10 +16,11 @@ cp ../recon/onera-m6-sharp-te.egads . ${two}/ref bootstrap onera-m6-sharp-te.egads --blend om6-blend.meshb -${two}/ref_driver \ - -i onera-m6-sharp-te-vol.meshb \ +${two}/ref adapt \ + onera-m6-sharp-te-vol.meshb \ -g onera-m6-sharp-te.egads \ - -o onera-m6-sharp-te01 + -x onera-m6-sharp-te01.meshb \ + --export-metric-as onera-m6-sharp-te01-final-metric.solb ${two}/ref_metric_test \ onera-m6-sharp-te01.meshb \