From f6bb1d86214117f434a2c06cddac9014100f63af Mon Sep 17 00:00:00 2001
From: "Kate.Friedman" <Kate.Friedman@noaa.gov>
Date: Wed, 10 Jan 2024 19:01:42 +0000
Subject: [PATCH] Updated some scripts for COM directories

Updates in some JJOB and ex-scripts remove use of ROTDIR
and replace with appropriate COM_* directories.

Refs #2061
---
 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT      |  6 ++++-
 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT_VRFY |  6 ++++-
 jobs/JGFS_ATMOS_FSU_GENESIS                | 31 +++++++++-------------
 jobs/JGLOBAL_ATMOS_POST_MANAGER            | 12 ++-------
 scripts/exglobal_atmos_pmgr.sh             |  2 +-
 5 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT
index a1ecc116ea..4a8242abfb 100755
--- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT
+++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT
@@ -15,7 +15,11 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalrun" -c "base ocnanal ocnanalr
 # Begin JOB SPECIFIC work
 ##############################################
 
-export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/ocean}
+YMD=${PDY} HH=${cyc} generate_com -rx COM_OCEAN_ANALYSIS
+
+mkdir -p "${COM_OCEAN_ANALYSIS}"
+
+export COMOUT=${COM_OCEAN_ANALYSIS}
 
 ###############################################################
 # Run relevant script
diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT_VRFY b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT_VRFY
index 08e7da60c0..4f4251b34f 100755
--- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT_VRFY
+++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT_VRFY
@@ -14,7 +14,11 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalrun" -c "base ocnanal ocnanalr
 # Begin JOB SPECIFIC work
 ##############################################
 
-export COMOUT=${COMOUT:-${ROTDIR}/${CDUMP}.${PDY}/${cyc}/ocean}
+YMD=${PDY} HH=${cyc} generate_com -rx COM_OCEAN_ANALYSIS
+
+mkdir -p "${COM_OCEAN_ANALYSIS}"
+
+export COMOUT=${COM_OCEAN_ANALYSIS}
 
 ###############################################################
 # Run relevant script
diff --git a/jobs/JGFS_ATMOS_FSU_GENESIS b/jobs/JGFS_ATMOS_FSU_GENESIS
index cc730e21bb..8b1600de88 100755
--- a/jobs/JGFS_ATMOS_FSU_GENESIS
+++ b/jobs/JGFS_ATMOS_FSU_GENESIS
@@ -33,25 +33,18 @@ export PYTHONPATH=${USHens_tracker}/FSUgenesisPY:${PYTHONPATH}
 ##############################################
 # Define COM and Data directories
 ##############################################
-export COMIN=${ROTDIR}/${RUN}.${PDY}/${cyc}/${COMPONENT}
-export COMINgfs=${COMIN}
-#export gfsdir=${COMINgfs}
-export gfsdir=${ROTDIR}
-export COMINgdas=${COMIN}
-export gdasdir=${COMINgdas}
-export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}/${COMPONENT}
-export COMINsyn=${COMINsyn:-$(compath.py ${envir}/com/gfs/${gfs_ver})/syndat}
-
-if [ ${RUN_ENVIR} = "nco" ]; then
-    export COMOUThur=${COMROOTp1}/hur/${envir}/global
-    export COMOUTatcf=${COMROOTp1}/nhc/${envir}/atcf
-    mkdir -m 775 -p ${COMOUThur} ${COMOUTatcf}
-else
-#    export COMOUThur=$COMOUT
-#    export COMOUTatcf=$COMOUT
-    export COMOUThur=${DATA}
-    export COMOUTatcf=${DATA}
-fi
+YMD=${PDY} HH=${cyc} generate_com -rx COM_ATMOS_GENESIS
+YMD=${PDY} HH=${cyc} GRID="0p25" generate_com -rx COM_ATMOS_GRIB_0p25:COM_ATMOS_GRIB_GRID_TMPL
+
+# The following variables are used by the tracker scripts which are outside
+#   of global-workflow and therefore can't be standardized at this time
+export COMIN=${COM_ATMOS_GRIB_0p25}
+export gfsdir=${COM_ATMOS_GRIB_0p25}
+export COMINgfs=${COM_ATMOS_GRIB_0p25}
+
+export COMOUT=${COM_ATMOS_GENESIS}
+
+export COMINsyn=${COMINsyn:-$(compath.py "${envir}/com/gfs/${gfs_ver}")/syndat}
 
 ##############################################
 # Run relevant script
diff --git a/jobs/JGLOBAL_ATMOS_POST_MANAGER b/jobs/JGLOBAL_ATMOS_POST_MANAGER
index 1d82537dca..3bbc258ce0 100755
--- a/jobs/JGLOBAL_ATMOS_POST_MANAGER
+++ b/jobs/JGLOBAL_ATMOS_POST_MANAGER
@@ -12,12 +12,6 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "post" -c "base post"
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
 
-
-####################################
-# Specify version numbers
-####################################
-export gfs_ver=${gfs_ver:-v15.0.0}
-
 ####################################
 # Specify Execution Areas
 ####################################
@@ -32,10 +26,8 @@ export USHgfs=${HOMEgfs:-${HOMEgfs}/ush}
 ###########################
 export EXT_FCST=NO
 
-export ROTDIR=${ROTDIR:-${COMROOT:?}/${NET}/${envir}}
-export COMIN=${COMIN:-${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos}
-export COMOUT=${COMOUT:-${ROTDIR}/${RUN}.${PDY}/${cyc}/atmos}
-
+YMD=${PDY} HH=${cyc} generate_com -rx COM_ATMOS_HISTORY
+YMD=${PDY} HH=${cyc} generate_com -rx COM_ATMOS_GRIB
 
 ########################################################
 # Execute the script.
diff --git a/scripts/exglobal_atmos_pmgr.sh b/scripts/exglobal_atmos_pmgr.sh
index 6e4c2ed3f4..86afed962e 100755
--- a/scripts/exglobal_atmos_pmgr.sh
+++ b/scripts/exglobal_atmos_pmgr.sh
@@ -43,7 +43,7 @@ icnt=1
 while [ $icnt -lt 1000 ]; do
   for fhr in $postjobs; do 
     fhr3=$(printf "%03d" $fhr)   
-    if [ -s ${COMIN}/${RUN}.${cycle}.logf${fhr}.txt -o  -s ${COMIN}/${RUN}.${cycle}.logf${fhr3}.txt ]; then
+    if [ -s ${COM_ATMOS_HISTORY}/${RUN}.${cycle}.atm.logf${fhr3}.txt ]; then
       if [ $fhr -eq 0 ]; then 
         ####        ecflow_client --event release_${RUN}_postanl
         ecflow_client --event release_postanl