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

Add lat_lon_land set #534

Closed
wants to merge 5 commits into from
Closed

Add lat_lon_land set #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e566351
Add lat_lon_land set
forsyth2 Nov 28, 2023
7d0c871
update
forsyth2 Dec 15, 2023
f80298e
update 2
forsyth2 Dec 21, 2023
64d1419
update 3
forsyth2 Dec 21, 2023
1157f4a
Most tests passing
forsyth2 Jan 30, 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
4 changes: 2 additions & 2 deletions tests/integration/generated/test_bundles_chrysalis.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ input = "/lcrc/group/e3sm/ac.forsyth2/E3SMv2/v2.LR.historical_0201"
input_subdir = archive/atm/hist
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
# To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_bundles.py
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_bundles_output/unique_id/v2.LR.historical_0201"
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_bundles_output/issue_518/v2.LR.historical_0201"
partition = "compute"
qos = "regular"
walltime = "07:00:00"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_bundles_www/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_bundles_www/issue_518"

[bundle]

Expand Down
7 changes: 4 additions & 3 deletions 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 @@ -7,10 +7,10 @@ input = "/lcrc/group/e3sm/ac.forsyth2//E3SMv2/v2.LR.historical_0201"
input_subdir = archive/atm/hist
mapping_file = "map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
# To run this test, edit `output` and `www` in this file, along with `actual_images_dir` in test_complete_run.py
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/unique_id/v2.LR.historical_0201"
output = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/issue_518/v2.LR.historical_0201"
partition = "debug"
qos = "regular"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_complete_run_www/unique_id"
www = "/lcrc/group/e3sm/public_html/diagnostic_output/ac.forsyth2/zppy_test_complete_run_www/issue_518"

[climo]
active = True
Expand Down 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_20231027v2"
environment_commands = "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240123"
sets = "qbo",
ts_subsection = "atm_monthly_180x360_aave"

Expand All @@ -116,6 +116,7 @@ years = "1850:1854:2", "1850:1854:4",
ref_years = "1850-1851",
reference_data_path = "/lcrc/group/e3sm/ac.forsyth2/zppy_test_complete_run_output/v2.LR.historical_0201/post/atm/180x360_aave/clim"
run_type = "model_vs_model"
sets = "lat_lon","lat_lon_land","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","enso_diags","qbo","diurnal_cycle","annual_cycle_zonal_mean","streamflow", "zonal_mean_2d_stratosphere",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@forsyth2 hi, I'm skimming at this PR to try figure out the problem. It sounds like only one e3sm_diags viewer is created for including both lat_lon and lat_lon_land? I had a comment earlier. We should have a separate task i.e. [[ lnd_monthly_180x360_aave_mvm ]] for the "lat_lon_land" set, because it is more straightforward, for instance this set depends on the the land data paths. (in the implementation here, I don't think the land data are used)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, at the time, I thought that advice was just for model-vs-obs, not model-vs-model since that seemed to be working. So yes, that's a good idea here too. I'll separate them and see if anything changes in the plots. Thanks.

short_ref_name = "v2.LR.historical_0201"
swap_test_ref = False
tag = "model_vs_model"
Expand Down
1 change: 1 addition & 0 deletions tests/integration/template_complete_run.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ years = "1850:1854:2", "1850:1854:4",
ref_years = "1850-1851",
reference_data_path = "#expand user_output#zppy_test_complete_run_output/v2.LR.historical_0201/post/atm/180x360_aave/clim"
run_type = "model_vs_model"
sets = "lat_lon","lat_lon_land","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","enso_diags","qbo","diurnal_cycle","annual_cycle_zonal_mean","streamflow", "zonal_mean_2d_stratosphere",
short_ref_name = "v2.LR.historical_0201"
swap_test_ref = False
tag = "model_vs_model"
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from mache import MachineInfo
from PIL import Image, ImageChops, ImageDraw

UNIQUE_ID = "unique_id"
UNIQUE_ID = "issue_518"

# Image checking ##########################################################

Expand Down Expand Up @@ -136,7 +136,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_20231027v2",
"diags_environment_commands": "source /home/ac.forsyth2/miniconda3/etc/profile.d/conda.sh; conda activate e3sm_diags_20240123",
"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
10 changes: 7 additions & 3 deletions zppy/templates/e3sm_diags.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ create_links_ts_rof()
cd ..
}

{%- if ("lat_lon" in sets) or ("zonal_mean_xy" in sets) or ("zonal_mean_2d" in sets) or ("polar" in sets) or ("cosp_histogram" in sets) or ("meridional_mean_2d" in sets) or ("annual_cycle_zonal_mean" in sets) or ("zonal_mean_2d_stratosphere" in sets) %}
{%- if ("lat_lon" in sets) or ("lat_lon_land" in sets) or ("zonal_mean_xy" in sets) or ("zonal_mean_2d" in sets) or ("polar" in sets) or ("cosp_histogram" in sets) or ("meridional_mean_2d" in sets) or ("annual_cycle_zonal_mean" in sets) or ("zonal_mean_2d_stratosphere" in sets) %}
{% if run_type == "model_vs_obs" %}
climo_dir_primary=climo
{% elif run_type == "model_vs_model" %}
Expand Down Expand Up @@ -257,13 +257,13 @@ ref_start_yr = {{ ref_start_yr }}
param = CoreParameter()

# Model
{%- if ("lat_lon" in sets) or ("zonal_mean_xy" in sets) or ("zonal_mean_2d" in sets) or ("polar" in sets) or ("cosp_histogram" in sets) or ("meridional_mean_2d" in sets) or ("annual_cycle_zonal_mean" in sets) or ("zonal_mean_2d_stratosphere" in sets) %}
{%- if ("lat_lon" in sets) or ("lat_lon_land" in sets) or ("zonal_mean_xy" in sets) or ("zonal_mean_2d" in sets) or ("polar" in sets) or ("cosp_histogram" in sets) or ("meridional_mean_2d" in sets) or ("annual_cycle_zonal_mean" in sets) or ("zonal_mean_2d_stratosphere" in sets) %}
param.test_data_path = '${climo_dir_primary}'
{%- endif %}
param.test_name = '${case}'
param.short_test_name = short_name

{%- if ("lat_lon" in sets) or ("zonal_mean_xy" in sets) or ("zonal_mean_2d" in sets) or ("polar" in sets) or ("cosp_histogram" in sets) or ("meridional_mean_2d" in sets) or ("annual_cycle_zonal_mean" in sets) or ("zonal_mean_2d_stratosphere" in sets) %}
{%- if ("lat_lon" in sets) or ("lat_lon_land" in sets) or ("zonal_mean_xy" in sets) or ("zonal_mean_2d" in sets) or ("polar" in sets) or ("cosp_histogram" in sets) or ("meridional_mean_2d" in sets) or ("annual_cycle_zonal_mean" in sets) or ("zonal_mean_2d_stratosphere" in sets) %}
{% if run_type == "model_vs_obs" %}
# Obs
param.reference_data_path = '{{ reference_data_path }}'
Expand Down Expand Up @@ -293,6 +293,10 @@ param.num_workers = {{ num_workers }}
#param.fail_on_incomplete = True
params = [param]

{%- if "lat_lon_land" in sets %}
param.variables = ["FLDS", "FSDS"]
{%- endif %}

{%- if "enso_diags" in sets %}
enso_param = EnsoDiagsParameter()
enso_param.test_data_path = test_ts
Expand Down
Loading