Skip to content

feat(ilamb): update ilamb3, remove ohc-NOAA, add evspsbl-pr diagnostic#573

Merged
lewisjared merged 24 commits intomainfrom
ilamb-no-files
Mar 1, 2026
Merged

feat(ilamb): update ilamb3, remove ohc-NOAA, add evspsbl-pr diagnostic#573
lewisjared merged 24 commits intomainfrom
ilamb-no-files

Conversation

@lewisjared
Copy link
Contributor

@lewisjared lewisjared commented Mar 1, 2026

Description

Updates the ILAMB diagnostic provider with several changes:

  • Update ilamb3 dependency to latest version
  • Remove ohc-NOAA diagnostic (ocean heat content) as requested by Forrest on behalf of the MBTT
  • Add emp-GLEAMGPCP2.3 diagnostic (evspsbl-pr metric over land)
  • Refactor standard.py to extract shared constraint logic into helper functions (_build_cmip_data_requirement, _build_test_data_spec), reducing duplication across CMIP6/CMIP7 data requirement construction
  • Update configure files (ilamb.yaml, iomb.yaml) with notes about obs4REF equivalents and updated data references
  • Add lossy compression for thetaO files which are large
  • Add missing variables and clean up data requirements
  • Loosen facet filter type to accept broader mapping types

Checklist

Please confirm that this pull request has done the following:

  • Tests added
  • Documentation added (where applicable)
  • Changelog item added to changelog/

nocollier and others added 20 commits February 19, 2026 16:11
@nocollier
Temporarily remove the ocean heat content diagnostic as per email fro…
2deee16 
…m Forrest (on behalf of the MBTT) on 17-Feb
@nocollier
changes to configure files, data references updated where possible
2a6f5c8
@nocollier
change how models are named in the plots and output filenames
ade4287
@nocollier
append the obs4REF dataset registry to the ilamb so these keys can be…
c77383e 
… used in configure files
@nocollier
add the evspsbl-pr metric only over land as requested
55553f8
@nocollier
add ilamb model color selector, only 1 model but at least won't be black
fe0b9f9
@nocollier
bump ilamb3 version
d6d3b9c
@nocollier
changelog
2cf846b
@lewisjared
fix: lockfile
3cc6603
@nocollier
expand ilamb3 ref configure files to allow for dictionaries with data…
67d0378 
… requirement facets
@lewisjared
Merge remote-tracking branch 'origin/main' into ilamb-updates
ef7d6ad 
* origin/main: (80 commits)
  chore: Update comment
  chore: upgrade pins for ilamb
  fix: revert compat=override on open_mfdataset
  docs: add changelog for #565
  chore: Upgrade lockfile and fix some errors
  chore: add coverage
  chore: add default separator in alembic
  fix: time_coder warning
  chore: Pin to use tas
  fix(solver): preserve DataCatalog wrapper in apply_dataset_filters
  fix(tests): use to_frame() when accessing DataCatalog in solver tests
  docs: Changelog
  chore: run the finalise in threads
  chore: clean up
  chore: add fix changelog entry for PR #561
  feat(cli): add --dataset-filter option to datasets list command
  chore: add changelog entry for PR #561
  feat(solver): add --dataset-filter option to filter input datasets when solving
  chore: Support env variables for parser
  feat(solver): add optional --limit flag to solve command
  ...
@lewisjared
chore: fix mypy
8815a50
@lewisjared
chore: remove ohc dataset
5393d00
@lewisjared
chore: loosen facet filter type
e8fab3e
@lewisjared
chore: clean up datarequirements
e9ad222
@lewisjared
revert: Undo the changes due to new datasets
c55b29c
@lewisjared
chore: add missing variable
5e29107
@lewisjared
Merge remote-tracking branch 'origin/main' into ilamb-no-files
1028f76 
* origin/main: (40 commits)
  chore: read mandatory variables
  fix: Better handling of nan values
  docs: Update documenation about DRS parser
  docs: changelog update
  fix: correct the order of the constraints
  chore: add changelog entries for PR #571
  chore: Clean up CMIP6 and CMIP7 test overlap
  chore: refactor tests
  chore: update tests
  chore: remove realm from filtering
  feat: Add CMIP7 lazy loading
  chore: Fix regression outputs
  chore: changelog
  fix: apply version filtering to the regression analysis
  chore: Use variable_name
  chore: fix pre-commit
  add change log
  rename double_ITCZ to doubleITCZ for consistency in output file naming
  chore: add test case for double ITCZ
  chore(deps-dev): bump jupyterlab in the python-dependencies group
  ...
@lewisjared
chore: add other missing variable
404b25b
@lewisjared
chore: add lossy compression as the thetaO files are large
063e7cb
@codecov
Copy link

codecov bot commented Mar 1, 2026 •
edited
Loading

Codecov Report

❌ Patch coverage is 55.55556% with 16 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
...limate-ref-ilamb/src/climate_ref_ilamb/standard.py 51.61% 12 Missing and 3 partials ⚠️
...limate-ref-core/src/climate_ref_core/esgf/cmip7.py 75.00% 1 Missing ⚠️
Flag Coverage Δ
core 93.26% <80.00%> (+<0.01%) ⬆️
providers 89.23% <51.61%> (-0.70%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
.../climate-ref-core/src/climate_ref_core/datasets.py 87.87% <100.00%> (ø)
...limate-ref-core/src/climate_ref_core/esgf/cmip7.py 93.91% <75.00%> (+0.05%) ⬆️
...limate-ref-ilamb/src/climate_ref_ilamb/standard.py 84.18% <51.61%> (-6.22%) ⬇️
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@lewisjared
Copy link
Contributor Author

lewisjared commented Mar 1, 2026

This is most of #548, but without the reference dataset changes

@lewisjared
chore: Add regression file
fa17b8e 
Its empty for now until there is a way of merging multiple data catalog
@lewisjared
chore: skip the diagnostic
116520f
@lewisjared
chore: remove test
e51352d
@lewisjared lewisjared merged commit 39b247b into main Mar 1, 2026
25 of 26 checks passed
@lewisjared lewisjared deleted the ilamb-no-files branch March 1, 2026 11:22
lewisjared added a commit that referenced this pull request Mar 2, 2026
@lewisjared
Merge branch 'move-esmval-constraint' into esmvaltool-ozone-diagnostics
ddeca4f 
* move-esmval-constraint: (70 commits)
  chore: ruff
  chore: run all solves
  chore: add a cmip7 data catalog and regenerate the ESMValTool tests
  chore: add CMIP7 data catalog
  chore: Use a subset of cmip6 source ids
  chore: update catalog
  chore: add ozone
  refactor: add a esgf_data_catalog_trimmed fixture
  chore: add back the catch
  chore: cleanup is_na checks
  chore: fetch obs4ref datasets too
  fix: add postgresql_using cast for String->DateTime downgrade
  fix: use FALSE instead of 0 in migration for PostgreSQL boolean column
  fix: use enum names in migration UPDATE for PostgreSQL compatibility
  chore: remove test
  chore: skip the diagnostic
  chore: Add regression file
  docs: add changelog entry for time_units and calendar feature
  fix: handle mixed-calendar cftime comparison in contiguity constraint
  chore: rename changelog to match PR #573
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@lewisjared @nocollier