From 1591949958ec70a07e38e0e81a95f277000dacc6 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 12 Aug 2024 14:33:34 +1000 Subject: [PATCH 1/4] Update VALID_*_START to 'days' instead of 'day' --- src/model_config_tests/qa/test_access_esm1p5_config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/model_config_tests/qa/test_access_esm1p5_config.py b/src/model_config_tests/qa/test_access_esm1p5_config.py index 7463efa..47817d2 100644 --- a/src/model_config_tests/qa/test_access_esm1p5_config.py +++ b/src/model_config_tests/qa/test_access_esm1p5_config.py @@ -24,8 +24,8 @@ VALID_KEYWORDS: set[str] = {"global", "access-esm1.5"} VALID_NOMINAL_RESOLUTION: str = "100 km" VALID_REFERENCE: str = "https://doi.org/10.1071/ES19035" -VALID_PREINDUSTRIAL_START: dict[str, int] = {"year": 101, "month": 1, "day": 1} -VALID_HISTORICAL_START: dict[str, int] = {"year": 1850, "month": 1, "day": 1} +VALID_PREINDUSTRIAL_START: dict[str, int] = {"year": 101, "month": 1, "days": 1} +VALID_HISTORICAL_START: dict[str, int] = {"year": 1850, "month": 1, "days": 1} VALID_RUNTIME: dict[str, int] = {"year": 1, "month": 0, "day": 0} VALID_RESTART_FREQ: str = "10YS" VALID_MPPNCCOMBINE_EXE: str = "mppnccombine.spack" From ff21c8fa4016b2881d17c90c606acd8d81337fea Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 12 Aug 2024 14:34:38 +1000 Subject: [PATCH 2/4] Update VALID_RUNTIME to add 's' to fields --- src/model_config_tests/qa/test_access_esm1p5_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/model_config_tests/qa/test_access_esm1p5_config.py b/src/model_config_tests/qa/test_access_esm1p5_config.py index 47817d2..4a4a175 100644 --- a/src/model_config_tests/qa/test_access_esm1p5_config.py +++ b/src/model_config_tests/qa/test_access_esm1p5_config.py @@ -26,7 +26,7 @@ VALID_REFERENCE: str = "https://doi.org/10.1071/ES19035" VALID_PREINDUSTRIAL_START: dict[str, int] = {"year": 101, "month": 1, "days": 1} VALID_HISTORICAL_START: dict[str, int] = {"year": 1850, "month": 1, "days": 1} -VALID_RUNTIME: dict[str, int] = {"year": 1, "month": 0, "day": 0} +VALID_RUNTIME: dict[str, int] = {"years": 1, "months": 0, "days": 0} VALID_RESTART_FREQ: str = "10YS" VALID_MPPNCCOMBINE_EXE: str = "mppnccombine.spack" From aa4dcd5bfda95dd53d68fc42b8eac736c5d3734a Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 12 Aug 2024 14:37:51 +1000 Subject: [PATCH 3/4] Add error message to test_mppnccombine_fast_collate_exe --- src/model_config_tests/qa/test_access_esm1p5_config.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/model_config_tests/qa/test_access_esm1p5_config.py b/src/model_config_tests/qa/test_access_esm1p5_config.py index 4a4a175..45e0e8b 100644 --- a/src/model_config_tests/qa/test_access_esm1p5_config.py +++ b/src/model_config_tests/qa/test_access_esm1p5_config.py @@ -181,6 +181,10 @@ def test_mppnccombine_fast_collate_exe(self, config): "collate.exe", "config.yaml", VALID_MPPNCCOMBINE_EXE ) + assert "mpi" in config["collate"], error_field_nonexistence( + "collate.mpi", "config.yaml" + ) + assert config["collate"]["mpi"], error_field_incorrect( "collate.mpi", "config.yaml", "true" ) From b25287335b58e0d9d1bc8e070059997d999268c4 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 12 Aug 2024 14:54:16 +1000 Subject: [PATCH 4/4] Update version to 0.0.4 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9a1c82b..6ca5472 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "model_config_tests" -version = "0.0.3" +version = "0.0.4" authors = [ { name = "ACCESS-NRI" }, ]