Merge pull request #525 from PCMDI/cmor_3.5.0

CMOR 3.5.0
PCMDI · Jul 30, 2019 · 10716a2 · 10716a2
2 parents f0dee24 + 245d97b
commit 10716a2
Show file tree

Hide file tree

Showing 52 changed files with 124 additions and 109 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -76,7 +76,7 @@ aliases:
        cd recipes
        export PKG_NAME=cmor
        export USER=pcmdi
-       export VERSION=3.4.0
+       export VERSION=3.5.0
        export LABEL=nightly
        python ./prep_for_build.py -l $VERSION
        conda build $PKG_NAME -c cdat/label/nightly -c conda-forge -c cdat --python=$PYTHON_VERSION

diff --git a/INSTALL b/INSTALL
@@ -1,6 +1,6 @@
 INSTALLATION INSTRUCTIONS  
 ------------------------- 
-Climate Model Output Rewriter (CMOR) version 3.4.0 installation instructions.
+Climate Model Output Rewriter (CMOR) version 3.5.0 installation instructions.
 
 
 DOWNLOAD 
@@ -13,7 +13,7 @@ cd CMOR
 
 INSTALLATION
 ------------ 
-CMOR 3.4.0 requires external packages that need to be installed first. 
+CMOR 3.5.0 requires external packages that need to be installed first. 
 It can be compiled/linked against either NetCDF3 or NetCDF4. If you
 decide to go with NetCDF4 be sure to build NetCDF4 with the
  --enable-netcdf-4 option! 

diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 # CMOR
 Climate Model Output Rewriter
 
