Fixed Judy's comment.

NOAA-GSL · Feb 5, 2024 · 38104cc · 38104cc
1 parent 8624c79
commit 38104cc
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 28 deletions.
diff --git a/workflow/gsl_template_hera.xml b/workflow/gsl_template_hera.xml
@@ -10,8 +10,8 @@
 	-->
 	<!ENTITY PSLOT "test">
 	<!ENTITY HOMEgfs "/scratch1/BMC/gsd-fv3-dev/Judy.K.Henderson/test/dev_19may23_0fae23fa">
-	<!ENTITY EXPDIR "&HOMEgfs;/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/&PSLOT;">
-	<!ENTITY ROTDIR "&HOMEgfs;/FV3GFSrun/rt_v17p8_ugwpv1_mynn/&PSLOT;">
+	<!ENTITY EXPDIR "&HOMEgfs;/FV3GFSwfm/&PSLOT;">
+	<!ENTITY ROTDIR "&HOMEgfs;/FV3GFSrun/&PSLOT;">
 	<!ENTITY JOBS_DIR "&HOMEgfs;/jobs/rocoto">
         <!ENTITY ICSDIR "/scratch1/BMC/gsd-fv3/rtruns/FV3ICS_L127">
         <!ENTITY CASE     "C768">
@@ -169,9 +169,9 @@
 	<join><cyclestr>&ROTDIR;/logs/@Y@m@d@H/gfsarch.log</cyclestr></join>
 
 	<envar><name>RUN_ENVIR</name><value>emc</value></envar>
-	<envar><name>HOMEgfs</name><value>/scratch1/BMC/gsd-fv3/rtruns/UFS-CAMsuite</value></envar>
-	<envar><name>EXPDIR</name><value>/home/role.rtfim/UFS-CAMsuite//FV3GFSwfm/rt_v17p8_ugwpv1_mynn</value></envar>
-	<envar><name>ROTDIR</name><value>/home/role.rtfim/UFS-CAMsuite//FV3GFSrun/rt_v17p8_ugwpv1_mynn</value></envar>
+	<envar><name>HOMEgfs</name><value>&HOMEgfs;</value></envar>
+	<envar><name>EXPDIR</name><value>&EXPDIR;</value></envar>
+	<envar><name>ROTDIR</name><value>&ROTDIR;</value></envar>
 	<envar><name>NET</name><value>gfs</value></envar>
         <envar><name>ATCFNAME</name><value>&ATCFNAME;</value></envar>
 	<envar><name>CDUMP</name><value>gfs</value></envar>
@@ -204,9 +204,9 @@
 	<join><cyclestr>&ROTDIR;/logs/@Y@m@d@H/gfscleanup.log</cyclestr></join>
 
 	<envar><name>RUN_ENVIR</name><value>emc</value></envar>
-	<envar><name>HOMEgfs</name><value>/scratch1/BMC/gsd-fv3/rtruns/UFS-CAMsuite</value></envar>
-	<envar><name>EXPDIR</name><value>/home/role.rtfim/UFS-CAMsuite//FV3GFSwfm/rt_v17p8_ugwpv1_mynn</value></envar>
-	<envar><name>ROTDIR</name><value>/home/role.rtfim/UFS-CAMsuite//FV3GFSrun/rt_v17p8_ugwpv1_mynn</value></envar>
+	<envar><name>HOMEgfs</name><value>&HOMEgfs;</value></envar>
+	<envar><name>EXPDIR</name><value>&EXPDIR;</value></envar>
+	<envar><name>ROTDIR</name><value>&ROTDIR;</value></envar>
 	<envar><name>NET</name><value>gfs</value></envar>
 	<envar><name>CDUMP</name><value>gfs</value></envar>
 	<envar><name>RUN</name><value>gfs</value></envar>

diff --git a/workflow/gsl_template_jet.xml b/workflow/gsl_template_jet.xml
@@ -10,8 +10,8 @@
 	-->
 	<!ENTITY PSLOT "test">
 	<!ENTITY HOMEgfs "/lfs1/BMC/gsd-fv3-test/jhender/scratch/gw_19may23">
