Update to obsproc.v1.0.2 and prepobs.v1.0.1 (#1049)

* Update HOMEobsproc paths in config.base
* Update primary obsproc JJOB call in prep.sh
* Add prepobs module load to R&D module_base modulefiles
* Add cdate10 setting to config.prep
* Add launcher_PREP to HERA and ORION env files
* Add needed COMINtcvital path to config.prep
* Retire config.prepbufr and prepbufr step from config.resources

Refs #1033

env/HERA.env

@@ -43,6 +43,7 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then
     export POE="NO"
     export BACK="NO"
     export sys_tp="HERA"
+    export launcher_PREP="srun"
 
 elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostbndpntbll" -o $step = "wavepostpnt" ]; then
 

env/ORION.env

@@ -42,6 +42,7 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then
     export POE="NO"
     export BACK=${BACK:-"YES"}
     export sys_tp="ORION"
+    export launcher_PREP="srun"
 
 elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostpnt" ]; then
 

jobs/rocoto/prep.sh

@@ -10,7 +10,7 @@ status=$?
 
 ###############################################################
 # Source relevant configs
-configs="base prep prepbufr"
+configs="base prep"
 for config in $configs; do
     . $EXPDIR/config.${config}
     status=$?
@@ -109,7 +109,7 @@ if [ $DO_MAKEPREPBUFR = "YES" ]; then
         export MAKE_NSSTBUFR="NO"
     fi
 
-    $HOMEobsproc_network/jobs/JGLOBAL_PREP
+    $HOMEobsproc/jobs/JOBSPROC_GLOBAL_PREP
     status=$?
     [[ $status -ne 0 ]] && exit $status
 

modulefiles/module_base.hera.lua

@@ -46,6 +46,9 @@ load(pathJoin("cdo", "1.9.5"))
 
 load(pathJoin("R", "3.5.0"))
 
+prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/v1.0.1/modulefiles"))
+load(pathJoin("prepobs", "1.0.1"))
+
 -- Temporary until official hpc-stack is updated
 prepend_path("MODULEPATH", "/scratch2/NCEPDEV/ensemble/save/Walter.Kolczynski/hpc-stack/modulefiles/stack")
 load(pathJoin("hpc", "1.2.0"))

modulefiles/module_base.orion.lua

@@ -47,6 +47,9 @@ load(pathJoin("slurm", "19.05.3-2"))
 
 load(pathJoin("cdo", "1.9.5"))
 
+prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/prepobs/v1.0.1/modulefiles"))
+load(pathJoin("prepobs", "1.0.1"))
+
 -- Temporary until official hpc-stack is updated
 prepend_path("MODULEPATH", "/work2/noaa/global/wkolczyn/save/hpc-stack/modulefiles/stack")
 load(pathJoin("hpc", "1.2.0"))

parm/config/config.base.emc.dyn

@@ -77,9 +77,7 @@ export MODE="@MODE@" # cycled/forecast-only
 export FIXgsi="$HOMEgfs/fix/gsi"
 export HOMEfv3gfs="$HOMEgfs/sorc/fv3gfs.fd"
 export HOMEpost="$HOMEgfs"
-export HOMEobsproc_prep="$BASE_GIT/obsproc/obsproc_prep.v5.5.0_hpc-stack"
-export HOMEobsproc_network="$BASE_GIT/obsproc/obsproc_global.v3.4.2_hpc-stack"
-export HOMEobsproc_global=$HOMEobsproc_network
+export HOMEobsproc="$BASE_GIT/obsproc/v1.0.2"
 
 # CONVENIENT utility scripts and other environment parameters
 export NCP="/bin/cp -p"

parm/config/config.base.nco.static

@@ -65,9 +65,7 @@ export REALTIME="YES"
 export FIXgsi="$HOMEgfs/fix/gsi"
 export HOMEfv3gfs="$HOMEgfs/sorc/fv3gfs.fd"
 export HOMEpost="$HOMEgfs"
-export HOMEobsproc_prep="$NWPROD/obsproc_prep.v5.5.0"
-export HOMEobsproc_network="$NWPROD/obsproc_global.v3.4.2"
-export HOMEobsproc_global=$HOMEobsproc_network
+export HOMEobsproc="/lfs/h1/ops/prod/packages/obsproc.v1.0.2"
 
 # CONVENIENT utility scripts and other environment parameters
 export NCP="/bin/cp -p"

parm/config/config.prep

@@ -9,6 +9,7 @@ echo "BEGIN: config.prep"
 . $EXPDIR/config.resources prep
 
 export DO_MAKEPREPBUFR="YES"   # if NO, will copy prepbufr from globaldump
+export cdate10=${PDY}${cyc}
 
 # Relocation and syndata QC
 export PROCESS_TROPCY=${PROCESS_TROPCY:-NO}
@@ -17,6 +18,7 @@ export DO_RELOCATE="NO"
 export TROPCYQCRELOSH="$HOMEgfs/scripts/exglobal_atmos_tropcy_qc_reloc.sh"
 export SENDCOM=YES
 
+export COMINtcvital=${COMINtcvital:-${DMPDIR}/${CDUMP}.${PDY}/${cyc}/atmos}
 export COMINsyn=${COMINsyn:-$(compath.py ${envir}/com/gfs/${gfs_ver})/syndat}
 
 export HOMERELO=$HOMEgfs

parm/config/config.resources

@@ -41,12 +41,12 @@ elif [[ "$machine" = "ORION" ]]; then
    export npe_node_max=40
 fi
 
-if [ $step = "prep" -o $step = "prepbufr" ]; then
-    eval "export wtime_$step='00:45:00'"
-    eval "export npe_$step=4"
-    eval "export npe_node_$step=2"
-    eval "export nth_$step=1"
-    eval "export memory_$step=40G"
+if [ $step = "prep" ]; then
+    export wtime_prep='00:45:00'
+    export npe_prep=4
+    export npe_node_prep=2
+    export nth_prep=1
+    export memory_prep="40G"
 
 elif [ $step = "aerosol_init" ]; then
     export wtime_aerosol_init="00:05:00"