Consolidate test case IN files; update test case test files.

ulmononian · Nov 13, 2024 · 367b01f · 367b01f
1 parent 29c2703
commit 367b01f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 182 deletions.
diff --git a/tests-dev/test_cases/exp_conf/baroclinic_wave.IN b/tests-dev/test_cases/exp_conf/baroclinic_wave.IN
diff --git a/tests-dev/test_cases/exp_conf/2020_CAPE.IN → tests-dev/test_cases/exp_conf/test_cases.IN b/tests-dev/test_cases/exp_conf/2020_CAPE.IN → tests-dev/test_cases/exp_conf/test_cases.IN
@@ -16,6 +16,7 @@ echo "inputdir=$inputdir,NPX=$NPX,NESTED=$NESTED"
 OPNREQ_TEST=${OPNREQ_TEST:-false}
 V2_SFC_FILE=${V2_SFC_FILE:-false}
 HSD_CASE=${HSD_CASE:-false}
+CASE_NAME=${CASE_NAME:-}
 SUFFIX=${RT_SUFFIX}
 if [ $WARM_START = .false. ]; then
   mkdir INPUT RESTART
@@ -24,7 +25,11 @@ if [ $WARM_START = .false. ]; then
   elif [ "$V2_SFC_FILE" = "true" ]; then
     cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/.
   elif [ "$HSD_CASE" = "true" ]; then
-    cp -r @[INPUTDATA_ROOT]/HSD_input_data/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/.
+    if [ "$CASE_NAME" = "2020_CAPE" ]; then
+      cp -r @[INPUTDATA_ROOT]/HSD_input_data/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/.
+    elif [ "$CASE_NAME" = "baroclinic_wave" ]; then
+      cp @[INPUTDATA_ROOT]/HSD_input_data/global_hyblev.l128.txt .
+    fi 
   else
     cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_gfsv17/* ./INPUT/.
   fi

diff --git a/tests-dev/test_cases/tests/2020_CAPE b/tests-dev/test_cases/tests/2020_CAPE
@@ -46,8 +46,10 @@ export FNSMCC_control="'global_soilmgldas.statsgo.t92.192.94.grb',"
 export FNMSKH_control="'global_slmask.t62.192.94.grb',"
 
 
-export FV3_RUN=2020_CAPE.IN
+#export FV3_RUN=2020_CAPE.IN
+export FV3_RUN=test_cases.IN
 export CCPP_SUITE='FV3_GFS_v16'
 export INPUT_NML=control.nml.IN
 export HSD_CASE=true
+export CASE_NAME="2020_CAPE"
 
diff --git a/tests-dev/test_cases/tests/baroclinic_wave b/tests-dev/test_cases/tests/baroclinic_wave
@@ -50,8 +50,9 @@ export JCHUNK3D=384
 export KCHUNK3D=1
 export OUTPUT_FH='0 6 12 18 24'
 
-export FV3_RUN=baroclinic_wave.IN
+#export FV3_RUN=baroclinic_wave.IN
+export FV3_RUN=test_cases.IN
 export INPUT_NML=baroclinic_wave.nml.IN
 export CCPP_SUITE='FV3_GFS_v17_p8_ugwpv1'
 export HSD_CASE=true
-
+export CASE_NAME="baroclinic_wave"