Brings fork develop into NOAA-EMC (#13)

* Set of changes going from rrfs to refs. * Cleans unused stuff out of rocoto, renames J-jobs (JRRFS_ENSPOST --> JREFS) * Cleans rrfs out of J-jobs, points at renamed ex-scripts. * Renames source directories and build related scripts. * Updates some J-job documentation lines. * Updates link_refs_fix.sh * Prototype .xml change for hawaii. * Fixes typos in ENSPROD_1 J-job file * Points to refs items within ex-scripts. * Fixes run.ver file * Folds in some changes made locally under emc.lam * Changes output name in python scripts from rrfs to refs. Could it use $NET instead? * Fixes some ush scripts * Updates parm table files - need to get those changes into the main trunk. * Folds in some missing WMO changes into this branch. * Changes v0.7.9 to na in rocoto xml files * Changes rrfs to refs in if tests within ensprod.fd code. Finally running clean. * Trial changes for ak and pr xml files. * rrfs to refs for "run" in code. Increases maximum number of products (12/24h Snow related) * Adds new snow and frzr products to REFS branch * Adds FZ24 to nonconus parm file. * Updates refs rocoto .xml files * Updated transfer run script * Brings changes into refs branch. * Fix for f57 precip issue. Also removes "v3" from ensprod run directories. * Updates refs system transfer jobs * Fixes typo in transfer run script * Some fixes for issues uncovered when REFS went live.
NOAA-EMC · Mar 1, 2024 · 43e0153 · 43e0153
1 parent 33734eb
commit 43e0153
Show file tree

Hide file tree

Showing 124 changed files with 690 additions and 4,133 deletions.
diff --git a/jobs/JRRFS_ENSPOST_AWIPS → jobs/JREFS_AWIPS b/jobs/JRRFS_ENSPOST_AWIPS → jobs/JREFS_AWIPS
@@ -28,18 +28,18 @@ export SENDCOM=${SENDCOM:-YES}
 export SENDECF=${SENDECF:-YES}
 export SENDDBN=${SENDDBN:-YES}
 
-export HOMErrfs=${HOMErrfs:-$PACKAGEROOT/rrfs.${rrfs_ver}}
-export USHrrfs=${USHrrfs:-$HOMErrfs/ush}
-export PARMwmo=${PARMwmo:-$HOMErrfs/parm/wmo}
+export HOMErefs=${HOMErefs:-$PACKAGEROOT/refs.${refs_ver}}
+export USHrefs=${USHrefs:-$HOMErefs/ush}
+export PARMwmo=${PARMwmo:-$HOMErefs/parm/wmo}
 
 ###############################
 # Specify NET and RUN name
 ###############################
-export NET=${NET:-rrfs}
-export RUN=${RUN:-rrfs} 
+export NET=${NET:-refs}
+export RUN=${RUN:-refs} 
 
-export COMIN=${COMIN:-$(compath.py -o $NET/${rrfs_ver})/$RUN.${PDY}/ensprod}
-export COMOUT=${COMOUT:-$(compath.py -o $NET/${rrfs_ver})/$RUN.${PDY}/wmo}
+export COMIN=${COMIN:-$(compath.py -o $NET/${refs_ver})/$RUN.${PDY}/ensprod}
+export COMOUT=${COMOUT:-$(compath.py -o $NET/${refs_ver})/$RUN.${PDY}/wmo}
 
 if [ ! -f $COMOUT ] ; then
   mkdir -p -m 775 $COMOUT
@@ -49,7 +49,7 @@ export pgmout=OUTPUT.$$
 
 #################################################################
 # Execute the script
-$HOMErrfs/scripts/exrrfs_enspost_awips.sh.ecf $type
+$HOMErefs/scripts/exrefs_awips.sh.ecf $type
 #################################################################
 
 cd ${DATAROOT}

diff --git a/jobs/JRRFS_ENSPOST_EAS_1 → jobs/JREFS_EAS_1 b/jobs/JRRFS_ENSPOST_EAS_1 → jobs/JREFS_EAS_1
@@ -43,28 +43,26 @@ export SENDDBN_NTC=${SENDDBN_NTC:-NO}
 
 # Save it for time lag ensemble
 # export COMINhiresw=${COMINhiresw:-$(compath.py ${envir}/com/hiresw/${hiresw_ver}/hiresw)}
-# export COMINnam=${COMINnam:-$GESROOT/rrfs}
-# export COMINhrrr=${COMINhrrr:-$GESROOT/rrfs}
 
-export HOMErrfs=${HOMErrfs:-$PACKAGEROOT/rrfs.${rrfs_ver}}
-export EXECrrfs=${EXECrrfs:-$HOMErrfs/exec}
-export PARMrrfs=${PARMrrfs:-$HOMErrfs/parm}
-export USHrrfs=${USHrrfs:-$HOMErrfs/ush}
-export FIXrrfs=${FIXrrfs:-$HOMErrfs/fix}
-export SCRIPTSrrfs=${SCRIPTSrrfs:-$HOMErrfs/scripts}
+export HOMErefs=${HOMErefs:-$PACKAGEROOT/refs.${refs_ver}}
+export EXECrefs=${EXECrefs:-$HOMErefs/exec}
+export PARMrefs=${PARMrefs:-$HOMErefs/parm}
+export USHrefs=${USHrefs:-$HOMErefs/ush}
+export FIXrefs=${FIXrefs:-$HOMErefs/fix}
+export SCRIPTSrefs=${SCRIPTSrefs:-$HOMErefs/scripts}
 
 ###################################
 # Specify NET and RUN Name and model
 ####################################
-export NET=${NET:-rrfs}
-export RUN=${RUN:-rrfs}
+export NET=${NET:-refs}
+export RUN=${RUN:-refs}
 
 export IOBUF_PARAMS='*:size=8M:count=8'
 ##############################################
 # Define running directory and COM directories
 ##############################################
 
-export COMOUT=${COMOUT:-$(compath.py -o $NET/${rrfs_ver})/$RUN.${PDY}}
+export COMOUT=${COMOUT:-$(compath.py -o $NET/${refs_ver})/$RUN.${PDY}}
 
 if [ ! -d $COMOUT ] ; then
  mkdir -p $COMOUT/ensprod
@@ -76,7 +74,7 @@ export pgmout="OUTPUT.$$"
 ########################################################
 # Execute the script.
 
-$HOMErrfs/scripts/exrrfs_enspost_eas_1.sh.ecf $type
+$HOMErefs/scripts/exrefs_eas_1.sh.ecf $type
 ########################################################
 
 msg="JOB $job HAS COMPLETED NORMALLY."

diff --git a/jobs/JRRFS_ENSPOST_EAS_2 → jobs/JREFS_EAS_2 b/jobs/JRRFS_ENSPOST_EAS_2 → jobs/JREFS_EAS_2
@@ -42,29 +42,27 @@ export SENDDBN_NTC=${SENDDBN_NTC:-NO}
 ## PDY not included here as pull data from PDYm1 as well
 
 # Save it for time lag ensemble
-export COMINhiresw=${COMINhiresw:-$(compath.py ${envir}/com/hiresw/${hiresw_ver}/hiresw)}
-export COMINnam=${COMINnam:-$GESROOT/rrfs}
-export COMINhrrr=${COMINhrrr:-$GESROOT/rrfs}
+export COMINhrrr=${COMINhrrr:-$GESROOT/refs}
 
-export HOMErrfs=${HOMErrfs:-$PACKAGEROOT/rrfs.${rrfs_ver}}
-export EXECrrfs=${EXECrrfs:-$HOMErrfs/exec}
-export PARMrrfs=${PARMrrfs:-$HOMErrfs/parm}
-export USHrrfs=${USHrrfs:-$HOMErrfs/ush}
-export FIXrrfs=${FIXrrfs:-$HOMErrfs/fix}
-export SCRIPTSrrfs=${SCRIPTSrrfs:-$HOMErrfs/scripts}
+export HOMErefs=${HOMErefs:-$PACKAGEROOT/refs.${refs_ver}}
+export EXECrefs=${EXECrefs:-$HOMErefs/exec}
+export PARMrefs=${PARMrefs:-$HOMErefs/parm}
+export USHrefs=${USHrefs:-$HOMErefs/ush}
+export FIXrefs=${FIXrefs:-$HOMErefs/fix}
+export SCRIPTSrefs=${SCRIPTSrefs:-$HOMErefs/scripts}
 
 ###################################
 # Specify NET and RUN Name and model
 ####################################
-export NET=${NET:-rrfs}
-export RUN=${RUN:-rrfs}
+export NET=${NET:-refs}
+export RUN=${RUN:-refs}
 
 export IOBUF_PARAMS='*:size=8M:count=8'
 ##############################################
 # Define running directory and COM directories
 ##############################################
 
-export COMOUT=${COMOUT:-$(compath.py -o $NET/${rrfs_ver})/$RUN.${PDY}}
+export COMOUT=${COMOUT:-$(compath.py -o $NET/${refs_ver})/$RUN.${PDY}}
 
 if [ ! -d $COMOUT ] ; then
  mkdir -p $COMOUT/ensprod
@@ -76,7 +74,7 @@ export pgmout="OUTPUT.$$"
 ########################################################
 # Execute the script.
 
-$HOMErrfs/scripts/exrrfs_enspost_eas_2.sh.ecf $type
+$HOMErefs/scripts/exrefs_eas_2.sh.ecf $type
 ########################################################
 
 msg="JOB $job HAS COMPLETED NORMALLY."

diff --git a/jobs/JRRFS_ENSPOST_ENSPROD_1 → jobs/JREFS_ENSPROD_1 b/jobs/JRRFS_ENSPOST_ENSPROD_1 → jobs/JREFS_ENSPROD_1
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 #############################################################
-# RRFS RUNALL 
 # 02/02/2015 Binbin Zhou, create for run all scripts 
 # 04/26/2023 Jun Du, added a timelag version (type=timelag)
+# 02/06/2024 M. Pyle - switches things to REFS
 #############################################################
 
 ########################################
@@ -45,18 +45,18 @@ export SENDECF=${SENDECF:-YES}
 export SENDDBN=${SENDDBN:-YES}
 export SENDDBN_NTC=${SENDDBN_NTC:-NO}
 
-export HOMErrfs=${HOMErrfs:-$PACKAGEROOT/rrfs.${rrfs_ver}} 
-export EXECrrfs=${EXECrrfs:-$HOMErrfs/exec}
-export PARMrrfs=${PARMrrfs:-$HOMErrfs/parm}
-export USHrrfs=${USHrrfs:-$HOMErrfs/ush}
-export FIXrrfs=${FIXrrfs:-$HOMErrfs/fix}
-export SCRIPTSrrfs=${SCRIPTSrrfs:-$HOMErrfs/scripts}
+export HOMErefs=${HOMErefs:-$PACKAGEROOT/refs.${refs_ver}} 
+export EXECrefs=${EXECrefs:-$HOMErefs/exec}
+export PARMrefs=${PARMrefs:-$HOMErefs/parm}
+export USHrefs=${USHrefs:-$HOMErefs/ush}
+export FIXrefs=${FIXrefs:-$HOMErefs/fix}
+export SCRIPTSrefs=${SCRIPTSrefs:-$HOMErefs/scripts}
 
 ###################################
 # Specify NET and RUN Name and model
 ####################################
-export NET=${NET:-rrfs}
-export RUN=${RUN:-rrfs}
+export NET=${NET:-refs}
+export RUN=${RUN:-refs}
 
 export IOBUF_PARAMS='*:size=8M:count=8'
 
@@ -66,10 +66,12 @@ export IOBUF_PARAMS='*:size=8M:count=8'
 
 ## PDY not included here as pull data from PDYm1 as well
 
-export COMINrrfs=${COMINrrfs:-$GESROOT/${RUN}}
-export COMOUT=${COMOUT:-$(compath.py -o $NET/${rrfs_ver})/$RUN.${PDY}}
-export COMINffg=${COMINffg:-$(compath.py -o $NET/${rrfs_ver})/${RUN}.${PDY}}
-export COMINffgm1=${COMINffg:-$(compath.py -o $NET/${rrfs_ver})/${RUN}.${PDYm1}}
+# think about this one.  is it COMINrefs?  Or just COMIN, as is internal to system?
+export COMINrefs=${COMINrefs:-$GESROOT/${RUN}}
+
+export COMOUT=${COMOUT:-$(compath.py -o $NET/${refs_ver})/$RUN.${PDY}}
+export COMINffg=${COMINffg:-$(compath.py -o $NET/${refs_ver})/${RUN}.${PDY}}
+export COMINffgm1=${COMINffg:-$(compath.py -o $NET/${refs_ver})/${RUN}.${PDYm1}}
 
 if [ ! -d $COMOUT/ensprod ] ; then 
  mkdir -p $COMOUT/ensprod
@@ -86,20 +88,20 @@ export pgmout="OUTPUT.$$"
 # export VERBOSE=YES
 
 ###################################################
-# Execute the Script exrrfs_enspost_ensprod.sh.ecf
-#export type=single
-#export type=timelag
-
-rm -rf poe.*
+# Execute the Script exrefs_ensprod.sh.ecf
 
+if [ -e ./poe.* ]
+then
+rm -rf ./poe.*
+fi
 
 hrlist="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 \
         26 27 28 29 30 31 32 33 34 35 36"
 
 for hr in $hrlist
 do
-echo "$SCRIPTSrrfs/exrrfs_enspost_ensprod_link.sh.ecf $hr $type" >> poe.link.all
-echo "$SCRIPTSrrfs/exrrfs_enspost_ensprod.sh.ecf $hr $type" >> poe.ensprod.all
+echo "$SCRIPTSrefs/exrefs_ensprod_link.sh.ecf $hr $type" >> poe.link.all
+echo "$SCRIPTSrefs/exrefs_ensprod.sh.ecf $hr $type" >> poe.ensprod.all
 done
 
 chmod 775 poe.link.all

diff --git a/jobs/JRRFS_ENSPOST_ENSPROD_2 → jobs/JREFS_ENSPROD_2 b/jobs/JRRFS_ENSPOST_ENSPROD_2 → jobs/JREFS_ENSPROD_2
@@ -1,10 +1,11 @@
 #!/bin/bash
 
 #############################################################
-# RRFS RUNALL 
 # 02/02/2015 Binbin Zhou, create for run all scripts 
 # 2nd part to process 37-60h -- Jun
 # 04/26/2023, Jun Du: added a timelag version (type=timelag or single)
+# 02/06/2024 M. Pyle - switches things to REFS
+#
 #############################################################
 
 ########################################
@@ -45,18 +46,18 @@ export SENDECF=${SENDECF:-YES}
 export SENDDBN=${SENDDBN:-YES}
 export SENDDBN_NTC=${SENDDBN_NTC:-NO}
 
-export HOMErrfs=${HOMErrfs:-$PACKAGEROOT/rrfs.${rrfs_ver}} 
-export EXECrrfs=${EXECrrfs:-$HOMErrfs/exec}
-export PARMrrfs=${PARMrrfs:-$HOMErrfs/parm}
-export USHrrfs=${USHrrfs:-$HOMErrfs/ush}
-export FIXrrfs=${FIXrrfs:-$HOMErrfs/fix}
-export SCRIPTSrrfs=${SCRIPTSrrfs:-$HOMErrfs/scripts}
+export HOMErefs=${HOMErefs:-$PACKAGEROOT/refs.${refs_ver}} 
+export EXECrefs=${EXECrefs:-$HOMErefs/exec}
+export PARMrefs=${PARMrefs:-$HOMErefs/parm}
+export USHrefs=${USHrefs:-$HOMErefs/ush}
+export FIXrefs=${FIXrefs:-$HOMErefs/fix}
+export SCRIPTSrefs=${SCRIPTSrefs:-$HOMErefs/scripts}
 
 ###################################
 # Specify NET and RUN Name and model
 ####################################
-export NET=${NET:-rrfs}
-export RUN=${RUN:-rrfs}
+export NET=${NET:-refs}
+export RUN=${RUN:-refs}
 
 export IOBUF_PARAMS='*:size=8M:count=8'
 
@@ -66,11 +67,12 @@ export IOBUF_PARAMS='*:size=8M:count=8'
 
 ## PDY not included here as pull data from PDYm1 as well
 
-export COMINrrfs=${COMINrrfs:-$GESROOT/${RUN}}
+# should this be COMINrefs?
+export COMINrefs=${COMINrefs:-$GESROOT/${RUN}}
 
-export COMOUT=${COMOUT:-$(compath.py -o $NET/${rrfs_ver})/${RUN}.${PDY}}
-export COMINffg=${COMINffg:-$(compath.py -o $NET/${rrfs_ver})/${RUN}.${PDY}}
-export COMINffgm1=${COMINffg:-$(compath.py -o $NET/${rrfs_ver})/${RUN}.${PDYm1}}
+export COMOUT=${COMOUT:-$(compath.py -o $NET/${refs_ver})/${RUN}.${PDY}}
+export COMINffg=${COMINffg:-$(compath.py -o $NET/${refs_ver})/${RUN}.${PDY}}
+export COMINffgm1=${COMINffg:-$(compath.py -o $NET/${refs_ver})/${RUN}.${PDYm1}}
 
 if [ ! -d $COMOUT/ensprod ] ; then 
  mkdir -p $COMOUT/ensprod
@@ -87,33 +89,26 @@ export pgmout="OUTPUT.$$"
 # export VERBOSE=YES
 
 ###################################################
-# Execute the Script exrrfs_enspost_ensprod.sh.ecf
-#export type=single
-#export type=timelag
+# Execute the Script exrefs_ensprod.sh.ecf
 
 rm -rf poe.*
 
-# might need to link from about f18 onward? (for 24 h QPF)
-# need every hour or just every 3 h??
-
 if [ $type = single ];then
 hrlist_link="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60"
 hrlist="37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60"
 else
-#hrlist_link="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54"
  hrlist_link="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60"
-#hrlist="37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54"
  hrlist="37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60"
 fi 
 
 for hr in $hrlist_link
 do
-echo "$SCRIPTSrrfs/exrrfs_enspost_ensprod_link.sh.ecf $hr $type" >> poe.link.all
+echo "$SCRIPTSrefs/exrefs_ensprod_link.sh.ecf $hr $type" >> poe.link.all
 done
 
 for hr in $hrlist
 do
-echo "$SCRIPTSrrfs/exrrfs_enspost_ensprod.sh.ecf $hr $type" >> poe.ensprod.all
+echo "$SCRIPTSrefs/exrefs_ensprod.sh.ecf $hr $type" >> poe.ensprod.all
 done
 
 

diff --git a/jobs/JRRFS_ENSPOST_FFG_GEN → jobs/JREFS_FFG_GEN b/jobs/JRRFS_ENSPOST_FFG_GEN → jobs/JREFS_FFG_GEN
@@ -29,23 +29,23 @@ export SENDCOM=${SENDCOM:-YES}
 export SENDECF=${SENDECF:-YES}
 export SENDDBN=${SENDDBN:-YES}
 
-export HOMErrfs=${HOMErrfs:-$PACKAGEROOT/rrfs.${rrfs_ver}}
-export USHrrfs=${USHrrfs:-$HOMErrfs/ush}
-export EXECrrfs=${EXECrrfs:-$HOMErrfs/exec}
+export HOMErefs=${HOMErefs:-$PACKAGEROOT/refs.${refs_ver}}
+export USHrefs=${USHrefs:-$HOMErefs/ush}
+export EXECrefs=${EXECrefs:-$HOMErefs/exec}
 
 ###############################
 # Specify NET and RUN name
 ###############################
-export NET=${NET:-rrfs}
-export RUN=${RUN:-rrfs} 
+export NET=${NET:-refs}
+export RUN=${RUN:-refs} 
 
 # how handle DCOMROOT - hardcode backup definition, or use $envir?
 
 export DCOMROOT=${DCOMROOT:-/lfs/h1/ops/${envir}/dcom}
-#export COMIN=${COMIN:-$(compath.py -o $NET/${rrfs_ver})/${RUN}.${PDY}}
-#export COMOUT=${COMOUT:-$(compath.py -o $NET/${rrfs_ver})/${RUN}.${PDY}}
-export COMIN=${COMIN:-$(compath.py -o $NET/${rrfs_ver})/${RUN}.${PDY}}
-export COMOUT=${COMOUT:-$(compath.py -o $NET/${rrfs_ver})/${RUN}.${PDY}}
+#export COMIN=${COMIN:-$(compath.py -o $NET/${refs_ver})/${RUN}.${PDY}}
+#export COMOUT=${COMOUT:-$(compath.py -o $NET/${refs_ver})/${RUN}.${PDY}}
+export COMIN=${COMIN:-$(compath.py -o $NET/${refs_ver})/${RUN}.${PDY}}
+export COMOUT=${COMOUT:-$(compath.py -o $NET/${refs_ver})/${RUN}.${PDY}}
 
 
 if [ ! -f $COMOUT ] ; then
@@ -56,7 +56,7 @@ export pgmout=OUTPUT.$$
 
 #################################################################
 # Execute the script
-$HOMErrfs/scripts/exrrfs_enspost_ffggen.sh.ecf
+$HOMErefs/scripts/exrefs_ffggen.sh.ecf
 #################################################################
 
 cd ${DATAROOT}