Issue #46 - updates to prod_util module on Cray and syndat paths thro…

…ughout
NOAA-EMC · Mar 30, 2020 · cbe3b00 · cbe3b00
1 parent 0e0dc87
commit cbe3b00
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 22 deletions.
diff --git a/driver/gdas/test_jgdas_tropc_cray.sh b/driver/gdas/test_jgdas_tropc_cray.sh
@@ -53,7 +53,6 @@ export COMDATEROOT=/gpfs/hps/ptmp/Qingfu.Liu/com
 #export COMDATEROOT=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/com
 #export COMDATEROOT=/gpfs/tp2/nco/ops/com
 export DATA_DUMPJB=/gpfs/hps/ptmp/Qingfu.Liu/com/111
-#export archsyndir=/gpfs/tp1/nco/ops/com/arch/prod/syndat
 
 #export DCOMROOT=/dcom
 export DCOMROOT=/gpfs/tp1/nco/ops/dcom

diff --git a/driver/gdas/test_jgdas_tropcy_qc_reloc_cray.sh b/driver/gdas/test_jgdas_tropcy_qc_reloc_cray.sh
@@ -14,6 +14,7 @@
 
 module use /gpfs/hps/nco/ops/nwprod/modulefiles
 module load prod_util
+module load prod_envir
 module unload grib_util
 module load grib_util/1.0.3
 ##module load crtm-intel/2.2.3
@@ -80,7 +81,7 @@ export PDY=20140814
 #export COMINgdas=/gpfs/tp1/nco/ops/com/gfs/prod/gdas.${PDY}
 export COMINgfs=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/com/gfs/$envir/gfs.${PDY}
 export COMINgdas=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/com/gfs/$envir/gdas.${PDY}
-export ARCHSYND=/gpfs/tp1/nco/ops/com/arch/prod/syndat
+export ARCHSYND=${COMINsyn:-$(compath.py gfs/prod/syndat)}
 export HOMENHC=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/guidance/storm-data/ncep
 #export GETGES_COM=/gpfs/tp1/nco/ops/com
 export GETGES_COM=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/com

diff --git a/driver/gfs/test_jgfs_cyclone_tracker_cray.sh b/driver/gfs/test_jgfs_cyclone_tracker_cray.sh
@@ -14,6 +14,7 @@
 
 module use /gpfs/hps/nco/ops/nwprod/modulefiles
 module load prod_util
+module load prod_envir
 module unload grib_util
 module load grib_util/1.0.3
 ##module load crtm-intel/2.2.3
@@ -76,7 +77,7 @@ export cycle=t${cyc}z
 #setpdy.sh
 #. PDY
 
-export archsyndir=/gpfs/tp1/nco/ops/com/arch/prod/syndat
+export archsyndir=${COMINsyn:-$(compath.py gfs/prod/syndat)}
 export WGRIB2=/gpfs/hps/nco/ops/nwprod/grib_util.v1.0.3/exec/wgrib2
 export GRB2INDEX=/gpfs/hps/nco/ops/nwprod/grib_util.v1.0.3/exec/grb2index
 export GRBINDEX2=/gpfs/hps/nco/ops/nwprod/grib_util.v1.0.3/exec/grb2index
@@ -90,8 +91,7 @@ export PDY=20140814
 #export COMINgdas=/gpfs/gp2/nco/ops/com/gfs/prod/gdas.${PDY}
 export COMINgfs=$COMROOT/gfs/$envir/gfs.${PDY}
 export COMINgdas=$COMROOT/gfs/$envir/gdas.${PDY}
-export ARCHSYND=/gpfs/tp1/nco/ops/com/arch/prod/syndat
-#export ARCHSYND=/gpfs/tp1/nco/ops/com/arch/prod/syndat
+export ARCHSYND=${COMINsyn:-$(compath.py gfs/prod/syndat)}
 export HOMENHC=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/guidance/storm-data/ncep
 #export GETGES_COM=/gpfs/gp2/nco/ops/com
 #export GESROOT=/gpfs/gp2/nco/ops/com

diff --git a/driver/gfs/test_jgfs_tropcy_qc_reloc_cray.sh b/driver/gfs/test_jgfs_tropcy_qc_reloc_cray.sh
@@ -14,6 +14,7 @@
 
 module use /gpfs/hps/nco/ops/nwprod/modulefiles
 module load prod_util
