From d3d85f0e0d573f16a71ca44778021dfc0ccf50c8 Mon Sep 17 00:00:00 2001
From: David Huber <69919478+DavidHuber-NOAA@users.noreply.github.com>
Date: Thu, 1 Aug 2024 08:12:14 -0400
Subject: [PATCH] Add fixes for metplus jobs when gfs_cyc=2 or 4 (#2791)

Changes how METplus jobs run so that they run on the last GFS cycle for
a given `PDY`.

This is a departure from operations where the METplus jobs run on the
00Z cycle for the previous 3 cycles and 00Z (i.e. `${PDYm1}06` through
`${PDY}00`). With this PR, for gfs_cyc=4, METplus jobs will run on
`${PDY}18` for cycles 00-18. See
https://github.com/NOAA-EMC/EMC_verif-global/pull/131 for more details.
---
 parm/config/gfs/config.base      | 2 --
 parm/config/gfs/config.metp      | 2 +-
 parm/config/gfs/config.resources | 2 +-
 sorc/verif-global.fd             | 2 +-
 workflow/rocoto/gfs_tasks.py     | 3 ++-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/parm/config/gfs/config.base b/parm/config/gfs/config.base
index d45d91961d..4ce3c8f45c 100644
--- a/parm/config/gfs/config.base
+++ b/parm/config/gfs/config.base
@@ -449,8 +449,6 @@ export binary_diag=".false."
 
 # Verification options
 export DO_METP="@DO_METP@"   # Run METPLUS jobs - set METPLUS settings in config.metp
-# TODO Reenable METplus jobs when issue #2790 is resolved
-export DO_METP="NO"
 export DO_FIT2OBS="YES"      # Run fit to observations package
 export DO_VRFY_OCEANDA="@DO_VRFY_OCEANDA@"  # Run SOCA Ocean and Seaice DA verification tasks
 
diff --git a/parm/config/gfs/config.metp b/parm/config/gfs/config.metp
index 5cee80823e..564966fd6d 100644
--- a/parm/config/gfs/config.metp
+++ b/parm/config/gfs/config.metp
@@ -8,7 +8,7 @@ echo "BEGIN: config.metp"
 # Get task specific resources
 . "${EXPDIR}/config.resources" metp
 
-export nproc=${npe_metp:-1}
+export nproc=${tasks_per_node:-1}
 
 export RUN_GRID2GRID_STEP1="YES" # Run grid-to-grid verification using METplus
 export RUN_GRID2OBS_STEP1="YES"  # Run grid-to-obs verification using METplus
diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources
index ebdfd5d713..9ddb85a87a 100644
--- a/parm/config/gfs/config.resources
+++ b/parm/config/gfs/config.resources
@@ -891,7 +891,7 @@ case ${step} in
     walltime_gfs="06:00:00"
     ntasks=4
     tasks_per_node=4
-    export is_exclusive=True
+    export memory="80G"
     ;;
 
   "echgres")
diff --git a/sorc/verif-global.fd b/sorc/verif-global.fd
index 0d9e0b6ab0..92904d2c43 160000
--- a/sorc/verif-global.fd
+++ b/sorc/verif-global.fd
@@ -1 +1 @@
-Subproject commit 0d9e0b6ab0cabbaccbdfa0868a256065984777ee
+Subproject commit 92904d2c431969345968f74e676717057ec0042a
diff --git a/workflow/rocoto/gfs_tasks.py b/workflow/rocoto/gfs_tasks.py
index 2808f2bc4d..1e4fbfc0fa 100644
--- a/workflow/rocoto/gfs_tasks.py
+++ b/workflow/rocoto/gfs_tasks.py
@@ -1799,7 +1799,8 @@ def metp(self):
 
         metpenvars = self.envars.copy()
         if self.app_config.mode in ['cycled']:
-            metpenvar_dict = {'SDATE_GFS': self._base.get('SDATE_GFS').strftime("%Y%m%d%H")}
+            metpenvar_dict = {'SDATE_GFS': self._base.get('SDATE_GFS').strftime("%Y%m%d%H"),
+                              'EDATE_GFS': self._base.get('EDATE_GFS').strftime("%Y%m%d%H")}
         elif self.app_config.mode in ['forecast-only']:
             metpenvar_dict = {'SDATE_GFS': self._base.get('SDATE').strftime("%Y%m%d%H")}
         metpenvar_dict['METPCASE'] = '#metpcase#'