Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ci/cases/pr/C48mx500_3DVarAOWCDA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ experiment:

arguments:
pslot: {{ 'pslot' | getenv }}
app: S2S
app: S2SW
resdetatmos: 48
resdetocean: 5.0
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
Expand All @@ -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

Expand Down
1 change: 1 addition & 0 deletions ci/cases/yamls/soca_gfs_defaults_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ defaults:
base:
ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
DO_JEDIOCNVAR: "YES"
DO_METP: "NO"

marineanl:
SOCA_NINNER: 1
Expand Down
12 changes: 11 additions & 1 deletion parm/archive/gdaswave.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}*"
6 changes: 3 additions & 3 deletions parm/archive/gfswave.yaml.j2
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
gfswave:
{% set head = "gfswave.t" + cycle_HH + "z." %}

name: "GFSWAVE"
target: "{{ ATARDIR }}/{{ cycle_YMDH }}/gfswave.tar"
required:
Expand All @@ -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.<region>.<res>.fHHH.grib2".
Expand Down
2 changes: 1 addition & 1 deletion workflow/rocoto/gfs_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -1233,7 +1233,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)

Expand Down