Merge branch 'NOAA-EMC:develop' into feature/unstructuredwavePR

Jenkinsfile

@@ -107,7 +107,8 @@ pipeline {
                 axes {
                     axis {
                         name 'Case'
-                        values 'C48_ATM', 'C48_S2SWA_gefs', 'C48_S2SW', 'C96_atm3DVar' // TODO add dynamic list of cases from env vars (needs addtional plugins)
+                        // TODO add dynamic list of cases from env vars (needs addtional plugins)
+                        values 'C48_ATM', 'C48_S2SWA_gefs', 'C48_S2SW', 'C96_atm3DVar', 'C48mx500_3DVarAOWCDA', 'C96C48_hybatmDA', 'C96_atmsnowDA'
                     }
                 }
                 stages {

parm/config/gefs/config.base.emc.dyn

@@ -144,7 +144,7 @@ export DO_OCN="NO"
 export DO_ICE="NO"
 export DO_AERO="NO"
 export WAVE_CDUMP="" # When to include wave suite: gdas, gfs, or both
-export DOBNDPNT_WAVE="NO"
+export DOBNDPNT_WAVE="NO" # The GEFS buoys file does not currently have any boundary points
 export FRAC_GRID=".true."
 
 # Set operational resolution

parm/config/gefs/config.resources

@@ -68,6 +68,15 @@ esac
 export npe_node_max
 
 case ${step} in
+
+  "stage_ic")
+    export wtime_stage_ic="00:15:00"
+    export npe_stage_ic=1
+    export npe_node_stage_ic=1
+    export nth_stage_ic=1
+    export is_exclusive=True
+    ;;
+
   "waveinit")
     export wtime_waveinit="00:10:00"
     export npe_waveinit=12
@@ -77,25 +86,10 @@ case ${step} in
     export memory_waveinit="2GB"
     ;;
 
-  "wavepostsbs")
-    export wtime_wavepostsbs="00:20:00"
-    export wtime_wavepostsbs_gfs="03:00:00"
-    export npe_wavepostsbs=8
-    export nth_wavepostsbs=1
-    export npe_node_wavepostsbs=$(( npe_node_max / nth_wavepostsbs ))
-    export NTASKS=${npe_wavepostsbs}
-    export memory_wavepostsbs="10GB"
-    export memory_wavepostsbs_gfs="10GB"
-    ;;
-
   "fcst" | "efcs")
     export is_exclusive=True
 
-    if [[ "${step}" == "fcst" ]]; then
-      _CDUMP_LIST=${CDUMP:-"gdas gfs"}
-    elif [[ "${step}" == "efcs" ]]; then
-      _CDUMP_LIST=${CDUMP:-"enkfgdas enkfgfs"}
-    fi
+    _CDUMP_LIST=${CDUMP:-"gdas gfs"}
 
     # During workflow creation, we need resources for all CDUMPs and CDUMP is undefined
     for _CDUMP in ${_CDUMP_LIST}; do
@@ -224,11 +218,39 @@ case ${step} in
     export is_exclusive=True
     ;;
 
-  "stage_ic")
-    export wtime_stage_ic="00:15:00"
-    export npe_stage_ic=1
-    export npe_node_stage_ic=1
-    export nth_stage_ic=1
+  "wavepostsbs")
+    export wtime_wavepostsbs="03:00:00"
+    export npe_wavepostsbs=1
+    export nth_wavepostsbs=1
+    export npe_node_wavepostsbs=$(( npe_node_max / nth_wavepostsbs ))
+    export NTASKS=${npe_wavepostsbs}
+    export memory_wavepostsbs="10GB"
+    ;;
+
+  "wavepostbndpnt")
+    export wtime_wavepostbndpnt="01:00:00"
+    export npe_wavepostbndpnt=240
+    export nth_wavepostbndpnt=1
+    export npe_node_wavepostbndpnt=$(( npe_node_max / nth_wavepostbndpnt ))
+    export NTASKS=${npe_wavepostbndpnt}
+    export is_exclusive=True
+    ;;
+
+  "wavepostbndpntbll")
+    export wtime_wavepostbndpntbll="01:00:00"
+    export npe_wavepostbndpntbll=448
+    export nth_wavepostbndpntbll=1
+    export npe_node_wavepostbndpntbll=$(( npe_node_max / nth_wavepostbndpntbll ))
+    export NTASKS=${npe_wavepostbndpntbll}
+    export is_exclusive=True
+    ;;
+
+  "wavepostpnt")
+    export wtime_wavepostpnt="04:00:00"
+    export npe_wavepostpnt=200
+    export nth_wavepostpnt=1
+    export npe_node_wavepostpnt=$(( npe_node_max / nth_wavepostpnt ))
+    export NTASKS=${npe_wavepostpnt}
     export is_exclusive=True
     ;;
 
@@ -239,4 +261,4 @@ case ${step} in
 
 esac
 
-echo "END: config.resources"
+echo "END: config.resources"

parm/config/gefs/config.wavepostbndpnt

@@ -0,0 +1,11 @@
+#! /usr/bin/env bash
+
+########## config.wavepostbndpnt ##########
+# Wave steps specific
+
+echo "BEGIN: config.wavepostbndpnt"
+
+# Get task specific resources
+source "${EXPDIR}/config.resources" wavepostbndpnt
+
+echo "END: config.wavepostbndpnt"

parm/config/gefs/config.wavepostbndpntbll

@@ -0,0 +1,11 @@
+#! /usr/bin/env bash
+
+########## config.wavepostbndpntbll ##########
+# Wave steps specific
+
+echo "BEGIN: config.wavepostbndpntbll"
+
+# Get task specific resources
+source "${EXPDIR}/config.resources" wavepostbndpntbll
+
+echo "END: config.wavepostbndpntbll"

