Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct ocean MOM.res_# stage copy #2868

Merged
merged 3 commits into from
Aug 29, 2024
Merged

Correct ocean MOM.res_# stage copy #2868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d818dc
Correct ocean MOM.res_# stage copy
KateFriedman-NOAA Aug 27, 2024
f7649e9
Update range in stage/ocean.yaml.j2
KateFriedman-NOAA Aug 28, 2024
7740a78
Merge branch 'NOAA-EMC:develop' into bugfix/ocnres_staging
KateFriedman-NOAA Aug 29, 2024
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
2 changes: 1 addition & 1 deletion parm/stage/ocean.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ocean:
{% set COMOUT_OCEAN_RESTART_PREV_MEM = COMOUT_OCEAN_RESTART_PREV_MEM_list[imem] %}
- ["{{ ICSDIR }}/{{ COMOUT_OCEAN_RESTART_PREV_MEM | relpath(ROTDIR) }}/{{ m_prefix }}.MOM.res.nc", "{{ COMOUT_OCEAN_RESTART_PREV_MEM }}"]
{% if OCNRES == "025" %}
{% for nn in range(1, 3) %}
{% for nn in range(1, 4) %}
- ["{{ ICSDIR }}/{{ COMOUT_OCEAN_RESTART_PREV_MEM | relpath(ROTDIR) }}/{{ m_prefix }}.MOM.res_{{ nn }}.nc", "{{ COMOUT_OCEAN_RESTART_PREV_MEM }}"]
{% endfor %}
{% endif %}
Expand Down
3 changes: 3 additions & 0 deletions scripts/exglobal_stage_ic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ def main():

stage_dict = AttrDict()
for key in keys:
# Make sure OCNRES is three digits
if key == "OCNRES":
stage.task_config.OCNRES = f"{stage.task_config.OCNRES :03d}"
KateFriedman-NOAA marked this conversation as resolved.
Show resolved Hide resolved
stage_dict[key] = stage.task_config[key]

# Also import all COM* directory and template variables
Expand Down
Loading