[cig-commits] [commit] master: Improve param generation script (06cab4f)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/vq

On branch  : master
Link       : https://github.com/geodynamics/vq/compare/4d339b3a383b69e1552cfeef4ca20868a1377289...d0edc6ddd56f9105f6d2488db4a9f36368529695

>---------------------------------------------------------------

commit 06cab4f7137d90fda20791da78fcb4aa16b27f15
Author: Eric Heien <emheien at ucdavis.edu>
Date:   Thu Dec 4 13:50:30 2014 -0800

    Improve param generation script


>---------------------------------------------------------------

06cab4f7137d90fda20791da78fcb4aa16b27f15
 examples/CMakeLists.txt  | 12 ++++++------
 examples/setup_params.sh |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index d9f7e2a..597701d 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -60,7 +60,7 @@ FOREACH(NPROC ${NUM_PROCS})
                 --print_statistics=statistics_${RES}.txt
                 )
             ADD_TEST(NAME param_P${NPROC}_${TAPER}_${RES} WORKING_DIRECTORY ${TEST_DIR}
-                COMMAND ${SETUP_PARAMS_SCRIPT} ${RES} 0.7 single_fault ${VQ_EXAMPLE_DIR}/example_params.d)
+                COMMAND ${SETUP_PARAMS_SCRIPT} ${RES} 0.7 single_fault ${VQ_EXAMPLE_DIR}/example_params.d params_${RES}.d)
             SET_TESTS_PROPERTIES (param_P${NPROC}_${TAPER}_${RES} PROPERTIES DEPENDS mesh_P${NPROC}_${TAPER}_${RES})
 
             # Test that the simulation runs with the resulting mesh
@@ -139,7 +139,7 @@ FOREACH(TAPER_IND RANGE ${NUM_TAPER})
             )
  
         ADD_TEST(NAME param_two_${TAPER}_${RES} WORKING_DIRECTORY ${TEST_DIR}
-            COMMAND ${SETUP_PARAMS_SCRIPT} ${RES} 0.7 two_fault ${VQ_EXAMPLE_DIR}/example_params.d)
+            COMMAND ${SETUP_PARAMS_SCRIPT} ${RES} 0.7 two_fault ${VQ_EXAMPLE_DIR}/example_params.d params_${RES}.d)
         SET_TESTS_PROPERTIES (param_two_${TAPER}_${RES} PROPERTIES DEPENDS mesh_two_${TAPER}_${RES})
 
         # Test that the simulation runs with the resulting mesh
@@ -198,15 +198,15 @@ IF (HDF5_FOUND)
             --export_file_type=text
             )
         ADD_TEST(NAME param_gen_${TEST_SUFFIX} WORKING_DIRECTORY ${TEST_DIR}
-            COMMAND ${SETUP_PARAMS_SCRIPT} ${RES} 0.5 single_fault ${VQ_EXAMPLE_DIR}/greens_generate.d)
+            COMMAND ${SETUP_PARAMS_SCRIPT} ${RES} 0.5 single_fault ${VQ_EXAMPLE_DIR}/greens_generate.d params_gen_${RES}.d)
         SET_TESTS_PROPERTIES (param_gen_${TEST_SUFFIX} PROPERTIES DEPENDS mesh_${TEST_SUFFIX})
 
         ADD_TEST(NAME param_run_${TEST_SUFFIX} WORKING_DIRECTORY ${TEST_DIR}
-            COMMAND ${SETUP_PARAMS_SCRIPT} ${RES} 0.5 single_fault ${VQ_EXAMPLE_DIR}/greens_input.d)
+            COMMAND ${SETUP_PARAMS_SCRIPT} ${RES} 0.5 single_fault ${VQ_EXAMPLE_DIR}/greens_input.d params_run_${RES}.d)
         SET_TESTS_PROPERTIES (param_run_${TEST_SUFFIX} PROPERTIES DEPENDS param_gen_${TEST_SUFFIX})
 
         ADD_TEST(NAME run_gen_${TEST_SUFFIX} WORKING_DIRECTORY ${TEST_DIR}
-            COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${NPROC} ${VQ_BINARY_DIR}/vq params_${RES}.d)
+            COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${NPROC} ${VQ_BINARY_DIR}/vq params_gen_${RES}.d)
         SET_TESTS_PROPERTIES (run_gen_${TEST_SUFFIX} PROPERTIES DEPENDS param_run_${TEST_SUFFIX})
 
         ADD_TEST(NAME check_${TEST_SUFFIX} WORKING_DIRECTORY ${TEST_DIR}
@@ -215,7 +215,7 @@ IF (HDF5_FOUND)
 
         # Test that the simulation runs with the resulting mesh
         ADD_TEST(NAME run_full_${TEST_SUFFIX} WORKING_DIRECTORY ${TEST_DIR}
-            COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${NPROC} ${VQ_BINARY_DIR}/vq params_${RES}.d)
+            COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${NPROC} ${VQ_BINARY_DIR}/vq params_run_${RES}.d)
         SET_TESTS_PROPERTIES (run_full_${TEST_SUFFIX} PROPERTIES DEPENDS run_gen_${TEST_SUFFIX})
 
         # Check that the results are internally self consistent
diff --git a/examples/setup_params.sh b/examples/setup_params.sh
index 94b9667..348038c 100755
--- a/examples/setup_params.sh
+++ b/examples/setup_params.sh
@@ -4,6 +4,7 @@ ELEM_SIZE=$1
 DYNAMIC=$2
 PREFIX=$3
 PARAM_TEMPLATE=$4
+PARAM_OUTPUT=$5
 
 echo ""
 echo "dynamic triggering factor:   ${DYNAMIC}"
@@ -15,7 +16,7 @@ BASE_NAME=${PREFIX}_${ELEM_SIZE}
 
 sed -e s/DYNAMIC/${DYNAMIC}/g \
     -e s/ELEM_SIZE/${ELEM_SIZE}/g \
-    -e s/INPUTFILE/${BASE_NAME}/g < ${PARAM_TEMPLATE} > params_${ELEM_SIZE}.d
+    -e s/INPUTFILE/${BASE_NAME}/g < ${PARAM_TEMPLATE} > ${PARAM_OUTPUT}
 
 exit $?