parm/config/gefs/config.wavepostpnt

@@ -0,0 +1,11 @@
+#! /usr/bin/env bash
+
+########## config.wavepostpnt ##########
+# Wave steps specific
+
+echo "BEGIN: config.wavepostpnt"
+
+# Get task specific resources
+source "${EXPDIR}/config.resources" wavepostpnt
+
+echo "END: config.wavepostpnt"

parm/config/gefs/config.wavepostsbs

@@ -0,0 +1,28 @@
+#! /usr/bin/env bash
+
+########## config.wavepostsbs ##########
+# Wave steps specific
+
+echo "BEGIN: config.wavepostsbs"
+
+# Get task specific resources
+source "${EXPDIR}/config.resources" wavepostsbs
+
+# Subgrid info for grib2 encoding
+export WAV_SUBGRBSRC=""
+export WAV_SUBGRB=""
+
+# Options for point output (switch on/off boundary point output)
+export DOIBP_WAV='NO' # Input boundary points
+export DOFLD_WAV='YES' # Field data
+export DOPNT_WAV='YES' # Station data
+export DOGRB_WAV='YES' # Create grib2 files
+if [[ -n "${waveinterpGRD}" ]]; then
+    export DOGRI_WAV='YES' # Create interpolated grids
+else
+    export DOGRI_WAV='NO' # Do not create interpolated grids
+fi
+export DOSPC_WAV='YES' # Spectral post
+export DOBLL_WAV='YES' # Bulletin post
+
+echo "END: config.wavepostsbs"

parm/config/gfs/config.base.emc.dyn

@@ -360,13 +360,13 @@ export MAKE_NSSTBUFR="@MAKE_NSSTBUFR@"
 export MAKE_ACFTBUFR="@MAKE_ACFTBUFR@"
 
 # Analysis increments to zero in CALCINCEXEC
-export INCREMENTS_TO_ZERO="'liq_wat_inc','icmr_inc'"
+export INCREMENTS_TO_ZERO="'liq_wat_inc','icmr_inc','rwmr_inc','snmr_inc','grle_inc'"
 
 # Write analysis files for early cycle EnKF
 export DO_CALC_INCREMENT_ENKF_GFS="YES"
 
 # Stratospheric increments to zero
-export INCVARS_ZERO_STRAT="'sphum_inc','liq_wat_inc','icmr_inc'"
+export INCVARS_ZERO_STRAT="'sphum_inc','liq_wat_inc','icmr_inc','rwmr_inc','snmr_inc','grle_inc'"
 export INCVARS_EFOLD="5"
 
 # Swith to generate netcdf or binary diagnostic files.  If not specified,

parm/config/gfs/config.wavepostbndpnt

@@ -6,6 +6,6 @@
 echo "BEGIN: config.wavepostbndpnt"
 
 # Get task specific resources
-. $EXPDIR/config.resources wavepostbndpnt
+source "${EXPDIR}/config.resources" wavepostbndpnt
 
 echo "END: config.wavepostbndpnt"

parm/config/gfs/config.wavepostbndpntbll

@@ -6,6 +6,6 @@
 echo "BEGIN: config.wavepostbndpntbll"
 
 # Get task specific resources
-. $EXPDIR/config.resources wavepostbndpntbll
+source "${EXPDIR}/config.resources" wavepostbndpntbll
 
 echo "END: config.wavepostbndpntbll"

parm/config/gfs/config.wavepostpnt

@@ -6,6 +6,6 @@
 echo "BEGIN: config.wavepostpnt"
 
 # Get task specific resources
-. $EXPDIR/config.resources wavepostpnt
+source "${EXPDIR}/config.resources" wavepostpnt
 
 echo "END: config.wavepostpnt"

parm/config/gfs/config.wavepostsbs

@@ -6,7 +6,7 @@
 echo "BEGIN: config.wavepostsbs"
 
 # Get task specific resources
-. $EXPDIR/config.resources wavepostsbs
+source "${EXPDIR}/config.resources" wavepostsbs
 
 # Subgrid info for grib2 encoding
 export WAV_SUBGRBSRC=""

scripts/exgfs_wave_post_pnt.sh

@@ -156,7 +156,11 @@ source "$HOMEgfs/ush/preamble.sh"
     cp -f $PARMwave/wave_${NET}.buoys buoy.loc.temp
     if [ "$DOBNDPNT_WAV" = YES ]; then
       #only do boundary points
-      sed -n '/^\$.*/!p' buoy.loc.temp | grep IBP > buoy.loc
+      sed -n '/^\$.*/!p' buoy.loc.temp | grep IBP > buoy.loc || {
+          echo "WARNING: No boundary points found in buoy file ${PARMwave}/wave_${NET}.buoys"
+          echo "         Ending job without doing anything."
+          exit 0
+        }
     else
       #exclude boundary points
       sed -n '/^\$.*/!p' buoy.loc.temp | grep -v IBP > buoy.loc

workflow/applications/gefs.py

@@ -20,7 +20,9 @@ def _get_app_configs(self):
             configs += ['efcs']
 
         if self.do_wave:
-            configs += ['waveinit']
+            configs += ['waveinit', 'wavepostsbs', 'wavepostpnt']
+            if self.do_wave_bnd:
+                configs += ['wavepostbndpnt', 'wavepostbndpntbll']
 
         return configs
 
@@ -47,4 +49,10 @@ def get_task_names(self):
 
         tasks += ['atmprod']
 
+        if self.do_wave:
+            tasks += ['wavepostsbs']
+            if self.do_wave_bnd:
+                tasks += ['wavepostbndpnt', 'wavepostbndpntbll']
+            tasks += ['wavepostpnt']
+
         return {f"{self._base['CDUMP']}": tasks}