climate-ref-ilamb 0.5.0__tar.gz → 0.5.1__tar.gz

{climate_ref_ilamb-0.5.0 → climate_ref_ilamb-0.5.1}/.gitignore

@@ -74,7 +74,6 @@ coverage.xml
 *.pot
 
 # Django stuff:
-*.log
 local_settings.py
 db.sqlite3
 db.sqlite3-journal

{climate_ref_ilamb-0.5.0 → climate_ref_ilamb-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: climate-ref-ilamb
-Version: 0.5.0
+Version: 0.5.1
 Summary: ILAMB diagnostic provider for the Rapid Evaluation Framework
 Author-email: Nathan Collier <nathaniel.collier@gmail.com>
 License: Apache-2.0
@@ -18,7 +18,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.11
 Requires-Dist: climate-ref-core
-Requires-Dist: ilamb3
+Requires-Dist: ilamb3>=2025.4.28
 Requires-Dist: types-pyyaml>=6.0.12.20241230
 Description-Content-Type: text/markdown
 

{climate_ref_ilamb-0.5.0 → climate_ref_ilamb-0.5.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "climate-ref-ilamb"
-version = "0.5.0"
+version = "0.5.1"
 description = "ILAMB diagnostic provider for the Rapid Evaluation Framework"
 readme = "README.md"
 authors = [{ name = "Nathan Collier", email = "nathaniel.collier@gmail.com" }]
@@ -19,13 +19,10 @@ classifiers = [
 ]
 dependencies = [
     "climate-ref-core",
-    "ilamb3",
+    "ilamb3>=2025.4.28",
     "types-pyyaml>=6.0.12.20241230",
 ]
 
-[tool.uv.sources]
-ilamb3 = { git = "https://github.com/rubisco-sfa/ilamb3", rev = "7c64e37ebda04b6902b39ef30db96f4bcabba472" }
-
 [project.license]
 text = "Apache-2.0"
 

{climate_ref_ilamb-0.5.0 → climate_ref_ilamb-0.5.1}/src/climate_ref_ilamb/__init__.py

@@ -38,7 +38,7 @@ dataset_registry_manager.register(
 )
 dataset_registry_manager.register(
     "iomb",
-    base_url="https://www.ilamb.org/IOMB-Data/DATA",
+    base_url="https://www.ilamb.org/ilamb3-data/",
     package="climate_ref_ilamb.dataset_registry",
     resource="iomb.txt",
     cache_name="ilamb3",

climate_ref_ilamb-0.5.1/src/climate_ref_ilamb/configure/ilamb.yaml

@@ -0,0 +1,45 @@
+registry: ilamb
+
+gpp-WECANN:
+  sources:
+    gpp: gpp/WECANN/gpp.nc
+  relationships:
+    pr: pr/GPCPv2.3/pr.nc
+    tas: tas/CRU4.02/tas.nc
+  variable_cmap: Greens
+
+gpp-FLUXNET2015:
+  sources:
+    gpp: gpp/FLUXNET2015/gpp.nc
+  variable_cmap: Greens
+
+mrro-LORA:
+  sources:
+    mrro: mrro/LORA/LORA.nc
+  variable_cmap: Blues
+
+mrsos-WangMao:
+  sources:
+    mrsol: mrsol/WangMao/mrsol_olc.nc
+  alternate_vars:
+  - mrsos
+  depth: 0.0
+  transform:
+  - soil_moisture_to_vol_fraction
+  variable_cmap: Blues
+
+cSoil-HWSD2:
+  sources:
+    cSoil: cSoil/HWSD2/hwsd2_cSoil.nc
+  variable_cmap: viridis
+
+lai-AVH15C1:
+  sources:
+    lai: lai/AVH15C1/lai.nc
+  variable_cmap: Greens
+
+nbp-Hoffman:
+  analyses:
+  - nbp
+  sources:
+    nbp: nbp/HOFFMAN/nbp_1850-2010.nc

climate_ref_ilamb-0.5.1/src/climate_ref_ilamb/configure/iomb.yaml

@@ -0,0 +1,27 @@
+registry: iomb
+
+thetao-WOA2023-surface:
+  sources:
+    thetao: WOA/thetao_mon_WOA_A5B4_gn_200501-201412.nc
+  variable_cmap: Reds
+  depth: 0.0
+  alternate_vars:
+  - tos
+
+so-WOA2023-surface:
+  sources:
+    so: WOA/so_mon_WOA_A5B4_gn_200501-201412.nc
+  variable_cmap: YlGn
+  depth: 0.0
+  alternate_vars:
+  - sos
+
+amoc-RAPID:
+  analyses:
+  - timeseries
+  alternate_vars:
+  - msftmz
+  transform:
+  - msftmz_to_rapid
+  sources:
+    amoc: RAPID/amoc_mon_RAPID_BE_NA_200404-202302.nc

climate_ref_ilamb-0.5.1/src/climate_ref_ilamb/dataset_registry/ilamb.txt

@@ -0,0 +1,11 @@
+cSoil/HWSD2/hwsd2_cSoil.nc sha1:9a6377e4c5ff457c08c194d2c376c46e003a4f84
+gpp/FLUXNET2015/gpp.nc sha1:16fd177e007caef2565687e2cd32884e20ef16e5
+gpp/WECANN/gpp.nc sha1:6e864a6ae201195cdf995a3a81720188af441e13
+lai/AVH15C1/lai.nc sha1:ccace4f84912d63acbb9ee09ee7b743412207a0d
+mrro/LORA/LORA.nc sha1:72bb16787877591d0c54a36d74697d0d208f985a
+mrsol/WangMao/mrsol_olc.nc sha1:24cbc9df69569bed3a39c20e499cfe4f911bd30e
+regions/GlobalLand.nc sha1:2f987d44fdba6ad0e72d14d6a2fecb7e8df2a9c5
+regions/Koppen_coarse.nc sha1:e464030db49f0295a6a22a81ca602b0f3c499b72
+pr/GPCPv2.3/pr.nc sha1:e1b942863ec76a75aa972b6d75e2e08646741259
+tas/CRU4.02/tas.nc sha1:2674da18a1a93483b50b1626e7a7ab741bf53d09
+nbp/HOFFMAN/nbp_1850-2010.nc sha1:8350af00614d6afc6b70ad314aa499a9ece80ec2

climate_ref_ilamb-0.5.1/src/climate_ref_ilamb/dataset_registry/iomb.txt

@@ -0,0 +1,3 @@
+WOA/so_mon_WOA_A5B4_gn_200501-201412.nc sha1:831c42c3b2ba443c255150289a2c725d7f3e5838
+WOA/thetao_mon_WOA_A5B4_gn_200501-201412.nc sha1:86d9056208291d76233e65b26c658c1fa54c3ea6
+RAPID/amoc_mon_RAPID_BE_NA_200404-202302.nc sha1:3efe773e5c2a3c832977791ff7fd9cb9f473fe65

{climate_ref_ilamb-0.5.0 → climate_ref_ilamb-0.5.1}/src/climate_ref_ilamb/standard.py

@@ -112,7 +112,6 @@ def _load_csv_and_merge(output_directory: Path) -> pd.DataFrame:
     df = pd.concat(
         [pd.read_csv(f, keep_default_na=False, na_values=["NaN"]) for f in output_directory.glob("*.csv")]
     ).drop_duplicates(subset=["source", "region", "analysis", "name"])
-    df["name"] = df["name"] + " [" + df["units"] + "]"
     return df
 
 
@@ -150,6 +149,7 @@ class ILAMBStandard(Diagnostic):
                             "variable_id": (
                                 self.variable_id,
                                 *ilamb_kwargs.get("relationships", {}).keys(),
+                                *ilamb_kwargs.get("alternate_vars", []),
                                 *_measure_facets(registry_file),
                             )
                         }
@@ -160,7 +160,7 @@ class ILAMBStandard(Diagnostic):
                 group_by=("experiment_id",),
             ),
         )
