Skip to content

Make ref_name optional in e3sm diags output figure names #524

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

Merged
forsyth2 merged 1 commit into from
Nov 7, 2023
Merged

Make ref_name optional in e3sm diags output figure names #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 tests/integration/generated/test_complete_run_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ years = "1850:1854:2", "1850:1854:4",
walltime = "5:00:00"

[[ atm_monthly_180x360_aave_environment_commands ]]
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20230914"
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20231027v2"
sets = "qbo",
ts_subsection = "atm_monthly_180x360_aave"

Expand Down
2 changes: 1 addition & 1 deletion tests/integration/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def get_chyrsalis_expansions(config):
"bundles_walltime": "07:00:00",
"constraint": "",
# To run this test, replace conda environment with your e3sm_diags dev environment
"diags_environment_commands": "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20230914",
"diags_environment_commands": "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20231027v2",
"diags_walltime": "5:00:00",
"environment_commands_test": "source /lcrc/soft/climate/e3sm-unified/test_e3sm_unified_1.9.0rc16_chrysalis.sh",
"expected_dir": "/lcrc/group/e3sm/public_html/zppy_test_resources/",
Expand Down
2 changes: 2 additions & 0 deletions zppy/templates/default.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ dc_obs_climo = string(default="")
# See https://e3sm-project.github.io/e3sm_diags/_build/html/master/available-parameters.html
# Required for run_type="model_vs_model"
diff_title = string(default="Model - Observations")
# Set this to False if the E3SM Diags model-vs-model output path should exclude the case name.
keep_mvm_case_name_in_fig = boolean(default=True)
# See https://e3sm-project.github.io/e3sm_diags/_build/html/master/available-parameters.html
# Required for run_type="model_vs_model" "streamflow" runs
gauges_path = string(default="")
Expand Down
24 changes: 17 additions & 7 deletions zppy/templates/e3sm_diags.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,16 @@ create_links_ts_rof ${ts_rof_dir_source} ${ts_rof_dir_ref} ${ref_Y1} ${ref_Y2} 8
{%- endif %}
{%- endif %}

{% if run_type == "model_vs_obs" %}
ref_name={{ ref_name }}
{%- endif %}
{% if (run_type == "model_vs_model") and keep_mvm_case_name_in_fig %}
ref_name={{ ref_name }}
{%- endif %}
{% if (run_type == "model_vs_model") and not keep_mvm_case_name_in_fig %}
ref_name=""
{%- endif %}

# Run E3SM Diags
echo
echo ===== RUN E3SM DIAGS =====
Expand Down Expand Up @@ -260,7 +270,7 @@ param.reference_data_path = '{{ reference_data_path }}'
{% elif run_type == "model_vs_model" %}
# Reference
param.reference_data_path = '${climo_dir_ref}'
param.ref_name = '{{ ref_name }}'
param.ref_name = '${ref_name}'
param.short_ref_name = '{{ short_ref_name }}'
# Optionally, swap test and reference model
if {{ swap_test_ref }}:
Expand Down Expand Up @@ -297,7 +307,7 @@ enso_param.ref_end_yr = ref_start_yr + 10
{% elif run_type == "model_vs_model" %}
# Reference
enso_param.reference_data_path = '${ts_dir_ref}'
enso_param.ref_name = '{{ ref_name }}'
enso_param.ref_name = '${ref_name}'
enso_param.short_ref_name = '{{ short_ref_name }}'
enso_param.ref_start_yr = '{{ ref_start_yr }}'
enso_param.ref_end_yr = '{{ ref_final_yr }}'
Expand Down Expand Up @@ -329,7 +339,7 @@ qbo_param.reference_data_path = '{{ obs_ts }}'
{% elif run_type == "model_vs_model" %}
# Reference
qbo_param.reference_data_path = '${ts_dir_ref}'
qbo_param.ref_name = '{{ ref_name }}'
qbo_param.ref_name = '${ref_name}'
qbo_param.short_ref_name = '{{ short_ref_name }}'
# Optionally, swap test and reference model
if {{ swap_test_ref }}:
Expand All @@ -353,7 +363,7 @@ ts_param.reference_data_path = '{{ obs_ts }}'
{% elif run_type == "model_vs_model" %}
# Reference
ts_param.reference_data_path = '${ts_dir_ref}'
ts_param.ref_name = '{{ ref_name }}'
ts_param.ref_name = '${ref_name}'
ts_param.short_ref_name = '{{ short_ref_name }}'
# Optionally, swap test and reference model
if {{ swap_test_ref }}:
Expand All @@ -376,7 +386,7 @@ dc_param.reference_data_path = '{{ dc_obs_climo }}'
{% elif run_type == "model_vs_model" %}
# Reference
dc_param.reference_data_path = '${climo_diurnal_dir_ref}'
dc_param.ref_name = '{{ ref_name }}'
dc_param.ref_name = '${ref_name}'
dc_param.short_ref_name = '{{ short_ref_name }}'
# Optionally, swap test and reference model
if {{ swap_test_ref }}:
Expand All @@ -402,7 +412,7 @@ streamflow_param.ref_end_yr = "1995"
{% elif run_type == "model_vs_model" %}
# Reference
streamflow_param.reference_data_path = '${ts_rof_dir_ref}'
streamflow_param.ref_name = '{{ ref_name }}'
streamflow_param.ref_name = '${ref_name}'
streamflow_param.short_ref_name = '{{ short_ref_name }}'
streamflow_param.ref_start_yr = '{{ ref_start_yr }}'
streamflow_param.ref_end_yr = '{{ ref_final_yr }}'
Expand Down Expand Up @@ -432,7 +442,7 @@ tc_param.ref_end_yr = "2018"
{% elif run_type == "model_vs_model" %}
# Reference
tc_param.reference_data_path = '{{ reference_data_path_tc }}'
tc_param.ref_name = '{{ ref_name }}'
tc_param.ref_name = '${ref_name}'
tc_param.short_ref_name = '{{ short_ref_name }}'
tc_param.ref_start_yr = '{{ ref_start_yr }}'
tc_param.ref_end_yr = '{{ ref_final_yr }}'
Expand Down