Python3 update, upstream update (#120)

py3 update; homedir update; upstream update
PCMDI · Jan 27, 2022 · 7f8153a · 7f8153a
2 parents 17163f6 + 6f65084
commit 7f8153a
Show file tree

Hide file tree

Showing 27 changed files with 631 additions and 531 deletions.
diff --git a/Tables/input4MIPs_A3hr.json b/Tables/input4MIPs_A3hr.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"0.125000",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"atmos",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_A3hr"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_A3hrPt.json b/Tables/input4MIPs_A3hrPt.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"0.125000",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"atmos",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_A3hrPt"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_Afx.json b/Tables/input4MIPs_Afx.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"0.00000",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"alevel",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"atmos land",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_Afx"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_Ayr.json b/Tables/input4MIPs_Ayr.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"30.00000",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"alevel alevhalf",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"atmos atmosChem",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_Ayr"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_CV.json b/Tables/input4MIPs_CV.json
diff --git a/Tables/input4MIPs_LIday.json b/Tables/input4MIPs_LIday.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"30.00000",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"olevel olevhalf",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"landIce",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_LIday"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_LIfx.json b/Tables/input4MIPs_LIfx.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"landIce",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_LIfx"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_LIyr.json b/Tables/input4MIPs_LIyr.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"30.00000",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"landIce land",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_LIyr"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_LIyrAnt.json b/Tables/input4MIPs_LIyrAnt.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"365.00",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"landIce",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_LIyrAnt"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_LIyrC.json b/Tables/input4MIPs_LIyrC.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"30.00000",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"olevel olevhalf",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"landIce",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_LIyrC"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_LIyrGre.json b/Tables/input4MIPs_LIyrGre.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"365.00",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"landIce",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_LIyrGre"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_Lday.json b/Tables/input4MIPs_Lday.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"30.00000",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"land",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_Lday"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_Lyr.json b/Tables/input4MIPs_Lyr.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"30.00000",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"land",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_Lyr"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_Oday.json b/Tables/input4MIPs_Oday.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"30.00000",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"olevel olevhalf",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"ocean",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_Oday"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_Ofx.json b/Tables/input4MIPs_Ofx.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"0.00000",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"olevel",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"ocean",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_Ofx"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_Omon.json b/Tables/input4MIPs_Omon.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"30.00000",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"olevel olevhalf",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"ocean",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_Omon"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_OmonC.json b/Tables/input4MIPs_OmonC.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"30.00000",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"olevel olevhalf",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"ocean",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_OmonC"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_Oyr.json b/Tables/input4MIPs_Oyr.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"30.00000",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"olevel olevhalf",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"ocean",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_Oyr"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_OyrC.json b/Tables/input4MIPs_OyrC.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"30.00000",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"olevel olevhalf",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"ocean",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_OyrC"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_SI3hrPt.json b/Tables/input4MIPs_SI3hrPt.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"0.125000",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"seaIce",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_SI3hrPt"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_SIday.json b/Tables/input4MIPs_SIday.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"1.00000",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"seaIce",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_SIday"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_SImon.json b/Tables/input4MIPs_SImon.json
@@ -3,14 +3,14 @@
         "Conventions":"CF-1.7 CMIP-6.2",
         "approx_interval":"30.00000",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
         "generic_levels":"",
         "int_missing_value":"-999",
         "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
         "realm":"seaIce",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_SImon"
     },
     "variable_entry":{

diff --git a/Tables/input4MIPs_grids.json b/Tables/input4MIPs_grids.json
@@ -2,10 +2,11 @@
     "Header":{
         "Conventions":"CF-1.7 CMIP-6.2",
         "cmor_version":"3.5",
-        "data_specs_version":"01.00.32",
+        "data_specs_version":"01.00.33",
+        "mip_era":"CMIP6",
         "missing_value":"1e20",
         "product":"input4MIPs",
-        "table_date":"14 September 2020",
+        "table_date":"26 January 2022",
         "table_id":"Table input4MIPs_grids"
     },
     "axis_entry":{

diff --git a/input4MIPs_frequency.json b/input4MIPs_frequency.json
@@ -3,9 +3,9 @@
         "1hr":"sampled hourly",
         "1hrCM":"monthly-mean diurnal cycle resolving each day into 1-hour means",
         "1hrPt":"sampled hourly, at specified time point within an hour",
-        "3hr":"sampled every 3 hours",
+        "3hr":"3 hourly mean samples",
         "3hrPt":"sampled 3 hourly, at specified time point within the time period",
-        "6hr":"sampled every 6 hours",
+        "6hr":"6 hourly mean samples",
         "6hrPt":"sampled 6 hourly, at specified time point within the time period",
         "day":"daily mean samples",
         "dec":"decadal mean samples",

diff --git a/input4MIPs_mip_era.json b/input4MIPs_mip_era.json
@@ -4,6 +4,7 @@
         "CMIP2",
         "CMIP3",
         "CMIP5",
-        "CMIP6"
+        "CMIP6",
+        "CMIP6Plus"
     ]
 }