-	<!ENTITY EXPDIR "&HOMEgfs;/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/&PSLOT;">
-	<!ENTITY ROTDIR "&HOMEgfs;/FV3GFSrun/rt_v17p8_ugwpv1_mynn/&PSLOT;">
+	<!ENTITY EXPDIR "&HOMEgfs;/FV3GFSwfm/&PSLOT;">
+	<!ENTITY ROTDIR "&HOMEgfs;/FV3GFSrun/&PSLOT;">
 	<!ENTITY JOBS_DIR "&HOMEgfs;/jobs/rocoto">
         <!ENTITY ICSDIR "/lfs1/BMC/gsd-fv3-test/rtfim/FV3ICS_L127">
         <!ENTITY CASE     "C768">
@@ -209,9 +209,9 @@
 	<join><cyclestr>&ROTDIR;/logs/@Y@m@d@H/gfsarch.log</cyclestr></join>
 
 	<envar><name>RUN_ENVIR</name><value>emc</value></envar>
-	<envar><name>HOMEgfs</name><value>/scratch1/BMC/gsd-fv3/rtruns/UFS-CAMsuite</value></envar>
-	<envar><name>EXPDIR</name><value>/home/role.rtfim/UFS-CAMsuite//FV3GFSwfm/rt_v17p8_ugwpv1_mynn</value></envar>
-	<envar><name>ROTDIR</name><value>/home/role.rtfim/UFS-CAMsuite//FV3GFSrun/rt_v17p8_ugwpv1_mynn</value></envar>
+	<envar><name>HOMEgfs</name><value>&HOMEgfs;</value></envar>
+	<envar><name>EXPDIR</name><value>&EXPDIR;</value></envar>
+	<envar><name>ROTDIR</name><value>&ROTDIR;</value></envar>
 	<envar><name>NET</name><value>gfs</value></envar>
 	<envar><name>CDUMP</name><value>gfs</value></envar>
 	<envar><name>RUN</name><value>gfs</value></envar>
@@ -247,9 +247,9 @@
 	<join><cyclestr>&ROTDIR;/logs/@Y@m@d@H/gfscleanup.log</cyclestr></join>
 
 	<envar><name>RUN_ENVIR</name><value>emc</value></envar>
-	<envar><name>HOMEgfs</name><value>/scratch1/BMC/gsd-fv3/rtruns/UFS-CAMsuite</value></envar>
-	<envar><name>EXPDIR</name><value>/home/role.rtfim/UFS-CAMsuite//FV3GFSwfm/rt_v17p8_ugwpv1_mynn</value></envar>
-	<envar><name>ROTDIR</name><value>/home/role.rtfim/UFS-CAMsuite//FV3GFSrun/rt_v17p8_ugwpv1_mynn</value></envar>
+	<envar><name>HOMEgfs</name><value>&HOMEgfs;</value></envar>
+	<envar><name>EXPDIR</name><value>&EXPDIR;</value></envar>
+	<envar><name>ROTDIR</name><value>&ROTDIR;</value></envar>
 	<envar><name>NET</name><value>gfs</value></envar>
 	<envar><name>CDUMP</name><value>gfs</value></envar>
 	<envar><name>RUN</name><value>gfs</value></envar>

diff --git a/workflow/p8_ugwpv1.sh b/workflow/p8_ugwpv1.sh
@@ -1,7 +1,7 @@
 USER=Judy.K.Henderson
 GITDIR=/scratch1/BMC/gsd-fv3-dev/jhender/test/gsl_ufs_dev/            ## where your git checkout is located
-COMROT=$GITDIR/FV3GFSrun/rt_v17p8_ugwpv1_mynn                    ## default COMROT directory
-EXPDIR=$GITDIR/FV3GFSwfm/rt_v17p8_ugwpv1_mynn                    ## default EXPDIR directory
+COMROT=$GITDIR/FV3GFSrun/                                        ## default COMROT directory
+EXPDIR=$GITDIR/FV3GFSwfm/                                        ## default EXPDIR directory
 ICSDIR=/scratch1/BMC/gsd-fv3/rtruns/FV3ICS_L127
 
 PSLOT=p8

diff --git a/workflow/rocoto/workflow_xml_gsl.py b/workflow/rocoto/workflow_xml_gsl.py
@@ -60,8 +60,8 @@ def _get_definitions(self) -> str:
         entity['PSLOT'] = self._base['PSLOT']
 
         entity['HOMEgfs'] = self._base['HOMEgfs']
