conflict cleanup WCRP-CMIP#1027

SrayPen · Jun 21, 2021 · a408768 · a408768
2 parents 6634422 + 02457c7
commit a408768
Show file tree

Hide file tree

Showing 19 changed files with 208 additions and 5 deletions.
diff --git a/CMIP6_activity_id.json b/CMIP6_activity_id.json
@@ -26,13 +26,22 @@
         "VolMIP":"Volcanic Forcings Model Intercomparison Project"
     },
     "version_metadata":{
+<<<<<<< HEAD
         "CV_collection_modified":"Mon Jun 21 11:11:27 2021 -0700",
         "CV_collection_version":"6.2.56.1",
+=======
+        "CV_collection_modified":"Mon Jun 21 11:22:45 2021 -0700",
+        "CV_collection_version":"6.2.56.2",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "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 <[email protected]>",
         "institution_id":"PCMDI",
+<<<<<<< HEAD
         "previous_commit":"20e34fd439edd35343fcde97a3eae6d3e323a4ef",
+=======
+        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }
diff --git a/CMIP6_experiment_id.json b/CMIP6_experiment_id.json
@@ -9456,13 +9456,22 @@
         }
     },
     "version_metadata":{
+<<<<<<< HEAD
         "CV_collection_modified":"Mon Jun 21 11:11:27 2021 -0700",
         "CV_collection_version":"6.2.56.1",
+=======
+        "CV_collection_modified":"Mon Jun 21 11:22:45 2021 -0700",
+        "CV_collection_version":"6.2.56.2",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "author":"Paul J. Durack <[email protected]>",
         "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",
+<<<<<<< HEAD
         "previous_commit":"20e34fd439edd35343fcde97a3eae6d3e323a4ef",
+=======
+        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }
diff --git a/CMIP6_frequency.json b/CMIP6_frequency.json
@@ -18,13 +18,22 @@
         "yrPt":"sampled yearly, at specified time point within the time period"
     },
     "version_metadata":{
+<<<<<<< HEAD
         "CV_collection_modified":"Mon Jun 21 11:11:27 2021 -0700",
         "CV_collection_version":"6.2.56.1",
+=======
+        "CV_collection_modified":"Mon Jun 21 11:22:45 2021 -0700",
+        "CV_collection_version":"6.2.56.2",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "author":"Paul J. Durack <[email protected]>",
         "frequency_CV_modified":"Mon May 24 13:48:15 2021 00100",
         "frequency_CV_note":"Update description of 3hr and 6hr frequencies",
         "institution_id":"PCMDI",
+<<<<<<< HEAD
         "previous_commit":"20e34fd439edd35343fcde97a3eae6d3e323a4ef",
+=======
+        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }
diff --git a/CMIP6_grid_label.json b/CMIP6_grid_label.json
@@ -47,13 +47,22 @@
         "grz":"regridded zonal mean data reported on the data provider's preferred latitude target grid"
     },
     "version_metadata":{
+<<<<<<< HEAD
         "CV_collection_modified":"Mon Jun 21 11:11:27 2021 -0700",
         "CV_collection_version":"6.2.56.1",
+=======
+        "CV_collection_modified":"Mon Jun 21 11:22:45 2021 -0700",
+        "CV_collection_version":"6.2.56.2",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "author":"Paul J. Durack <[email protected]>",
         "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",
+<<<<<<< HEAD
         "previous_commit":"20e34fd439edd35343fcde97a3eae6d3e323a4ef",
+=======
+        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }
diff --git a/CMIP6_institution_id.json b/CMIP6_institution_id.json
@@ -55,13 +55,22 @@
         "UofT":"Department of Physics, University of Toronto, 60 St George Street, Toronto, ON M5S1A7, Canada"
     },
     "version_metadata":{
+<<<<<<< HEAD
         "CV_collection_modified":"Mon Jun 21 11:11:27 2021 -0700",
         "CV_collection_version":"6.2.56.1",
+=======
+        "CV_collection_modified":"Mon Jun 21 11:22:45 2021 -0700",
+        "CV_collection_version":"6.2.56.2",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "author":"Paul J. Durack <[email protected]>",
         "institution_id":"PCMDI",
         "institution_id_CV_modified":"Mon Nov 16 11:16:39 2020 -0800",
         "institution_id_CV_note":"Register institution_id LLNL; Py3 cleanup",
+<<<<<<< HEAD
         "previous_commit":"20e34fd439edd35343fcde97a3eae6d3e323a4ef",
+=======
+        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }
diff --git a/CMIP6_license.json b/CMIP6_license.json
@@ -3,13 +3,22 @@
         "CMIP6 model data produced by <Your Centre Name> is licensed under a Creative Commons Attribution-[NonCommercial-]ShareAlike 4.0 International License (https://creativecommons.org/licenses). Consult https://pcmdi.llnl.gov/CMIP6/TermsOfUse for terms of use governing CMIP6 output, including citation requirements and proper acknowledgment. Further information about this data, including some limitations, can be found via the further_info_url (recorded as a global attribute in this file)[ and at <some URL maintained by modeling group>]. The data producers and data providers make no warranty, either express or implied, including, but not limited to, warranties of merchantability and fitness for a particular purpose. All liabilities arising from the supply of the information (including any liability arising in negligence) are excluded to the fullest extent permitted by law."
     ],
     "version_metadata":{
+<<<<<<< HEAD
         "CV_collection_modified":"Mon Jun 21 11:11:27 2021 -0700",
         "CV_collection_version":"6.2.56.1",
+=======
+        "CV_collection_modified":"Mon Jun 21 11:22:45 2021 -0700",
+        "CV_collection_version":"6.2.56.2",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "author":"Paul J. Durack <[email protected]>",
         "institution_id":"PCMDI",
         "license_CV_modified":"Mon Feb 27 10:30:00 2017 -0700",
         "license_CV_note":"Issue225 durack1 add institution_id THU (#232)",
+<<<<<<< HEAD
         "previous_commit":"20e34fd439edd35343fcde97a3eae6d3e323a4ef",
+=======
+        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }
diff --git a/CMIP6_nominal_resolution.json b/CMIP6_nominal_resolution.json
@@ -17,13 +17,22 @@
         "5000 km"
     ],
     "version_metadata":{
+<<<<<<< HEAD
         "CV_collection_modified":"Mon Jun 21 11:11:27 2021 -0700",
         "CV_collection_version":"6.2.56.1",
+=======
+        "CV_collection_modified":"Mon Jun 21 11:22:45 2021 -0700",
+        "CV_collection_version":"6.2.56.2",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "author":"Paul J. Durack <[email protected]>",
         "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)",
+<<<<<<< HEAD
         "previous_commit":"20e34fd439edd35343fcde97a3eae6d3e323a4ef",
+=======
+        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }
diff --git a/CMIP6_realm.json b/CMIP6_realm.json
@@ -10,11 +10,19 @@
         "seaIce":"Sea Ice"
     },
     "version_metadata":{
+<<<<<<< HEAD
         "CV_collection_modified":"Mon Jun 21 11:11:27 2021 -0700",
         "CV_collection_version":"6.2.56.1",
         "author":"Paul J. Durack <[email protected]>",
         "institution_id":"PCMDI",
         "previous_commit":"20e34fd439edd35343fcde97a3eae6d3e323a4ef",
+=======
+        "CV_collection_modified":"Mon Jun 21 11:22:45 2021 -0700",
+        "CV_collection_version":"6.2.56.2",
+        "author":"Paul J. Durack <[email protected]>",
+        "institution_id":"PCMDI",
+        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "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
@@ -32,11 +32,19 @@
         "variant_label"
     ],
     "version_metadata":{
+<<<<<<< HEAD
         "CV_collection_modified":"Mon Jun 21 11:11:27 2021 -0700",
         "CV_collection_version":"6.2.56.1",
         "author":"Paul J. Durack <[email protected]>",
         "institution_id":"PCMDI",
         "previous_commit":"20e34fd439edd35343fcde97a3eae6d3e323a4ef",
+=======
+        "CV_collection_modified":"Mon Jun 21 11:22:45 2021 -0700",
+        "CV_collection_version":"6.2.56.2",
+        "author":"Paul J. Durack <[email protected]>",
+        "institution_id":"PCMDI",
+        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "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
@@ -5087,6 +5087,58 @@
             "source_id":"IPSL-CM6A-LR-INCA"
         },
         "IPSL-CM6A-MR025":{
+<<<<<<< HEAD
+=======
+            "activity_participation":[
+                "CMIP"
+            ],
+            "cohort":[
+                "Registered"
+            ],
+            "institution_id":[
+                "IPSL"
+            ],
+            "label":"IPSL-CM6A-MR025",
+            "label_extended":"IPSL-CM6A-MR025",
+            "model_component":{
+                "aerosol":{
+                    "description":"none",
+                    "native_nominal_resolution":"none"
+                },
+                "atmos":{
+                    "description":"LMDZ (NPv6; 256 x 256 longitude/latitude; 79 levels; top level 80000 m)",
+                    "native_nominal_resolution":"100 km"
+                },
+                "atmosChem":{
+                    "description":"none",
+                    "native_nominal_resolution":"none"
+                },
+                "land":{
+                    "description":"ORCHIDEE (v2.2, Water/Carbon/Energy mode; same grid as atmos)",
+                    "native_nominal_resolution":"100 km"
+                },
+                "landIce":{
+                    "description":"none",
+                    "native_nominal_resolution":"none"
+                },
+                "ocean":{
+                    "description":"NEMO-OPA (eORCA025, tripolar primarily 0.25deg; 1442 x 1207 longitude/latitude; 75 levels; top grid cell 0-2 m)",
+                    "native_nominal_resolution":"25 km"
+                },
+                "ocnBgchem":{
+                    "description":"none",
+                    "native_nominal_resolution":"none"
+                },
+                "seaIce":{
+                    "description":"NEMO-LIM3 (same grid as ocean)",
+                    "native_nominal_resolution":"25 km"
+                }
+            },
+            "release_year":"2021",
+            "source_id":"IPSL-CM6A-MR025"
+        },
+        "IPSL-CM6A-MR1":{
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
             "activity_participation":[
                 "CMIP"
             ],
@@ -7372,12 +7424,21 @@
         }
     },
     "version_metadata":{
+<<<<<<< HEAD
         "CV_collection_modified":"Mon Jun 21 11:11:27 2021 -0700",
         "CV_collection_version":"6.2.56.1",
         "author":"Paul J. Durack <[email protected]>",
         "institution_id":"PCMDI",
         "previous_commit":"20e34fd439edd35343fcde97a3eae6d3e323a4ef",
         "source_id_CV_modified":"Fri Apr 30 14:11:32 2021 -0700",
+=======
+        "CV_collection_modified":"Mon Jun 21 11:22:45 2021 -0700",
+        "CV_collection_version":"6.2.56.2",
+        "author":"Paul J. Durack <[email protected]>",
+        "institution_id":"PCMDI",
+        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+        "source_id_CV_modified":"Mon Jun 21 11:06:44 2021 -0700",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "source_id_CV_note":"Register source_id IPSL-CM6A-MR025",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }

