Merge pull request #124 from PCMDI/issue123_durack1_RegisterPCMDI-AMI…

…P-1-1-8
PCMDI · Jun 14, 2022 · bb8b903 · bb8b903
2 parents 5987861 + 548772a
commit bb8b903
Show file tree

Hide file tree

Showing 26 changed files with 58 additions and 51 deletions.
diff --git a/Tables/input4MIPs_A3hr.json b/Tables/input4MIPs_A3hr.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"atmos",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_A3hr"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_A3hrPt.json b/Tables/input4MIPs_A3hrPt.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"atmos",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_A3hrPt"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_Afx.json b/Tables/input4MIPs_Afx.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"atmos land",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_Afx"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_Ayr.json b/Tables/input4MIPs_Ayr.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"atmos atmosChem",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_Ayr"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_CV.json b/Tables/input4MIPs_CV.json
@@ -105,7 +105,7 @@
             "UofMD":"University of Maryland (UofMD), College Park, MD 20742, USA",
             "VUA":"Vrije Universiteit Amsterdam, De Boelelaan 1105, 1081 HV Amsterdam, Netherlands"
         },
-        "license":"<Your_Data_Identifier> 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 input4MIPs 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). 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.",
+        "license":"<Your_Data_Identifier> data produced by <Your_Centre_Name> is licensed under a Creative Commons Attribution 4.0 International (CC BY 4.0; https://creativecommons.org/licenses/by/4.0/) License. Consult https://pcmdi.llnl.gov/CMIP6/TermsOfUse for terms of use governing input4MIPs 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). 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.",
         "mip_era":[
             "CMIP1",
             "CMIP2",
@@ -1005,7 +1005,7 @@
                 "target_mip":"CMIP",
                 "title":"PCMDI-AMIP 1.1.7 dataset prepared for input4MIPs"
             },
