wave configuration update

.gitignore

@@ -165,3 +165,5 @@ util/sub_wcoss_d
 workflow/user.yaml
 sorc/checkout-gldas.fd.log
 sorc/gldas.fd/
+sorc/reg2grb2.fd/*.o
+sorc/reg2grb2.fd/*.mod

README.md

@@ -11,8 +11,9 @@ sh checkout.sh coupled                                    # Check out the couple
 ```
 ## Compile code used in ufs-s2s-model and EMC_post and link fixed files and executable programs:
 ```
-sh build_ncep_post.sh        #This command will build ncep_post.
+sh build_ncep_post.sh        #This command will build ncep_post
 sh build_fv3_coupled.sh      #This command will build ufs-s2s-model
+sh build_reg2grb2.sh         #This command will build exes for ocean-ice post
 
 To link fixed files and executable programs for the coupled application:
 On Hera: 
@@ -85,6 +86,13 @@ module load rocoto
 rocotorun -w workflow.xml -d workflow.db
 ```
 
+## Using crons on Orion 
+
+On orion, you will need to update the path to rocotorun in the autogenerated workflow.crontab  to be
+/apps/contrib/rocoto/1.3.1/bin/rocotorun
+
+Also note, on orion you need to be on login node 1 for cronjobs. 
+
 ## Resource handling
 There are two ways of changing resource settings (cpu count, time limits, threads) for a job that has already been defined in the workflow.
 

env/HERA.env

@@ -154,6 +154,11 @@ elif [ $step = "fv3ic" ]; then
     [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max
     export APRUN_CHGRES="time"
 
+elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" ]; then
+
+    export mpmd="--multi-prog"
+    export CFP_MP="YES"
+
 elif [ $step = "postsnd" ]; then
 
     nth_max=$(($npe_node_max / $npe_node_postsnd))

env/ORION.env

@@ -189,6 +189,11 @@ elif [ $step = "fv3ic" ]; then
     [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max
     export APRUN_CHGRES="time"
 
+elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" ]; then
+
+    export mpmd="--multi-prog"
+    export CFP_MP="YES"
+
 elif [ $step = "postsnd" ]; then
 
     nth_max=$(($npe_node_max / $npe_node_postsnd))

jobs/JGLOBAL_FORECAST

@@ -9,7 +9,7 @@ date
 #############################
 # Source relevant config files
 #############################
-configs="base fcst"
+configs="base fcst wave"
 export EXPDIR=${EXPDIR:-$HOMEgfs/parm/config}
 config_path=${EXPDIR:-$NWROOT/gfs.${gfs_ver}/parm/config}
 for config in $configs; do
@@ -62,6 +62,8 @@ if [ $RUN_ENVIR = "nco" ]; then
     export RSTDIR=${GESROOT:?}/$envir
 fi
 
+export COMPONENTwave=${COMPONENTwave:-${RUN}wave}
+export WAV_MOD_TAG=${COMPONENTwave}${waveMEMB}
 
 ##############################################
 # Begin JOB SPECIFIC work

jobs/JGLOBAL_FORECAST_MEDCOLD

@@ -9,7 +9,7 @@ date
 #############################
 # Source relevant config files
 #############################
-configs="base fcst"
+configs="base fcst wave"
 export EXPDIR=${EXPDIR:-$HOMEgfs/parm/config}
 config_path=${EXPDIR:-$NWROOT/gfs.${gfs_ver}/parm/config}
 for config in $configs; do
@@ -62,6 +62,8 @@ if [ $RUN_ENVIR = "nco" ]; then
     export RSTDIR=${GESROOT:?}/$envir
 fi
 
+export COMPONENTwave=${COMPONENTwave:-${RUN}wave}
+export WAV_MOD_TAG=${COMPONENTwave}${waveMEMB}
 
 ##############################################
 # Begin JOB SPECIFIC work

jobs/JWAVE_INIT

@@ -7,7 +7,7 @@ set -x -e
 #############################
 # Source relevant config files
 #############################
-configs="base wave waveinit"
+configs="base wave"
 export EXPDIR=${EXPDIR:-$HOMEgfs/parm/config}
 config_path=${EXPDIR:-$NWROOT/gfs.${gfs_ver}/parm/config}
 for config in $configs; do
@@ -26,18 +26,13 @@ status=$?
 # PATH for working directory
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
-export COMPONENTwave=${COMPONENTwave:-${RUN}wave}
 
-export HOMEgfs=${HOMEgfs:-$NWROOT/${NET}.${gfs_ver}}
+export COMPONENTwave=${COMPONENTwave:-${RUN}wave}
 
 # Add default errchk = err_chk
 export errchk=${errchk:-err_chk}
 
-# Set HOMEwave to HOMEgfs
-HOMEwave=${HOMEwave:-${HOMEgfs}} 
-
-# Create and go to DATA directory
-export DATA=${DATA:-${DATAROOT:?}/${jobid}}
+export DATA=${DATA:-${DATAROOT}/${jobid:?}}
 mkdir -p $DATA
 cd $DATA
 
@@ -50,21 +45,10 @@ sh ./PDY
 
 export pgmout=OUTPUT.$$
 
-export MP_PULSE=0
-
-# Set resources to propagate NTASKS across cfp call
-NTASKS=${NTASKS:-${npe_node_waveinit}}
-export NTASKS=${NTASKS:?NTASKS required to be set}
-
-# Path to HOME Directory
-export CODEwave=${CODEwave:-${HOMEfv3gfs}/WW3}
-export EXECwave=${EXECwave:-$HOMEwave/exec}
-export FIXwave=${FIXwave:-$HOMEwave/fix/fix_wave_${NET}}
-export PARMwave=${PARMwave:-$HOMEwave/parm/wave}
-export USHwave=${USHwave:-$HOMEwave/ush}
-export EXECcode=${EXECcode:-$CODEwave/exec}
+export COMINice=${COMINice:-$COMROOTp2/omb/prod}
+export COMINwnd=${COMINwnd:-$COMROOT/gfs/prod}
+export COMIN_WAV_CUR=${COMIN_WAV_CUR:-$COMROOTp2/rtofs/prod} 
 
-# Set COM Paths and GETGES environment
 export COMINwave=${COMINwave:-${ROTDIR:?}}
 export COMOUTwave=${COMOUTwave:-${ROTDIR:?}}
 export COMIN=${COMIN:-${COMINwave}/${COMPONENTwave}.${PDY}/${cyc}}
@@ -75,19 +59,14 @@ if [ $SENDCOM = YES ]; then
   mkdir -p $COMOUT/rundata
 fi
 
-export wavelog=${COMOUTwave}/wave.log
-
 # Set mpi serial command
-export wavempexec=${wavempexec:-"mpirun -n"}
-export wave_mpmd=${wave_mpmd:-"cfp"}
+export wavempexec=${launcher:-"mpirun -n"}
+export wave_mpmd=${mpmd:-"cfp"}
 
 # Execute the Script  
 $HOMEwave/scripts/exwave_init.sh
 
 # Remove temp directories
-if [ "$KEEPDATA" != "YES" ]; then
-  cd $DATAROOT
-  rm -rf $DATA
-fi
-date
+[[ $KEEPDATA = "NO" ]] && rm -rf $DATA
 
+date

jobs/JWAVE_POST_SBS

@@ -7,7 +7,7 @@ set -x -e
 #############################
 # Source relevant config files
 #############################
-configs="base wave wavepostsbs"
+configs="base wave"
 export EXPDIR=${EXPDIR:-$HOMEgfs/parm/config}
 config_path=${EXPDIR:-$NWROOT/gfs.${gfs_ver}/parm/config}
 for config in $configs; do
@@ -26,72 +26,45 @@ status=$?
 # PATH for working directory
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
-export COMPONENTwave=${COMPONENTwave:-${RUN}wave}
 
-export HOMEgefs=${HOMEgefs:-$NWROOT/$NET.${gefs_ver}}
-export HOMEgfs=${HOMEgfs:-$NWROOT/$NET.${gfs_ver}}
+export COMPONENTwave=${COMPONENTwave:-${RUN}wave}
 
 # Add default errchk = err_chk
 export errchk=${errchk:-err_chk}
 
-# Set HOMEwave to HOMEgefs
-HOMEwave=${HOMEwave:-${HOMEgfs}} 
-
-# Set resources to propagate NTASKS across cfp call
-NTASKS=${NTASKS:-${npe_node_waveprep}}
-export NTASKS=${NTASKS:?NTASKS required to be set}
-
-# Create and go to DATA directory
-export DATA=${DATA:-${DATAROOT:?}/${jobid}}
+export DATA=${DATA:-${DATAROOT}/${jobid:?}}
 mkdir -p $DATA
 cd $DATA
 
-export cyc=${cyc:-00}
+cyc=${cyc:-00}
 export cycle=${cycle:-t${cyc}z}
- 
+
 # Set PDY
 setpdy.sh
 sh ./PDY
 
 export pgmout=OUTPUT.$$
 
-export MP_PULSE=0
+export COMINice=$((COMINice:-$COMROOTp2/omb/prod))
+export COMINwnd=$((COMINwnd:-$COMROOT/gfs/prod))
+export COMIN_WAV_CUR=$((COMIN_WAV_CUR:-$COMROOTp2/rtofs/prod))
 
-# Path to HOME Directory
-export CODEwave=${CODEwave:-${HOMEfv3gfs}/WW3}
-export EXECwave=${EXECwave:-$HOMEwave/exec}
-export FIXwave=${FIXwave:-$HOMEwave/fix/fix_wave_${NET}}
-export PARMwave=${PARMwave:-$HOMEwave/parm/wave}
-export USHwave=${USHwave:-$HOMEwave/ush}
-export EXECcode=${EXECcode:-$CODEwave/exec}
-
-# Set COM Paths and GETGES environment
 export COMINwave=${COMINwave:-${ROTDIR:?}}
 export COMOUTwave=${COMOUTwave:-${ROTDIR:?}}
 export COMIN=${COMIN:-${COMINwave}/${COMPONENTwave}.${PDY}/${cyc}}
 export COMOUT=${COMOUT:-${COMOUTwave}/${COMPONENTwave}.${PDY}/${cyc}}
 
-export COMINice=${COMINice:-${COMROOTp2}/omb/prod}
-export COMINwnd=${COMINwnd:-${COMROOT}/gfs/prod}
-export COMIN_WAV_CUR=${COMIN_WAV_CUR:-${COMROOTp2}/rtofs/prod}
-
 mkdir -p $COMOUT/gridded
 mkdir -p $COMOUT/station
 mkdir -p $COMOUT/stats
 
-export wavelog=${COMOUTwave}/wave.log
-
-# Set mpi serial command
-export wavempexec=${wavempexec:-"mpirun -n"}
-export wave_mpmd=${wave_mpmd:-"cfp"}
-
 env | sort
 
 # Set wave model ID tag to include member number 
 # if ensemble; waveMEMB var empty in deterministic
 # Set wave model ID tag to include member number
 # if ensemble; waveMEMB var empty in deterministic
-membTAG='p'
+export membTAG='p'
 if [ "${waveMEMB}" == "00" ]; then membTAG='c'; fi
 export membTAG
 export WAV_MOD_TAG=${COMPONENTwave}${waveMEMB}
@@ -114,4 +87,3 @@ if [ "$KEEPDATA" != "YES" ]; then
   rm -rf $DATA
 fi
 date
-

jobs/JWAVE_PREP

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -x
+
 date
 export PS4=' $SECONDS + '
 set -x -e
@@ -26,22 +28,14 @@ status=$?
 # PATH for working directory
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
-export COMPONENTwave=${COMPONENTwave:-${RUN}wave}
 
-export HOMEgfs=${HOMEgfs:-$NWROOT/gfs.${gfs_ver}}
+export COMPONENTwave=${COMPONENTwave:-${RUN}wave}
+export WAV_MOD_TAG=${COMPONENTwave}${waveMEMB}
 
 # Add default errchk = err_chk
 export errchk=${errchk:-err_chk}
 
-# Set HOMEwave to HOMEgfs
-HOMEwave=${HOMEwave:-${HOMEgfs}} 
-
-# Set resources to propagate NTASKS across cfp call
-NTASKS=${NTASKS:-${npe_node_waveprep}}
-export NTASKS=${NTASKS:?NTASKS required to be set}
-
-# Create and go to DATA directory
-export DATA=${DATA:-${DATAROOT:?}/${jobid}}
+export DATA=${DATA:-${DATAROOT}/${jobid:?}}
 mkdir -p $DATA
 cd $DATA
 
@@ -56,24 +50,10 @@ export RPDY=$PDY
 
 export pgmout=OUTPUT.$$
 
-export MP_PULSE=0
+export COMINice=${COMINice:-${COMROOTp2}/omb/prod}
+export COMINwnd=${COMINwnd:-${COMROOT}/gfs/prod}
+export COMIN_WAV_CUR=${COMIN_WAV_CUR:-${COMROOTp2}/rtofs/prod}
 
-# CDO required for processing RTOFS currents
-# export CDO=${COMROOTp2}/nwprod/rtofs_glo.v1.2.0/bin/cdo
-export CDO=/gpfs/dell2/emc/verification/noscrub/Todd.Spindler/CDO/bin/cdo
-
-# Path to HOME Directory
-export CODEwave=${CODEwave:-${HOMEfv3gfs}/WW3}
-export EXECwave=${EXECwave:-$HOMEwave/exec}
-export FIXwave=${FIXwave:-$HOMEwave/fix/fix_wave_${NET}}
-export PARMwave=${PARMwave:-$HOMEwave/parm/wave}
-export USHwave=${USHwave:-$HOMEwave/ush}
-export EXECcode=${EXECcode:-$CODEwave/exec}
-
-###################################
-# Set COM Paths and GETGES environment
-###################################
-# Set COM Paths and GETGES environment
 export COMINwave=${COMINwave:-${ROTDIR:?}}
 export COMOUTwave=${COMOUTwave:-${ROTDIR:?}}
 export COMIN=${COMIN:-${COMINwave}/${COMPONENTwave}.${PDY}/${cyc}}
@@ -88,7 +68,7 @@ if [ $RUN_ENVIR = "nco" ]; then
     export RPDY=`$NDATE -24 ${PDY}00 | cut -c1-8`
     export COMIN_WAV_CUR=$(compath.py ${WAVECUR_DID}/prod)/${WAVECUR_DID}.${RPDY}
   fi
-else 
+else
   if [ ! -d $DMPDIR/${WAVECUR_DID}.${RPDY} ]; then export RPDY=`$NDATE -24 ${PDY}00 | cut -c1-8`; fi
   if [ ! -L $ROTDIR/${WAVECUR_DID}.${RPDY} ]; then # Check if symlink already exists in ROTDIR
     $NLN $DMPDIR/${WAVECUR_DID}.${RPDY} $ROTDIR/${WAVECUR_DID}.${RPDY}
@@ -104,15 +84,9 @@ if [ $SENDCOM = YES ]; then
   mkdir -p $COMOUT
 fi
 
-export wavelog=${COMOUTwave}/wave.log
-
 # Set mpi serial command
-export wavempexec=${wavempexec:-"mpirun -n"}
-export wave_mpmd=${wave_mpmd:-"cfp"}
-
-# Set wave model ID tag to include member number 
-# if ensemble; waveMEMB var empty in deterministic
-export WAV_MOD_TAG=${COMPONENTwave}${waveMEMB}
+export wavempexec=${launcher:-"mpirun -n"}
+export wave_mpmd=${mpmd:-"cfp"}
 
 # Execute the Script  
 $HOMEwave/scripts/exwave_prep.sh
@@ -123,4 +97,4 @@ if [ "$KEEPDATA" != "YES" ]; then
   rm -rf $DATA
 fi
 date
-
+exit 0