Merge pull request #425 from PCMDI/cmor_3.4.0

Cmor 3.4.0

.circleci/config.yml

@@ -73,7 +73,7 @@ aliases:
        cd conda-recipes
        export PKG_NAME=cmor
        export USER=pcmdi
-       export VERSION=3.3.3
+       export VERSION=3.4.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=2.7

INSTALL

@@ -1,6 +1,6 @@
 INSTALLATION INSTRUCTIONS  
 ------------------------- 
-Climate Model Output Rewriter (CMOR) version 3.3.3 installation instructions.
+Climate Model Output Rewriter (CMOR) version 3.4.0 installation instructions.
 
 
 DOWNLOAD 
@@ -13,7 +13,7 @@ cd CMOR
 
 INSTALLATION
 ------------ 
-CMOR 3.3.3 requires external packages that need to be installed first. 
+CMOR 3.4.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! 

README.md

@@ -1,7 +1,7 @@
 # CMOR
 Climate Model Output Rewriter
 
-CMOR 3.3 documentation can be found here: http://cmor.llnl.gov
+CMOR 3.4 documentation can be found here: http://cmor.llnl.gov
 
 
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1294043.svg)](https://doi.org/10.5281/zenodo.1294043)

TestTables/CMIP6_3hr.json

@@ -1,10 +1,10 @@
 {
     "Header": {
-        "data_specs_version": "01.00.28", 
-        "cmor_version": "3.3", 
+        "data_specs_version": "01.00.29", 
+        "cmor_version": "3.4", 
         "table_id": "Table 3hr", 
         "realm": "atmos", 
-        "table_date": "06 November 2018", 
+        "table_date": "14 December 2018", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 
@@ -21,7 +21,7 @@
             "units": "%", 
             "cell_methods": "area: time: mean", 
             "cell_measures": "area: areacella", 
-            "long_name": "Total Cloud Fraction", 
+            "long_name": "Total Cloud Cover Percentage", 
             "comment": "Total cloud area fraction for the whole atmospheric column, as seen from the surface or the top of the atmosphere. Includes both large-scale and convective cloud.", 
             "dimensions": "longitude latitude time", 
             "out_name": "clt", 
@@ -58,7 +58,7 @@
             "cell_methods": "area: time: mean", 
             "cell_measures": "area: areacella", 
             "long_name": "Surface Upward Sensible Heat Flux", 
-            "comment": "The surface called 'surface' means the lower boundary of the atmosphere. 'Upward' indicates a vector component which is positive when directed upward (negative downward). The surface sensible heat flux, also called 'turbulent' heat flux, is the exchange of heat between the surface and the air by motion of air. In accordance with common usage in geophysical disciplines, 'flux' implies per unit area, called 'flux density' in physics. Unless indicated in the cell_methods attribute, a quantity is assumed to apply to the whole area of each horizontal grid box. Previously, the qualifier where_type was used to specify that the quantity applies only to the part of the grid box of the named type.  Names containing the where_type qualifier are deprecated and newly created data should use the cell_methods attribute to indicate the horizontal area to which the quantity applies.", 
+            "comment": "The surface sensible heat flux, also called turbulent heat flux, is the exchange of heat between the surface and the air by motion of air.", 
             "dimensions": "longitude latitude time", 
             "out_name": "hfss", 
             "type": "real", 
@@ -166,7 +166,7 @@
             "cell_methods": "area: time: mean", 
             "cell_measures": "area: areacella", 
             "long_name": "Snowfall Flux", 
-            "comment": "at surface; includes precipitation of all forms of water in the solid phase", 
+            "comment": "At surface; includes precipitation of all forms of water in the solid phase", 
             "dimensions": "longitude latitude time", 
             "out_name": "prsn", 
             "type": "real", 
@@ -256,7 +256,7 @@
             "cell_methods": "area: time: mean", 
             "cell_measures": "area: areacella", 
             "long_name": "Surface Downwelling Shortwave Radiation", 
-            "comment": "surface solar irradiance for UV calculations", 
+            "comment": "Surface solar irradiance for UV calculations.", 
             "dimensions": "longitude latitude time", 
             "out_name": "rsds", 
             "type": "real", 
@@ -274,7 +274,7 @@
             "cell_methods": "area: time: mean", 
             "cell_measures": "area: areacella", 
             "long_name": "Surface Downwelling Clear-Sky Shortwave Radiation", 
-            "comment": "surface solar irradiance clear sky for UV calculations", 
+            "comment": "Surface solar irradiance clear sky for UV calculations", 
             "dimensions": "longitude latitude time", 
             "out_name": "rsdscs", 
             "type": "real", 
@@ -292,7 +292,7 @@
             "cell_methods": "area: time: mean", 
             "cell_measures": "area: areacella", 
             "long_name": "Surface Diffuse Downwelling Shortwave Radiation", 
-            "comment": "Downwelling radiation is radiation from above. It does not mean 'net downward'.  'Diffuse' radiation is radiation that has been scattered by particles in the atmosphere such as cloud droplets and aerosols. When thought of as being incident on a surface, a radiative flux is sometimes called 'irradiance'.  In addition, it is identical with the quantity measured by a cosine-collector light-meter and sometimes called 'vector irradiance'.  In accordance with common usage in geophysical disciplines, 'flux' implies per unit area, called 'flux density' in physics.  The surface called 'surface' means the lower boundary of the atmosphere.  'shortwave' means shortwave radiation.", 
+            "comment": "Surface downwelling solar irradiance from diffuse radiation for UV calculations.", 
             "dimensions": "longitude latitude time", 
             "out_name": "rsdsdiff", 
             "type": "real", 
@@ -399,7 +399,7 @@
             "units": "m s-1", 
             "cell_methods": "area: mean time: point", 
             "cell_measures": "area: areacella", 
-            "long_name": "Eastward Near-Surface Wind Speed", 
+            "long_name": "Eastward Near-Surface Wind", 
             "comment": "Eastward component of the near-surface (usually, 10 meters)  wind", 
             "dimensions": "longitude latitude time1 height10m", 
             "out_name": "uas", 
@@ -417,7 +417,7 @@
             "units": "m s-1", 
             "cell_methods": "area: mean time: point", 
             "cell_measures": "area: areacella", 
-            "long_name": "Northward Near-Surface Wind Speed", 
+            "long_name": "Northward Near-Surface Wind", 
             "comment": "Northward component of the near surface wind", 
             "dimensions": "longitude latitude time1 height10m", 
             "out_name": "vas", 

TestTables/CMIP6_6hrLev.json

@@ -1,10 +1,10 @@
 {
     "Header": {
-        "data_specs_version": "01.00.28", 
-        "cmor_version": "3.3", 
+        "data_specs_version": "01.00.29", 
+        "cmor_version": "3.4", 
         "table_id": "Table 6hrLev", 
         "realm": "atmos", 
-        "table_date": "06 November 2018", 
+        "table_date": "14 December 2018", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 
@@ -21,7 +21,7 @@
             "units": "m-1 sr-1", 
             "cell_methods": "area: time: mean", 
             "cell_measures": "area: areacella", 
-            "long_name": "Aerosol backscatter coefficient", 
+            "long_name": "Aerosol Backscatter Coefficient", 
             "comment": "Aerosol  Backscatter at 550nm and 180 degrees, computed from extinction and lidar ratio", 
             "dimensions": "longitude latitude time lambda550nm scatter180", 
             "out_name": "bs550aer", 
@@ -39,7 +39,7 @@
             "units": "m-1", 
             "cell_methods": "area: mean time: point", 
             "cell_measures": "area: areacella", 
-            "long_name": "Aerosol extinction coefficient", 
+            "long_name": "Aerosol Extinction Coefficient", 
             "comment": "Aerosol Extinction at 550nm", 
             "dimensions": "longitude latitude alevel time1 lambda550nm", 
             "out_name": "ec550aer", 
@@ -58,7 +58,7 @@
             "cell_methods": "area: mean time: point", 
             "cell_measures": "area: areacella", 
             "long_name": "Specific Humidity", 
-            "comment": "'specific' means per unit mass. Specific humidity is the mass fraction of water vapor in (moist) air.", 
+            "comment": "Specific humidity is the mass fraction of water vapor in (moist) air.", 
             "dimensions": "longitude latitude alevel time1", 
             "out_name": "hus", 
             "type": "real", 
@@ -75,7 +75,7 @@
             "units": "Pa", 
             "cell_methods": "area: mean time: point", 
             "cell_measures": "area: areacella", 
-            "long_name": "Air Pressure", 
+            "long_name": "Pressure at Model Full-Levels", 
             "comment": "Air pressure on model levels", 
             "dimensions": "longitude latitude alevel time1", 
             "out_name": "pfull", 
@@ -130,7 +130,7 @@
             "cell_methods": "time: point", 
             "cell_measures": "--OPT", 
             "long_name": "Eastward Wind", 
-            "comment": "'Eastward' indicates a vector component which is positive when directed eastward (negative westward). Wind is defined as a two-dimensional (horizontal) air velocity vector, with no vertical component. (Vertical motion in the atmosphere has the standard name upward_air_velocity.)", 
+            "comment": "Zonal wind (positive in a eastward direction).", 
             "dimensions": "longitude latitude alevel time1", 
             "out_name": "ua", 
             "type": "real", 
@@ -148,7 +148,7 @@
             "cell_methods": "time: point", 
             "cell_measures": "--OPT", 
             "long_name": "Northward Wind", 
-            "comment": "'Northward' indicates a vector component which is positive when directed northward (negative southward). Wind is defined as a two-dimensional (horizontal) air velocity vector, with no vertical component. (Vertical motion in the atmosphere has the standard name upward_air_velocity.)", 
+            "comment": "Meridional wind (positive in a northward direction).", 
             "dimensions": "longitude latitude alevel time1", 
             "out_name": "va", 
             "type": "real", 

TestTables/CMIP6_6hrPlev.json

@@ -1,10 +1,10 @@
 {
     "Header": {
-        "data_specs_version": "01.00.28", 
-        "cmor_version": "3.3", 
+        "data_specs_version": "01.00.29", 
+        "cmor_version": "3.4", 
         "table_id": "Table 6hrPlev", 
         "realm": "atmos", 
-        "table_date": "06 November 2018", 
+        "table_date": "14 December 2018", 
         "missing_value": "1e20", 
         "int_missing_value": "-999", 
         "product": "model-output", 
@@ -58,7 +58,7 @@
             "cell_methods": "area: time: mean", 
             "cell_measures": "area: areacella", 
             "long_name": "Specific Humidity", 
-            "comment": "'specific' means per unit mass. Specific humidity is the mass fraction of water vapor in (moist) air.", 
+            "comment": "Specific humidity is the mass fraction of water vapor in (moist) air.", 
             "dimensions": "longitude latitude plev4 time", 
             "out_name": "hus", 
             "type": "real", 
@@ -129,7 +129,7 @@
             "units": "s-1", 
             "cell_methods": "area: time: mean", 
             "cell_measures": "area: areacella", 
-            "long_name": "Relative Vorticity at 850 hPa", 
+            "long_name": "Relative Vorticity at 850hPa", 
             "comment": "Relative vorticity is the upward component of the vorticity vector i.e. the component which arises from horizontal velocity.", 
             "dimensions": "longitude latitude time p850", 
             "out_name": "rv850", 
@@ -165,7 +165,7 @@
             "units": "K", 
             "cell_methods": "area: time: mean", 
             "cell_measures": "area: areacella", 
-            "long_name": "Surface Air Temperature", 
+            "long_name": "Near-Surface Air Temperature", 
             "comment": "near-surface (usually, 2 meter) air temperature", 
             "dimensions": "longitude latitude time height2m", 
             "out_name": "tas", 
@@ -255,7 +255,7 @@
             "units": "Pa s-1", 
             "cell_methods": "area: time: mean", 
             "cell_measures": "area: areacella", 
-            "long_name": "omega (=dp/dt)", 
+            "long_name": "Omega (=dp/dt)", 
             "comment": "Omega (vertical velocity in pressure coordinates, positive downwards)", 
             "dimensions": "longitude latitude plev4 time", 
             "out_name": "wap", 
@@ -309,7 +309,7 @@
             "units": "m", 
             "cell_methods": "area: time: mean", 
             "cell_measures": "area: areacella", 
-            "long_name": "Geopotential Height at 1000 hPa", 
+            "long_name": "Geopotential Height at 1000hPa", 
             "comment": "Geopotential height on the 1000 hPa surface", 
             "dimensions": "longitude latitude time p1000", 
             "out_name": "zg1000",