From 908bb4e3885ae09cd4155a3a0914635de1d42a26 Mon Sep 17 00:00:00 2001
From: "Paul J. Durack"
Date: Thu, 28 Mar 2024 23:25:52 +0100
Subject: [PATCH] Issue177 durack1 revise source_id GISS-E2-1-H (#1226)
---
CMIP6_DRS.json | 6 +-
CMIP6_activity_id.json | 6 +-
CMIP6_experiment_id.json | 6 +-
CMIP6_frequency.json | 6 +-
CMIP6_grid_label.json | 6 +-
CMIP6_institution_id.json | 6 +-
CMIP6_license.json | 6 +-
CMIP6_nominal_resolution.json | 6 +-
CMIP6_realm.json | 6 +-
CMIP6_required_global_attributes.json | 6 +-
CMIP6_source_id.json | 12 +--
CMIP6_source_type.json | 6 +-
CMIP6_sub_experiment_id.json | 6 +-
CMIP6_table_id.json | 6 +-
README.md | 2 +-
docs/CMIP6_experiment_id.html | 2 +-
docs/CMIP6_institution_id.html | 2 +-
docs/CMIP6_source_id.html | 4 +-
docs/CMIP6_source_id_citation.html | 2 +-
docs/CMIP6_source_id_experiment_citation.html | 2 +-
docs/CMIP6_source_id_licenses.html | 2 +-
mip_era.json | 6 +-
src/citation.json.gz | Bin 9951 -> 9951 bytes
src/citation_expts.json.gz | Bin 45340 -> 45340 bytes
src/versionHistory.json | 10 +-
src/writeJson.py | 90 ++----------------
26 files changed, 67 insertions(+), 145 deletions(-)
diff --git a/CMIP6_DRS.json b/CMIP6_DRS.json
index 88f01c06..58320c44 100644
--- a/CMIP6_DRS.json
+++ b/CMIP6_DRS.json
@@ -8,13 +8,13 @@
"filename_template":"_____[_].nc"
},
"version_metadata":{
- "CV_collection_modified":"Thu Mar 28 14:38:25 2024 -0700",
- "CV_collection_version":"6.2.58.65",
+ "CV_collection_modified":"Thu Mar 28 15:14:13 2024 -0700",
+ "CV_collection_version":"6.2.58.66",
"DRS_CV_modified":"Tue Jun 7 14:29:45 2022 -0700",
"DRS_CV_note":"Add CMIP6 Data Reference Syntax (DRS) templates",
"author":"Paul J. Durack ",
"institution_id":"PCMDI",
- "previous_commit":"dc457131d86fbda6625f21ab5b373cd03a9f066f",
+ "previous_commit":"08dc9e6b7e6381a79bf1ca0c5a663f57cd8ecc34",
"specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
}
}
\ No newline at end of file
diff --git a/CMIP6_activity_id.json b/CMIP6_activity_id.json
index 89e8eccc..dd1f6b25 100644
--- a/CMIP6_activity_id.json
+++ b/CMIP6_activity_id.json
@@ -26,13 +26,13 @@
"VolMIP":"Volcanic Forcings Model Intercomparison Project"
},
"version_metadata":{
- "CV_collection_modified":"Thu Mar 28 14:38:25 2024 -0700",
- "CV_collection_version":"6.2.58.65",
+ "CV_collection_modified":"Thu Mar 28 15:14:13 2024 -0700",
+ "CV_collection_version":"6.2.58.66",
"activity_id_CV_modified":"Mon Mar 5 16:39:09 2018 -0800",
"activity_id_CV_note":"Update activity_id to include CDRMIP and PAMIP",
"author":"Paul J. Durack ",
"institution_id":"PCMDI",
- "previous_commit":"dc457131d86fbda6625f21ab5b373cd03a9f066f",
+ "previous_commit":"08dc9e6b7e6381a79bf1ca0c5a663f57cd8ecc34",
"specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
}
}
\ No newline at end of file
diff --git a/CMIP6_experiment_id.json b/CMIP6_experiment_id.json
index 4a73babf..e4f08792 100644
--- a/CMIP6_experiment_id.json
+++ b/CMIP6_experiment_id.json
@@ -9456,13 +9456,13 @@
}
},
"version_metadata":{
- "CV_collection_modified":"Thu Mar 28 14:38:25 2024 -0700",
- "CV_collection_version":"6.2.58.65",
+ "CV_collection_modified":"Thu Mar 28 15:14:13 2024 -0700",
+ "CV_collection_version":"6.2.58.66",
"author":"Paul J. Durack ",
"experiment_id_CV_modified":"Tue Dec 15 12:25:59 2020 -0800",
"experiment_id_CV_note":"Revise experiment_id historical parent experiments",
"institution_id":"PCMDI",
- "previous_commit":"dc457131d86fbda6625f21ab5b373cd03a9f066f",
+ "previous_commit":"08dc9e6b7e6381a79bf1ca0c5a663f57cd8ecc34",
"specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
}
}
\ No newline at end of file
diff --git a/CMIP6_frequency.json b/CMIP6_frequency.json
index 09f6f911..1d6573e6 100644
--- a/CMIP6_frequency.json
+++ b/CMIP6_frequency.json
@@ -18,13 +18,13 @@
"yrPt":"sampled yearly, at specified time point within the time period"
},
"version_metadata":{
- "CV_collection_modified":"Thu Mar 28 14:38:25 2024 -0700",
- "CV_collection_version":"6.2.58.65",
+ "CV_collection_modified":"Thu Mar 28 15:14:13 2024 -0700",
+ "CV_collection_version":"6.2.58.66",
"author":"Paul J. Durack ",
"frequency_CV_modified":"Mon May 24 13:48:15 2021 00100",
"frequency_CV_note":"Update description of 3hr and 6hr frequencies",
"institution_id":"PCMDI",
- "previous_commit":"dc457131d86fbda6625f21ab5b373cd03a9f066f",
+ "previous_commit":"08dc9e6b7e6381a79bf1ca0c5a663f57cd8ecc34",
"specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
}
}
\ No newline at end of file
diff --git a/CMIP6_grid_label.json b/CMIP6_grid_label.json
index 3723ab58..fa10ac81 100644
--- a/CMIP6_grid_label.json
+++ b/CMIP6_grid_label.json
@@ -47,13 +47,13 @@
"grz":"regridded zonal mean data reported on the data provider's preferred latitude target grid"
},
"version_metadata":{
- "CV_collection_modified":"Thu Mar 28 14:38:25 2024 -0700",
- "CV_collection_version":"6.2.58.65",
+ "CV_collection_modified":"Thu Mar 28 15:14:13 2024 -0700",
+ "CV_collection_version":"6.2.58.66",
"author":"Paul J. Durack ",
"grid_label_CV_modified":"Fri Sep 8 18:12:00 2017 -0700",
"grid_label_CV_note":"Issue395 durack1 augment grid_label with description (#401)",
"institution_id":"PCMDI",
- "previous_commit":"dc457131d86fbda6625f21ab5b373cd03a9f066f",
+ "previous_commit":"08dc9e6b7e6381a79bf1ca0c5a663f57cd8ecc34",
"specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
}
}
\ No newline at end of file
diff --git a/CMIP6_institution_id.json b/CMIP6_institution_id.json
index 9220bc12..54f7109e 100644
--- a/CMIP6_institution_id.json
+++ b/CMIP6_institution_id.json
@@ -51,13 +51,13 @@
"UHH":"Universitat Hamburg, Hamburg 20148, Germany"
},
"version_metadata":{
- "CV_collection_modified":"Thu Mar 28 14:38:25 2024 -0700",
- "CV_collection_version":"6.2.58.65",
+ "CV_collection_modified":"Thu Mar 28 15:14:13 2024 -0700",
+ "CV_collection_version":"6.2.58.66",
"author":"Paul J. Durack ",
"institution_id":"PCMDI",
"institution_id_CV_modified":"Mon Aug 15 21:41:00 2022 -0700",
"institution_id_CV_note":"Register institution_id UCSB for E3SM-1-0",
- "previous_commit":"dc457131d86fbda6625f21ab5b373cd03a9f066f",
+ "previous_commit":"08dc9e6b7e6381a79bf1ca0c5a663f57cd8ecc34",
"specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
}
}
\ No newline at end of file
diff --git a/CMIP6_license.json b/CMIP6_license.json
index 4541cc02..29bfd901 100644
--- a/CMIP6_license.json
+++ b/CMIP6_license.json
@@ -21,13 +21,13 @@
}
},
"version_metadata":{
- "CV_collection_modified":"Thu Mar 28 14:38:25 2024 -0700",
- "CV_collection_version":"6.2.58.65",
+ "CV_collection_modified":"Thu Mar 28 15:14:13 2024 -0700",
+ "CV_collection_version":"6.2.58.66",
"author":"Paul J. Durack ",
"institution_id":"PCMDI",
"license_CV_modified":"Tue May 24 11:20:06 2022 -0700",
"license_CV_note":"Update published source_id entries with rights; augment license",
- "previous_commit":"dc457131d86fbda6625f21ab5b373cd03a9f066f",
+ "previous_commit":"08dc9e6b7e6381a79bf1ca0c5a663f57cd8ecc34",
"specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
}
}
\ No newline at end of file
diff --git a/CMIP6_nominal_resolution.json b/CMIP6_nominal_resolution.json
index f4055488..54de2b87 100644
--- a/CMIP6_nominal_resolution.json
+++ b/CMIP6_nominal_resolution.json
@@ -17,13 +17,13 @@
"5000 km"
],
"version_metadata":{
- "CV_collection_modified":"Thu Mar 28 14:38:25 2024 -0700",
- "CV_collection_version":"6.2.58.65",
+ "CV_collection_modified":"Thu Mar 28 15:14:13 2024 -0700",
+ "CV_collection_version":"6.2.58.66",
"author":"Paul J. Durack ",
"institution_id":"PCMDI",
"nominal_resolution_CV_modified":"Tues Nov 15 16:04:00 2016 -0700",
"nominal_resolution_CV_note":"Issue141 durack1 update grid_resolution to nominal_resolution (#143)",
- "previous_commit":"dc457131d86fbda6625f21ab5b373cd03a9f066f",
+ "previous_commit":"08dc9e6b7e6381a79bf1ca0c5a663f57cd8ecc34",
"specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
}
}
\ No newline at end of file
diff --git a/CMIP6_realm.json b/CMIP6_realm.json
index f60d3b9c..265245df 100644
--- a/CMIP6_realm.json
+++ b/CMIP6_realm.json
@@ -10,11 +10,11 @@
"seaIce":"Sea Ice"
},
"version_metadata":{
- "CV_collection_modified":"Thu Mar 28 14:38:25 2024 -0700",
- "CV_collection_version":"6.2.58.65",
+ "CV_collection_modified":"Thu Mar 28 15:14:13 2024 -0700",
+ "CV_collection_version":"6.2.58.66",
"author":"Paul J. Durack ",
"institution_id":"PCMDI",
- "previous_commit":"dc457131d86fbda6625f21ab5b373cd03a9f066f",
+ "previous_commit":"08dc9e6b7e6381a79bf1ca0c5a663f57cd8ecc34",
"realm_CV_modified":"Tues Apr 18 12:03:00 2017 -0700",
"realm_CV_note":"Issue285 durack1 update realm format (#290)",
"specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
diff --git a/CMIP6_required_global_attributes.json b/CMIP6_required_global_attributes.json
index 8c07e223..d1429e9b 100644
--- a/CMIP6_required_global_attributes.json
+++ b/CMIP6_required_global_attributes.json
@@ -32,11 +32,11 @@
"variant_label"
],
"version_metadata":{
- "CV_collection_modified":"Thu Mar 28 14:38:25 2024 -0700",
- "CV_collection_version":"6.2.58.65",
+ "CV_collection_modified":"Thu Mar 28 15:14:13 2024 -0700",
+ "CV_collection_version":"6.2.58.66",
"author":"Paul J. Durack ",
"institution_id":"PCMDI",
- "previous_commit":"dc457131d86fbda6625f21ab5b373cd03a9f066f",
+ "previous_commit":"08dc9e6b7e6381a79bf1ca0c5a663f57cd8ecc34",
"required_global_attributes_CV_modified":"Thu Dec 19 15:32:17 2019 -0800",
"required_global_attributes_CV_note":"Reverting addition of external_variables to required_global_attributes",
"specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
diff --git a/CMIP6_source_id.json b/CMIP6_source_id.json
index 816e3ade..8738577a 100644
--- a/CMIP6_source_id.json
+++ b/CMIP6_source_id.json
@@ -4507,7 +4507,7 @@
"native_nominal_resolution":"none"
},
"ocean":{
- "description":"HYCOM Ocean (~1 degree tripolar grid; 360 x 180 longitude/latitude; 32 levels; top grid cell 0-10 m)",
+ "description":"HYCOM Ocean (~1 degree tripolar grid; 360 x 180 longitude/latitude; 33 levels; top grid cell 0-10 m)",
"native_nominal_resolution":"100 km"
},
"ocnBgchem":{
@@ -8187,13 +8187,13 @@
}
},
"version_metadata":{
- "CV_collection_modified":"Thu Mar 28 14:38:25 2024 -0700",
- "CV_collection_version":"6.2.58.65",
+ "CV_collection_modified":"Thu Mar 28 15:14:13 2024 -0700",
+ "CV_collection_version":"6.2.58.66",
"author":"Paul J. Durack ",
"institution_id":"PCMDI",
- "previous_commit":"dc457131d86fbda6625f21ab5b373cd03a9f066f",
- "source_id_CV_modified":"Thu Mar 28 13:39:10 2024 -0700",
- "source_id_CV_note":"Registered source_id EC-Earth3-ESM-1",
+ "previous_commit":"08dc9e6b7e6381a79bf1ca0c5a663f57cd8ecc34",
+ "source_id_CV_modified":"Thu Mar 28 14:38:25 2024 -0700",
+ "source_id_CV_note":"Revised source_id GISS-E2-1-H",
"specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
}
}
\ No newline at end of file
diff --git a/CMIP6_source_type.json b/CMIP6_source_type.json
index c1923070..be410ad0 100644
--- a/CMIP6_source_type.json
+++ b/CMIP6_source_type.json
@@ -12,11 +12,11 @@
"SLAB":"slab-ocean used with an AGCM in representing the atmosphere-ocean coupled system"
},
"version_metadata":{
- "CV_collection_modified":"Thu Mar 28 14:38:25 2024 -0700",
- "CV_collection_version":"6.2.58.65",
+ "CV_collection_modified":"Thu Mar 28 15:14:13 2024 -0700",
+ "CV_collection_version":"6.2.58.66",
"author":"Paul J. Durack ",
"institution_id":"PCMDI",
- "previous_commit":"dc457131d86fbda6625f21ab5b373cd03a9f066f",
+ "previous_commit":"08dc9e6b7e6381a79bf1ca0c5a663f57cd8ecc34",
"source_type_CV_modified":"Fri Sep 8 17:57:00 2017 -0700",
"source_type_CV_note":"Issue396 durack1 augment source_type with description (#399)",
"specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
diff --git a/CMIP6_sub_experiment_id.json b/CMIP6_sub_experiment_id.json
index 599e9857..b31c4f9a 100644
--- a/CMIP6_sub_experiment_id.json
+++ b/CMIP6_sub_experiment_id.json
@@ -76,11 +76,11 @@
"s2029":"initialized near end of year 2029"
},
"version_metadata":{
- "CV_collection_modified":"Thu Mar 28 14:38:25 2024 -0700",
- "CV_collection_version":"6.2.58.65",
+ "CV_collection_modified":"Thu Mar 28 15:14:13 2024 -0700",
+ "CV_collection_version":"6.2.58.66",
"author":"Paul J. Durack ",
"institution_id":"PCMDI",
- "previous_commit":"dc457131d86fbda6625f21ab5b373cd03a9f066f",
+ "previous_commit":"08dc9e6b7e6381a79bf1ca0c5a663f57cd8ecc34",
"specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)",
"sub_experiment_id_CV_modified":"Mon Jun 17 11:01:51 2019 -0700",
"sub_experiment_id_CV_note":"Revise sub_experiment_id values"
diff --git a/CMIP6_table_id.json b/CMIP6_table_id.json
index 950bc47c..264859aa 100644
--- a/CMIP6_table_id.json
+++ b/CMIP6_table_id.json
@@ -45,11 +45,11 @@
"fx"
],
"version_metadata":{
- "CV_collection_modified":"Thu Mar 28 14:38:25 2024 -0700",
- "CV_collection_version":"6.2.58.65",
+ "CV_collection_modified":"Thu Mar 28 15:14:13 2024 -0700",
+ "CV_collection_version":"6.2.58.66",
"author":"Paul J. Durack ",
"institution_id":"PCMDI",
- "previous_commit":"dc457131d86fbda6625f21ab5b373cd03a9f066f",
+ "previous_commit":"08dc9e6b7e6381a79bf1ca0c5a663f57cd8ecc34",
"specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)",
"table_id_CV_modified":"Fri Jan 13 09:27:00 2017 -0700",
"table_id_CV_note":"Issue199 durack1 update table_id to Data Request v1.0 (#200)"
diff --git a/README.md b/README.md
index d7b16eb6..0c77a63d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# CMIP6_CVs [![stable version](https://img.shields.io/badge/Current%20version-6.2.58.65-brightgreen.svg)](https://github.com/WCRP-CMIP/CMIP6_CVs/releases/tag/6.2.58.65)
+# CMIP6_CVs [![stable version](https://img.shields.io/badge/Current%20version-6.2.58.66-brightgreen.svg)](https://github.com/WCRP-CMIP/CMIP6_CVs/releases/tag/6.2.58.66)
Core Controlled Vocabularies (CVs) for use in CMIP6
diff --git a/docs/CMIP6_experiment_id.html b/docs/CMIP6_experiment_id.html
index 4dfe7999..8126c510 100644
--- a/docs/CMIP6_experiment_id.html
+++ b/docs/CMIP6_experiment_id.html
@@ -21,7 +21,7 @@
CMIP6 experiment_id values
-WCRP-CMIP CMIP6_CVs version: 6.2.58.65
+WCRP-CMIP CMIP6_CVs version: 6.2.58.66
Experiment IDs |
Institution IDs |
diff --git a/docs/CMIP6_institution_id.html b/docs/CMIP6_institution_id.html
index 66f2b8df..068cc9eb 100644
--- a/docs/CMIP6_institution_id.html
+++ b/docs/CMIP6_institution_id.html
@@ -20,7 +20,7 @@
CMIP6 institution_id values
-
WCRP-CMIP CMIP6_CVs version: 6.2.58.65
+WCRP-CMIP CMIP6_CVs version: 6.2.58.66
Experiment IDs |
Institution IDs |
diff --git a/docs/CMIP6_source_id.html b/docs/CMIP6_source_id.html
index bb2522bd..0261739f 100644
--- a/docs/CMIP6_source_id.html
+++ b/docs/CMIP6_source_id.html
@@ -20,7 +20,7 @@
CMIP6 source_id values
-
WCRP-CMIP CMIP6_CVs version: 6.2.58.65
+WCRP-CMIP CMIP6_CVs version: 6.2.58.66
Experiment IDs |
Institution IDs |
@@ -1544,7 +1544,7 @@
GISS-E2.1H |
GISS-E2.1 (2.5x2 degree; 144 x 90 longitude/latitude; 40 levels; top level 0.1 hPa) |
250 km |
-HYCOM Ocean (~1 degree tripolar grid; 360 x 180 longitude/latitude; 32 levels; top grid cell 0-10 m) |
+HYCOM Ocean (~1 degree tripolar grid; 360 x 180 longitude/latitude; 33 levels; top grid cell 0-10 m) |
100 km |
none |
none |
diff --git a/docs/CMIP6_source_id_citation.html b/docs/CMIP6_source_id_citation.html
index 6f9e9240..f4a2b022 100644
--- a/docs/CMIP6_source_id_citation.html
+++ b/docs/CMIP6_source_id_citation.html
@@ -22,7 +22,7 @@
CMIP6 Source ID Citation details details
-
WCRP-CMIP CMIP6_CVs version: 6.2.58.65
+ WCRP-CMIP CMIP6_CVs version: 6.2.58.66
Experiment IDs |
diff --git a/docs/CMIP6_source_id_experiment_citation.html b/docs/CMIP6_source_id_experiment_citation.html
index dd8f60d3..9d333f56 100644
--- a/docs/CMIP6_source_id_experiment_citation.html
+++ b/docs/CMIP6_source_id_experiment_citation.html
@@ -22,7 +22,7 @@
CMIP6 Source ID Citation details by experiment details
-
WCRP-CMIP CMIP6_CVs version: 6.2.58.65
+ WCRP-CMIP CMIP6_CVs version: 6.2.58.66
Experiment IDs |
diff --git a/docs/CMIP6_source_id_licenses.html b/docs/CMIP6_source_id_licenses.html
index 13570544..a2aa67e9 100644
--- a/docs/CMIP6_source_id_licenses.html
+++ b/docs/CMIP6_source_id_licenses.html
@@ -22,7 +22,7 @@
CMIP6 source_id license details
-
WCRP-CMIP CMIP6_CVs version: 6.2.58.65
+ WCRP-CMIP CMIP6_CVs version: 6.2.58.66
Experiment IDs |
diff --git a/mip_era.json b/mip_era.json
index 63e0bcdb..a6608add 100644
--- a/mip_era.json
+++ b/mip_era.json
@@ -7,13 +7,13 @@
"CMIP6"
],
"version_metadata":{
- "CV_collection_modified":"Thu Mar 28 14:38:25 2024 -0700",
- "CV_collection_version":"6.2.58.65",
+ "CV_collection_modified":"Thu Mar 28 15:14:13 2024 -0700",
+ "CV_collection_version":"6.2.58.66",
"author":"Paul J. Durack ",
"institution_id":"PCMDI",
"mip_era_CV_modified":"Thu Aug 25 17:21:00 2016 -0700",
"mip_era_CV_note":"Fix #36 - Add CV name to json structure",
- "previous_commit":"dc457131d86fbda6625f21ab5b373cd03a9f066f",
+ "previous_commit":"08dc9e6b7e6381a79bf1ca0c5a663f57cd8ecc34",
"specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
}
}
\ No newline at end of file
diff --git a/src/citation.json.gz b/src/citation.json.gz
index dbcccdf8fb1489cbc1ee3b63aa3a747044b32e24..27d660e113873f5d8686f2b4c2bce1a8c9ebcd67 100644
GIT binary patch
delta 15
Wcmccbd*7E$zMF$X?afBEn`!_tMg`#j
delta 15
Wcmccbd*7E$zMF&N(BqA4H`M?%!3J~y
diff --git a/src/citation_expts.json.gz b/src/citation_expts.json.gz
index f4a17f768377045faea21be4f2f24cb67bad489f..2cb06ea4fbe22ad8b1b826f19f2049ac34cec160 100644
GIT binary patch
delta 17
ZcmbR9h-uCvCN}wQ4vr0PHnNFr1OPw>2HOAt
delta 17
ZcmbR9h-uCvCN}wQ4i2v;8`;D*0suXG25kTU
diff --git a/src/versionHistory.json b/src/versionHistory.json
index 199e3d73..e9575626 100644
--- a/src/versionHistory.json
+++ b/src/versionHistory.json
@@ -67,10 +67,10 @@
"timeStamp":"Thu Dec 19 15:32:17 2019 -0800"
},
"source_id":{
- "MD5":"dc457131d86fbda6625f21ab5b373cd03a9f066f",
- "URL":"https://github.com/WCRP-CMIP/CMIP6_CVs/commit/dc457131d86fbda6625f21ab5b373cd03a9f066f",
- "commitMessage":"Registered source_id EC-Earth3-ESM-1",
- "timeStamp":"Thu Mar 28 14:38:25 2024 -0700"
+ "MD5":"08dc9e6b7e6381a79bf1ca0c5a663f57cd8ecc34",
+ "URL":"https://github.com/WCRP-CMIP/CMIP6_CVs/commit/08dc9e6b7e6381a79bf1ca0c5a663f57cd8ecc34",
+ "commitMessage":"Revised source_id GISS-E2-1-H",
+ "timeStamp":"Thu Mar 28 15:14:13 2024 -0700"
},
"source_type":{
"MD5":"fa3f07e9c215b35e0a54737acba2c2a9f6b8901f",
@@ -91,7 +91,7 @@
"timeStamp":"Fri Jan 13 09:27:00 2017 -0700"
},
"versions":{
- "versionCVCommit":65,
+ "versionCVCommit":66,
"versionCVContent":58,
"versionCVStructure":2,
"versionMIPEra":6
diff --git a/src/writeJson.py b/src/writeJson.py
index d0d26af1..191c2c5c 100644
--- a/src/writeJson.py
+++ b/src/writeJson.py
@@ -63,6 +63,7 @@
PJD 25 Jan 2024 - Registered source_id E3SM-2-1 https://github.com/WCRP-CMIP/CMIP6_CVs/issues/1218
PJD 28 Mar 2024 - Revised source_id EC-Earth3-GrIS https://github.com/WCRP-CMIP/CMIP6_CVs/issues/1223
PJD 28 Mar 2024 - Registered source_id EC-Earth3-ESM-1 https://github.com/WCRP-CMIP/CMIP6_CVs/issues/1222
+PJD 28 Mar 2024 - Revised source_id GISS-E2-1-H https://github.com/WCRP-CMIP/CMIP6_CVs/issues/177
- TODO: Review all start/end_year pairs for experiments https://github.com/WCRP-CMIP/CMIP6_CVs/issues/845
- TODO: Generate table_id from dataRequest https://github.com/WCRP-CMIP/CMIP6_CVs/issues/166
@@ -70,7 +71,7 @@
"""
# %% Set commit message and author info
-commitMessage = '"Registered source_id EC-Earth3-ESM-1"'
+commitMessage = '"Revised source_id GISS-E2-1-H"'
# author = 'Matthew Mizielinski '
# author_institution_id = 'MOHC'
author = "Paul J. Durack "
@@ -627,91 +628,12 @@
del tmp
# Fix issues
-key = "EC-Earth3-ESM-1"
-source_id[key] = {}
-source_id[key]["activity_participation"] = [
- "C4MIP",
- "CDRMIP",
- "CMIP",
- "DCPP",
- "LUMIP",
- "OMIP",
- "ScenarioMIP",
-]
-source_id[key]["cohort"] = [
- "Registered",
-]
-source_id[key]["institution_id"] = [
- "EC-Earth-Consortium",
-]
-source_id[key]["label"] = key
-source_id[key]["label_extended"] = key
-source_id[key]["model_component"] = {}
-source_id[key]["model_component"]["aerosol"] = {}
-source_id[key]["model_component"]["aerosol"]["description"] = "none"
-source_id[key]["model_component"]["aerosol"]["native_nominal_resolution"] = "none"
-source_id[key]["model_component"]["atmos"] = {}
-source_id[key]["model_component"]["atmos"]["description"] = " ".join(
- [
- "IFS cy36r4 (TL255, linearly reduced Gaussian grid",
- "equivalent to 512 x 256 longitude/latitude;",
- "91 levels; top level 0.01 hPa) and co2box v1.0",
- "(CO2 box model; global grid)",
- ]
-)
-source_id[key]["model_component"]["atmos"]["native_nominal_resolution"] = "100 km"
-source_id[key]["model_component"]["atmosChem"] = {}
-source_id[key]["model_component"]["atmosChem"]["description"] = "none"
-source_id[key]["model_component"]["atmosChem"]["native_nominal_resolution"] = "none"
-source_id[key]["model_component"]["land"] = {}
-source_id[key]["model_component"]["land"]["description"] = " ".join(
- [
- "HTESSEL (land surface scheme built in IFS) and",
- "LPJ-GUESS v4.1.2 (same grid as atmos)",
- ]
-)
-source_id[key]["model_component"]["land"]["native_nominal_resolution"] = "100 km"
-source_id[key]["model_component"]["landIce"] = {}
-source_id[key]["model_component"]["landIce"][
+key = "GISS-E2-1-H"
+source_id[key]["model_component"]["ocean"][
"description"
-] = "PISM v1.2 (5 km x 5 km for Greenland, 31 levels)"
-source_id[key]["model_component"]["landIce"]["native_nominal_resolution"] = "5 km"
-source_id[key]["model_component"]["ocean"] = {}
-source_id[key]["model_component"]["ocean"]["description"] = " ".join(
- [
- "NEMO3.6 (ORCA1 tripolar primarily 1 degree",
- "with meridional refinement down to 1/3 degree",
- "in the tropics; 362 x 292 longitude/latitude;",
- "75 levels; top grid cell 0-1 m) and MWE v1.0",
- "(Melt Water Emulator; same grid as ocean for",
- "Antarctic surroundings)",
- ]
-)
+] = "HYCOM Ocean (~1 degree tripolar grid; 360 x 180 longitude/latitude; 33 levels; top grid cell 0-10 m)"
source_id[key]["model_component"]["ocean"]["native_nominal_resolution"] = "100 km"
-source_id[key]["model_component"]["ocnBgchem"] = {}
-source_id[key]["model_component"]["ocnBgchem"][
- "description"
-] = "PISCES v2 (same grid as ocean)"
-source_id[key]["model_component"]["ocnBgchem"]["native_nominal_resolution"] = "100 km"
-source_id[key]["model_component"]["seaIce"] = {}
-source_id[key]["model_component"]["seaIce"]["description"] = "LIM3 (same grid as ocean)"
-source_id[key]["model_component"]["seaIce"]["native_nominal_resolution"] = "100 km"
-source_id[key]["release_year"] = "2024"
-source_id[key]["source_id"] = key
-# License info
-licenseId = "CC BY 4.0"
-source_id[key]["license_info"] = {}
-source_id[key]["license_info"]["exceptions_contact"] = "@ec-earth.org <- cmip6-data"
-source_id[key]["license_info"][
- "history"
-] = "" # "2022-xx-xx: initially published under CC BY 4.0"
-source_id[key]["license_info"]["id"] = licenseId
-licenseStr = license["license_options"][licenseId]["license_id"]
-licenseUrl = license["license_options"][licenseId]["license_url"]
-source_id[key]["license_info"]["license"] = "".join(
- [licenseStr, " (", licenseId, "; ", licenseUrl, ")"]
-)
-source_id[key]["license_info"]["url"] = licenseUrl
+
# Example fresh publication, no previous data
# key = "CanESM5-1"