diff --git a/CITATION.cff b/CITATION.cff
index d71a67ed..225efb5c 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -22,7 +22,7 @@ authors:
given-names: "Martin"
orcid: "https://orcid.org/0000-0003-1770-2132"
title: "CMIP6 Controlled Vocabularies (CVs)"
-version: 6.2.58.69
+version: 6.2.58.70
doi: 10.5281/zenodo.12197150
date-released: 2024-08-02
url: "https://github.com/WCRP-CMIP/CMIP6_CVs"
diff --git a/CMIP6_DRS.json b/CMIP6_DRS.json
index 649a4ed7..862d7231 100644
--- a/CMIP6_DRS.json
+++ b/CMIP6_DRS.json
@@ -8,13 +8,13 @@
"filename_template":"_____[_].nc"
},
"version_metadata":{
- "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700",
- "CV_collection_version":"6.2.58.69",
+ "CV_collection_modified":"Fri Aug 2 13:17:27 2024 -0700",
+ "CV_collection_version":"6.2.58.70",
"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":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd",
+ "previous_commit":"025c791e0339878e1b13e5c3ffd41bff46eaa1b9",
"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 2104be3a..900e843a 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":"Fri Aug 2 12:57:50 2024 -0700",
- "CV_collection_version":"6.2.58.69",
+ "CV_collection_modified":"Fri Aug 2 13:17:27 2024 -0700",
+ "CV_collection_version":"6.2.58.70",
"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":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd",
+ "previous_commit":"025c791e0339878e1b13e5c3ffd41bff46eaa1b9",
"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 368f7bbc..b7965f71 100644
--- a/CMIP6_experiment_id.json
+++ b/CMIP6_experiment_id.json
@@ -9456,13 +9456,13 @@
}
},
"version_metadata":{
- "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700",
- "CV_collection_version":"6.2.58.69",
+ "CV_collection_modified":"Fri Aug 2 13:17:27 2024 -0700",
+ "CV_collection_version":"6.2.58.70",
"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":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd",
+ "previous_commit":"025c791e0339878e1b13e5c3ffd41bff46eaa1b9",
"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 d3d01c74..570ee945 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":"Fri Aug 2 12:57:50 2024 -0700",
- "CV_collection_version":"6.2.58.69",
+ "CV_collection_modified":"Fri Aug 2 13:17:27 2024 -0700",
+ "CV_collection_version":"6.2.58.70",
"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":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd",
+ "previous_commit":"025c791e0339878e1b13e5c3ffd41bff46eaa1b9",
"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 642d1333..090bdb2f 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":"Fri Aug 2 12:57:50 2024 -0700",
- "CV_collection_version":"6.2.58.69",
+ "CV_collection_modified":"Fri Aug 2 13:17:27 2024 -0700",
+ "CV_collection_version":"6.2.58.70",
"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":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd",
+ "previous_commit":"025c791e0339878e1b13e5c3ffd41bff46eaa1b9",
"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 12596a11..76b7879f 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":"Fri Aug 2 12:57:50 2024 -0700",
- "CV_collection_version":"6.2.58.69",
+ "CV_collection_modified":"Fri Aug 2 13:17:27 2024 -0700",
+ "CV_collection_version":"6.2.58.70",
"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":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd",
+ "previous_commit":"025c791e0339878e1b13e5c3ffd41bff46eaa1b9",
"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 072f9370..5b15ccab 100644
--- a/CMIP6_license.json
+++ b/CMIP6_license.json
@@ -21,13 +21,13 @@
}
},
"version_metadata":{
- "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700",
- "CV_collection_version":"6.2.58.69",
+ "CV_collection_modified":"Fri Aug 2 13:17:27 2024 -0700",
+ "CV_collection_version":"6.2.58.70",
"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":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd",
+ "previous_commit":"025c791e0339878e1b13e5c3ffd41bff46eaa1b9",
"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 cd39ffe9..b12dcd52 100644
--- a/CMIP6_nominal_resolution.json
+++ b/CMIP6_nominal_resolution.json
@@ -17,13 +17,13 @@
"5000 km"
],
"version_metadata":{
- "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700",
- "CV_collection_version":"6.2.58.69",
+ "CV_collection_modified":"Fri Aug 2 13:17:27 2024 -0700",
+ "CV_collection_version":"6.2.58.70",
"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":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd",
+ "previous_commit":"025c791e0339878e1b13e5c3ffd41bff46eaa1b9",
"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 a86a4918..326f8cee 100644
--- a/CMIP6_realm.json
+++ b/CMIP6_realm.json
@@ -10,11 +10,11 @@
"seaIce":"Sea Ice"
},
"version_metadata":{
- "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700",
- "CV_collection_version":"6.2.58.69",
+ "CV_collection_modified":"Fri Aug 2 13:17:27 2024 -0700",
+ "CV_collection_version":"6.2.58.70",
"author":"Paul J. Durack ",
"institution_id":"PCMDI",
- "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd",
+ "previous_commit":"025c791e0339878e1b13e5c3ffd41bff46eaa1b9",
"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 01ca0490..15a1b679 100644
--- a/CMIP6_required_global_attributes.json
+++ b/CMIP6_required_global_attributes.json
@@ -32,11 +32,11 @@
"variant_label"
],
"version_metadata":{
- "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700",
- "CV_collection_version":"6.2.58.69",
+ "CV_collection_modified":"Fri Aug 2 13:17:27 2024 -0700",
+ "CV_collection_version":"6.2.58.70",
"author":"Paul J. Durack ",
"institution_id":"PCMDI",
- "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd",
+ "previous_commit":"025c791e0339878e1b13e5c3ffd41bff46eaa1b9",
"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 cbdbc521..70e4c2bc 100644
--- a/CMIP6_source_id.json
+++ b/CMIP6_source_id.json
@@ -467,7 +467,7 @@
},
"ocean":{
"description":"FESOM 1.4 (unstructured grid in the horizontal with 126859 wet nodes; 46 levels; top grid cell 0-5 m)",
- "native_nominal_resolution":"50 km"
+ "native_nominal_resolution":"100 km"
},
"ocnBgchem":{
"description":"none",
@@ -475,7 +475,7 @@
},
"seaIce":{
"description":"FESOM 1.4",
- "native_nominal_resolution":"50 km"
+ "native_nominal_resolution":"100 km"
}
},
"release_year":"2018",
@@ -588,7 +588,7 @@
},
"ocean":{
"description":"FESOM 1.4 (unstructured grid in the horizontal with 126859 wet nodes; 46 levels; top grid cell 0-5 m)",
- "native_nominal_resolution":"50 km"
+ "native_nominal_resolution":"100 km"
},
"ocnBgchem":{
"description":"none",
@@ -596,7 +596,7 @@
},
"seaIce":{
"description":"FESOM 1.4",
- "native_nominal_resolution":"50 km"
+ "native_nominal_resolution":"100 km"
}
},
"release_year":"2018",
@@ -648,15 +648,15 @@
},
"ocean":{
"description":"FESOM 1.4 (unstructured grid in the horizontal with 126859 wet nodes; 46 levels; top grid cell 0-5 m)",
- "native_nominal_resolution":"50 km"
+ "native_nominal_resolution":"100 km"
},
"ocnBgchem":{
"description":"REcoM2 (same grid as ocean component)",
- "native_nominal_resolution":"50 km"
+ "native_nominal_resolution":"100 km"
},
"seaIce":{
"description":"FESOM 1.4 (same grid as ocean component)",
- "native_nominal_resolution":"50 km"
+ "native_nominal_resolution":"100 km"
}
},
"release_year":"2024",
@@ -8130,13 +8130,13 @@
}
},
"version_metadata":{
- "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700",
- "CV_collection_version":"6.2.58.69",
+ "CV_collection_modified":"Fri Aug 2 13:17:27 2024 -0700",
+ "CV_collection_version":"6.2.58.70",
"author":"Paul J. Durack ",
"institution_id":"PCMDI",
- "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd",
- "source_id_CV_modified":"Wed May 1 16:23:31 2024 -0700",
- "source_id_CV_note":"Deregistered source_id AWI-ESM-2-1-LR",
+ "previous_commit":"025c791e0339878e1b13e5c3ffd41bff46eaa1b9",
+ "source_id_CV_modified":"Fri Aug 2 12:57:50 2024 -0700",
+ "source_id_CV_note":"Revise multiple AWI source_id entries",
"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 efeccb63..f2e95493 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":"Fri Aug 2 12:57:50 2024 -0700",
- "CV_collection_version":"6.2.58.69",
+ "CV_collection_modified":"Fri Aug 2 13:17:27 2024 -0700",
+ "CV_collection_version":"6.2.58.70",
"author":"Paul J. Durack ",
"institution_id":"PCMDI",
- "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd",
+ "previous_commit":"025c791e0339878e1b13e5c3ffd41bff46eaa1b9",
"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 9ea1a8f7..199744c4 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":"Fri Aug 2 12:57:50 2024 -0700",
- "CV_collection_version":"6.2.58.69",
+ "CV_collection_modified":"Fri Aug 2 13:17:27 2024 -0700",
+ "CV_collection_version":"6.2.58.70",
"author":"Paul J. Durack ",
"institution_id":"PCMDI",
- "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd",
+ "previous_commit":"025c791e0339878e1b13e5c3ffd41bff46eaa1b9",
"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 9b9bc79b..2c2634ab 100644
--- a/CMIP6_table_id.json
+++ b/CMIP6_table_id.json
@@ -45,11 +45,11 @@
"fx"
],
"version_metadata":{
- "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700",
- "CV_collection_version":"6.2.58.69",
+ "CV_collection_modified":"Fri Aug 2 13:17:27 2024 -0700",
+ "CV_collection_version":"6.2.58.70",
"author":"Paul J. Durack ",
"institution_id":"PCMDI",
- "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd",
+ "previous_commit":"025c791e0339878e1b13e5c3ffd41bff46eaa1b9",
"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 411b109b..287c2b5c 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.69-brightgreen.svg)](https://github.com/WCRP-CMIP/CMIP6_CVs/releases/tag/6.2.58.69) [![DOI](https://zenodo.org/badge/62754800.svg)](https://zenodo.org/doi/10.5281/zenodo.12197150)
+# CMIP6_CVs [![stable version](https://img.shields.io/badge/Current%20version-6.2.58.70-brightgreen.svg)](https://github.com/WCRP-CMIP/CMIP6_CVs/releases/tag/6.2.58.70) [![DOI](https://zenodo.org/badge/62754800.svg)](https://zenodo.org/doi/10.5281/zenodo.12197150)
Core Controlled Vocabularies (CVs) for use in CMIP6
diff --git a/docs/CMIP6_experiment_id.html b/docs/CMIP6_experiment_id.html
index 909b2d58..2b927afd 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.69
+WCRP-CMIP CMIP6_CVs version: 6.2.58.70
Experiment IDs |
Institution IDs |
diff --git a/docs/CMIP6_institution_id.html b/docs/CMIP6_institution_id.html
index 6416b094..13faf5ed 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.69
+WCRP-CMIP CMIP6_CVs version: 6.2.58.70
Experiment IDs |
Institution IDs |
diff --git a/docs/CMIP6_source_id.html b/docs/CMIP6_source_id.html
index 02172622..6681c1be 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.69
+WCRP-CMIP CMIP6_CVs version: 6.2.58.70
Experiment IDs |
Institution IDs |
@@ -225,7 +225,7 @@
ECHAM6.3.04p1 (T63L47 native atmosphere T63 gaussian grid; 192 x 96 longitude/latitude; 47 levels; top level 80 km) |
250 km |
FESOM 1.4 (unstructured grid in the horizontal with 126859 wet nodes; 46 levels; top grid cell 0-5 m) |
-50 km |
+100 km |
none |
none |
none |
@@ -265,7 +265,7 @@
ECHAM6.3.04p1 (T63L47 native atmosphere T63 gaussian grid; 192 x 96 longitude/latitude; 47 levels; top level 80 km) |
250 km |
FESOM 1.4 (unstructured grid in the horizontal with 126859 wet nodes; 46 levels; top grid cell 0-5 m) |
-50 km |
+100 km |
none |
none |
none |
@@ -285,7 +285,7 @@
ECHAM6.3.04p1 (T63L47 native atmosphere T63 gaussian grid; 192 x 96 longitude/latitude; 47 levels; top level 80 km) |
250 km |
FESOM 1.4 (unstructured grid in the horizontal with 126859 wet nodes; 46 levels; top grid cell 0-5 m) |
-50 km |
+100 km |
none |
none |
none |
diff --git a/docs/CMIP6_source_id_citation.html b/docs/CMIP6_source_id_citation.html
index 08d89a46..cdc8c031 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.69
+ WCRP-CMIP CMIP6_CVs version: 6.2.58.70
Experiment IDs |
diff --git a/docs/CMIP6_source_id_experiment_citation.html b/docs/CMIP6_source_id_experiment_citation.html
index dba19228..1b7e5ad5 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.69
+ WCRP-CMIP CMIP6_CVs version: 6.2.58.70
Experiment IDs |
diff --git a/docs/CMIP6_source_id_licenses.html b/docs/CMIP6_source_id_licenses.html
index 51d1ca17..01489626 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.69
+ WCRP-CMIP CMIP6_CVs version: 6.2.58.70
Experiment IDs |
diff --git a/mip_era.json b/mip_era.json
index 801906e5..93b7019b 100644
--- a/mip_era.json
+++ b/mip_era.json
@@ -7,13 +7,13 @@
"CMIP6"
],
"version_metadata":{
- "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700",
- "CV_collection_version":"6.2.58.69",
+ "CV_collection_modified":"Fri Aug 2 13:17:27 2024 -0700",
+ "CV_collection_version":"6.2.58.70",
"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":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd",
+ "previous_commit":"025c791e0339878e1b13e5c3ffd41bff46eaa1b9",
"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 4f0a7c46..d4acfe41 100644
Binary files a/src/citation.json.gz and b/src/citation.json.gz differ
diff --git a/src/citation_expts.json.gz b/src/citation_expts.json.gz
index 22270c1d..d3e3efab 100644
Binary files a/src/citation_expts.json.gz and b/src/citation_expts.json.gz differ
diff --git a/src/versionHistory.json b/src/versionHistory.json
index 660e6340..0ad814c3 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":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd",
- "URL":"https://github.com/WCRP-CMIP/CMIP6_CVs/commit/d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd",
- "commitMessage":"Deregistered source_id AWI-ESM-2-1-LR",
- "timeStamp":"Fri Aug 2 12:57:50 2024 -0700"
+ "MD5":"025c791e0339878e1b13e5c3ffd41bff46eaa1b9",
+ "URL":"https://github.com/WCRP-CMIP/CMIP6_CVs/commit/025c791e0339878e1b13e5c3ffd41bff46eaa1b9",
+ "commitMessage":"Revise multiple AWI source_id entries",
+ "timeStamp":"Fri Aug 2 13:17:27 2024 -0700"
},
"source_type":{
"MD5":"fa3f07e9c215b35e0a54737acba2c2a9f6b8901f",
@@ -91,7 +91,7 @@
"timeStamp":"Fri Jan 13 09:27:00 2017 -0700"
},
"versions":{
- "versionCVCommit":69,
+ "versionCVCommit":70,
"versionCVContent":58,
"versionCVStructure":2,
"versionMIPEra":6
diff --git a/src/writeJson.py b/src/writeJson.py
index 4890eb03..5c63766c 100644
--- a/src/writeJson.py
+++ b/src/writeJson.py
@@ -72,6 +72,7 @@
PJD 3 Jul 2024 - Added CITATION.cff version management
PJD 29 Jul 2024 - Revised source_id AWI-ESM-1-REcoM https://github.com/WCRP-CMIP/CMIP6_CVs/issues/1220
PJD 2 Aug 2024 - Deregistered source_id AWI-ESM-2-1-LR https://github.com/WCRP-CMIP/CMIP6_CVs/issues/1220#issuecomment-2265990964
+PJD 2 Aug 2024 - Revise multiple AWI source_id entries https://github.com/WCRP-CMIP/CMIP6_CVs/issues/1236
- 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
@@ -79,7 +80,7 @@
"""
# %% Set commit message and author info
-commitMessage = '"Deregistered source_id AWI-ESM-2-1-LR"'
+commitMessage = '"Revise multiple AWI source_id entries"'
# author = 'Matthew Mizielinski '
# author_institution_id = 'MOHC'
author = "Paul J. Durack "
@@ -637,34 +638,17 @@
# Fix issues
# License
-key = "AWI-ESM-1-REcoM"
-print("processing:", key)
-licenseId = "CC BY 4.0"
-source_id[key]["cohort"] = ["Published"]
-source_id[key]["license_info"]["exceptions_contact"] = "@awi.de <- mip-contact"
-source_id[key]["license_info"][
- "history"
-] = "2024-07-04: 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"]["source_specific_info"] = ""
-source_id[key]["license_info"]["url"] = licenseUrl
-# activity_participation
-source_id[key]["activity_participation"] = [
- "C4MIP",
- "CDRMIP",
- "CMIP",
- "ScenarioMIP",
-]
-
-# deregister AWI-ESM-2-1-LR
-key = "AWI-ESM-2-1-LR"
-source_id.pop(key)
+key = "AWI-CM-1-1-LR"
+source_id[key]["model_component"]["ocean"]["native_nominal_resolution"] = "100 km"
+source_id[key]["model_component"]["seaIce"]["native_nominal_resolution"] = "100 km"
+key = "AWI-ESM-1-1-LR"
+source_id[key]["model_component"]["ocean"]["native_nominal_resolution"] = "100 km"
+source_id[key]["model_component"]["seaIce"]["native_nominal_resolution"] = "100 km"
+key = "AWI-ESM-1-REcoM"
+source_id[key]["model_component"]["ocean"]["native_nominal_resolution"] = "100 km"
+source_id[key]["model_component"]["ocnBgchem"]["native_nominal_resolution"] = "100 km"
+source_id[key]["model_component"]["seaIce"]["native_nominal_resolution"] = "100 km"
# Example fresh publication, no previous data
# key = "CanESM5-1"