-        self.facets = ("region", "model", "metric")
+        self.facets = ("region", "model", "metric", "statistic")
 
         # Setup ILAMB data and options
         self.registry_file = registry_file

climate_ref_ilamb-0.5.1/tests/integration/test_diagnostics.py

@@ -0,0 +1,15 @@
+import pytest
+from climate_ref_ilamb import provider as ilamb_provider
+
+from climate_ref_core.diagnostics import Diagnostic
+
+diagnostics = [pytest.param(diagnostic, id=diagnostic.slug) for diagnostic in ilamb_provider.diagnostics()]
+
+
+@pytest.mark.slow
+@pytest.mark.parametrize("diagnostic", diagnostics)
+def test_diagnostics(diagnostic: Diagnostic, diagnostic_validation):
+    if diagnostic.slug.startswith("thetao"):
+        pytest.xfail("Missing data for thetao diagnostics")
+
+    diagnostic_validation(diagnostic)

{climate_ref_ilamb-0.5.0 → climate_ref_ilamb-0.5.1}/tests/unit/test_standard_metrics.py

@@ -7,7 +7,7 @@ from climate_ref_core.datasets import DatasetCollection
 
 
 def test_standard_site(cmip6_data_catalog, definition_factory):
-    metric = ILAMBStandard(
+    diagnostic = ILAMBStandard(
         registry_file="ilamb-test", metric_name="test-site-tas", sources={"tas": "test/Site/tas.nc"}
     )
     ds = (
@@ -19,10 +19,10 @@ def test_standard_site(cmip6_data_catalog, definition_factory):
         .first()
     )
 
-    definition = definition_factory(cmip6=DatasetCollection(ds, "instance_id"))
+    definition = definition_factory(diagnostic=diagnostic, cmip6=DatasetCollection(ds, "instance_id"))
     definition.output_directory.mkdir(parents=True, exist_ok=True)
 
-    result = metric.run(definition)
+    result = diagnostic.run(definition)
 
     assert str(result.output_bundle_filename) == "output.json"
 
@@ -42,7 +42,7 @@ def test_standard_site(cmip6_data_catalog, definition_factory):
 
 
 def test_standard_grid(cmip6_data_catalog, definition_factory):
-    metric = ILAMBStandard(
+    diagnostic = ILAMBStandard(
         registry_file="ilamb-test",
         metric_name="test-grid-gpp",
         sources={"gpp": "test/Grid/gpp.nc"},
@@ -54,10 +54,10 @@ def test_standard_grid(cmip6_data_catalog, definition_factory):
     ].groupby(["source_id", "member_id", "grid_label"])
     _, ds = next(iter(grp))
 
-    definition = definition_factory(cmip6=DatasetCollection(ds, "instance_id"))
+    definition = definition_factory(diagnostic=diagnostic, cmip6=DatasetCollection(ds, "instance_id"))
     definition.output_directory.mkdir(parents=True, exist_ok=True)
 
-    result = metric.run(definition)
+    result = diagnostic.run(definition)
 
     assert str(result.output_bundle_filename) == "output.json"
 

climate_ref_ilamb-0.5.0/src/climate_ref_ilamb/configure/ilamb.yaml

@@ -1,14 +0,0 @@
-registry: ilamb
-
-gpp-WECANN:
-  sources:
-    gpp: gpp/WECANN/gpp.nc
-  relationships:
-    pr: pr/GPCPv2.3/pr.nc
-    tas: tas/CRU4.02/tas.nc
-  variable_cmap: Greens
-
-gpp-FLUXNET2015:
-  sources:
-    gpp: gpp/FLUXNET2015/gpp.nc
-  variable_cmap: Greens

climate_ref_ilamb-0.5.0/src/climate_ref_ilamb/configure/iomb.yaml

@@ -1,13 +0,0 @@
-registry: iomb
-
-thetao-WOA2018-0m:
-  sources:
-    thetao: WOA2018/thetao.nc
-  variable_cmap: cool
-  depth: 0.0
-
-thetao-WOA2018-200m:
-  sources:
-    thetao: WOA2018/thetao.nc
-  variable_cmap: cool
-  depth: 200.0

climate_ref_ilamb-0.5.0/src/climate_ref_ilamb/dataset_registry/ilamb.txt

@@ -1,19 +0,0 @@
-cSoil/HWSD2/hwsd2_cSoil.nc sha1:9a6377e4c5ff457c08c194d2c376c46e003a4f84
-cSoil/NCSCDV22/soilc_0.5x0.5.nc sha1:605efa69f547277309eca87cb581374dd3a76000
-gpp/FLUXNET2015/gpp.nc sha1:16fd177e007caef2565687e2cd32884e20ef16e5
-gpp/WECANN/gpp.nc sha1:6e864a6ae201195cdf995a3a81720188af441e13
-gpp/FLUXCOM/gpp.nc sha1:f661eb295adf9f7ad0f0531dad26c702a7988339
-lai/GIMMS_LAI4g/cao2023_lai.nc sha1:63f54dde4158afb176175eaf054923bdbfb6240b
-lai/AVH15C1/lai.nc sha1:ccace4f84912d63acbb9ee09ee7b743412207a0d
-lai/MODIS/lai_0.5x0.5.nc sha1:77c198e1b6fc768deb374a90611726ff87f398b1
-lai/AVHRR/lai_0.5x0.5.nc sha1:8b2bdece87b97c3cef8533bbcf34d9d1d7a28fbd
-mrro/Dai/runoff.nc sha1:08a23c5ea69fa439f296a6e6119598851453b3dd
-mrro/Dai/basins_0.5x0.5.nc sha1:172ff6f92a4036c186a6e2ecb66a678c578d0672
-mrro/LORA/LORA.nc sha1:72bb16787877591d0c54a36d74697d0d208f985a
-mrro/CLASS/mrro.nc sha1:5283142fcb2eea1e9c5dbc9d324c62496b0d6fa7
-mrsos/WangMao/mrsos_olc.nc sha1:23082e5776ffd3a7d6d00e160dc9d91d06321c13
-nee/FLUXNET2015/nee.nc sha1:1dc03453cb7f58e45c3f93a2a48dd8c133c63eda
-regions/GlobalLand.nc sha1:2f987d44fdba6ad0e72d14d6a2fecb7e8df2a9c5
-regions/Koppen_coarse.nc sha1:e464030db49f0295a6a22a81ca602b0f3c499b72
-pr/GPCPv2.3/pr.nc sha1:e1b942863ec76a75aa972b6d75e2e08646741259
-tas/CRU4.02/tas.nc sha1:2674da18a1a93483b50b1626e7a7ab741bf53d09

climate_ref_ilamb-0.5.0/src/climate_ref_ilamb/dataset_registry/iomb.txt

@@ -1,2 +0,0 @@
-GLODAP2.2022/thetao.nc sha1:9385d5b3039b56527cb2dd585e04452b0a95d499
-WOA2018/thetao.nc sha1:d7db6516d844c663f91e6e34c4ae915772789fcb