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

env/HERA.env

@@ -18,6 +18,8 @@ export npe_node_max=40
 export launcher="srun -l --export=ALL"
 export mpmd_opt="--multi-prog --output=mpmd.%j.%t.out"
 
+#export POSTAMBLE_CMD='report-mem'
+
 # Configure MPI environment
 #export I_MPI_ADJUST_ALLREDUCE=5
 #export MPI_BUFS_PER_PROC=2048

parm/config/gfs/config.prepoceanobs

@@ -7,7 +7,7 @@ echo "BEGIN: config.prepoceanobs"
 export OCNOBS2IODAEXEC=${HOMEgfs}/sorc/gdas.cd/build/bin/gdas_obsprovider2ioda.x
 
 export OBS_YAML_DIR=${HOMEgfs}/sorc/gdas.cd/parm/soca/obs/config
-export OBSPROC_YAML=@OBSPROC_YAML@
+export OBSPREP_YAML=@OBSPREP_YAML@
 export OBS_LIST=@SOCA_OBS_LIST@
 [[ -n "${OBS_LIST}" ]] || export OBS_LIST=${HOMEgfs}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml
 export OBS_YAML=${OBS_LIST}

ush/preamble.sh

@@ -16,6 +16,8 @@
 #   TRACE (YES/NO): Whether to echo every command (set -x) [default: "YES"]
 #   STRICT (YES/NO): Whether to exit immediately on error or undefined variable
 #     (set -eu) [default: "YES"]
+#   POSTAMBLE_CMD (empty/set): A command to run at the end of the job
+#     [default: empty]
 #
 #######
 set +x
@@ -70,6 +72,24 @@ postamble() {
     start_time="${2}"
     rc="${3}"
 
+    # Execute postamble command
+    #
+    # Commands can be added to the postamble by appending them to $POSTAMBLE_CMD:
+    #    POSTAMBLE_CMD="new_thing; ${POSTAMBLE_CMD:-}" # (before existing commands)
+    #    POSTAMBLE_CMD="${POSTAMBLE_CMD:-}; new_thing" # (after existing commands)
+    #
+    # Always use this form so previous POSTAMBLE_CMD are not overwritten. This should
+    #   only be used for commands that execute conditionally (i.e. on certain machines
+    #   or jobs). Global changes should just be added to this function.
+    # These commands will be called when EACH SCRIPT terminates, so be mindful. Please
+    #   consult with global-workflow CMs about permanent changes to $POSTAMBLE_CMD or
+    #   this postamble function.
+    #
+
+    if [[ -v 'POSTAMBLE_CMD' ]]; then
+      ${POSTAMBLE_CMD}
+    fi
+
     # Calculate the elapsed time
     end_time=$(date +%s)
     end_time_human=$(date -d@"${end_time}" -u +%H:%M:%S)

workflow/rocoto/tasks.py

@@ -4,6 +4,7 @@
 from applications.applications import AppConfig
 import rocoto.rocoto as rocoto
 from wxflow import Template, TemplateConstants, to_timedelta
+from typing import List
 
 __all__ = ['Tasks']
 
@@ -124,7 +125,7 @@ def _template_to_rocoto_cycstring(self, template: str, subs_dict: dict = {}) ->
                                              rocoto_conversion_dict.get)
 
     @staticmethod
-    def _get_forecast_hours(cdump, config) -> list[str]:
+    def _get_forecast_hours(cdump, config) -> List[str]:
         fhmin = config['FHMIN']
         fhmax = config['FHMAX']
         fhout = config['FHOUT']