From 23df70ff8bfa887b7de49a57664a72215a391cf6 Mon Sep 17 00:00:00 2001
From: Natalie Perlin <Natalie.Perlin@noaa.gov>
Date: Tue, 5 Nov 2024 12:35:29 -0600
Subject: [PATCH] Revert variables MODEL_INITIALIZATION, HSD_CASE to simple
 true or false strings

---
 tests-dev/test_cases/exp_conf/2020_CAPE.IN       | 14 +++++++-------
 tests-dev/test_cases/exp_conf/baroclinic_wave.IN | 14 +++++++-------
 tests-dev/test_cases/tests/2020_CAPE             |  2 +-
 tests-dev/test_cases/tests/baroclinic_wave       |  2 +-
 tests/default_vars.sh                            |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/tests-dev/test_cases/exp_conf/2020_CAPE.IN b/tests-dev/test_cases/exp_conf/2020_CAPE.IN
index 6947172ff9..74dd08dfcb 100644
--- a/tests-dev/test_cases/exp_conf/2020_CAPE.IN
+++ b/tests-dev/test_cases/exp_conf/2020_CAPE.IN
@@ -13,17 +13,17 @@ fi
 
 echo "inputdir=$inputdir,NPX=$NPX,NESTED=$NESTED"
 
-OPNREQ_TEST=${OPNREQ_TEST:-".false."}
-V2_SFC_FILE=${V2_SFC_FILE:-".false."}
-HSD_CASE=${HSD_CASE:-".false."}
+OPNREQ_TEST=${OPNREQ_TEST:-false}
+V2_SFC_FILE=${V2_SFC_FILE:-false}
+HSD_CASE=${HSD_CASE:-false}
 SUFFIX=${RT_SUFFIX}
 if [ $WARM_START = .false. ]; then
   mkdir INPUT RESTART
   if [ "$NESTED" = .true. ]; then
     cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_nested/* ./INPUT/.
-  elif [ "$V2_SFC_FILE" = .true. ]; then
+  elif [ "$V2_SFC_FILE" = "true" ]; then
     cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/.
-  elif [ "$HSD_CASE" = .true. ]; then
+  elif [ "$HSD_CASE" = "true" ]; then
     cp -r @[HSD_INPUT_DATA]/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/.
   else
     cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_gfsv17/* ./INPUT/.
@@ -47,7 +47,7 @@ else
     cp ../${DEP_RUN}${SUFFIX}/${RFILE} .
   fi
 
-  if [ $MODEL_INITIALIZATION = .false. ]; then
+  if [ $MODEL_INITIALIZATION = "false" ]; then
     #read_inc and iau tests restart from fh=24
     CURRDIR=`pwd`
     FILEDIR=${CURRDIR}/../${DEP_RUN}${SUFFIX}/RESTART
@@ -58,7 +58,7 @@ else
 
   if [[ ${IAU_OFFSET} != 0 ]] || [[ $READ_INCREMENT = .true. ]]; then
 
-    if [ $MODEL_INITIALIZATION = .false. ]; then
+    if [ $MODEL_INITIALIZATION = "false" ]; then
       cp ${FILEDIR}/../INPUT/fv3_increment.nc INPUT/.
       cp ${FILEDIR}/../INPUT/grid_spec.nc INPUT/.
       cp ${FILEDIR}/../INPUT/*_grid.tile*.nc INPUT/.
diff --git a/tests-dev/test_cases/exp_conf/baroclinic_wave.IN b/tests-dev/test_cases/exp_conf/baroclinic_wave.IN
index 2c39fbb7a9..d92cc1f589 100644
--- a/tests-dev/test_cases/exp_conf/baroclinic_wave.IN
+++ b/tests-dev/test_cases/exp_conf/baroclinic_wave.IN
@@ -12,19 +12,19 @@ elif [ $NPX = 769 ]; then
 fi
 
 echo "inputdir=$inputdir,NPX=$NPX,NESTED=$NESTED"
-HSD_CASE=${HSD_CASE:-".false."}
-if [ "$HSD_CASE" = .true. ]; then
+HSD_CASE=${HSD_CASE:-false}
+if [ "$HSD_CASE" = "true" ]; then
   cp @[HSD_INPUT_DATA]/global_hyblev.l128.txt .
 fi
 
-OPNREQ_TEST=${OPNREQ_TEST:-".false."}
-V2_SFC_FILE=${V2_SFC_FILE:-".false."}
+OPNREQ_TEST=${OPNREQ_TEST:-false}
+V2_SFC_FILE=${V2_SFC_FILE:-false}
 SUFFIX=${RT_SUFFIX}
 if [ $WARM_START = .false. ]; then
   mkdir INPUT RESTART
   if [ "$NESTED" = .true. ]; then
     cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_nested/* ./INPUT/.
-  elif [ "$V2_SFC_FILE" = .true. ]; then
+  elif [ "$V2_SFC_FILE" = "true" ]; then
     cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/.
   else
     cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_gfsv17/* ./INPUT/.
@@ -48,7 +48,7 @@ else
     cp ../${DEP_RUN}${SUFFIX}/${RFILE} .
   fi
 
-  if [ $MODEL_INITIALIZATION = .false. ]; then
+  if [ $MODEL_INITIALIZATION = "false" ]; then
     #read_inc and iau tests restart from fh=24
     CURRDIR=`pwd`
     FILEDIR=${CURRDIR}/../${DEP_RUN}${SUFFIX}/RESTART
@@ -59,7 +59,7 @@ else
 
   if [[ ${IAU_OFFSET} != 0 ]] || [[ $READ_INCREMENT = .true. ]]; then
 
-    if [ $MODEL_INITIALIZATION = .false. ]; then
+    if [ $MODEL_INITIALIZATION = "false" ]; then
       cp ${FILEDIR}/../INPUT/fv3_increment.nc INPUT/.
       cp ${FILEDIR}/../INPUT/grid_spec.nc INPUT/.
       cp ${FILEDIR}/../INPUT/*_grid.tile*.nc INPUT/.
diff --git a/tests-dev/test_cases/tests/2020_CAPE b/tests-dev/test_cases/tests/2020_CAPE
index 034326bad9..d68aa94685 100644
--- a/tests-dev/test_cases/tests/2020_CAPE
+++ b/tests-dev/test_cases/tests/2020_CAPE
@@ -49,5 +49,5 @@ export FNMSKH_control="'global_slmask.t62.192.94.grb',"
 export FV3_RUN=2020_CAPE.IN
 export CCPP_SUITE='FV3_GFS_v16'
 export INPUT_NML=control.nml.IN
-export HSD_CASE=.true.
+export HSD_CASE=true
 
diff --git a/tests-dev/test_cases/tests/baroclinic_wave b/tests-dev/test_cases/tests/baroclinic_wave
index 6508547dd1..744ae814d5 100644
--- a/tests-dev/test_cases/tests/baroclinic_wave
+++ b/tests-dev/test_cases/tests/baroclinic_wave
@@ -54,5 +54,5 @@ export OUTPUT_FH='0 6 12 18 24 30 36 42 48 54 60 66 72 78 84 90 96 102 108 114 1
 export FV3_RUN=baroclinic_wave.IN
 export INPUT_NML=baroclinic_wave.nml.IN
 export CCPP_SUITE='FV3_GFS_v17_p8_ugwpv1'
-export HSD_CASE=.true.
+export HSD_CASE=true
 export WLCLK=90
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index ec6e361b21..2aefd87186 100644
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -564,7 +564,7 @@ export DOMAINS_STACK_SIZE=3000000
 
 # Coldstart/warmstart
 #rt script for ICs
-export MODEL_INITIALIZATION=.false.
+export MODEL_INITIALIZATION=false
 #namelist variable
 export WARM_START=.false.
 export READ_INCREMENT=.false.