+module load prod_envir
 module unload grib_util
 module load grib_util/1.0.3
 ##module load crtm-intel/2.2.3
@@ -80,7 +81,7 @@ export PDY=20140814
 #export COMINgdas=/gpfs/tp1/nco/ops/com/gfs/prod/gdas.${PDY}
 export COMINgfs=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/com/gfs/$envir/gfs.${PDY}
 export COMINgdas=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/com/gfs/$envir/gdas.${PDY}
-export ARCHSYND=/gpfs/tp1/nco/ops/com/arch/prod/syndat
+export ARCHSYND=${COMINsyn:-$(compath.py gfs/prod/syndat)}
 export HOMENHC=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/guidance/storm-data/ncep
 #export GETGES_COM=/gpfs/tp1/nco/ops/com
 export GETGES_COM=/gpfs/hps/emc/global/noscrub/Qingfu.Liu/com

diff --git a/jobs/JGFS_CYCLONE_GENESIS b/jobs/JGFS_CYCLONE_GENESIS
@@ -102,7 +102,7 @@ export COMOUTgenvit=${COMOUTgenvit:-${COMOUT}/genesis_vital_${JYYYY}}
 #export COMINgenvit=${COMINgenvit:-${DATA}/genesis_vital_${JYYYY}}
 #export COMOUTgenvit=${COMOUTgenvit:-${DATA}/genesis_vital_${JYYYY}}
 
-export COMINsyn=${COMINsyn:-$(compath.py arch/prod/syndat)}
+export COMINsyn=${COMINsyn:-$(compath.py gfs/prod/syndat)}
 
 mkdir -m 775 -p $COMOUTgenvit
 

diff --git a/jobs/JGFS_CYCLONE_TRACKER b/jobs/JGFS_CYCLONE_TRACKER
@@ -98,7 +98,7 @@ export gfsdir=${COMINgfs}
 export COMINgdas=${COMIN}
 export gdasdir=${COMINgdas}
 export COMOUT=${ROTDIR}/${RUN}.${PDY}/${cyc}
-export COMINsyn=${COMINsyn:-$(compath.py arch/prod/syndat)}
+export COMINsyn=${COMINsyn:-$(compath.py gfs/prod/syndat)}
 
 if [ $RUN_ENVIR = "nco" ]; then
     export COMOUThur=${COMROOTp1:?}/hur/${envir}/global

diff --git a/jobs/JGLOBAL_TROPCY_QC_RELOC b/jobs/JGLOBAL_TROPCY_QC_RELOC
@@ -72,7 +72,7 @@ export DO_RELOCATE=${DO_RELOCATE:-NO}           # Turn on tropical cyclone reloc
 
 export tmmark=tm00
 if [ $RUN_ENVIR = "nco" ]; then
-    export ARCHSYND=$COMROOTp3/gfs/${envir}/syndat     # this location is unique, do not change
+    export ARCHSYND=${COMINsyn:-$(compath.py gfs/prod/syndat)}
 else
     export ARCHSYND=${ROTDIR}/syndat   
 fi

diff --git a/jobs/rocoto/prep.sh b/jobs/rocoto/prep.sh
@@ -57,13 +57,13 @@ fi
 
 if [ $PROCESS_TROPCY = "YES" ]; then
 
-    export ARCHSYNDNCO=$COMROOTp1/arch/prod/syndat
+    export COMINsyn=${COMINsyn:-$(compath.py gfs/prod/syndat)}
     if [ $RUN_ENVIR != "nco" ]; then
         export ARCHSYND=${ROTDIR}/syndat
         if [ ! -d ${ARCHSYND} ]; then mkdir -p $ARCHSYND; fi
         if [ ! -s $ARCHSYND/syndat_akavit ]; then 
             for file in syndat_akavit syndat_dateck syndat_stmcat.scr syndat_stmcat syndat_sthisto syndat_sthista ; do
-                cp $ARCHSYNDNCO/$file $ARCHSYND/. 
+                cp $COMINsyn/$file $ARCHSYND/.
             done
         fi
     fi

diff --git a/modulefiles/module_base.wcoss_c b/modulefiles/module_base.wcoss_c
@@ -33,7 +33,7 @@ module load udreg
 module load ugni
 module load hpss
 
