Merge branch 'feature/get-arch' of https://github.com/AntonMFernando-…

…NOAA/global-workflow into feature/get-arch
AntonMFernando-NOAA · Aug 1, 2024 · 8cce2c4 · 8cce2c4
2 parents 541b1ea + 73e209b
commit 8cce2c4
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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#'