update comrot to be consistent with g-w develop (#811)

NOAA-EMC · Jan 12, 2024 · b9379ba · b9379ba
1 parent 54ff2af
commit b9379ba
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/test/aero/global-workflow/setup_workflow_exp.sh b/test/aero/global-workflow/setup_workflow_exp.sh
@@ -15,11 +15,11 @@ resensatmos='48'
 nens=0
 pslot='gdas_test'
 configdir=$srcdir/../../parm/config/gfs
-comrot=$bindir/test/aero/global-workflow/testrun/ROTDIRS
+comroot=$bindir/test/aero/global-workflow/testrun/ROTDIRS
 expdir=$bindir/test/aero/global-workflow/testrun/experiments
 
 # clean previous experiment
-rm -rf $comrot $expdir config
+rm -rf $comroot $expdir config
 
 # copy config.yaml to local config
 cp -r $configdir config
@@ -46,7 +46,7 @@ $srcdir/../../workflow/setup_expt.py gfs cycled --idate $idate  \
                        --nens $nens \
                        --pslot $pslot \
                        --configdir $expdir/../config \
-                       --comrot $comrot \
+                       --comroot $comroot \
                        --expdir $expdir \
                        --yaml $expdir/../config.yaml
 

diff --git a/test/atm/global-workflow/setup_workflow_exp.sh b/test/atm/global-workflow/setup_workflow_exp.sh
@@ -16,11 +16,11 @@ resensatmos='48'
 nens=3
 pslot='gdas_test'
 configdir=$srcdir/../../parm/config/gfs
-comrot=$bindir/test/atm/global-workflow/testrun/ROTDIRS
+comroot=$bindir/test/atm/global-workflow/testrun/ROTDIRS
 expdir=$bindir/test/atm/global-workflow/testrun/experiments
 
 # clean previous experiment
-rm -rf $comrot $expdir config
+rm -rf $comroot $expdir config
 
 # copy config.yaml to local config
 cp -r $configdir config
@@ -45,7 +45,7 @@ $srcdir/../../workflow/setup_expt.py gfs cycled --idate $idate  \
                        --nens $nens \
                        --pslot $pslot \
                        --configdir $expdir/../config \
-                       --comrot $comrot \
+                       --comroot $comroot \
                        --expdir $expdir \
                        --yaml $expdir/../config.yaml
 

diff --git a/test/setup_workflow_exp.sh b/test/setup_workflow_exp.sh
@@ -14,16 +14,16 @@ resensatmos='48'
 nens=0
 pslot='gdas_test'
 configdir=$srcdir/../../parm/config/gfs
-comrot=$bindir/test/testrun/ROTDIRS
+comroot=$bindir/test/testrun/ROTDIRS
 expdir=$bindir/test/testrun/experiments
 
 # clean previous experiment
-rm -rf "${comrot}" "${expdir}"
+rm -rf "${comroot}" "${expdir}"
 
 # run the script
 cd $srcdir/../../workflow
 
 echo "Running global-workflow experiment generation script"
-./setup_expt.py gfs cycled --idate $idate --edate $edate --app $app --start $starttype --gfs_cyc $gfscyc --resdetatmos $resdetatmos --resensatmos $resensatmos --nens $nens --pslot $pslot --configdir $configdir --comrot $comrot --expdir $expdir
+./setup_expt.py gfs cycled --idate $idate --edate $edate --app $app --start $starttype --gfs_cyc $gfscyc --resdetatmos $resdetatmos --resensatmos $resensatmos --nens $nens --pslot $pslot --configdir $configdir --comroot $comroot --expdir $expdir
 
 exit $?
diff --git a/test/soca/gw/CMakeLists.txt b/test/soca/gw/CMakeLists.txt
@@ -1,7 +1,7 @@
 # test for creating an experiment directory within the global-workflow
 file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/test/soca/gw/testrun)
 
-# Prepare COMROT and static dir
+# Prepare ROTDIR and static dir
 add_test(NAME test_gdasapp_soca_prep
          COMMAND ${PROJECT_SOURCE_DIR}/test/soca/gw/prep.sh ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
          WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/soca/gw)

diff --git a/test/soca/gw/run_jjobs.yaml.test b/test/soca/gw/run_jjobs.yaml.test
@@ -55,7 +55,7 @@ setup_expt config:
     NICAS_GRID_SIZE: 150
   prepoceanobs:
     SOCA_OBS_LIST: @HOMEgfs@/sorc/gdas.cd/parm/soca/obs/obs_list.yaml
-    OBSPROC_CONFIG: @HOMEgfs@/sorc/gdas.cd/parm/soca/obsproc/obsproc_config.yaml
+    OBSPROC_YAML: @HOMEgfs@/sorc/gdas.cd/parm/soca/obsproc/obsproc_config.yaml
     DMPDIR: @HOMEgfs@/sorc/gdas.cd/build/gdas/test/soca/gw/obsproc
 
 job options:

diff --git a/ush/soca/run_jjobs.py b/ush/soca/run_jjobs.py
@@ -130,7 +130,7 @@ def setupexpt(self):
             "nens": "0",
             "pslot": "${PSLOT}",
             "configdir": "${PWD}/config/gfs",
-            "comrot": self.rotdir,
+            "comroot": self.rotdir,
             "expdir": "${EXPDIRS}",
             "yaml": "overwrite_defaults.yaml"}
 
@@ -164,7 +164,7 @@ def precom(self, com, tmpl):
     def copy_bkgs(self):
         """
         Fill the ROTDIR with backgrounds
-        TODO: replace by fill comrot?
+        TODO: replace by fill comroot?
         """
         print(f"gPDY: {self.gPDY}")
         print(f"gcyc: {self.gcyc}")
@@ -254,7 +254,7 @@ def execute(self, submit=False):
 
 
 def main():
-    epilog = ["Make sure the comrot, experiment and config directories are removed before running this script",
+    epilog = ["Make sure the comroot, experiment and config directories are removed before running this script",
               "Examples:",
               "   ./run_jjobs.py -y run_jjobs_orion.yaml",
               "   ./run_jjobs.py -h"]
@@ -272,7 +272,7 @@ def main():
         exp_config = yaml.safe_load(file)
 
     if not args.skip:
-        # Write a setup card (prepare COMROT, configs, ...)
+        # Write a setup card (prepare COMROOT, configs, ...)
         setup_card = JobCard("setup_expt.sh", exp_config)
         setup_card.export_env_vars_script()
         setup_card.setupexpt()