-module load prod_util
+module load prod_util/1.1.0
 module load g2tmpl-intel/1.4.0
 module load crtm-intel/2.2.6
 module load iobuf/2.0.7

diff --git a/modulefiles/module_base.wcoss_cray b/modulefiles/module_base.wcoss_cray
@@ -31,7 +31,7 @@ module load udreg
 module load ugni
 module load hpss
 
-module load prod_util
+module load prod_util/1.1.0
 module load g2tmpl-intel/1.4.0
 module load crtm-intel/2.2.6
 module load iobuf/2.0.7

diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn
@@ -32,6 +32,7 @@ export SCRgfs=$HOMEgfs/scripts
 
 # GLOBAL static environment parameters
 export NWPROD="@NWPROD@"
+export COMROOT="@COMROOT@"
 export DMPDIR="@DMPDIR@"
 export RTMFIX=$CRTM_FIX
 

diff --git a/parm/config/config.prep b/parm/config/config.prep
@@ -18,6 +18,11 @@ export DO_RELOCATE="NO"
 export TROPCYQCRELOSH="$HOMEgfs/scripts/extropcy_qc_reloc.sh.ecf"
 export SENDCOM=YES
 
+export COMINsyn=${COMINsyn:-$(compath.py gfs/prod/syndat)}
+if [ $machine = "HERA" ]; then
+    export COMINsyn="${COMROOT}/arch/prod/syndat"
+fi
+
 export HOMERELO=$HOMEgfs
 export EXECRELO=${HOMERELO}/exec
 export FIXRELO=${HOMERELO}/fix/fix_am

diff --git a/parm/config/config.vrfy b/parm/config/config.vrfy
@@ -142,11 +142,9 @@ if [ "$VRFYTRAK" = "YES" ]; then
         export FHOUT_CYCLONE=6            
         export FHMAX_CYCLONE=$(( FHMAX_GFS<240 ? FHMAX_GFS : 240 ))
     fi
+    export COMINsyn=${COMINsyn:-$(compath.py gfs/prod/syndat)}
     if [ $machine = "HERA" ]; then
-       export COMROOTp1="/scratch1/NCEPDEV/rstprod/com"
-       export COMINsyn=${COMINsyn:-${COMROOTp1}/arch/prod/syndat}
-    else
-       export COMINsyn=${COMINsyn:-${COMROOT}/gfs/prod/syndat}
+       export COMINsyn="${COMROOT}/arch/prod/syndat"
     fi
 fi
 

diff --git a/ush/global_extrkr.sh b/ush/global_extrkr.sh
@@ -287,7 +287,7 @@ export homesyndir=${homesyndir:-${HOMERELO}}
 export homesyndir=${homesyndir:-$NWPROD/util}
 export exectrkdir=${exectrkdir:-${homesyndir}/exec}
 export ushtrkdir=${ushtrkdir:-${homesyndir}/ush}
-export archsyndir=${archsyndir:-${COMDIR}${COMROOTp1}/arch/prod/syndat}
+export archsyndir=${archsyndir:-${COMINsyn:-$(compath.py gfs/prod/syndat)}}
 
 ##cp /com/date/t${CYL}z ncepdate
 ##export CENT=` cut -c7-8 ncepdate `

diff --git a/ush/rocoto/setup_expt.py b/ush/rocoto/setup_expt.py
@@ -95,6 +95,7 @@ def edit_baseconfig():
                     .replace('@BASE_SVN@', base_svn) \
                     .replace('@DMPDIR@', dmpdir) \
                     .replace('@NWPROD@', nwprod) \
+                    .replace('@COMROOT@', comroot) \
                     .replace('@HOMEDIR@', homedir) \
                     .replace('@STMP@', stmp) \
                     .replace('@PTMP@', ptmp) \
@@ -168,7 +169,8 @@ def edit_baseconfig():
       base_git = '/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git'
       base_svn = '/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git'
       dmpdir = '/gpfs/dell3/emc/global/dump'
-      nwprod = '/gpfs/dell1/nco/ops/nwprod'
+      nwprod = '${NWROOT:-"/gpfs/dell1/nco/ops/nwprod"}'
+      comroot = '${COMROOT:-"/gpfs/dell1/nco/ops/com"}'
       homedir = '/gpfs/dell2/emc/modeling/noscrub/$USER'
       stmp = '/gpfs/dell3/stmp/$USER'
       ptmp = '/gpfs/dell3/ptmp/$USER'
