From 17b6fb3e66293ce2fc712847f6739ca3f091e5a7 Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Thu, 23 Jan 2025 10:38:23 -0500 Subject: [PATCH 1/5] modified ci\cases\pr\C48mx500_3DVarAOWCDA.yaml --- ci/cases/pr/C48mx500_3DVarAOWCDA.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml b/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml index 9cc3d3c03a8..cc33b75ddee 100644 --- a/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml +++ b/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml @@ -13,7 +13,7 @@ arguments: idate: 2021032418 edate: 2021032500 nens: 0 - interval: 0 + interval: 6 start: warm yaml: {{ HOMEgfs }}/ci/cases/yamls/soca_gfs_defaults_ci.yaml From aefe85c2f18987d2c98f0e159ec1b9d9aeca6ce0 Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Thu, 23 Jan 2025 10:50:06 -0500 Subject: [PATCH 2/5] updated ci\cases\pr\C48mx500_3DVarAOWCDA.yaml --- ci/cases/pr/C48mx500_3DVarAOWCDA.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml b/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml index cc33b75ddee..11a13f0bc30 100644 --- a/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml +++ b/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml @@ -4,7 +4,7 @@ experiment: arguments: pslot: {{ 'pslot' | getenv }} - app: S2S + app: S2SW resdetatmos: 48 resdetocean: 5.0 comroot: {{ 'RUNTESTS' | getenv }}/COMROOT From d4015df3f0c3f0fa2f6136426d1a37580d6b6e3c Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Mon, 27 Jan 2025 11:30:43 -0500 Subject: [PATCH 3/5] fixed fhrs workflow\rocoto\gfs_tasks.py --- workflow/rocoto/gfs_tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/rocoto/gfs_tasks.py b/workflow/rocoto/gfs_tasks.py index 08d260fe57d..497aaa1098e 100644 --- a/workflow/rocoto/gfs_tasks.py +++ b/workflow/rocoto/gfs_tasks.py @@ -1203,7 +1203,7 @@ def wavepostsbs(self): deps.append(rocoto.add_dependency(dep_dict)) dependencies = rocoto.create_dependency(dep=deps, dep_condition='or') - fhrs = self._get_forecast_hours('gfs', self._configs['wavepostsbs'], 'wave') + fhrs = self._get_forecast_hours(self.run, self._configs['wavepostsbs'], 'wave') max_tasks = self._configs['wavepostsbs']['MAX_TASKS'] fhr_var_dict = self.get_grouped_fhr_dict(fhrs=fhrs, ngroups=max_tasks) From be01bb3e0771bdce99ffa5b4bff3b3e0dbaf16f1 Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Mon, 27 Jan 2025 14:29:04 -0500 Subject: [PATCH 4/5] modified yaml files --- parm/archive/gdaswave.yaml.j2 | 12 +++++++++++- parm/archive/gfswave.yaml.j2 | 6 +++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/parm/archive/gdaswave.yaml.j2 b/parm/archive/gdaswave.yaml.j2 index 109c70c181f..3f140c70620 100644 --- a/parm/archive/gdaswave.yaml.j2 +++ b/parm/archive/gdaswave.yaml.j2 @@ -4,5 +4,15 @@ gdaswave: target: "{{ ATARDIR }}/{{ cycle_YMDH }}/gdaswave.tar" required: # TODO explicitly name the wave grid/station files to archive - - "{{ COMIN_WAVE_GRID | relpath(ROTDIR) }}/{{ head }}*" + {% set WAVE_OUT_GRIDS_list = WAVE_OUT_GRIDS.split(' ') %} + {% for grd in WAVE_OUT_GRIDS_list %} + {% set tmpl_dict = ({ '${ROTDIR}':ROTDIR, + '${RUN}':RUN, + '${YMD}':cycle_YMD, + '${HH}':cycle_HH, + '${MEMDIR}':'', + '${GRDRESNAME}':grd}) %} + {% set file_path = COM_WAVE_GRID_RES_TMPL | replace_tmpl(tmpl_dict) %} + - "{{ file_path | relpath(ROTDIR) }}/{{ head }}*" + {% endfor %} - "{{ COMIN_WAVE_STATION | relpath(ROTDIR) }}/{{ head }}*" diff --git a/parm/archive/gfswave.yaml.j2 b/parm/archive/gfswave.yaml.j2 index 550ecdb1be4..8d02d28dec7 100644 --- a/parm/archive/gfswave.yaml.j2 +++ b/parm/archive/gfswave.yaml.j2 @@ -1,6 +1,6 @@ gfswave: {% set head = "gfswave.t" + cycle_HH + "z." %} - + name: "GFSWAVE" target: "{{ ATARDIR }}/{{ cycle_YMDH }}/gfswave.tar" required: @@ -13,8 +13,8 @@ gfswave: '${HH}':cycle_HH, '${MEMDIR}':'', '${GRDRESNAME}':grd}) %} - {% set file_path = COM_WAVE_GRID_RES_TMPL | replace_tmpl(tmpl_dict) %} - + {% set file_path = COM_WAVE_GRID_RES_TMPL | replace_tmpl(tmpl_dict) %} + {% for fh in range(0, FHMAX_HF_WAV + FHOUT_HF_WAV, FHOUT_HF_WAV) %} # NOTE This is as explicit as possible without major logic to parse wavepostGRD. # Matches files of the form "gfswave.tCCz...fHHH.grib2". From bbcfc4cb509c0e67c4591d620d8b8af865b150b0 Mon Sep 17 00:00:00 2001 From: AntonMFernando Date: Tue, 28 Jan 2025 10:58:14 -0500 Subject: [PATCH 5/5] switched off METPlus jobs --- ci/cases/yamls/soca_gfs_defaults_ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/cases/yamls/soca_gfs_defaults_ci.yaml b/ci/cases/yamls/soca_gfs_defaults_ci.yaml index dbddcf23bb8..3f5b5c0824a 100644 --- a/ci/cases/yamls/soca_gfs_defaults_ci.yaml +++ b/ci/cases/yamls/soca_gfs_defaults_ci.yaml @@ -3,6 +3,7 @@ defaults: base: ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }} DO_JEDIOCNVAR: "YES" + DO_METP: "NO" marineanl: SOCA_NINNER: 1