Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/export-cmor-cvs-table.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
ESGVOC_REVISION: "5145b8f6d8b1859c663e63fb7b0bad952e8bc7b5"
# Modify these as needed
UNIVERSE_CVS_FORK: "znichollscr"
UNIVERSE_CVS_BRANCH: "add-abrupt-experiments"
UNIVERSE_CVS_BRANCH: "add-amip-experiments"
CMIP7_CVS_FORK: ${{ github.event.pull_request.head.repo.owner.login }}
CMIP7_CVS_BRANCH: ${{ github.head_ref || github.ref_name }}
run: |
Expand Down
5 changes: 4 additions & 1 deletion activity/c4mip.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
"type": "activity",
"experiments": [
"1pctco2-bgc",
"1pctco2-rad"
"1pctco2-rad",
"esm-flat10",
"esm-flat10-cdr",
"esm-flat10-zec"
],
"urls": [
"https://doi.org/10.5194/egusphere-2024-3356",
Expand Down
4 changes: 3 additions & 1 deletion activity/cfmip.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
"type": "activity",
"experiments": [
"abrupt-0p5xco2",
"abrupt-2xco2"
"abrupt-2xco2",
"amip-p4k",
"amip-piforcing"
],
"urls": [
"https://doi.org/10.5194/gmd-10-359-2017"
Expand Down
9 changes: 8 additions & 1 deletion activity/cmip.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@
"type": "activity",
"experiments": [
"1pctco2",
"abrupt-4xco2"
"abrupt-4xco2",
"amip",
"esm-hist",
"esm-picontrol",
"esm-picontrol-spinup",
"historical",
"picontrol",
"picontrol-spinup"
],
"urls": [
"https://doi.org/10.5194/gmd-18-6671-2025"
Expand Down
13 changes: 13 additions & 0 deletions activity/damip.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"@context": "000_context.jsonld",
"id": "damip",
"type": "activity",
"experiments": [
"hist-aer",
"hist-ghg",
"hist-nat"
],
"urls": [
"https://doi.org/10.5194/gmd-18-4399-2025"
]
}
12 changes: 12 additions & 0 deletions activity/pmip.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"@context": "000_context.jsonld",
"id": "pmip",
"type": "activity",
"experiments": [
"abrupt-127k"
],
"urls": [
"https://doi.org/10.5194/cp-19-883-2023",
"https://doi.org/10.5194/gmd-10-3979-2017"
]
}
204 changes: 187 additions & 17 deletions cmor-cvs.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions create-cmor-cvs-table-export-environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ python3.13 -m venv venv
ESGVOC_FORK="znichollscr"
ESGVOC_REVISION="5145b8f6d8b1859c663e63fb7b0bad952e8bc7b5"
UNIVERSE_CVS_FORK="znichollscr"
UNIVERSE_CVS_BRANCH="add-abrupt-experiments"
UNIVERSE_CVS_BRANCH="add-amip-experiments"
CMIP7_CVS_FORK="znichollscr"
CMIP7_CVS_BRANCH="add-abrupt-experiments"
CMIP7_CVS_BRANCH="add-amip-experiments"

venv/bin/pip install -r requirements-cmor-cvs-table.txt
venv/bin/pip install --no-deps "git+https://github.com/$ESGVOC_FORK/esgf-vocab.git@$ESGVOC_REVISION"
Expand Down
8 changes: 8 additions & 0 deletions experiment/abrupt-127k.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"@context": "000_context.jsonld",
"id": "abrupt-127k",
"type": "experiment",
"min_number_yrs_per_sim": 100.0,
"parent_mip_era": "cmip7",
"tier": 1
}
10 changes: 10 additions & 0 deletions experiment/amip-p4k.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"@context": "000_context.jsonld",
"id": "amip-p4k",
"type": "experiment",
"start_timestamp": "1979-01-01",
"end_timestamp": "2021-12-31",
"min_number_yrs_per_sim": 43.0,
"parent_mip_era": "cmip7",
"tier": 1
}
10 changes: 10 additions & 0 deletions experiment/amip-piforcing.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"@context": "000_context.jsonld",
"id": "amip-piforcing",
"type": "experiment",
"start_timestamp": "1870-01-01",
"end_timestamp": "2021-12-31",
"min_number_yrs_per_sim": 152.0,
"parent_mip_era": "cmip7",
"tier": 1
}
10 changes: 10 additions & 0 deletions experiment/amip.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"@context": "000_context.jsonld",
"id": "amip",
"type": "experiment",
"start_timestamp": "1979-01-01",
"end_timestamp": "2021-12-31",
"min_number_yrs_per_sim": 43.0,
"parent_mip_era": "cmip7",
"tier": 1
}
7 changes: 7 additions & 0 deletions experiment/esm-flat10-cdr.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"@context": "000_context.jsonld",
"id": "esm-flat10-cdr",
"type": "experiment",
"parent_mip_era": "cmip7",
"tier": 1
}
7 changes: 7 additions & 0 deletions experiment/esm-flat10-zec.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"@context": "000_context.jsonld",
"id": "esm-flat10-zec",
"type": "experiment",
"parent_mip_era": "cmip7",
"tier": 1
}
7 changes: 7 additions & 0 deletions experiment/esm-flat10.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"@context": "000_context.jsonld",
"id": "esm-flat10",
"type": "experiment",
"parent_mip_era": "cmip7",
"tier": 1
}
3 changes: 2 additions & 1 deletion experiment/esm-hist.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
"@context": "000_context.jsonld",
"id": "esm-hist",
"type": "experiment",
"start_timestamp": "1850-01-01",
"end_timestamp": "2021-12-31",
"min_number_yrs_per_sim": 172,
"min_number_yrs_per_sim": 172.0,
"parent_mip_era": "cmip7",
"tier": 1
}
5 changes: 4 additions & 1 deletion experiment/esm-picontrol-spinup.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"@context": "000_context.jsonld",
"id": "esm-picontrol-spinup",
"type": "experiment"
"type": "experiment",
"min_number_yrs_per_sim": null,
"parent_mip_era": null,
"tier": 3
}
1 change: 1 addition & 0 deletions experiment/esm-picontrol.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"@context": "000_context.jsonld",
"id": "esm-picontrol",
"type": "experiment",
"min_number_yrs_per_sim": 400.0,
"parent_mip_era": "cmip7",
"tier": 1
}
12 changes: 12 additions & 0 deletions experiment/hist-aer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"@context": "000_context.jsonld",
"id": "hist-aer",
"type": "experiment",
"description": "Response to historical aerosol forcing (with extension using forcings from the `m` scenario simulation). All other conditions are kept the same as piControl.",
"start_timestamp": "1850-01-01",
"end_timestamp": "2035-12-31",
"min_number_yrs_per_sim": 186.0,
"min_ensemble_size": 3,
"parent_mip_era": "cmip7",
"tier": 1
}
12 changes: 12 additions & 0 deletions experiment/hist-ghg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"@context": "000_context.jsonld",
"id": "hist-ghg",
"type": "experiment",
"description": "Response to historical aerosol forcing (with extension using forcings from the `m` scenario simulation). All other conditions are kept the same as piControl.",
"start_timestamp": "1850-01-01",
"end_timestamp": "2035-12-31",
"min_number_yrs_per_sim": 186.0,
"min_ensemble_size": 3,
"parent_mip_era": "cmip7",
"tier": 1
}
12 changes: 12 additions & 0 deletions experiment/hist-nat.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"@context": "000_context.jsonld",
"id": "hist-nat",
"type": "experiment",
"description": "Response to historical aerosol forcing (with extension using forcings from the `m` scenario simulation). All other conditions are kept the same as piControl.",
"start_timestamp": "1850-01-01",
"end_timestamp": "2035-12-31",
"min_number_yrs_per_sim": 186.0,
"min_ensemble_size": 3,
"parent_mip_era": "cmip7",
"tier": 1
}
3 changes: 2 additions & 1 deletion experiment/historical.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
"@context": "000_context.jsonld",
"id": "historical",
"type": "experiment",
"start_timestamp": "1850-01-01",
"end_timestamp": "2021-12-31",
"min_number_yrs_per_sim": 172,
"min_number_yrs_per_sim": 172.0,
"parent_mip_era": "cmip7",
"tier": 1
}
5 changes: 4 additions & 1 deletion experiment/picontrol-spinup.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"@context": "000_context.jsonld",
"id": "picontrol-spinup",
"type": "experiment"
"type": "experiment",
"min_number_yrs_per_sim": null,
"parent_mip_era": null,
"tier": 3
}
1 change: 1 addition & 0 deletions experiment/picontrol.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"@context": "000_context.jsonld",
"id": "picontrol",
"type": "experiment",
"min_number_yrs_per_sim": 400.0,
"parent_mip_era": "cmip7",
"tier": 1
}