Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add fix for metplus jobs when gfs_cyc=2 or 4 #2791

Merged
merged 11 commits into from
Aug 1, 2024
Merged
2 changes: 0 additions & 2 deletions parm/config/gfs/config.base
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion parm/config/gfs/config.metp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion parm/config/gfs/config.resources
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 2 additions & 1 deletion workflow/rocoto/gfs_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -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#'
Expand Down
Loading