From a19d8473390239f6e4e2b7d512742939cd56e990 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Thu, 24 Apr 2025 13:22:20 +0000 Subject: [PATCH 1/4] add low resolution tests --- dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml | 22 +++++++++++++++ dev/ci/cases/yamls/gfs_cyc_defaults_ci.yaml | 28 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml create mode 100644 dev/ci/cases/yamls/gfs_cyc_defaults_ci.yaml diff --git a/dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml b/dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml new file mode 100644 index 00000000000..53afca8be92 --- /dev/null +++ b/dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml @@ -0,0 +1,22 @@ +experiment: + system: gfs + mode: cycled + +arguments: + pslot: {{ 'pslot' | getenv }} + app: S2SW + resdetatmos: 96 + resensatmos: 48 + resdetocean: 5.0 + comroot: {{ 'RUNTESTS' | getenv }}/COMROOT + expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR + icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327 + idate: 2021122012 + edate: 2021122100 + nens: 2 + interval: 6 + start: cold + yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_cyc_defaults_ci.yaml + +skip_ci_on_hosts: + - gaeac5 diff --git a/dev/ci/cases/yamls/gfs_cyc_defaults_ci.yaml b/dev/ci/cases/yamls/gfs_cyc_defaults_ci.yaml new file mode 100644 index 00000000000..e35850ed178 --- /dev/null +++ b/dev/ci/cases/yamls/gfs_cyc_defaults_ci.yaml @@ -0,0 +1,28 @@ +defaults: + !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml +base: + DOIAU: "YES" + DO_JEDIATMVAR: "NO" + DO_JEDIATMENS: "NO" + DO_JEDIOCNVAR: "YES" + DO_JEDISNOWDA: "YES" + DO_GSISOILDA: "YES" + DO_MERGENSST: "NO" + DOHYBVAR: "YES" + DOHYBVAR_OCN: "YES" + DOLETKF_OCN: "NO" + DO_STARTMEM_FROM_JEDIICE: "YES" + DO_FIT2OBS: "YES" + DO_VERFOZN: "YES" + DO_VERFRAD: "YES" + EUPD_CYC: "both" + INTERVAL_GFS: 6 + SDATE_GFS: 2021122018 + NMEM_ENS_GFS: 2 + NMEM_ENS_GFS_OFFSET: 0 + DO_TEST_MODE: "NO" + +marineanl: + SOCA_NINNER: 1 + + From de013e1cf3a3a9a7dd1570461c063cab9e74791c Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Fri, 25 Apr 2025 13:36:23 +0000 Subject: [PATCH 2/4] bug fixes for low res test --- dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml | 2 +- parm/stage/ice.yaml.j2 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml b/dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml index 53afca8be92..9f19e5da48a 100644 --- a/dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml +++ b/dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml @@ -16,7 +16,7 @@ arguments: nens: 2 interval: 6 start: cold - yaml: {{ HOMEgfs }}/ci/cases/yamls/gfs_cyc_defaults_ci.yaml + yaml: {{ HOMEgfs }}/dev/ci/cases/yamls/gfs_cyc_defaults_ci.yaml skip_ci_on_hosts: - gaeac5 diff --git a/parm/stage/ice.yaml.j2 b/parm/stage/ice.yaml.j2 index 320145c4c82..22d26e98d2d 100644 --- a/parm/stage/ice.yaml.j2 +++ b/parm/stage/ice.yaml.j2 @@ -2,8 +2,8 @@ {% if DO_JEDIOCNVAR == True and RUN == 'gdas' %} {% set START_ICE_FROM_ANA = True %} {% endif %} -{% if DO_STARTMEM_FROM_JEDIICE == False and RUN == 'enkfgdas' %} - {% set START_ICE_FROM_ANA = False %} +{% if DO_STARTMEM_FROM_JEDIICE == True and RUN == 'enkfgdas' %} + {% set START_ICE_FROM_ANA = True %} {% endif %} ice: {% if START_ICE_FROM_ANA == True %} From 21de25a34cc49a9c5cc07bb4076431e479ead423 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Mon, 28 Apr 2025 14:28:02 +0000 Subject: [PATCH 3/4] add account --- dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml b/dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml index 9f19e5da48a..df0574ddc73 100644 --- a/dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml +++ b/dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml @@ -3,6 +3,7 @@ experiment: mode: cycled arguments: + account: {{ 'HPC_ACCOUNT' | getenv }} pslot: {{ 'pslot' | getenv }} app: S2SW resdetatmos: 96 From 1e8236fe182af2868bfe7001fc8c9064f7e0f93c Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Wed, 30 Apr 2025 13:04:40 +0000 Subject: [PATCH 4/4] fix from Kate for metplus in rocoto jobs --- dev/workflow/rocoto/gfs_tasks.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev/workflow/rocoto/gfs_tasks.py b/dev/workflow/rocoto/gfs_tasks.py index 89ac5e6e8de..3b0a99dfd32 100644 --- a/dev/workflow/rocoto/gfs_tasks.py +++ b/dev/workflow/rocoto/gfs_tasks.py @@ -1938,7 +1938,10 @@ def metp(self): dep_dict = {'type': 'cycleexist', 'condition': 'not', 'offset': offset} deps2.append(rocoto.add_dependency(dep_dict)) - offset = timedelta_to_HMS(-to_timedelta(f'{6*lookback}H')) + edate_gfs = self._base['EDATE'] + edate_metp = edate_gfs.replace(hour=18) + edate_metp_diff = edate_metp - edate_gfs + offset = timedelta_to_HMS(-to_timedelta(f'{edate_metp_diff}H')) dep_dict = {'type': 'task', 'name': f'{self.run}_arch_vrfy', 'offset': offset} deps2.append(rocoto.add_dependency(dep_dict)) deps.append(rocoto.create_dependency(dep_condition='and', dep=deps2))