-            "PCMDI-AMIP-1-2-0":{
+            "PCMDI-AMIP-1-1-8":{
                 "calendar":"gregorian",
                 "comment":"Based on Hurrell SST/sea ice consistency criteria applied to merged HadISST (1870-01 to 1981-10) & NCEP-0I2 (1981-11 to 2021-12)",
                 "contact":"PCMDI (pcmdi-cmip@llnl.gov)",
@@ -1015,17 +1015,17 @@
                 "grid_label":"gn",
                 "institution":"Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA",
                 "institution_id":"PCMDI",
-                "mip_era":"CMIP6Plus",
+                "mip_era":"CMIP6",
                 "nominal_resolution":"1x1 degree",
                 "product":"observations",
                 "references":"Taylor, K.E., D. Williamson and F. Zwiers, 2000: The sea surface temperature and sea ice concentration boundary conditions for AMIP II simulations. PCMDI Report 60, Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, 25 pp. Available online: https://pcmdi.llnl.gov/report/pdf/60.pdf",
                 "region":[
                     "global_ocean"
                 ],
                 "release_year":"2022",
-                "source":"PCMDI-AMIP 1.2.0: Merged SST based on UK MetOffice HadISST and NCEP OI2",
+                "source":"PCMDI-AMIP 1.1.8: Merged SST based on UK MetOffice HadISST and NCEP OI2",
                 "source_description":"Sea surface temperature and sea-ice datasets produced by PCMDI (LLNL) for the AMIP (DECK) experiment of CMIP6",
-                "source_id":"PCMDI-AMIP-1-2-0",
+                "source_id":"PCMDI-AMIP-1-1-8",
                 "source_type":"satellite_blended",
                 "source_variables":[
                     "areacello",
@@ -1035,9 +1035,9 @@
                     "tos",
                     "tosbcs"
                 ],
-                "source_version":"1.2.0",
+                "source_version":"1.1.8",
                 "target_mip":"CMIP",
-                "title":"PCMDI-AMIP 1.2.0 dataset prepared for input4MIPs"
+                "title":"PCMDI-AMIP 1.1.8 dataset prepared for input4MIPs"
             },
             "UKESM1-0-LL-ssp585-1-0":{
                 "comment":"Prepared using CMIP6 model UKESM1-0-LL as input. A combination of historical and ssp585 datasets were used to create this ISMIP6 forcing dataset",

diff --git a/Tables/input4MIPs_LIday.json b/Tables/input4MIPs_LIday.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"landIce",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_LIday"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_LIfx.json b/Tables/input4MIPs_LIfx.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"landIce",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_LIfx"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_LIyr.json b/Tables/input4MIPs_LIyr.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"landIce land",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_LIyr"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_LIyrAnt.json b/Tables/input4MIPs_LIyrAnt.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"landIce",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_LIyrAnt"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_LIyrC.json b/Tables/input4MIPs_LIyrC.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"landIce",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_LIyrC"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_LIyrGre.json b/Tables/input4MIPs_LIyrGre.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"landIce",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_LIyrGre"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_Lday.json b/Tables/input4MIPs_Lday.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"land",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_Lday"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_Lyr.json b/Tables/input4MIPs_Lyr.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"land",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_Lyr"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_Oday.json b/Tables/input4MIPs_Oday.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"ocean",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_Oday"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_Ofx.json b/Tables/input4MIPs_Ofx.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"ocean",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_Ofx"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_Omon.json b/Tables/input4MIPs_Omon.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"ocean",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_Omon"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_OmonC.json b/Tables/input4MIPs_OmonC.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"ocean",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_OmonC"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_Oyr.json b/Tables/input4MIPs_Oyr.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"ocean",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_Oyr"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_OyrC.json b/Tables/input4MIPs_OyrC.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"ocean",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_OyrC"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_SI3hrPt.json b/Tables/input4MIPs_SI3hrPt.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"seaIce",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_SI3hrPt"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_SIday.json b/Tables/input4MIPs_SIday.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"seaIce",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_SIday"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_SImon.json b/Tables/input4MIPs_SImon.json
@@ -10,7 +10,7 @@
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"seaIce",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_SImon"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_grids.json b/Tables/input4MIPs_grids.json
@@ -6,7 +6,7 @@
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
-        "table_date":"08 March 2022",
+        "table_date":"14 June 2022",
         "table_id":"Table input4MIPs_grids"
     },
     "axis_entry":{

diff --git a/input4MIPs_license.json b/input4MIPs_license.json
@@ -1,3 +1,3 @@
 {
-    "license1":"<Your_Data_Identifier> 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 input4MIPs 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). 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."
+    "license1":"<Your_Data_Identifier> data produced by <Your_Centre_Name> is licensed under a Creative Commons Attribution 4.0 International (CC BY 4.0; https://creativecommons.org/licenses/by/4.0/) License. Consult https://pcmdi.llnl.gov/CMIP6/TermsOfUse for terms of use governing input4MIPs 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). 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."
 }
diff --git a/input4MIPs_source_id.json b/input4MIPs_source_id.json
@@ -763,7 +763,7 @@
             "target_mip":"CMIP",
             "title":"PCMDI-AMIP 1.1.7 dataset prepared for input4MIPs"
         },
-        "PCMDI-AMIP-1-2-0":{
+        "PCMDI-AMIP-1-1-8":{
             "calendar":"gregorian",
             "comment":"Based on Hurrell SST/sea ice consistency criteria applied to merged HadISST (1870-01 to 1981-10) & NCEP-0I2 (1981-11 to 2021-12)",
             "contact":"PCMDI (pcmdi-cmip@llnl.gov)",
@@ -773,17 +773,17 @@
             "grid_label":"gn",
             "institution":"Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA",
             "institution_id":"PCMDI",
-            "mip_era":"CMIP6Plus",
+            "mip_era":"CMIP6",
             "nominal_resolution":"1x1 degree",
             "product":"observations",
             "references":"Taylor, K.E., D. Williamson and F. Zwiers, 2000: The sea surface temperature and sea ice concentration boundary conditions for AMIP II simulations. PCMDI Report 60, Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, 25 pp. Available online: https://pcmdi.llnl.gov/report/pdf/60.pdf",
             "region":[
                 "global_ocean"
             ],
             "release_year":"2022",
-            "source":"PCMDI-AMIP 1.2.0: Merged SST based on UK MetOffice HadISST and NCEP OI2",
+            "source":"PCMDI-AMIP 1.1.8: Merged SST based on UK MetOffice HadISST and NCEP OI2",
             "source_description":"Sea surface temperature and sea-ice datasets produced by PCMDI (LLNL) for the AMIP (DECK) experiment of CMIP6",
-            "source_id":"PCMDI-AMIP-1-2-0",
+            "source_id":"PCMDI-AMIP-1-1-8",
             "source_type":"satellite_blended",
             "source_variables":[
                 "areacello",
@@ -793,9 +793,9 @@
                 "tos",
                 "tosbcs"
             ],
-            "source_version":"1.2.0",
+            "source_version":"1.1.8",
             "target_mip":"CMIP",
-            "title":"PCMDI-AMIP 1.2.0 dataset prepared for input4MIPs"
+            "title":"PCMDI-AMIP 1.1.8 dataset prepared for input4MIPs"
         },
         "UKESM1-0-LL-ssp585-1-0":{
             "comment":"Prepared using CMIP6 model UKESM1-0-LL as input. A combination of historical and ssp585 datasets were used to create this ISMIP6 forcing dataset",

diff --git a/src/writeJson.py b/src/writeJson.py
@@ -98,17 +98,20 @@
 PJD  8 Sep 2020     - Register source_id MRI-JRA55-do-1-5-0 https://github.com/PCMDI/input4MIPs-cmor-tables/issues/109
 PJD 26 Jan 2022     - Update home path
 PJD  8 Mar 2022     - Register PCMDI-AMIP-1-2-0 https://github.com/PCMDI/input4MIPs-cmor-tables/issues/87
+PJD 14 Jun 2022     - Register PCMDI-AMIP-1-1-8 https://github.com/PCMDI/input4MIPs-cmor-tables/issues/123
+PJD 14 Jun 2022     - Updated default license from CC BY-SA-NC 4.0 to CC BY 4.0
                     - TODO: Deal with lab cert issue https://raw.githubusercontent.com -> http://rawgit.com (see requests library)
 
 
 @author: durack1
 """
 
 # %% Import statements
-from durolib import readJsonCreateDict
-import copy, gc, json, os, sys, time  # shutil, subprocess, pdb
+import copy
+import gc, json, os, sys, time  # shutil, subprocess, pdb
 sys.path.append('~/git/durolib/durolib/')
 sys.path.append('~/sync/git/durolib/durolib/')
+from durolib import readJsonCreateDict
 
 # %% Determine path
 #homePath = os.path.join('/','/'.join(os.path.realpath(__file__).split('/')[0:-1]))
@@ -431,9 +434,9 @@
     LIyrGre['variable_entry']['licalvf'])
 LIday['variable_entry']['licalvf']['comment'] = ' '.join(['Computed as the flux of',
                                                          'solid ice into the ocean',
-                                                         'divided by the area of',
-                                                         'the land portion of the',
-                                                         'grid cell'])
+                                                          'divided by the area of',
+                                                          'the land portion of the',
+                                                          'grid cell'])
 LIday['variable_entry']['licalvf']['dimensions'] = 'longitude latitude time'
 LIday['variable_entry']['licalvf']['frequency'] = 'day'
 LIday['variable_entry']['licalvf']['modeling_realm'] = 'landIce'
@@ -799,9 +802,10 @@
 #institution_id['institution_id']['RSS'] = 'Remote Sensing Systems, Santa Rosa, CA 95401, USA'
 
 # %% License
-license1 = ('<Your_Data_Identifier> 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'
+license1 = ('<Your_Data_Identifier> data produced by <Your_Centre_Name> is licensed under a'
+            ' Creative Commons Attribution 4.0 International (CC BY 4.0;'
+            ' https://creativecommons.org/licenses/by/4.0/) License.'
+            ' Consult https://pcmdi.llnl.gov/CMIP6/TermsOfUse'
             ' for terms of use governing input4MIPs 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'
@@ -874,8 +878,8 @@
     print(count, key)
     source_id[key]['mip_era'] = 'CMIP6'
 
-# Add PCMDI-AMIP-1-2-0
-key = 'PCMDI-AMIP-1-2-0'
+# Add PCMDI-AMIP-1-1-8
+key = 'PCMDI-AMIP-1-1-8'
 source_id.pop(key, None)  # Cleanup and start again
 source_id[key] = {}
 source_id[key]['calendar'] = 'gregorian'
@@ -895,7 +899,7 @@
                                           'Livermore National Laboratory,',
                                           'Livermore, CA 94550, USA'])
 source_id[key]['nominal_resolution'] = '1x1 degree'
-source_id[key]['mip_era'] = 'CMIP6Plus'
+source_id[key]['mip_era'] = 'CMIP6'
 source_id[key]['product'] = 'observations'
 source_id[key]['references'] = ''.join(['Taylor, K.E., D. Williamson and F. Zwiers, ',
                                         '2000: The sea surface temperature and sea ice ',
@@ -910,14 +914,17 @@
                                                 'sea-ice datasets produced by',
                                                  'PCMDI (LLNL) for the AMIP',
                                                  '(DECK) experiment of CMIP6'])
-source_id[key]['source'] = 'PCMDI-AMIP 1.2.0: Merged SST based on UK MetOffice HadISST and NCEP OI2'
+source_id[key]['source'] = 'PCMDI-AMIP 1.1.8: Merged SST based on UK MetOffice HadISST and NCEP OI2'
 source_id[key]['source_id'] = key
 source_id[key]['source_type'] = 'satellite_blended'
 source_id[key]['source_variables'] = ['areacello', 'sftof', 'siconc', 'siconcbcs',
                                       'tos', 'tosbcs']
-source_id[key]['source_version'] = '1.2.0'
+source_id[key]['source_version'] = '1.1.8'
 source_id[key]['target_mip'] = 'CMIP'
-source_id[key]['title'] = 'PCMDI-AMIP 1.2.0 dataset prepared for input4MIPs'
+source_id[key]['title'] = 'PCMDI-AMIP 1.1.8 dataset prepared for input4MIPs'
+# Remove PCMDI-AMIP-1-2-0
+key = "PCMDI-AMIP-1-2-0"
+source_id.pop(key)
 
 # %% Create CV master
 CV = {}
@@ -985,7 +992,7 @@
         jsonDict = eval(jsonName)
     fH = open(outFile, 'w')
     json.dump(jsonDict, fH, ensure_ascii=True, sort_keys=True,
-              indent=4, separators=(',', ':')) #, encoding="utf-8")
+              indent=4, separators=(',', ':'))  # , encoding="utf-8")
     fH.close()
 
 del(jsonName, outFile)