-CMOR 3.4 documentation can be found here: http://cmor.llnl.gov
+CMOR 3.5 documentation can be found here: http://cmor.llnl.gov
 
 
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2456203.svg)](https://doi.org/10.5281/zenodo.2456203)
-[![stable version](https://img.shields.io/badge/stable%20version-3.4.0-brightgreen.svg)](https://github.com/PCMDI/cmor/releases/tag/3.4.0)
+[![stable version](https://img.shields.io/badge/stable%20version-3.5.0-brightgreen.svg)](https://github.com/PCMDI/cmor/releases/tag/3.5.0)
 ![platforms](https://img.shields.io/badge/platforms-linux%20|%20osx-lightgrey.svg)
 [![Anaconda-Server Badge](https://anaconda.org/pcmdi/cmor/badges/installer/conda.svg)](https://conda.anaconda.org/pcmdi)
 [![Anaconda-Server Badge](https://anaconda.org/pcmdi/cmor/badges/downloads.svg)](https://anaconda.org/pcmdi)
diff --git a/TestTables/CMIP6_3hr.json b/TestTables/CMIP6_3hr.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table 3hr", 
         "realm": "atmos", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_6hrLev.json b/TestTables/CMIP6_6hrLev.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table 6hrLev", 
         "realm": "atmos", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_6hrPlev.json b/TestTables/CMIP6_6hrPlev.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table 6hrPlev", 
         "realm": "atmos", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_6hrPlevPt.json b/TestTables/CMIP6_6hrPlevPt.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table 6hrPlevPt", 
         "realm": "atmos", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_AERday.json b/TestTables/CMIP6_AERday.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table AERday", 
         "realm": "aerosol", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_AERhr.json b/TestTables/CMIP6_AERhr.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table AERhr", 
         "realm": "aerosol", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_AERmon.json b/TestTables/CMIP6_AERmon.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table AERmon", 
         "realm": "aerosol", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_AERmonZ.json b/TestTables/CMIP6_AERmonZ.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table AERmonZ", 
         "realm": "aerosol", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_Amon.json b/TestTables/CMIP6_Amon.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table Amon", 
         "realm": "atmos atmosChem", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_CF3hr.json b/TestTables/CMIP6_CF3hr.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table CF3hr", 
         "realm": "atmos", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_CFday.json b/TestTables/CMIP6_CFday.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table CFday", 
         "realm": "atmos", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_CFmon.json b/TestTables/CMIP6_CFmon.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table CFmon", 
         "realm": "atmos", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_CFsubhr.json b/TestTables/CMIP6_CFsubhr.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table CFsubhr", 
         "realm": "atmos", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_CV.json b/TestTables/CMIP6_CV.json
@@ -33,13 +33,13 @@
             "variant_label"
         ],
         "version_metadata":{
-            "CV_collection_modified":"Mon Jul 22 11:09:12 2019 -0700",
-            "CV_collection_version":"6.2.35.0",
+            "CV_collection_modified":"Mon Jul 29 14:43:08 2019 -0700",
+            "CV_collection_version":"6.2.35.3",
             "author":"Paul J. Durack <[email protected]>",
-            "experiment_id_CV_modified":"Wed Jul 17 09:35:08 2019 -0700",
+            "experiment_id_CV_modified":"Mon Jul 22 11:09:12 2019 -0700",
             "experiment_id_CV_note":"Revise experiment_id esm-hist-ext",
             "institution_id":"PCMDI",
-            "previous_commit":"3aa1d6e45b27576caaf0a23b2d04419e74f5ccb9",
+            "previous_commit":"a613682c14fa76d0e7e845139bd182123c913e17",
             "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
         },
         "activity_id":{
@@ -235,6 +235,20 @@
                 "source_id":"AWI-ESM-1-1-LR",
                 "source":"AWI-ESM 1.1 LR (2018): \naerosol: none\natmos: ECHAM6.3.04p1 (T63L47 native atmosphere T63 gaussian grid; 192 x 96 longitude/latitude; 47 levels; top level 80 km)\natmosChem: none\nland: JSBACH 3.20 with dynamic vegetation\nlandIce: none\nocean: FESOM 1.4 (unstructured grid in the horizontal with 126859 wet nodes; 46 levels; top grid cell 0-5 m)\nocnBgchem: none\nseaIce: FESOM 1.4"
             },
+            "AWI-ESM-2-1-LR":{
+                "activity_participation":[
+                    "CMIP",
+                    "PMIP"
+                ],
+                "cohort":[
+                    "Registered"
+                ],
+                "institution_id":[
+                    "AWI"
+                ],
+                "source_id":"AWI-ESM-2-1-LR",
+                "source":"AWI-ESM 2.1 LR (2019): \naerosol: none\natmos: ECHAM6.3.04p1 (T63L47 native atmosphere T63 gaussian grid; 192 x 96 longitude/latitude; 47 levels; top level 80 km)\natmosChem: none\nland: JSBACH 3.20 with dynamic vegetation\nlandIce: none\nocean: FESOM 2 (unstructured grid in the horizontal with 126858 wet nodes; 48 levels; top grid cell 0-5 m)\nocnBgchem: none\nseaIce: FESOM 2"
+            },
             "BCC-CSM2-HR":{
                 "activity_participation":[
                     "CMIP",
@@ -707,6 +721,7 @@
                     "DynVarMIP",
                     "LS3MIP",
                     "PAMIP",
+                    "PMIP",
                     "RFMIP",
                     "SIMIP",
                     "ScenarioMIP",

diff --git a/TestTables/CMIP6_E1hr.json b/TestTables/CMIP6_E1hr.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table E1hr", 
         "realm": "atmos", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_E1hrClimMon.json b/TestTables/CMIP6_E1hrClimMon.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table E1hrClimMon", 
         "realm": "atmos", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_E3hr.json b/TestTables/CMIP6_E3hr.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table E3hr", 
         "realm": "land", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_E3hrPt.json b/TestTables/CMIP6_E3hrPt.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table E3hrPt", 
         "realm": "atmos", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_E6hrZ.json b/TestTables/CMIP6_E6hrZ.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table E6hrZ", 
         "realm": "atmos", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_Eday.json b/TestTables/CMIP6_Eday.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table Eday", 
         "realm": "land", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_EdayZ.json b/TestTables/CMIP6_EdayZ.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table EdayZ", 
         "realm": "atmos", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_Efx.json b/TestTables/CMIP6_Efx.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table Efx", 
         "realm": "land", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_Emon.json b/TestTables/CMIP6_Emon.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table Emon", 
         "realm": "land", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_EmonZ.json b/TestTables/CMIP6_EmonZ.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table EmonZ", 
         "realm": "atmos", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 

diff --git a/TestTables/CMIP6_Esubhr.json b/TestTables/CMIP6_Esubhr.json
@@ -1,10 +1,10 @@
 {
     "Header": {
         "data_specs_version": "01.00.31", 
-        "cmor_version": "3.4", 
+        "cmor_version": "3.5", 
         "table_id": "Table Esubhr", 
         "realm": "atmos", 
-        "table_date": "22 July 2019", 
+        "table_date": "24 July 2019", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output",