From da7bade555da05572dd6626520a559c336e3b0b9 Mon Sep 17 00:00:00 2001 From: lee1043 Date: Sat, 21 Feb 2026 16:37:57 -0800 Subject: [PATCH 1/5] initial commit --- .../params/pmp_param_annualcycle_2-metrics.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/climate-ref-pmp/src/climate_ref_pmp/params/pmp_param_annualcycle_2-metrics.py b/packages/climate-ref-pmp/src/climate_ref_pmp/params/pmp_param_annualcycle_2-metrics.py index bacc14826..b03869bd0 100644 --- a/packages/climate-ref-pmp/src/climate_ref_pmp/params/pmp_param_annualcycle_2-metrics.py +++ b/packages/climate-ref-pmp/src/climate_ref_pmp/params/pmp_param_annualcycle_2-metrics.py @@ -1,3 +1,4 @@ + import os # @@ -41,7 +42,12 @@ generate_sftlf = True # if land surface type mask cannot be found, generate one # Region -regions = {"rlut": ["Global"]} +regions_specs = { + "global": {}, + "double_ITCZ": {"domain": {"latitude": (-20.0, 0), "longitude": (100, 210)}} +} +regions = {"rlut": ["global"], + "pr": ["global", "double_ITCZ"]} # ROOT PATH FOR MODELS CLIMATOLOGIES test_data_path = "demo_data_tmp/CMIP5_demo_clims/" From 5e54e72cf8dac3efd71e6dfb0ee50c3daa58bc9c Mon Sep 17 00:00:00 2001 From: Jared Lewis Date: Wed, 25 Feb 2026 14:03:47 +1100 Subject: [PATCH 2/5] chore: add test case for double ITCZ --- .../diagnostics/annual_cycle.py | 27 +++++++++++++++++-- .../params/pmp_param_annualcycle_2-metrics.py | 9 ++----- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/packages/climate-ref-pmp/src/climate_ref_pmp/diagnostics/annual_cycle.py b/packages/climate-ref-pmp/src/climate_ref_pmp/diagnostics/annual_cycle.py index c2e2a8fe2..144e4ef2b 100644 --- a/packages/climate-ref-pmp/src/climate_ref_pmp/diagnostics/annual_cycle.py +++ b/packages/climate-ref-pmp/src/climate_ref_pmp/diagnostics/annual_cycle.py @@ -320,7 +320,7 @@ class AnnualCycle(CommandLineDiagnostic): test_data_spec = TestDataSpecification( test_cases=( TestCase( - name="cmip6", + name="cmip6-ts", description="Test with CMIP6 ts data and ERA-5 climatology", requests=( RegistryRequest( @@ -342,7 +342,30 @@ class AnnualCycle(CommandLineDiagnostic): ), ), TestCase( - name="cmip7", + name="cmip6-pr", + description="Test with CMIP6 pr data and GPCP-Monthly-3-2 climatology. " + "Produces double ITCZ pattern in the diagnostics.", + requests=( + RegistryRequest( + slug="annual-cycle-gpcp-pr", + registry_name="pmp-climatology", + facets={"variable_id": "pr", "source_id": "GPCP-Monthly-3-2"}, + ), + CMIP6Request( + slug="annual-cycle-cmip6-pr", + facets={ + "source_id": "ACCESS-ESM1-5", + "experiment_id": "historical", + "variable_id": "pr", + "member_id": "r1i1p1f1", + "table_id": "Amon", + }, + time_span=("2000-01", "2014-12"), + ), + ), + ), + TestCase( + name="cmip7-ts", description="CMIP7 test case with converted historical ts from ACCESS-ESM1-5", requests=( RegistryRequest( diff --git a/packages/climate-ref-pmp/src/climate_ref_pmp/params/pmp_param_annualcycle_2-metrics.py b/packages/climate-ref-pmp/src/climate_ref_pmp/params/pmp_param_annualcycle_2-metrics.py index b03869bd0..e2257d2f5 100644 --- a/packages/climate-ref-pmp/src/climate_ref_pmp/params/pmp_param_annualcycle_2-metrics.py +++ b/packages/climate-ref-pmp/src/climate_ref_pmp/params/pmp_param_annualcycle_2-metrics.py @@ -1,4 +1,3 @@ - import os # @@ -42,12 +41,8 @@ generate_sftlf = True # if land surface type mask cannot be found, generate one # Region -regions_specs = { - "global": {}, - "double_ITCZ": {"domain": {"latitude": (-20.0, 0), "longitude": (100, 210)}} -} -regions = {"rlut": ["global"], - "pr": ["global", "double_ITCZ"]} +regions_specs = {"global": {}, "double_ITCZ": {"domain": {"latitude": (-20.0, 0), "longitude": (100, 210)}}} +regions = {"rlut": ["global"], "pr": ["global", "double_ITCZ"]} # ROOT PATH FOR MODELS CLIMATOLOGIES test_data_path = "demo_data_tmp/CMIP5_demo_clims/" From 5c69847a64d86928189eb143ae76ed3f3f151ceb Mon Sep 17 00:00:00 2001 From: lee1043 Date: Tue, 24 Feb 2026 21:46:10 -0800 Subject: [PATCH 3/5] rename double_ITCZ to doubleITCZ for consistency in output file naming --- .../climate_ref_pmp/params/pmp_param_annualcycle_2-metrics.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/climate-ref-pmp/src/climate_ref_pmp/params/pmp_param_annualcycle_2-metrics.py b/packages/climate-ref-pmp/src/climate_ref_pmp/params/pmp_param_annualcycle_2-metrics.py index e2257d2f5..b2eb20e9d 100644 --- a/packages/climate-ref-pmp/src/climate_ref_pmp/params/pmp_param_annualcycle_2-metrics.py +++ b/packages/climate-ref-pmp/src/climate_ref_pmp/params/pmp_param_annualcycle_2-metrics.py @@ -41,8 +41,8 @@ generate_sftlf = True # if land surface type mask cannot be found, generate one # Region -regions_specs = {"global": {}, "double_ITCZ": {"domain": {"latitude": (-20.0, 0), "longitude": (100, 210)}}} -regions = {"rlut": ["global"], "pr": ["global", "double_ITCZ"]} +regions_specs = {"global": {}, "doubleITCZ": {"domain": {"latitude": (-20.0, 0), "longitude": (100, 210)}}} +regions = {"rlut": ["global"], "pr": ["global", "doubleITCZ"]} # ROOT PATH FOR MODELS CLIMATOLOGIES test_data_path = "demo_data_tmp/CMIP5_demo_clims/" From 999d94461cea3085fbe28790cd646c1c6619735e Mon Sep 17 00:00:00 2001 From: lee1043 Date: Tue, 24 Feb 2026 21:48:35 -0800 Subject: [PATCH 4/5] add change log --- changelog/557.feature.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/557.feature.md diff --git a/changelog/557.feature.md b/changelog/557.feature.md new file mode 100644 index 000000000..7e1c02ac2 --- /dev/null +++ b/changelog/557.feature.md @@ -0,0 +1 @@ +Metric for diagnostics of double ITCZ was added: Spatial corrleation of simulated DJF precipitation climatology against reference dataset over the area of 20S to 0 latitude and 100 to 210 longitude. \ No newline at end of file From c81d78b87285d2fe909ac3c0e573e32fb68b8fe6 Mon Sep 17 00:00:00 2001 From: Jared Lewis Date: Wed, 25 Feb 2026 19:05:17 +1100 Subject: [PATCH 5/5] chore: fix pre-commit --- changelog/557.feature.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/557.feature.md b/changelog/557.feature.md index 7e1c02ac2..af8e3eb74 100644 --- a/changelog/557.feature.md +++ b/changelog/557.feature.md @@ -1 +1 @@ -Metric for diagnostics of double ITCZ was added: Spatial corrleation of simulated DJF precipitation climatology against reference dataset over the area of 20S to 0 latitude and 100 to 210 longitude. \ No newline at end of file +Metric for diagnostics of double ITCZ was added: Spatial corrleation of simulated DJF precipitation climatology against reference dataset over the area of 20S to 0 latitude and 100 to 210 longitude.