From 2d25cc8c0cb2b8215a5a432aaf12bf695aa15135 Mon Sep 17 00:00:00 2001 From: "Xianwu.Xue" Date: Mon, 14 Nov 2022 11:29:13 -0500 Subject: [PATCH 1/5] Modify to expand FHMAX_ENKF for gfsefmn jobs On branch feature/expand_FHMAX_ENKF modified: parm/config/config.base.emc.dyn Refs: #1116 --- parm/config/config.base.emc.dyn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn index 8e465c908c..47a0b7d04d 100755 --- a/parm/config/config.base.emc.dyn +++ b/parm/config/config.base.emc.dyn @@ -340,6 +340,11 @@ export lwrite4danl=".true." if [ $DOHYBVAR = "YES" ]; then export FHMIN_ENKF=3 export FHMAX_ENKF=9 + if [[ $EUPD_CYC == "BOTH" ]]; then + if [[ $CDUMP == "gfs" ]]; then + export FHMAX_ENKF=120 + fi + fi if [ $l4densvar = ".true." ]; then export FHOUT=1 export FHOUT_ENKF=1 From f3594480fb92c6ca1bdf3bb949f926a4e37f1957 Mon Sep 17 00:00:00 2001 From: "Xianwu.Xue" Date: Wed, 16 Nov 2022 15:58:11 -0500 Subject: [PATCH 2/5] Introduce FHMAX_ENKF_GFS to expand the fcst capacity On branch feature/expand_FHMAX_ENKF Changes to be committed: modified: parm/config/config.base.emc.dyn modified: scripts/exgdas_enkf_fcst.sh modified: workflow/rocoto/workflow_tasks.py Refs: #1116 --- parm/config/config.base.emc.dyn | 6 +----- scripts/exgdas_enkf_fcst.sh | 6 ++++++ workflow/rocoto/workflow_tasks.py | 5 +++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn index 47a0b7d04d..b0a1408117 100755 --- a/parm/config/config.base.emc.dyn +++ b/parm/config/config.base.emc.dyn @@ -340,11 +340,7 @@ export lwrite4danl=".true." if [ $DOHYBVAR = "YES" ]; then export FHMIN_ENKF=3 export FHMAX_ENKF=9 - if [[ $EUPD_CYC == "BOTH" ]]; then - if [[ $CDUMP == "gfs" ]]; then - export FHMAX_ENKF=120 - fi - fi + export FHMAX_ENKF_GFS=120 if [ $l4densvar = ".true." ]; then export FHOUT=1 export FHOUT_ENKF=1 diff --git a/scripts/exgdas_enkf_fcst.sh b/scripts/exgdas_enkf_fcst.sh index 7fa9d3df4a..15d7499174 100755 --- a/scripts/exgdas_enkf_fcst.sh +++ b/scripts/exgdas_enkf_fcst.sh @@ -112,6 +112,12 @@ export FHOUT=${FHOUT_ENKF:-3} # model_configure export DELTIM=${DELTIM_ENKF:-${DELTIM:-225}} export FHMAX=${FHMAX_ENKF:-9} +if [[ $EUPD_CYC == "BOTH" ]]; then + if [[ $CDUMP == "gfs" ]]; then + export FHMAXF=$FHMAX_ENKF_GFS + fi +fi + export restart_interval=${restart_interval_ENKF:-${restart_interval:-6}} # gfs_physics_nml diff --git a/workflow/rocoto/workflow_tasks.py b/workflow/rocoto/workflow_tasks.py index 1302bc1130..9d0f242f29 100644 --- a/workflow/rocoto/workflow_tasks.py +++ b/workflow/rocoto/workflow_tasks.py @@ -1192,8 +1192,13 @@ def echgres(self): def epos(self): def _get_eposgroups(epos): + eupd_cyc=self._base['EUPD_CYC'].lower() + fhmin = epos['FHMIN_ENKF'] fhmax = epos['FHMAX_ENKF'] + if eupd_cyc == "both": + if self.cdump == "gfs": + fhmax = epos['FHMAX_ENKF_GFS'] fhout = epos['FHOUT_ENKF'] fhrs = range(fhmin, fhmax + fhout, fhout) From f5e54827847fec1be4c2d4bb9d8737813d9ebeb4 Mon Sep 17 00:00:00 2001 From: "Xianwu.Xue" Date: Wed, 16 Nov 2022 17:25:41 -0500 Subject: [PATCH 3/5] Remove EUPD_CYC if conditions On branch feature/expand_FHMAX_ENKF modified: scripts/exgdas_enkf_fcst.sh modified: workflow/rocoto/workflow_tasks.py Refs: #1116 --- scripts/exgdas_enkf_fcst.sh | 6 ++---- workflow/rocoto/workflow_tasks.py | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/exgdas_enkf_fcst.sh b/scripts/exgdas_enkf_fcst.sh index 15d7499174..2a85ff03cf 100755 --- a/scripts/exgdas_enkf_fcst.sh +++ b/scripts/exgdas_enkf_fcst.sh @@ -112,10 +112,8 @@ export FHOUT=${FHOUT_ENKF:-3} # model_configure export DELTIM=${DELTIM_ENKF:-${DELTIM:-225}} export FHMAX=${FHMAX_ENKF:-9} -if [[ $EUPD_CYC == "BOTH" ]]; then - if [[ $CDUMP == "gfs" ]]; then - export FHMAXF=$FHMAX_ENKF_GFS - fi +if [[ $CDUMP == "gfs" ]]; then + export FHMAXF=$FHMAX_ENKF_GFS fi export restart_interval=${restart_interval_ENKF:-${restart_interval:-6}} diff --git a/workflow/rocoto/workflow_tasks.py b/workflow/rocoto/workflow_tasks.py index 9d0f242f29..d80dbfeaa6 100644 --- a/workflow/rocoto/workflow_tasks.py +++ b/workflow/rocoto/workflow_tasks.py @@ -1196,9 +1196,8 @@ def _get_eposgroups(epos): fhmin = epos['FHMIN_ENKF'] fhmax = epos['FHMAX_ENKF'] - if eupd_cyc == "both": - if self.cdump == "gfs": - fhmax = epos['FHMAX_ENKF_GFS'] + if self.cdump == "gfs": + fhmax = epos['FHMAX_ENKF_GFS'] fhout = epos['FHOUT_ENKF'] fhrs = range(fhmin, fhmax + fhout, fhout) From 519607a0b85bb1a057436774dece6d46beabaf82 Mon Sep 17 00:00:00 2001 From: "Xianwu.Xue" Date: Wed, 16 Nov 2022 17:27:19 -0500 Subject: [PATCH 4/5] Delete unused line On branch feature/expand_FHMAX_ENKF modified: workflow/rocoto/workflow_tasks.py Refs: #1116 --- workflow/rocoto/workflow_tasks.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/workflow/rocoto/workflow_tasks.py b/workflow/rocoto/workflow_tasks.py index d80dbfeaa6..95791c9ff7 100644 --- a/workflow/rocoto/workflow_tasks.py +++ b/workflow/rocoto/workflow_tasks.py @@ -1192,8 +1192,6 @@ def echgres(self): def epos(self): def _get_eposgroups(epos): - eupd_cyc=self._base['EUPD_CYC'].lower() - fhmin = epos['FHMIN_ENKF'] fhmax = epos['FHMAX_ENKF'] if self.cdump == "gfs": From 85966f1fed20883e8ea5387c52b39a874f9e0119 Mon Sep 17 00:00:00 2001 From: "Xianwu.Xue" Date: Wed, 16 Nov 2022 23:39:51 -0500 Subject: [PATCH 5/5] Fix a bug and improve it On branch feature/expand_FHMAX_ENKF modified: scripts/exgdas_enkf_fcst.sh Refs: #1116 --- scripts/exgdas_enkf_fcst.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/exgdas_enkf_fcst.sh b/scripts/exgdas_enkf_fcst.sh index 2a85ff03cf..5b00243012 100755 --- a/scripts/exgdas_enkf_fcst.sh +++ b/scripts/exgdas_enkf_fcst.sh @@ -113,7 +113,7 @@ export FHOUT=${FHOUT_ENKF:-3} export DELTIM=${DELTIM_ENKF:-${DELTIM:-225}} export FHMAX=${FHMAX_ENKF:-9} if [[ $CDUMP == "gfs" ]]; then - export FHMAXF=$FHMAX_ENKF_GFS + export FHMAX=${FHMAX_ENKF_GFS:-${FHMAX_ENKF:-${FHMAX}}} fi export restart_interval=${restart_interval_ENKF:-${restart_interval:-6}}