-        entity['EXPDIR'] = "&HOMEgfs;/FV3GFSwfm/rt_v17p8_ugwpv1_mynn/&PSLOT;"
-        entity['ROTDIR'] = "&HOMEgfs;/FV3GFSrun/rt_v17p8_ugwpv1_mynn/&PSLOT;"
+        entity['EXPDIR'] = "&HOMEgfs;/FV3GFSwfm/&PSLOT;"
+        entity['ROTDIR'] = "&HOMEgfs;/FV3GFSrun/&PSLOT;"
         entity['JOBS_DIR'] = "&HOMEgfs;/jobs/rocoto"
         entity['ICSDIR'] = "/scratch1/BMC/gsd-fv3/rtruns/FV3ICS_L127"
 

diff --git a/workflow/rt_mynn_hera.sh b/workflow/rt_mynn_hera.sh
@@ -1,7 +1,7 @@
 USER=role.rtfim
 GITDIR=${HOME}/UFS-CAMsuite/                                     ## where your git checkout is located
-COMROT=$GITDIR/FV3GFSrun/rt_v17p8_ugwpv1_mynn                    ## default COMROT directory
-EXPDIR=$GITDIR/FV3GFSwfm/rt_v17p8_ugwpv1_mynn                    ## default EXPDIR directory
+COMROT=$GITDIR/FV3GFSrun/                                        ## default COMROT directory
+EXPDIR=$GITDIR/FV3GFSwfm/                                        ## default EXPDIR directory
 ICSDIR=/scratch1/BMC/gsd-fv3/rtruns/FV3ICS_L127
 
 PSLOT=rt_v17p8_ugwpv1_mynn

diff --git a/workflow/rt_mynn_jet.sh b/workflow/rt_mynn_jet.sh
@@ -1,7 +1,7 @@
 USER=Judy.K.Henderson
 GITDIR=/lfs1/BMC/gsd-fv3-test/HFIP/gsl_ufs_rt               ## where your git checkout is located  PLACEHOLDER, change this!
-COMROT=$GITDIR/FV3GFSrun/rt_v17p8_ugwpv1_mynn                    ## default COMROT directory
-EXPDIR=$GITDIR/FV3GFSwfm/rt_v17p8_ugwpv1_mynn                    ## default EXPDIR directory
+COMROT=$GITDIR/FV3GFSrun/                                        ## default COMROT directory
+EXPDIR=$GITDIR/FV3GFSwfm/                                        ## default EXPDIR directory
 ICSDIR=/lfs1/BMC/gsd-fv3-test/rtfim/FV3ICS_L127
 
 PSLOT=rt_v17p8_mynn               ## PLACEHOLDER -- change this

diff --git a/workflow/test_hera.sh b/workflow/test_hera.sh
@@ -1,7 +1,7 @@
 USER=Judy.K.Henderson
 GITDIR=/scratch1/BMC/gsd-fv3-dev/Judy.K.Henderson/test/gsl_ufs_rt         ## where your git checkout is located
-COMROT=$GITDIR/FV3GFSrun/rt_v17p8_ugwpv1_mynn                    ## default COMROT directory
-EXPDIR=$GITDIR/FV3GFSwfm/rt_v17p8_ugwpv1_mynn                    ## default EXPDIR directory
+COMROT=$GITDIR/FV3GFSrun/                                        ## default COMROT directory
+EXPDIR=$GITDIR/FV3GFSwfm/                                        ## default EXPDIR directory
 ICSDIR=/scratch1/BMC/gsd-fv3/rtruns/FV3ICS_L127
 
 PSLOT=test_hera

diff --git a/workflow/test_jet.sh b/workflow/test_jet.sh
@@ -1,7 +1,7 @@
 USER=Judy.K.Henderson
 GITDIR=/lfs1/BMC/gsd-fv3-test/jhender/scratch/gsl_ufs_rt             ## where your git checkout is located
-COMROT=$GITDIR/FV3GFSrun/rt_v17p8_ugwpv1_mynn                    ## default COMROT directory
-EXPDIR=$GITDIR/FV3GFSwfm/rt_v17p8_ugwpv1_mynn                    ## default EXPDIR directory
+COMROT=$GITDIR/FV3GFSrun/                                        ## default COMROT directory
+EXPDIR=$GITDIR/FV3GFSwfm/                                        ## default EXPDIR directory
 ICSDIR=/lfs1/BMC/gsd-fv3-test/rtfim/FV3ICS_L127
 
 PSLOT=test_jet