From 935e8de60aa8ecb475a7f4f4edd4dfb240ca1616 Mon Sep 17 00:00:00 2001 From: David Huber Date: Thu, 25 Jul 2024 12:50:58 +0000 Subject: [PATCH 1/8] Add fix for metplus jobs when gfs_cyc=2 or 4 --- sorc/verif-global.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/verif-global.fd b/sorc/verif-global.fd index 0d9e0b6ab0..431e5a92e2 160000 --- a/sorc/verif-global.fd +++ b/sorc/verif-global.fd @@ -1 +1 @@ -Subproject commit 0d9e0b6ab0cabbaccbdfa0868a256065984777ee +Subproject commit 431e5a92e2fc28f6c45b467c9f035b042c74632f From b52bf6dd0db0711aba2cfb4332824aa773530111 Mon Sep 17 00:00:00 2001 From: David Huber Date: Thu, 25 Jul 2024 19:38:01 +0000 Subject: [PATCH 2/8] Make fixes to sequences and increments --- sorc/verif-global.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/verif-global.fd b/sorc/verif-global.fd index 431e5a92e2..30320620b7 160000 --- a/sorc/verif-global.fd +++ b/sorc/verif-global.fd @@ -1 +1 @@ -Subproject commit 431e5a92e2fc28f6c45b467c9f035b042c74632f +Subproject commit 30320620b75c31b8657d49075500dd519e8dd672 From fa9507b7d3a48320e6ccdf02f5b6bb01150921f0 Mon Sep 17 00:00:00 2001 From: David Huber Date: Fri, 26 Jul 2024 12:21:29 +0000 Subject: [PATCH 3/8] Run the metp jobs non-exclusively --- parm/config/gfs/config.resources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources index 2dd037d426..242baefb60 100644 --- a/parm/config/gfs/config.resources +++ b/parm/config/gfs/config.resources @@ -967,7 +967,7 @@ case ${step} in export wtime_metp_gfs="06:00:00" export npe_metp=4 export npe_node_metp=4 - export is_exclusive=True + export memory_fit2obs="80G" ;; "echgres") From e12a4a601155fbff3c4789b94410d2bbe28d4955 Mon Sep 17 00:00:00 2001 From: David Huber Date: Fri, 26 Jul 2024 15:54:35 +0000 Subject: [PATCH 4/8] Add EDATE_GFS for metp tasks --- workflow/rocoto/gfs_tasks.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/workflow/rocoto/gfs_tasks.py b/workflow/rocoto/gfs_tasks.py index 1f14751642..cf63f78e13 100644 --- a/workflow/rocoto/gfs_tasks.py +++ b/workflow/rocoto/gfs_tasks.py @@ -1794,7 +1794,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#' From 859de17fa0dd9c9eb2e0d5d5b0efb695bc6d7cfa Mon Sep 17 00:00:00 2001 From: David Huber Date: Fri, 26 Jul 2024 15:57:15 +0000 Subject: [PATCH 5/8] Update verif-global to fix cycle selection --- sorc/verif-global.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/verif-global.fd b/sorc/verif-global.fd index 30320620b7..62cd9a4949 160000 --- a/sorc/verif-global.fd +++ b/sorc/verif-global.fd @@ -1 +1 @@ -Subproject commit 30320620b75c31b8657d49075500dd519e8dd672 +Subproject commit 62cd9a4949bcd3f3e4664674dd97ba2ff8d6c018 From 2379a6c0897afeaf56a420b155452bb37d91615c Mon Sep 17 00:00:00 2001 From: David Huber Date: Mon, 29 Jul 2024 14:41:21 +0000 Subject: [PATCH 6/8] Update verif-global to derive fhr_intvl --- sorc/verif-global.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/verif-global.fd b/sorc/verif-global.fd index 62cd9a4949..cf6feaae5f 160000 --- a/sorc/verif-global.fd +++ b/sorc/verif-global.fd @@ -1 +1 @@ -Subproject commit 62cd9a4949bcd3f3e4664674dd97ba2ff8d6c018 +Subproject commit cf6feaae5f9905944fa3c9a19a1066b005b3ed14 From aff8f455343eb8233304a3a2dc37b2265a1f908c Mon Sep 17 00:00:00 2001 From: David Huber Date: Mon, 29 Jul 2024 15:20:03 +0000 Subject: [PATCH 7/8] Point verif-global back to auth repo --- sorc/verif-global.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/verif-global.fd b/sorc/verif-global.fd index cf6feaae5f..92904d2c43 160000 --- a/sorc/verif-global.fd +++ b/sorc/verif-global.fd @@ -1 +1 @@ -Subproject commit cf6feaae5f9905944fa3c9a19a1066b005b3ed14 +Subproject commit 92904d2c431969345968f74e676717057ec0042a From 78ac751ce04c0bbdbc74feac0fa10df12990e18b Mon Sep 17 00:00:00 2001 From: DavidHuber Date: Mon, 29 Jul 2024 17:50:18 +0000 Subject: [PATCH 8/8] Reenable METplus jobs --- parm/config/gfs/config.base | 2 -- 1 file changed, 2 deletions(-) diff --git a/parm/config/gfs/config.base b/parm/config/gfs/config.base index fca3fd99ed..9fd66bf0c7 100644 --- a/parm/config/gfs/config.base +++ b/parm/config/gfs/config.base @@ -453,8 +453,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