@@ -183,7 +185,8 @@ def edit_baseconfig():
       base_git = '/gpfs/hps3/emc/global/noscrub/emc.glopara/git'
       base_svn = '/gpfs/hps3/emc/global/noscrub/emc.glopara/svn'
       dmpdir = '/gpfs/dell3/emc/global/dump'
-      nwprod = '/gpfs/hps/nco/ops/nwprod'
+      nwprod = '${NWROOT:-"/gpfs/hps/nco/ops/nwprod"}'
+      comroot = '${COMROOT:-"/gpfs/hps/nco/ops/com"}'
       homedir = '/gpfs/hps3/emc/global/noscrub/$USER'
       stmp = '/gpfs/hps2/stmp/$USER'
       ptmp = '/gpfs/hps2/ptmp/$USER'
@@ -196,6 +199,7 @@ def edit_baseconfig():
       base_svn = '/scratch1/NCEPDEV/global/glopara/svn'
       dmpdir = '/scratch1/NCEPDEV/global/glopara/dump'
       nwprod = '/scratch1/NCEPDEV/global/glopara/nwpara'
+      comroot = '/scratch1/NCEPDEV/rstprod/com'
       homedir = '/scratch1/NCEPDEV/global/$USER'
       stmp = '/scratch1/NCEPDEV/stmp2/$USER'
       ptmp = '/scratch1/NCEPDEV/stmp4/$USER'

diff --git a/ush/rocoto/setup_expt_fcstonly.py b/ush/rocoto/setup_expt_fcstonly.py
@@ -69,6 +69,7 @@ def edit_baseconfig():
                     .replace('@BASE_SVN@', base_svn) \
                     .replace('@DMPDIR@', dmpdir) \
                     .replace('@NWPROD@', nwprod) \
+                    .replace('@COMROOT@', comroot) \
                     .replace('@HOMEDIR@', homedir) \
                     .replace('@STMP@', stmp) \
                     .replace('@PTMP@', ptmp) \
@@ -134,7 +135,8 @@ def edit_baseconfig():
       base_git = '/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git'
       base_svn = '/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git'
       dmpdir = '/gpfs/dell3/emc/global/dump'
-      nwprod = '/gpfs/dell1/nco/ops/nwprod'
+      nwprod = '${NWROOT:-"/gpfs/dell1/nco/ops/nwprod"}'
+      comroot = '${COMROOT:-"/gpfs/dell1/nco/ops/com"}'
       homedir = '/gpfs/dell2/emc/modeling/noscrub/$USER'
       stmp = '/gpfs/dell3/stmp/$USER'
       ptmp = '/gpfs/dell3/ptmp/$USER'
@@ -149,7 +151,8 @@ def edit_baseconfig():
       base_git = '/gpfs/hps3/emc/global/noscrub/emc.glopara/git'
       base_svn = '/gpfs/hps3/emc/global/noscrub/emc.glopara/svn'
       dmpdir = '/gpfs/dell3/emc/global/dump'
-      nwprod = '/gpfs/hps/nco/ops/nwprod'
+      nwprod = '${NWROOT:-"/gpfs/hps/nco/ops/nwprod"}'
+      comroot = '${COMROOT:-"/gpfs/hps/nco/ops/com"}'
       homedir = '/gpfs/hps3/emc/global/noscrub/$USER'
       stmp = '/gpfs/hps2/stmp/$USER'
       ptmp = '/gpfs/hps2/ptmp/$USER'
@@ -162,6 +165,7 @@ def edit_baseconfig():
       base_svn = '/scratch1/NCEPDEV/global/glopara/svn'
       dmpdir = '/scratch1/NCEPDEV/global/glopara/dump'
       nwprod = '/scratch1/NCEPDEV/global/glopara/nwpara'
+      comroot = '/scratch1/NCEPDEV/rstprod/com'
       homedir = '/scratch1/NCEPDEV/global/$USER'
       stmp = '/scratch1/NCEPDEV/stmp2/$USER'
       ptmp = '/scratch1/NCEPDEV/stmp4/$USER'