diff --git a/CMIP6_source_type.json b/CMIP6_source_type.json
@@ -12,11 +12,19 @@
         "SLAB":"slab-ocean used with an AGCM in representing the atmosphere-ocean coupled system"
     },
     "version_metadata":{
+<<<<<<< HEAD
         "CV_collection_modified":"Mon Jun 21 11:11:27 2021 -0700",
         "CV_collection_version":"6.2.56.1",
         "author":"Paul J. Durack <[email protected]>",
         "institution_id":"PCMDI",
         "previous_commit":"20e34fd439edd35343fcde97a3eae6d3e323a4ef",
+=======
+        "CV_collection_modified":"Mon Jun 21 11:22:45 2021 -0700",
+        "CV_collection_version":"6.2.56.2",
+        "author":"Paul J. Durack <[email protected]>",
+        "institution_id":"PCMDI",
+        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "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
@@ -76,11 +76,19 @@
         "s2029":"initialized near end of year 2029"
     },
     "version_metadata":{
+<<<<<<< HEAD
         "CV_collection_modified":"Mon Jun 21 11:11:27 2021 -0700",
         "CV_collection_version":"6.2.56.1",
         "author":"Paul J. Durack <[email protected]>",
         "institution_id":"PCMDI",
         "previous_commit":"20e34fd439edd35343fcde97a3eae6d3e323a4ef",
+=======
+        "CV_collection_modified":"Mon Jun 21 11:22:45 2021 -0700",
+        "CV_collection_version":"6.2.56.2",
+        "author":"Paul J. Durack <[email protected]>",
+        "institution_id":"PCMDI",
+        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "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
@@ -45,11 +45,19 @@
         "fx"
     ],
     "version_metadata":{
+<<<<<<< HEAD
         "CV_collection_modified":"Mon Jun 21 11:11:27 2021 -0700",
         "CV_collection_version":"6.2.56.1",
         "author":"Paul J. Durack <[email protected]>",
         "institution_id":"PCMDI",
         "previous_commit":"20e34fd439edd35343fcde97a3eae6d3e323a4ef",
+=======
+        "CV_collection_modified":"Mon Jun 21 11:22:45 2021 -0700",
+        "CV_collection_version":"6.2.56.2",
+        "author":"Paul J. Durack <[email protected]>",
+        "institution_id":"PCMDI",
+        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+>>>>>>> 02457c7108099bf0590f3b6cb361f51e1c0c3182
         "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
@@ -1,4 +1,4 @@
-# CMIP6_CVs [![stable version](https://img.shields.io/badge/Current%20version-6.2.56.1-brightgreen.svg)](https://github.com/WCRP-CMIP/CMIP6_CVs/releases/tag/6.2.56.1)
+# CMIP6_CVs [![stable version](https://img.shields.io/badge/Current%20version-6.2.56.2-brightgreen.svg)](https://github.com/WCRP-CMIP/CMIP6_CVs/releases/tag/6.2.56.2)
 
 Core Controlled Vocabularies (CVs) for use in CMIP6
 

diff --git a/docs/CMIP6_experiment_id.html b/docs/CMIP6_experiment_id.html
@@ -19,7 +19,7 @@
 <title>CMIP6 experiment_id values</title>
 </head>
 <body>
-<p>WCRP-CMIP CMIP6_CVs version: 6.2.56.1</p>
+<p>WCRP-CMIP CMIP6_CVs version: 6.2.56.2</p>
 <table id="table_id" class="display">
 <thead>
 <tr>

diff --git a/docs/CMIP6_institution_id.html b/docs/CMIP6_institution_id.html
@@ -19,7 +19,7 @@
 <title>CMIP6 institution_id values</title>
 </head>
 <body>
-<p>WCRP-CMIP CMIP6_CVs version: 6.2.56.1</p>
+<p>WCRP-CMIP CMIP6_CVs version: 6.2.56.2</p>
 <table id="table_id" class="display">
 <thead>
 <tr>