Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 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
2 changes: 1 addition & 1 deletion jobs/JGLOBAL_STAGE_IC
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ err=$?
###############################################################
# Check for errors and exit if any of the above failed
if [[ "${err}" -ne 0 ]]; then
echo "FATAL ERROR: Unable to copy ICs to ${ROTDIR}; ABORT!"
echo "FATAL ERROR: Unable to stage ICs to ${ROTDIR}; ABORT!"
exit "${err}"
fi

Expand Down
2 changes: 1 addition & 1 deletion parm/stage/analysis.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ analysis:
{% set COMOUT_ATMOS_ANALYSIS_MEM = COMOUT_ATMOS_ANALYSIS_MEM_list[imem] %}
- "{{ COMOUT_ATMOS_ANALYSIS_MEM }}"
{% endfor %}
copy:
link:
{% for mem in range(first_mem, last_mem + 1) %}
{% set imem = mem - first_mem %}
{% set COMOUT_ATMOS_ANALYSIS_MEM = COMOUT_ATMOS_ANALYSIS_MEM_list[imem] %}
Expand Down
2 changes: 1 addition & 1 deletion parm/stage/atmosphere_cold.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ atmosphere_cold:
{% set COMOUT_ATMOS_INPUT_MEM = COMOUT_ATMOS_INPUT_MEM_list[imem] %}
- "{{ COMOUT_ATMOS_INPUT_MEM }}"
{% endfor %} # mem loop
copy:
link:
{% for mem in range(first_mem, last_mem + 1) %}
{% set imem = mem - first_mem %}
{% set COMOUT_ATMOS_INPUT_MEM = COMOUT_ATMOS_INPUT_MEM_list[imem] %}
Expand Down
2 changes: 1 addition & 1 deletion parm/stage/atmosphere_ens_perturbations.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ atmosphere_ens_perturbation:
{% set COMOUT_ATMOS_ANALYSIS_MEM = COMOUT_ATMOS_ANALYSIS_MEM_list[imem] %}
- "{{ COMOUT_ATMOS_ANALYSIS_MEM }}"
{% endfor %} # mem loop
copy:
link:
{% for mem in range(first_mem + 1, last_mem + 1) %}
{% set imem = mem - first_mem %}
{% set COMOUT_ATMOS_ANALYSIS_MEM = COMOUT_ATMOS_ANALYSIS_MEM_list[imem] %}
Expand Down
4 changes: 2 additions & 2 deletions parm/stage/atmosphere_nest.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ atmosphere_nest:
{% set COMOUT_ATMOS_RESTART_PREV_MEM = COMOUT_ATMOS_RESTART_PREV_MEM_list[imem] %}
- "{{ COMOUT_ATMOS_RESTART_PREV_MEM }}"
{% endfor %} # mem loop
copy:
link:
{% for mem in range(first_mem, last_mem + 1) %}
{% set imem = mem - first_mem %}
{% set COMOUT_ATMOS_RESTART_PREV_MEM = COMOUT_ATMOS_RESTART_PREV_MEM_list[imem] %}
Expand All @@ -25,7 +25,7 @@ atmosphere_nest:
{% set COMOUT_ATMOS_INPUT_MEM = COMOUT_ATMOS_INPUT_MEM_list[imem] %}
- "{{ COMOUT_ATMOS_INPUT_MEM }}"
{% endfor %} # mem loop
copy:
link:
{% for mem in range(first_mem, last_mem + 1) %}
{% set imem = mem - first_mem %}
{% set COMOUT_ATMOS_INPUT_MEM = COMOUT_ATMOS_INPUT_MEM_list[imem] %}
Expand Down
2 changes: 1 addition & 1 deletion parm/stage/atmosphere_warm.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ atmosphere_warm:
{% set COMOUT_ATMOS_RESTART_PREV_MEM = COMOUT_ATMOS_RESTART_PREV_MEM_list[imem] %}
- "{{ COMOUT_ATMOS_RESTART_PREV_MEM }}"
{% endfor %} # mem loop
copy:
link:
{% for mem in range(first_mem, last_mem + 1) %}
{% set imem = mem - first_mem %}
{% set COMOUT_ATMOS_RESTART_PREV_MEM = COMOUT_ATMOS_RESTART_PREV_MEM_list[imem] %}
Expand Down
4 changes: 2 additions & 2 deletions parm/stage/ice.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ice:
{% set COMOUT_ICE_ANALYSIS_MEM = COMOUT_ICE_ANALYSIS_MEM_list[imem] %}
- "{{ COMOUT_ICE_ANALYSIS_MEM }}"
{% endfor %} # mem loop
copy:
link:
{% for mem in range(first_mem, last_mem + 1) %}
{% set imem = mem - first_mem %}
{% set COMOUT_ICE_ANALYSIS_MEM = COMOUT_ICE_ANALYSIS_MEM_list[imem] %}
Expand All @@ -26,7 +26,7 @@ ice:
{% set COMOUT_ICE_RESTART_PREV_MEM = COMOUT_ICE_RESTART_PREV_MEM_list[imem] %}
- "{{ COMOUT_ICE_RESTART_PREV_MEM }}"
{% endfor %} # mem loop
copy:
link:
{% for mem in range(first_mem, last_mem + 1) %}
{% set imem = mem - first_mem %}
{% set COMOUT_ICE_RESTART_PREV_MEM = COMOUT_ICE_RESTART_PREV_MEM_list[imem] %}
Expand Down
6 changes: 5 additions & 1 deletion parm/stage/master_gefs.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,17 @@
# - "COM directory to create"
# copy:
# - ["source_file", "destination_file"]
# link:
# - ["target", "link_name"]
# key2:
# mkdir:
# - "COM directory to create"
# copy:
# - ["source_file", "destination_file"]
# link:
# - ["target", "link_name"]
#
# Any number of keys with nested mkdir and copy are permitted
# Any number of keys with nested mkdir, copy, and link are permitted
# Jinja is permitted in this yaml, as long as the keys are:
# - COMOUT_
# - DO_ATM, DO_OCN, DO_ICE, etc.
Expand Down
6 changes: 5 additions & 1 deletion parm/stage/master_gfs.yaml.j2
Comment thread
aerorahul marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,17 @@
# - "COM directory to create"
# copy:
# - ["source_file", "destination_file"]
# link:
# - ["target", "link_name"]
# key2:
# mkdir:
# - "COM directory to create"
# copy:
# - ["source_file", "destination_file"]
# link:
# - ["target", "link_name"]
#
# Any number of keys with nested mkdir and copy are permitted
# Any number of keys with nested mkdir, copy, and link are permitted
# Jinja is permitted in this yaml, as long as the keys are:
# - COMOUT_
# - DO_ATM, DO_OCN, DO_ICE, etc.
Expand Down
2 changes: 1 addition & 1 deletion parm/stage/ocean.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ocean:
{% set COMOUT_OCEAN_RESTART_PREV_MEM = COMOUT_OCEAN_RESTART_PREV_MEM_list[imem] %}
- "{{ COMOUT_OCEAN_RESTART_PREV_MEM }}"
{% endfor %} # mem loop
copy:
link:
{% for mem in range(first_mem, last_mem + 1) %}
{% set imem = mem - first_mem %}
{% set COMOUT_OCEAN_RESTART_PREV_MEM = COMOUT_OCEAN_RESTART_PREV_MEM_list[imem] %}
Expand Down
2 changes: 1 addition & 1 deletion parm/stage/ocean_ens_perturbations.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ocean_ens_perturbation:
{% set COMOUT_OCEAN_ANALYSIS_MEM = COMOUT_OCEAN_ANALYSIS_MEM_list[imem] %}
- "{{ COMOUT_OCEAN_ANALYSIS_MEM }}"
{% endfor %} # mem loop
copy:
link:
{% for mem in range(first_mem + 1, last_mem + 1) %}
{% set imem = mem - first_mem %}
{% set COMOUT_OCEAN_ANALYSIS_MEM = COMOUT_OCEAN_ANALYSIS_MEM_list[imem] %}
Expand Down
2 changes: 1 addition & 1 deletion parm/stage/ocean_mediator.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ocean_mediator:
{% set COMOUT_MED_RESTART_PREV_MEM = COMOUT_MED_RESTART_PREV_MEM_list[imem] %}
- "{{ COMOUT_MED_RESTART_PREV_MEM }}"
{% endfor %} # mem loop
copy:
link:
{% for mem in range(first_mem, last_mem + 1) %}
{% set imem = mem - first_mem %}
{% set COMOUT_MED_RESTART_PREV_MEM = COMOUT_MED_RESTART_PREV_MEM_list[imem] %}
Expand Down
2 changes: 1 addition & 1 deletion parm/stage/ocean_rerun.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ocean_rerun:
{% set COMOUT_OCEAN_ANALYSIS_MEM = COMOUT_OCEAN_ANALYSIS_MEM_list[imem] %}
- "{{ COMOUT_OCEAN_ANALYSIS_MEM }}"
{% endfor %} # mem loop
copy:
link:
{% for mem in range(first_mem, last_mem + 1) %}
{% set imem = mem - first_mem %}
{% set COMOUT_OCEAN_ANALYSIS_MEM = COMOUT_OCEAN_ANALYSIS_MEM_list[imem] %}
Expand Down
2 changes: 1 addition & 1 deletion parm/stage/wave.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ wave:
{% set COMOUT_WAVE_RESTART_PREV_MEM = COMOUT_WAVE_RESTART_PREV_MEM_list[imem] %}
- "{{ COMOUT_WAVE_RESTART_PREV_MEM }}"
{% endfor %} # mem loop
copy:
link:
{% for mem in range(first_mem, last_mem + 1) %}
{% set imem = mem - first_mem %}
{% set COMOUT_WAVE_RESTART_PREV_MEM = COMOUT_WAVE_RESTART_PREV_MEM_list[imem] %}
Expand Down
4 changes: 2 additions & 2 deletions ush/python/pygfs/task/stage_ic.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ def execute_stage(self, stage_dict: Dict[str, Any]) -> None:
# Add the glob.glob function for capturing filenames
stage_dict['glob'] = glob.glob

# Parse stage yaml to get list of files to copy
# Parse staging yaml to get list of files to stage
stage_set = parse_j2yaml(self.task_config.STAGE_IC_YAML_TMPL, stage_dict, allow_missing=False)

# Copy files to ROTDIR
# stage files to ROTDIR
for key in stage_set.keys():
FileHandler(stage_set[key]).sync()