From 5ccdd8b6ca4a8a09cd976b93b3df1909a51e287c Mon Sep 17 00:00:00 2001 From: Kate Friedman Date: Thu, 29 Aug 2024 13:08:50 -0400 Subject: [PATCH] Correct ocean `MOM.res_#` stage copy (#2868) This PR corrects a bug in the staging job for ocean `MOM.res_#` IC files. The `OCNRES` value was coming in as an integer (e.g. `25`) but the `ocean.yaml.j2` file was checking for `"025"`. Correct to now set OCNRES to be three digits in staging script and also correct the for loop range to include third file. Resolves #2864 --- parm/stage/ocean.yaml.j2 | 2 +- scripts/exglobal_stage_ic.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/parm/stage/ocean.yaml.j2 b/parm/stage/ocean.yaml.j2 index 75a472dff0..b57c36d4ac 100644 --- a/parm/stage/ocean.yaml.j2 +++ b/parm/stage/ocean.yaml.j2 @@ -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 %} diff --git a/scripts/exglobal_stage_ic.py b/scripts/exglobal_stage_ic.py index d4c212a297..d737d83b47 100755 --- a/scripts/exglobal_stage_ic.py +++ b/scripts/exglobal_stage_ic.py @@ -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}" stage_dict[key] = stage.task_config[key] # Also import all COM* directory and template variables