-
Notifications
You must be signed in to change notification settings - Fork 14
Mint ESMValTool CMIP7 regression baselines #767
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
c532d41
fix(esmvaltool): subset regional-historical-timeseries cmip7 fixture …
lewisjared e1aec74
test(esmvaltool): add CMIP7 regression baselines for working diagnostics
lewisjared 98b6e81
docs(changelog): add news fragment for CMIP7 baselines (#767)
lewisjared File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Added canonical CMIP7 regression baselines for 16 of the ESMValTool diagnostics. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
305 changes: 305 additions & 0 deletions
305
packages/climate-ref-esmvaltool/tests/test-data/climate-drivers-for-fire/cmip7/catalog.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,305 @@ | ||
| _metadata: | ||
| hash: 0a33e7dc76794bea1cae3db045b63d108dd41457 | ||
| cmip7: | ||
| slug_column: instance_id | ||
| selector: | ||
| grid_label: gn | ||
| source_id: CanESM5 | ||
| variant_label: r1i1p1f1 | ||
| datasets: | ||
| - activity_id: CMIP | ||
| branch_time_in_child: 0.0 | ||
| branch_time_in_parent: 1223115.0 | ||
| branded_variable: sftlf_ti-u-hxy-u | ||
| branding_suffix: ti-u-hxy-u | ||
| calendar: null | ||
| end_time: null | ||
| experiment_id: historical | ||
| external_variables: areacella | ||
| filename: sftlf_ti-u-hxy-u_fx_glb_gn_CanESM5_historical_r1i1p1f1.nc | ||
| finalised: true | ||
| frequency: fx | ||
| grid_label: gn | ||
| instance_id: CMIP7.CMIP.CCCma.CanESM5.historical.r1i1p1f1.glb.fx.sftlf.ti-u-hxy-u.gn.v0 | ||
| institution_id: CCCma | ||
| license_id: CC-BY-4.0 | ||
| long_name: Percentage of the grid cell occupied by land (including lakes) | ||
| mip_era: CMIP7 | ||
| nominal_resolution: 500 km | ||
| parent_activity_id: CMIP | ||
| parent_experiment_id: piControl | ||
| parent_mip_era: CMIP6 | ||
| parent_source_id: CanESM5 | ||
| parent_time_units: days since 1850-01-01 0:0:0.0 | ||
| parent_variant_label: r1i1p1f1 | ||
| realm: atmos | ||
| region: glb | ||
| source_id: CanESM5 | ||
| standard_name: land_area_fraction | ||
| start_time: null | ||
| time_range: null | ||
| time_units: null | ||
| tracking_id: hdl:21.14107/820cd847-4343-4f87-ace3-d6502edcc218 | ||
| units: '%' | ||
| variable_id: sftlf | ||
| variant_label: r1i1p1f1 | ||
| version: v0 | ||
| - activity_id: CMIP | ||
| branch_time_in_child: 0.0 | ||
| branch_time_in_parent: 1223115.0 | ||
| branded_variable: cVeg_tavg-u-hxy-lnd | ||
| branding_suffix: tavg-u-hxy-lnd | ||
| calendar: 365_day | ||
| end_time: '2014-12-16 12:00:00' | ||
| experiment_id: historical | ||
| external_variables: areacella | ||
| filename: cVeg_tavg-u-hxy-lnd_mon_glb_gn_CanESM5_historical_r1i1p1f1_185001-201412.nc | ||
| finalised: true | ||
| frequency: mon | ||
| grid_label: gn | ||
| instance_id: CMIP7.CMIP.CCCma.CanESM5.historical.r1i1p1f1.glb.mon.cVeg.tavg-u-hxy-lnd.gn.v0 | ||
| institution_id: CCCma | ||
| license_id: CC-BY-4.0 | ||
| long_name: Carbon Mass in Vegetation | ||
| mip_era: CMIP7 | ||
| nominal_resolution: 500 km | ||
| parent_activity_id: CMIP | ||
| parent_experiment_id: piControl | ||
| parent_mip_era: CMIP6 | ||
| parent_source_id: CanESM5 | ||
| parent_time_units: days since 1850-01-01 0:0:0.0 | ||
| parent_variant_label: r1i1p1f1 | ||
| realm: land | ||
| region: glb | ||
| source_id: CanESM5 | ||
| standard_name: vegetation_carbon_content | ||
| start_time: '1850-01-16 12:00:00' | ||
| time_range: 1850-01-16 12:00:00-2014-12-16 12:00:00 | ||
| time_units: days since 1850-01-01 | ||
| tracking_id: hdl:21.14107/d099c10d-2cd6-4de1-906a-99b9ac69c5d1 | ||
| units: kg m-2 | ||
| variable_id: cVeg | ||
| variant_label: r1i1p1f1 | ||
| version: v0 | ||
| - activity_id: CMIP | ||
| branch_time_in_child: 0.0 | ||
| branch_time_in_parent: 1223115.0 | ||
| branded_variable: hurs_tavg-h2m-hxy-u | ||
| branding_suffix: tavg-h2m-hxy-u | ||
| calendar: 365_day | ||
| end_time: '2014-12-16 12:00:00' | ||
| experiment_id: historical | ||
| external_variables: areacella | ||
| filename: hurs_tavg-h2m-hxy-u_mon_glb_gn_CanESM5_historical_r1i1p1f1_185001-201412.nc | ||
| finalised: true | ||
| frequency: mon | ||
| grid_label: gn | ||
| instance_id: CMIP7.CMIP.CCCma.CanESM5.historical.r1i1p1f1.glb.mon.hurs.tavg-h2m-hxy-u.gn.v0 | ||
| institution_id: CCCma | ||
| license_id: CC-BY-4.0 | ||
| long_name: Near-Surface Relative Humidity | ||
| mip_era: CMIP7 | ||
| nominal_resolution: 500 km | ||
| parent_activity_id: CMIP | ||
| parent_experiment_id: piControl | ||
| parent_mip_era: CMIP6 | ||
| parent_source_id: CanESM5 | ||
| parent_time_units: days since 1850-01-01 0:0:0.0 | ||
| parent_variant_label: r1i1p1f1 | ||
| realm: atmos | ||
| region: glb | ||
| source_id: CanESM5 | ||
| standard_name: relative_humidity | ||
| start_time: '1850-01-16 12:00:00' | ||
| time_range: 1850-01-16 12:00:00-2014-12-16 12:00:00 | ||
| time_units: days since 1850-01-01 | ||
| tracking_id: hdl:21.14107/2991c02d-9405-4b4a-a3fb-94342423589a | ||
| units: '%' | ||
| variable_id: hurs | ||
| variant_label: r1i1p1f1 | ||
| version: v0 | ||
| - activity_id: CMIP | ||
| branch_time_in_child: 0.0 | ||
| branch_time_in_parent: 1223115.0 | ||
| branded_variable: pr_tavg-u-hxy-u | ||
| branding_suffix: tavg-u-hxy-u | ||
| calendar: 365_day | ||
| end_time: '2014-12-16 12:00:00' | ||
| experiment_id: historical | ||
| external_variables: areacella | ||
| filename: pr_tavg-u-hxy-u_mon_glb_gn_CanESM5_historical_r1i1p1f1_185001-201412.nc | ||
| finalised: true | ||
| frequency: mon | ||
| grid_label: gn | ||
| instance_id: CMIP7.CMIP.CCCma.CanESM5.historical.r1i1p1f1.glb.mon.pr.tavg-u-hxy-u.gn.v0 | ||
| institution_id: CCCma | ||
| license_id: CC-BY-4.0 | ||
| long_name: Precipitation | ||
| mip_era: CMIP7 | ||
| nominal_resolution: 500 km | ||
| parent_activity_id: CMIP | ||
| parent_experiment_id: piControl | ||
| parent_mip_era: CMIP6 | ||
| parent_source_id: CanESM5 | ||
| parent_time_units: days since 1850-01-01 0:0:0.0 | ||
| parent_variant_label: r1i1p1f1 | ||
| realm: atmos | ||
| region: glb | ||
| source_id: CanESM5 | ||
| standard_name: precipitation_flux | ||
| start_time: '1850-01-16 12:00:00' | ||
| time_range: 1850-01-16 12:00:00-2014-12-16 12:00:00 | ||
| time_units: days since 1850-01-01 | ||
| tracking_id: hdl:21.14107/f8ed8043-a5d4-4d41-a798-cc7d01ef73e7 | ||
| units: kg m-2 s-1 | ||
| variable_id: pr | ||
| variant_label: r1i1p1f1 | ||
| version: v0 | ||
| - activity_id: CMIP | ||
| branch_time_in_child: 0.0 | ||
| branch_time_in_parent: 1223115.0 | ||
| branded_variable: tas_tavg-h2m-hxy-u | ||
| branding_suffix: tavg-h2m-hxy-u | ||
| calendar: 365_day | ||
| end_time: '2014-12-16 12:00:00' | ||
| experiment_id: historical | ||
| external_variables: areacella | ||
| filename: tas_tavg-h2m-hxy-u_mon_glb_gn_CanESM5_historical_r1i1p1f1_185001-201412.nc | ||
| finalised: true | ||
| frequency: mon | ||
| grid_label: gn | ||
| instance_id: CMIP7.CMIP.CCCma.CanESM5.historical.r1i1p1f1.glb.mon.tas.tavg-h2m-hxy-u.gn.v0 | ||
| institution_id: CCCma | ||
| license_id: CC-BY-4.0 | ||
| long_name: Near-Surface Air Temperature | ||
| mip_era: CMIP7 | ||
| nominal_resolution: 500 km | ||
| parent_activity_id: CMIP | ||
| parent_experiment_id: piControl | ||
| parent_mip_era: CMIP6 | ||
| parent_source_id: CanESM5 | ||
| parent_time_units: days since 1850-01-01 0:0:0.0 | ||
| parent_variant_label: r1i1p1f1 | ||
| realm: atmos | ||
| region: glb | ||
| source_id: CanESM5 | ||
| standard_name: air_temperature | ||
| start_time: '1850-01-16 12:00:00' | ||
| time_range: 1850-01-16 12:00:00-2014-12-16 12:00:00 | ||
| time_units: days since 1850-01-01 | ||
| tracking_id: hdl:21.14107/29fd6a7f-a383-46d5-9ca1-17b215ccbaf3 | ||
| units: K | ||
| variable_id: tas | ||
| variant_label: r1i1p1f1 | ||
| version: v0 | ||
| - activity_id: CMIP | ||
| branch_time_in_child: 0.0 | ||
| branch_time_in_parent: 1223115.0 | ||
| branded_variable: tas_tmaxavg-h2m-hxy-u | ||
| branding_suffix: tmaxavg-h2m-hxy-u | ||
| calendar: 365_day | ||
| end_time: '2014-12-16 12:00:00' | ||
| experiment_id: historical | ||
| external_variables: areacella | ||
| filename: tas_tmaxavg-h2m-hxy-u_mon_glb_gn_CanESM5_historical_r1i1p1f1_185001-201412.nc | ||
| finalised: true | ||
| frequency: mon | ||
| grid_label: gn | ||
| instance_id: CMIP7.CMIP.CCCma.CanESM5.historical.r1i1p1f1.glb.mon.tas.tmaxavg-h2m-hxy-u.gn.v0 | ||
| institution_id: CCCma | ||
| license_id: CC-BY-4.0 | ||
| long_name: Daily Maximum Near-Surface Air Temperature | ||
| mip_era: CMIP7 | ||
| nominal_resolution: 500 km | ||
| parent_activity_id: CMIP | ||
| parent_experiment_id: piControl | ||
| parent_mip_era: CMIP6 | ||
| parent_source_id: CanESM5 | ||
| parent_time_units: days since 1850-01-01 0:0:0.0 | ||
| parent_variant_label: r1i1p1f1 | ||
| realm: atmos | ||
| region: glb | ||
| source_id: CanESM5 | ||
| standard_name: air_temperature | ||
| start_time: '1850-01-16 12:00:00' | ||
| time_range: 1850-01-16 12:00:00-2014-12-16 12:00:00 | ||
| time_units: days since 1850-01-01 | ||
| tracking_id: hdl:21.14107/008f5a8c-a53d-4dfe-9e53-0f00474bcedc | ||
| units: K | ||
| variable_id: tas | ||
| variant_label: r1i1p1f1 | ||
| version: v0 | ||
| - activity_id: CMIP | ||
| branch_time_in_child: 0.0 | ||
| branch_time_in_parent: 1223115.0 | ||
| branded_variable: treeFrac_tavg-u-hxy-u | ||
| branding_suffix: tavg-u-hxy-u | ||
| calendar: 365_day | ||
| end_time: '2014-12-16 12:00:00' | ||
| experiment_id: historical | ||
| external_variables: areacella | ||
| filename: treeFrac_tavg-u-hxy-u_mon_glb_gn_CanESM5_historical_r1i1p1f1_185001-201412.nc | ||
| finalised: true | ||
| frequency: mon | ||
| grid_label: gn | ||
| instance_id: CMIP7.CMIP.CCCma.CanESM5.historical.r1i1p1f1.glb.mon.treeFrac.tavg-u-hxy-u.gn.v0 | ||
| institution_id: CCCma | ||
| license_id: CC-BY-4.0 | ||
| long_name: Tree Cover Percentage | ||
| mip_era: CMIP7 | ||
| nominal_resolution: 500 km | ||
| parent_activity_id: CMIP | ||
| parent_experiment_id: piControl | ||
| parent_mip_era: CMIP6 | ||
| parent_source_id: CanESM5 | ||
| parent_time_units: days since 1850-01-01 0:0:0.0 | ||
| parent_variant_label: r1i1p1f1 | ||
| realm: land | ||
| region: glb | ||
| source_id: CanESM5 | ||
| standard_name: area_fraction | ||
| start_time: '1850-01-16 12:00:00' | ||
| time_range: 1850-01-16 12:00:00-2014-12-16 12:00:00 | ||
| time_units: days since 1850-01-01 | ||
| tracking_id: hdl:21.14107/94383bfb-9df2-4833-a7a2-5ef82ec840b3 | ||
| units: '%' | ||
| variable_id: treeFrac | ||
| variant_label: r1i1p1f1 | ||
| version: v0 | ||
| - activity_id: CMIP | ||
| branch_time_in_child: 0.0 | ||
| branch_time_in_parent: 1223115.0 | ||
| branded_variable: vegFrac_tavg-u-hxy-u | ||
| branding_suffix: tavg-u-hxy-u | ||
| calendar: 365_day | ||
| end_time: '2014-12-16 12:00:00' | ||
| experiment_id: historical | ||
| external_variables: areacella | ||
| filename: vegFrac_tavg-u-hxy-u_mon_glb_gn_CanESM5_historical_r1i1p1f1_185001-201412.nc | ||
| finalised: true | ||
| frequency: mon | ||
| grid_label: gn | ||
| instance_id: CMIP7.CMIP.CCCma.CanESM5.historical.r1i1p1f1.glb.mon.vegFrac.tavg-u-hxy-u.gn.v0 | ||
| institution_id: CCCma | ||
| license_id: CC-BY-4.0 | ||
| long_name: Total Vegetated Percentage Cover | ||
| mip_era: CMIP7 | ||
| nominal_resolution: 500 km | ||
| parent_activity_id: CMIP | ||
| parent_experiment_id: piControl | ||
| parent_mip_era: CMIP6 | ||
| parent_source_id: CanESM5 | ||
| parent_time_units: days since 1850-01-01 0:0:0.0 | ||
| parent_variant_label: r1i1p1f1 | ||
| realm: land | ||
| region: glb | ||
| source_id: CanESM5 | ||
| standard_name: area_fraction | ||
| start_time: '1850-01-16 12:00:00' | ||
| time_range: 1850-01-16 12:00:00-2014-12-16 12:00:00 | ||
| time_units: days since 1850-01-01 | ||
| tracking_id: hdl:21.14107/135a2423-5f8c-4a79-a267-1e86132b4d82 | ||
| units: '%' | ||
| variable_id: vegFrac | ||
| variant_label: r1i1p1f1 | ||
| version: v0 | ||
11 changes: 11 additions & 0 deletions
11
packages/climate-ref-esmvaltool/tests/test-data/climate-drivers-for-fire/cmip7/manifest.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "catalog_hash": "0a33e7dc76794bea1cae3db045b63d108dd41457", | ||
| "committed": { | ||
| "diagnostic.json": "183d82f3963ad19b5a556b8025e6990c444f292adda1d464e12136d05a5ef3b3", | ||
| "output.json": "c7a2dd809d8e30636ec7b2410764b4f44a799c911bb10b4ee323a57f8c94b751", | ||
| "series.json": "37517e5f3dc66819f61f5a7bb8ace1921282415f10551d2defa5c3eb0985b570" | ||
| }, | ||
| "native": {}, | ||
| "schema": 1, | ||
| "test_case_version": 1 | ||
| } |
9 changes: 9 additions & 0 deletions
9
...-ref-esmvaltool/tests/test-data/climate-drivers-for-fire/cmip7/regression/diagnostic.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "DIMENSIONS": { | ||
| "json_structure": [] | ||
| }, | ||
| "DISCLAIMER": null, | ||
| "NOTES": null, | ||
| "PROVENANCE": null, | ||
| "RESULTS": {} | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win
Add the missing
areacellacatalogue record.These datasets all declare
external_variables: areacella, but this bundle never commits anareacellaentry — onlysftlfis present. That makes the regression case depend on ambient catalogue state instead of the committed fixture set, and can break consumers that load this YAML as the full dataset contract.