Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
1 change: 1 addition & 0 deletions isschecker/data/experiments_ismip7.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
experiment;start_year_min;start_year_max;end_year;duration
historical;1850;2014;2014;-1
ssp370;2015;2015;2100;86
ssp245;2015;2015;2100;86
ssp126;2015;2015;2300;286
ssp585;2015;2015;2300;286
ssp534-over;2015;2015;2300;286
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "isschecker"
version = "0.8.0"
version = "0.9.0"
description = "ISMIP7 compliance checker for ice sheet model simulation NetCDF datasets"
readme = "README.md"
license = "MIT"
Expand Down
13 changes: 8 additions & 5 deletions tests/test_compliance_checker.py
Original file line number Diff line number Diff line change
Expand Up @@ -639,14 +639,17 @@ def test_checker_reports_historical_time_range_violation(case_dir):
)


def test_checker_accepts_an_ssp534_over_run(tmp_path):
"""The overshoot scenario of E001 and E002 runs 2015-2300."""
@pytest.mark.parametrize(
("scenario", "end_year"), [("ssp534-over", 2300), ("ssp245", 2100)]
)
def test_checker_accepts_an_esm_experiment_scenario(tmp_path, scenario, end_year):
"""Scenarios forced only in the ESM experiments, not in the core ones."""
generate_test_files.create_netcdf_file(
None,
grid_name="GrIS_16000m",
scenario="ssp534-over",
scenario=scenario,
start_year=2015,
nyears=286,
nyears=end_year - 2015 + 1,
include_scalars=True,
include_xyt=False,
set_counter="E001",
Expand All @@ -658,7 +661,7 @@ def test_checker_accepts_an_ssp534_over_run(tmp_path):

assert summary["total_errors"] == 0, summary["log_text"]
assert (
"covering nominal years 2015-2300, as experiment 'ssp534-over'"
f"covering nominal years 2015-{end_year}, as experiment '{scenario}'"
" requires: OK" in summary["log_text"]
)

Expand Down
Loading