[cmor-tables] 53/83: 2010-11-12 : added site longitude latitude to cfSite, added must_call_cmor_grid attribute, need CMOR 2.5
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sun Aug 30 08:06:12 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository cmor-tables.
commit 94343418a1c345a396d056a0787f001c01a6723b
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date: Fri Nov 12 12:52:32 2010 -0800
2010-11-12 : added site longitude latitude to cfSite, added must_call_cmor_grid attribute, need CMOR 2.5
---
Lib/table_generator.py | 15 +--
RELEASE-NOTES | 1 +
Tables/CMIP5_3hr | 4 +-
Tables/CMIP5_6hrLev | 4 +-
Tables/CMIP5_6hrPlev | 5 +-
Tables/CMIP5_Amon | 5 +-
Tables/CMIP5_LImon | 4 +-
Tables/CMIP5_Lmon | 4 +-
Tables/CMIP5_OImon | 4 +-
Tables/CMIP5_Oclim | 4 +-
Tables/CMIP5_Omon | 4 +-
Tables/CMIP5_Oyr | 4 +-
Tables/CMIP5_aero | 10 +-
Tables/CMIP5_cf3hr | 20 ++--
Tables/CMIP5_cfDay | 8 +-
Tables/CMIP5_cfMon | 8 +-
Tables/CMIP5_cfOff | 8 +-
Tables/CMIP5_cfSites | 271 ++++++++++++++++++++++++++-----------------------
Tables/CMIP5_day | 5 +-
Tables/CMIP5_fx | 4 +-
Tables/CMIP5_grids | 18 +---
Tables/md5s | 2 +-
Tables_csv/aero.csv | 6 +-
Tables_csv/cf3hr.csv | 4 +-
Tables_csv/cfSites.csv | 74 +++++++-------
Tables_csv/dims.csv | 94 ++++++++---------
configure | 18 ++--
configure.ac | 2 +-
28 files changed, 302 insertions(+), 308 deletions(-)
diff --git a/Lib/table_generator.py b/Lib/table_generator.py
index 1cd1440..52daf9e 100644
--- a/Lib/table_generator.py
+++ b/Lib/table_generator.py
@@ -3,7 +3,7 @@ import sys,time,os,genutil,numpy
prefix = "CMIP5"
-general = """cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+general = """cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: %s ! project id
table_date: %s ! date this table was constructed
@@ -113,6 +113,7 @@ must_have_bounds: %(bounds?)
index_only: %(index axis?)
climatology: %(climatology)
coords_attrib: %(coords_attrib)
+must_call_cmor_grid: %(grid?)
!----------------------------------
!
"""
@@ -432,8 +433,8 @@ def create_table_header(tbnm, table_file, dims_file, fqcy):
lns=lns.replace("zlevel",zlevel_name)
if tbnm.find("Oclim")>-1:
lns=lns.replace("dimensions: longitude latitude time","dimensions: longitude latitude time2")
- # if tbnm.find("cfSite")>-1:
- # lns=lns.replace("longitude latitude","site")
+ if tbnm.find("cfSite")>-1:
+ lns=lns.replace("longitude latitude","site")
print >> fo, lns
return fo
@@ -466,8 +467,8 @@ def create_table(table_file, dims_file,minmax={}):
## if sp[i2]=='tasmax' : print i2,sp[i2]
if len(sp)>15 and 'time' in sp[16]:
sp[16]=sp[16].replace('time','time1')
-# if table_file[-11:-4]=='cfSites':
-# sp[16]=sp[16].replace("longitude latitude","site")
+ if table_file[-11:-4]=='cfSites':
+ sp[16]=sp[16].replace("longitude latitude","site")
for i in range(len(sp)):
if sp[i].find(",")>-1:
sp[i]='"%s"' % sp[i]
@@ -494,8 +495,8 @@ def create_table(table_file, dims_file,minmax={}):
dlines=dlines2
for l in dlines:
sp,iadd = process_a_line(l)
-# if len(sp)>15 and table_file[-11:-4]=='cfSites':
-# sp[16]=sp[16].replace("longitude latitude","site")
+ if len(sp)>15 and table_file[-11:-4]=='cfSites':
+ sp[16]=sp[16].replace("longitude latitude","site")
if 0<=sp[0].find("CMOR Table")<=1 and foundnm == False: # line that will give us the table name
i=1
while sp[i].strip()=="":
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1e7c911..ba97399 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,4 @@
+2010-11-12 : added site longitude latitude to cfSite, added must_call_cmor_grid attribute, need CMOR 2.5
2010-10-25 : Fixed cfSites still had some lat/lon...
2010-10-22 : Table replaced cell_measures with ext_cell_measures to be CF compliant
2010-10-19 : added required attribute parent_experiment_rip
diff --git a/Tables/CMIP5_3hr b/Tables/CMIP5_3hr
index b9022a3..31e2871 100644
--- a/Tables/CMIP5_3hr
+++ b/Tables/CMIP5_3hr
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: 3hr
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 05 November 2010 ! date this table was constructed
+table_date: 12 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_6hrLev b/Tables/CMIP5_6hrLev
index 3b629c6..2c2e1aa 100644
--- a/Tables/CMIP5_6hrLev
+++ b/Tables/CMIP5_6hrLev
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: 6hr
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 05 November 2010 ! date this table was constructed
+table_date: 12 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_6hrPlev b/Tables/CMIP5_6hrPlev
index 78cfafb..be4e0a0 100644
--- a/Tables/CMIP5_6hrPlev
+++ b/Tables/CMIP5_6hrPlev
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: 6hr
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 05 November 2010 ! date this table was constructed
+table_date: 12 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -123,7 +123,6 @@ long_name: pressure
out_name: plev
stored_direction: decreasing
tolerance: 0.001
-
type: double
requested: 85000. 50000. 25000. ! space-separated list of requested coordinates
must_have_bounds: no
diff --git a/Tables/CMIP5_Amon b/Tables/CMIP5_Amon
index f62e3fe..281583c 100644
--- a/Tables/CMIP5_Amon
+++ b/Tables/CMIP5_Amon
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: mon
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 05 November 2010 ! date this table was constructed
+table_date: 12 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -125,7 +125,6 @@ long_name: pressure
out_name: plev
stored_direction: decreasing
tolerance: 0.001
-
type: double
requested: 100000. 92500. 85000. 70000. 60000. 50000. 40000. 30000. 25000. 20000. 15000. 10000. 7000. 5000. 3000. 2000. 1000. ! space-separated list of requested coordinates
must_have_bounds: no
diff --git a/Tables/CMIP5_LImon b/Tables/CMIP5_LImon
index b82e8b7..aac5b52 100644
--- a/Tables/CMIP5_LImon
+++ b/Tables/CMIP5_LImon
@@ -3,10 +3,10 @@ modeling_realm: land
frequency: mon
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 05 November 2010 ! date this table was constructed
+table_date: 12 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_Lmon b/Tables/CMIP5_Lmon
index c6d9dec..1d70cbe 100644
--- a/Tables/CMIP5_Lmon
+++ b/Tables/CMIP5_Lmon
@@ -3,10 +3,10 @@ modeling_realm: land
frequency: mon
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 05 November 2010 ! date this table was constructed
+table_date: 12 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_OImon b/Tables/CMIP5_OImon
index 43c0602..f62a4ee 100644
--- a/Tables/CMIP5_OImon
+++ b/Tables/CMIP5_OImon
@@ -3,10 +3,10 @@ modeling_realm: ocean
frequency: mon
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 05 November 2010 ! date this table was constructed
+table_date: 12 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_Oclim b/Tables/CMIP5_Oclim
index 0d5d7a1..7e39441 100644
--- a/Tables/CMIP5_Oclim
+++ b/Tables/CMIP5_Oclim
@@ -3,10 +3,10 @@ modeling_realm: ocean
frequency: monClim
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 05 November 2010 ! date this table was constructed
+table_date: 12 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_Omon b/Tables/CMIP5_Omon
index 160ca55..17e3eb1 100644
--- a/Tables/CMIP5_Omon
+++ b/Tables/CMIP5_Omon
@@ -3,10 +3,10 @@ modeling_realm: ocean
frequency: mon
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 05 November 2010 ! date this table was constructed
+table_date: 12 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_Oyr b/Tables/CMIP5_Oyr
index 2ab951e..0d929f9 100644
--- a/Tables/CMIP5_Oyr
+++ b/Tables/CMIP5_Oyr
@@ -3,10 +3,10 @@ modeling_realm: ocean
frequency: yr
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 05 November 2010 ! date this table was constructed
+table_date: 12 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_aero b/Tables/CMIP5_aero
index 21c8f0c..52dc5b1 100644
--- a/Tables/CMIP5_aero
+++ b/Tables/CMIP5_aero
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: mon
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 05 November 2010 ! date this table was constructed
+table_date: 12 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -518,7 +518,7 @@ standard_name: atmosphere_optical_thickness_due_to_ambient_aerosol
units: 1
cell_methods: time: mean
cell_measures: area: areacella
-long_name: Ambient Aerosol Opitical Thickness at 550 nm
+long_name: Ambient Aerosol Optical Thickness at 550 nm
comment: AOD from the ambient aerosls (i.e., includes aerosol water). Does not include AOD from stratospheric aerosols if these are prescribed but includes other possible background aerosol types.
!----------------------------------
! Additional variable information:
@@ -540,7 +540,7 @@ standard_name: atmosphere_optical_thickness_due_to_pm1_ambient_aerosol
units: 1
cell_methods: time: mean
cell_measures: area: areacella
-long_name: Ambient Fine Aerosol Opitical Thickness at 550 nm
+long_name: Ambient Fine Aerosol Optical Thickness at 550 nm
comment: od550 due to particles with wet diameter less than 1 um (""ambient"" means ""wetted""). When models do not include explicit size information, it can be assumed that all anthropogenic aerosols and natural secondary aerosols have diameter less than 1 um.
!----------------------------------
! Additional variable information:
@@ -583,7 +583,7 @@ standard_name: atmosphere_optical_thickness_due_to_ambient_aerosol
units: 1
cell_methods: time: mean
cell_measures: area: areacella
-long_name: Ambient Aerosol Opitical Thickness at 870 nm
+long_name: Ambient Aerosol Optical Thickness at 870 nm
comment: AOD from the ambient aerosls (i.e., includes aerosol water). Does not include AOD from stratospheric aerosols if these are prescribed but includes other possible background aerosol types.
!----------------------------------
! Additional variable information:
diff --git a/Tables/CMIP5_cf3hr b/Tables/CMIP5_cf3hr
index 39fd9df..d6eeb0b 100644
--- a/Tables/CMIP5_cf3hr
+++ b/Tables/CMIP5_cf3hr
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: 3hr
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 05 November 2010 ! date this table was constructed
+table_date: 12 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -197,7 +197,6 @@ long_name: altitude
out_name: alt40
stored_direction: increasing
tolerance: 0.001
-
type: double
requested: 240. 720. 1200. 1680. 2160. 2640. 3120. 3600. 4080. 4560. 5040. 5520. 6000. 6480. 6960. 7440. 7920. 8400. 8880. 9360. 9840. 10320. 10800. 11280. 11760. 12240. 12720. 13200. 13680. 14160. 14640. 15120. 15600. 16080. 16560. 17040. 17520. 18000. 18480. 18960. ! space-separated list of requested coordinates
requested_bounds: 0. 480. 480. 960. 960. 1440. 1440. 1920. 1920. 2400. 2400. 2880. 2880. 3360. 3360. 3840. 3840. 4320. 4320. 4800. 4800. 5280. 5280. 5760. 5760. 6240. 6240. 6720. 6720. 7200. 7200. 7680. 7680. 8160. 8160. 8640. 8640. 9120. 9120. 9600. 9600. 10080. 10080. 10560. 10560. 11040. 11040. 11520. 11520. 12000. 12000. 12480. 12480. 12960. 12960. 13440. 13440. 13920. 13920. 14400. 14400. 14880. 14880. 15360. 15360. 15840. 15840. 16320. 16320. 16800. 16800. 17280. 17280. 17760. 1776 [...]
@@ -313,7 +312,6 @@ long_name: lidar backscattering ratio
out_name: scatratio
stored_direction: increasing
tolerance: 0.001
-
type: double
requested: 0.0605 2.1 4. 6. 8.5 12.5 17.5 22.5 27.5 35. 45. 55. 70. 539.5 1004. ! space-separated list of requested coordinates
requested_bounds: 0.01 1.2 1.2 3. 3. 5. 5. 7. 7. 10. 10. 15. 15. 20. 20. 25. 25. 30. 30. 40. 40. 50. 50. 60. 60. 80. 80. 999. 999. 1009. ! space-separated list of requested coordinate bounds
@@ -337,7 +335,6 @@ long_name: CloudSat simulator equivalent radar reflectivity factor
out_name: dbze
stored_direction: increasing
tolerance: 0.001
-
type: double
requested: -47.5 -42.5 -37.5 -32.5 -27.5 -22.5 -17.5 -12.5 -7.5 -2.5 2.5 7.5 12.5 17.5 22.5 ! space-separated list of requested coordinates
requested_bounds: -50. -45. -45. -40. -40. -35. -35. -30. -30. -25. -25. -20. -20. -15. -15. -10. -10. -5. -5. 0. 0. 5. 5. 10. 10. 15. 15. 20. 20. 25. ! space-separated list of requested coordinate bounds
@@ -361,7 +358,6 @@ long_name: solar zenith angle
out_name: sza
stored_direction: increasing
tolerance: 0.001
-
type: double
requested: 0. 20. 40. 60. 80. ! space-separated list of requested coordinates
must_have_bounds: no
@@ -385,6 +381,8 @@ stored_direction: increasing
type: integer
must_have_bounds: no
index_only: ok
+must_call_cmor_grid: yes
+
!----------------------------------
!
@@ -933,7 +931,7 @@ type: real
!
!============
-variable_entry: lon
+variable_entry: longitude
!============
modeling_realm: atmos
!----------------------------------
@@ -943,18 +941,20 @@ standard_name: longitude
units: degrees_east
cell_methods: time: point
long_name: Longitude
-comment: function of time. Note that the CF convention and CMOR2 expect that this field will be included in each file that contains a variable that is a function of the ""location"" dimension, so it shouldn't be necessary to also save this field by itself.
+comment: is a function of time. Note that the CF convention and CMOR2 require that this field will be included in each file that contains a variable that is a function of the ""location"" dimension, so there is no need to save this field by itself.
!----------------------------------
! Additional variable information:
!----------------------------------
dimensions: location time1
out_name: lon
type: real
+valid_min: 0.0
+valid_max: 360.0
!----------------------------------
!
!============
-variable_entry: lat
+variable_entry: latitude
!============
modeling_realm: atmos
!----------------------------------
@@ -971,6 +971,8 @@ comment: the above comment also applies to latitude.
dimensions: location time1
out_name: lat
type: real
+valid_min: -90.0
+valid_max: 90.0
!----------------------------------
!
diff --git a/Tables/CMIP5_cfDay b/Tables/CMIP5_cfDay
index 97c3369..6c7f80b 100644
--- a/Tables/CMIP5_cfDay
+++ b/Tables/CMIP5_cfDay
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: day
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 05 November 2010 ! date this table was constructed
+table_date: 12 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -125,7 +125,6 @@ long_name: pressure
out_name: plev
stored_direction: decreasing
tolerance: 0.001
-
type: double
requested: 90000. 74000. 62000. 50000. 37500. 24500. 9000. ! space-separated list of requested coordinates
requested_bounds: 100000. 80000. 80000. 68000. 68000. 56000. 56000. 44000. 44000. 31000. 31000. 18000. 18000. 0. ! space-separated list of requested coordinate bounds
@@ -197,7 +196,6 @@ long_name: altitude
out_name: alt40
stored_direction: increasing
tolerance: 0.001
-
type: double
requested: 240. 720. 1200. 1680. 2160. 2640. 3120. 3600. 4080. 4560. 5040. 5520. 6000. 6480. 6960. 7440. 7920. 8400. 8880. 9360. 9840. 10320. 10800. 11280. 11760. 12240. 12720. 13200. 13680. 14160. 14640. 15120. 15600. 16080. 16560. 17040. 17520. 18000. 18480. 18960. ! space-separated list of requested coordinates
requested_bounds: 0. 480. 480. 960. 960. 1440. 1440. 1920. 1920. 2400. 2400. 2880. 2880. 3360. 3360. 3840. 3840. 4320. 4320. 4800. 4800. 5280. 5280. 5760. 5760. 6240. 6240. 6720. 6720. 7200. 7200. 7680. 7680. 8160. 8160. 8640. 8640. 9120. 9120. 9600. 9600. 10080. 10080. 10560. 10560. 11040. 11040. 11520. 11520. 12000. 12000. 12480. 12480. 12960. 12960. 13440. 13440. 13920. 13920. 14400. 14400. 14880. 14880. 15360. 15360. 15840. 15840. 16320. 16320. 16800. 16800. 17280. 17280. 17760. 1776 [...]
@@ -242,7 +240,6 @@ long_name: cloud optical thickness
out_name: tau
stored_direction: increasing
tolerance: 0.001
-
type: double
requested: 0.15 0.8 2.45 6.5 16.2 41.5 100. ! space-separated list of requested coordinates
requested_bounds: 0.0 0.3 0.3 1.3 1.3 3.6 3.6 9.4 9.4 23.0 23.0 60.0 60.0 100000. ! space-separated list of requested coordinate bounds
@@ -266,7 +263,6 @@ long_name: solar zenith angle
out_name: sza
stored_direction: increasing
tolerance: 0.001
-
type: double
requested: 0. 20. 40. 60. 80. ! space-separated list of requested coordinates
must_have_bounds: no
diff --git a/Tables/CMIP5_cfMon b/Tables/CMIP5_cfMon
index 87c3f24..83d2186 100644
--- a/Tables/CMIP5_cfMon
+++ b/Tables/CMIP5_cfMon
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: mon
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 05 November 2010 ! date this table was constructed
+table_date: 12 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -125,7 +125,6 @@ long_name: pressure
out_name: plev
stored_direction: decreasing
tolerance: 0.001
-
type: double
requested: 90000. 74000. 62000. 50000. 37500. 24500. 9000. ! space-separated list of requested coordinates
requested_bounds: 100000. 80000. 80000. 68000. 68000. 56000. 56000. 44000. 44000. 31000. 31000. 18000. 18000. 0. ! space-separated list of requested coordinate bounds
@@ -223,7 +222,6 @@ long_name: altitude
out_name: alt40
stored_direction: increasing
tolerance: 0.001
-
type: double
requested: 240. 720. 1200. 1680. 2160. 2640. 3120. 3600. 4080. 4560. 5040. 5520. 6000. 6480. 6960. 7440. 7920. 8400. 8880. 9360. 9840. 10320. 10800. 11280. 11760. 12240. 12720. 13200. 13680. 14160. 14640. 15120. 15600. 16080. 16560. 17040. 17520. 18000. 18480. 18960. ! space-separated list of requested coordinates
requested_bounds: 0. 480. 480. 960. 960. 1440. 1440. 1920. 1920. 2400. 2400. 2880. 2880. 3360. 3360. 3840. 3840. 4320. 4320. 4800. 4800. 5280. 5280. 5760. 5760. 6240. 6240. 6720. 6720. 7200. 7200. 7680. 7680. 8160. 8160. 8640. 8640. 9120. 9120. 9600. 9600. 10080. 10080. 10560. 10560. 11040. 11040. 11520. 11520. 12000. 12000. 12480. 12480. 12960. 12960. 13440. 13440. 13920. 13920. 14400. 14400. 14880. 14880. 15360. 15360. 15840. 15840. 16320. 16320. 16800. 16800. 17280. 17280. 17760. 1776 [...]
@@ -268,7 +266,6 @@ long_name: cloud optical thickness
out_name: tau
stored_direction: increasing
tolerance: 0.001
-
type: double
requested: 0.15 0.8 2.45 6.5 16.2 41.5 100. ! space-separated list of requested coordinates
requested_bounds: 0.0 0.3 0.3 1.3 1.3 3.6 3.6 9.4 9.4 23.0 23.0 60.0 60.0 100000. ! space-separated list of requested coordinate bounds
@@ -292,7 +289,6 @@ long_name: solar zenith angle
out_name: sza
stored_direction: increasing
tolerance: 0.001
-
type: double
requested: 0. 20. 40. 60. 80. ! space-separated list of requested coordinates
must_have_bounds: no
diff --git a/Tables/CMIP5_cfOff b/Tables/CMIP5_cfOff
index 369ae0c..f9d395c 100644
--- a/Tables/CMIP5_cfOff
+++ b/Tables/CMIP5_cfOff
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: mon
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 05 November 2010 ! date this table was constructed
+table_date: 12 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -195,7 +195,6 @@ long_name: altitude
out_name: alt40
stored_direction: increasing
tolerance: 0.001
-
type: double
requested: 240. 720. 1200. 1680. 2160. 2640. 3120. 3600. 4080. 4560. 5040. 5520. 6000. 6480. 6960. 7440. 7920. 8400. 8880. 9360. 9840. 10320. 10800. 11280. 11760. 12240. 12720. 13200. 13680. 14160. 14640. 15120. 15600. 16080. 16560. 17040. 17520. 18000. 18480. 18960. ! space-separated list of requested coordinates
requested_bounds: 0. 480. 480. 960. 960. 1440. 1440. 1920. 1920. 2400. 2400. 2880. 2880. 3360. 3360. 3840. 3840. 4320. 4320. 4800. 4800. 5280. 5280. 5760. 5760. 6240. 6240. 6720. 6720. 7200. 7200. 7680. 7680. 8160. 8160. 8640. 8640. 9120. 9120. 9600. 9600. 10080. 10080. 10560. 10560. 11040. 11040. 11520. 11520. 12000. 12000. 12480. 12480. 12960. 12960. 13440. 13440. 13920. 13920. 14400. 14400. 14880. 14880. 15360. 15360. 15840. 15840. 16320. 16320. 16800. 16800. 17280. 17280. 17760. 1776 [...]
@@ -240,7 +239,6 @@ long_name: lidar backscattering ratio
out_name: scatratio
stored_direction: increasing
tolerance: 0.001
-
type: double
requested: 0.0605 2.1 4. 6. 8.5 12.5 17.5 22.5 27.5 35. 45. 55. 70. 539.5 1004. ! space-separated list of requested coordinates
requested_bounds: 0.01 1.2 1.2 3. 3. 5. 5. 7. 7. 10. 10. 15. 15. 20. 20. 25. 25. 30. 30. 40. 40. 50. 50. 60. 60. 80. 80. 999. 999. 1009. ! space-separated list of requested coordinate bounds
@@ -264,7 +262,6 @@ long_name: CloudSat simulator equivalent radar reflectivity factor
out_name: dbze
stored_direction: increasing
tolerance: 0.001
-
type: double
requested: -47.5 -42.5 -37.5 -32.5 -27.5 -22.5 -17.5 -12.5 -7.5 -2.5 2.5 7.5 12.5 17.5 22.5 ! space-separated list of requested coordinates
requested_bounds: -50. -45. -45. -40. -40. -35. -35. -30. -30. -25. -25. -20. -20. -15. -15. -10. -10. -5. -5. 0. 0. 5. 5. 10. 10. 15. 15. 20. 20. 25. ! space-separated list of requested coordinate bounds
@@ -288,7 +285,6 @@ long_name: solar zenith angle
out_name: sza
stored_direction: increasing
tolerance: 0.001
-
type: double
requested: 0. 20. 40. 60. 80. ! space-separated list of requested coordinates
must_have_bounds: no
diff --git a/Tables/CMIP5_cfSites b/Tables/CMIP5_cfSites
index c51067f..c40d57c 100644
--- a/Tables/CMIP5_cfSites
+++ b/Tables/CMIP5_cfSites
@@ -8,10 +8,10 @@ modeling_realm: atmos
frequency: subhr
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 05 November 2010 ! date this table was constructed
+table_date: 12 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -68,52 +68,6 @@ approx_interval: 0.017361 ! approximate spacing between successive time
generic_levels: alevel alevhalf
!============
-axis_entry: longitude
-!============
-!----------------------------------
-! Axis attributes:
-!----------------------------------
-standard_name: longitude
-units: degrees_east
-axis: X ! X, Y, Z, T (default: undeclared)
-long_name: longitude
-!----------------------------------
-! Additional axis information:
-!----------------------------------
-out_name: lon
-valid_min: 0.0
-valid_max: 360.0
-stored_direction: increasing
-type: double
-must_have_bounds: yes
-!----------------------------------
-!
-
-
-!============
-axis_entry: latitude
-!============
-!----------------------------------
-! Axis attributes:
-!----------------------------------
-standard_name: latitude
-units: degrees_north
-axis: Y ! X, Y, Z, T (default: undeclared)
-long_name: latitude
-!----------------------------------
-! Additional axis information:
-!----------------------------------
-out_name: lat
-valid_min: -90.0
-valid_max: 90.0
-stored_direction: increasing
-type: double
-must_have_bounds: yes
-!----------------------------------
-!
-
-
-!============
axis_entry: time1
!============
!----------------------------------
@@ -183,6 +137,27 @@ must_have_bounds: no
!----------------------------------
!
+
+!============
+axis_entry: site
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+units: 1
+long_name: site index
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name: site
+type: integer
+must_have_bounds: no
+index_only: ok
+must_call_cmor_grid: yes
+
+!----------------------------------
+!
+
!============
axis_entry: smooth_level
!============
@@ -389,7 +364,7 @@ comment: height above the geoid; as defined here, ""the geoid"" is a s
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude
+dimensions: site
out_name: orog
type: real
valid_min: -700
@@ -558,7 +533,7 @@ comment: near-surface (usually, 2 meter) air temperature.
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1 height2m
+dimensions: site time1 height2m
out_name: tas
type: real
valid_min: 180.6
@@ -584,7 +559,7 @@ comment: ""skin"" temperature (i.e., SST for open ocean)
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: ts
type: real
valid_min: 176.8
@@ -610,7 +585,7 @@ comment: not, in general, the same as surface pressure
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: psl
type: real
valid_min: 9.477e+04
@@ -636,7 +611,7 @@ comment: not, in general, the same as mean sea-level pressure
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: ps
type: real
valid_min: 4.792e+04
@@ -661,7 +636,7 @@ comment: near-surface (usually, 10 meters) eastward component of wind.
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1 height10m
+dimensions: site time1 height10m
out_name: uas
type: real
valid_min: -19.01
@@ -686,7 +661,7 @@ comment: near-surface (usually, 10 meters) northward component of wind
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1 height10m
+dimensions: site time1 height10m
out_name: vas
type: real
valid_min: -18.04
@@ -711,7 +686,7 @@ comment: near-surface (usually, 10 meters) wind speed. This is the me
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1 height10m
+dimensions: site time1 height10m
out_name: sfcWind
type: real
!----------------------------------
@@ -733,7 +708,7 @@ comment: near-surface (usually, 2meters) relative humidity expressed a
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1 height2m
+dimensions: site time1 height2m
out_name: hurs
type: real
!----------------------------------
@@ -755,7 +730,7 @@ comment: near-surface (usually, 2 meters) specific humidity.
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1 height2m
+dimensions: site time1 height2m
out_name: huss
type: real
valid_min: -7.21e-06
@@ -781,7 +756,7 @@ comment: at surface; includes both liquid and solid phases from all ty
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: pr
type: real
valid_min: 0
@@ -807,7 +782,7 @@ comment: at surface; includes precipitation of all forms of water in t
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: prsn
type: real
valid_min: 0
@@ -833,7 +808,7 @@ comment: at surface; includes both liquid and solid phases.
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: prc
type: real
valid_min: 0
@@ -859,7 +834,7 @@ comment: at surface; flux of water into the atmosphere due to conversi
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: evspsbl
type: real
!----------------------------------
@@ -881,7 +856,7 @@ comment: The snow and ice sublimation flux is the loss of snow and ice
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: sbl
type: real
valid_min: -0.004959
@@ -905,7 +880,7 @@ long_name: Surface Downward Eastward Wind Stress
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: tauu
type: real
positive: down
@@ -930,7 +905,7 @@ long_name: Surface Downward Northward Wind Stress
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: tauv
type: real
positive: down
@@ -957,7 +932,7 @@ comment: includes both evaporation and sublimation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: hfls
type: real
positive: up
@@ -983,7 +958,7 @@ long_name: Surface Upward Sensible Heat Flux
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: hfss
type: real
positive: up
@@ -1009,7 +984,7 @@ long_name: Surface Downwelling Longwave Radiation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: rlds
type: real
positive: down
@@ -1035,7 +1010,7 @@ long_name: Surface Upwelling Longwave Radiation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: rlus
type: real
positive: up
@@ -1061,7 +1036,7 @@ long_name: Surface Downwelling Shortwave Radiation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: rsds
type: real
positive: down
@@ -1087,7 +1062,7 @@ long_name: Surface Upwelling Shortwave Radiation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: rsus
type: real
positive: up
@@ -1113,7 +1088,7 @@ long_name: Surface Downwelling Clear-Sky Shortwave Radiation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: rsdscs
type: real
positive: down
@@ -1139,7 +1114,7 @@ long_name: Surface Upwelling Clear-Sky Shortwave Radiation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: rsuscs
type: real
positive: up
@@ -1165,7 +1140,7 @@ long_name: Surface Downwelling Clear-Sky Longwave Radiation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: rldscs
type: real
positive: down
@@ -1192,7 +1167,7 @@ comment: incident shortwave at the top of the atmosphere
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: rsdt
type: real
positive: down
@@ -1219,7 +1194,7 @@ comment: at the top of the atmosphere
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: rsut
type: real
positive: up
@@ -1246,7 +1221,7 @@ comment: at the top of the atmosphere (to be compared with satellite m
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: rlut
type: real
positive: up
@@ -1272,7 +1247,7 @@ long_name: TOA Outgoing Clear-Sky Longwave Radiation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: rlutcs
type: real
positive: up
@@ -1298,7 +1273,7 @@ long_name: TOA Outgoing Clear-Sky Shortwave Radiation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: rsutcs
type: real
positive: up
@@ -1325,7 +1300,7 @@ comment: vertically integrated through the atmospheric column
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: prw
type: real
valid_min: -0.0006775
@@ -1351,7 +1326,7 @@ comment: for the whole atmospheric column, as seen from the surface or
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: clt
type: real
valid_min: -0.0001822
@@ -1377,7 +1352,7 @@ comment: calculate mass of condensed (liquid + ice) water in the colum
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: clwvi
type: real
valid_min: -3.827e-06
@@ -1403,7 +1378,7 @@ comment: calculate mass of ice water in the column divided by the area
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: clivi
type: real
valid_min: -1.872e-06
@@ -1429,7 +1404,7 @@ comment: i.e., at the top of that portion of the atmosphere where dyna
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: rtmt
type: real
positive: down
@@ -1455,7 +1430,7 @@ long_name: Air Pressure at Convective Cloud Base
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: ccb
type: real
!----------------------------------
@@ -1476,7 +1451,7 @@ long_name: Air Pressure at Convective Cloud Top
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: cct
type: real
!----------------------------------
@@ -1498,7 +1473,7 @@ comment: Fraction of time that convection occurs in the grid cell .
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: ci
type: real
!----------------------------------
@@ -1520,7 +1495,7 @@ comment: Fraction of time that shallow convection occurs in the grid c
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: sci
type: real
!----------------------------------
@@ -1542,7 +1517,7 @@ comment: This is requested only for the emission-driven coupled carbon
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: fco2antt
type: real
positive: up
@@ -1565,7 +1540,7 @@ comment: This is requested only for the emission-driven coupled carbon
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: fco2fos
type: real
positive: up
@@ -1588,7 +1563,7 @@ comment: Report from all simulations (both emission-driven and concent
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1
+dimensions: site time1
out_name: fco2nat
type: real
positive: up
@@ -1610,7 +1585,7 @@ comment: Include both large-scale and convective cloud.
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: cl
type: real
valid_min: 0
@@ -1635,7 +1610,7 @@ comment: Include both large-scale and convective cloud. Calculate as
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: clw
type: real
!----------------------------------
@@ -1656,7 +1631,7 @@ comment: Include both large-scale and convective cloud. Calculate as t
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: cli
type: real
!----------------------------------
@@ -1677,7 +1652,7 @@ comment: Report on model half-levels (i.e., model layer bounds and not
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevhalf longitude latitude time1
+dimensions: alevhalf site time1
out_name: mc
type: real
positive: up
@@ -1698,7 +1673,7 @@ long_name: Air Temperature
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: ta
type: real
valid_min: 157.1
@@ -1722,7 +1697,7 @@ long_name: Eastward Wind
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: ua
type: real
valid_min: -68.65
@@ -1746,7 +1721,7 @@ long_name: Northward Wind
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: va
type: real
valid_min: -71.1
@@ -1770,7 +1745,7 @@ long_name: Specific Humidity
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: hus
type: real
valid_min: -0.000299
@@ -1795,7 +1770,7 @@ comment: This is the relative humidity with respect to liquid water fo
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: hur
type: real
valid_min: -2.642
@@ -1820,7 +1795,7 @@ comment: commonly referred to as ""omega"", this represents the vertic
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: wap
type: real
valid_min: -1.126
@@ -1844,7 +1819,7 @@ long_name: Geopotential Height
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: zg
type: real
valid_min: -719.7
@@ -1868,7 +1843,7 @@ long_name: Upwelling Longwave Radiation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: rlu
type: real
positive: up
@@ -1889,7 +1864,7 @@ long_name: Upwelling Shortwave Radiation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: rsu
type: real
positive: up
@@ -1910,7 +1885,7 @@ long_name: Downwelling Longwave Radiation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: rld
type: real
positive: down
@@ -1931,7 +1906,7 @@ long_name: Downwelling Shortwave Radiation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: rsd
type: real
positive: down
@@ -1952,7 +1927,7 @@ long_name: Upwelling Clear-Sky Longwave Radiation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: rlucs
type: real
positive: up
@@ -1973,7 +1948,7 @@ long_name: Upwelling Clear-Sky Shortwave Radiation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: rsucs
type: real
positive: up
@@ -1994,7 +1969,7 @@ long_name: Downwelling Clear-Sky Longwave Radiation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: rldcs
type: real
positive: down
@@ -2015,7 +1990,7 @@ long_name: Downwelling Clear-Sky Shortwave Radiation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: rsdcs
type: real
positive: down
@@ -2036,7 +2011,7 @@ long_name: Tendency of Air Temperature
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: tnt
type: real
!----------------------------------
@@ -2056,7 +2031,7 @@ long_name: Tendency of Air Temperature due to Advection
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: tnta
type: real
!----------------------------------
@@ -2076,7 +2051,7 @@ long_name: Tendency of Air Temperature due to Diabatic Processes
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: tntmp
type: real
!----------------------------------
@@ -2096,7 +2071,7 @@ long_name: Tendency of Air Temperature due to Stratiform Cloud Condensat
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: tntscpbl
type: real
!----------------------------------
@@ -2116,7 +2091,7 @@ long_name: Tendency of Air Temperature due to Radiative Heating
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: tntr
type: real
!----------------------------------
@@ -2136,7 +2111,7 @@ long_name: Tendency of Air Temperature due to Moist Convection
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: tntc
type: real
!----------------------------------
@@ -2156,7 +2131,7 @@ long_name: Tendency of Specific Humidity
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: tnhus
type: real
!----------------------------------
@@ -2176,7 +2151,7 @@ long_name: Tendency of Specific Humidity due to Advection
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: tnhusa
type: real
!----------------------------------
@@ -2196,7 +2171,7 @@ long_name: Tendency of Specific Humidity due to Convection
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: tnhusc
type: real
!----------------------------------
@@ -2216,7 +2191,7 @@ long_name: Tendency of Specific Humidity due to Diffusion
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: tnhusd
type: real
!----------------------------------
@@ -2236,7 +2211,7 @@ long_name: Tendency of Specific Humidity due to Stratiform Cloud Condens
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: tnhusscpbl
type: real
!----------------------------------
@@ -2256,7 +2231,7 @@ long_name: Tendency of Specific Humidity due to Model Physics
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: tnhusmp
type: real
!----------------------------------
@@ -2276,7 +2251,7 @@ long_name: Eddy Viscosity Coefficient for Momentum Variables
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: evu
type: real
!----------------------------------
@@ -2296,7 +2271,7 @@ long_name: Eddy Diffusivity Coefficient for Temperature Variable
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: edt
type: real
!----------------------------------
@@ -2317,7 +2292,7 @@ comment: This field is needed only for models in which the pressure ca
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: pfull
type: real
!----------------------------------
@@ -2338,9 +2313,53 @@ comment: This field is needed only for models in which the pressure ca
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: alevel longitude latitude time1
+dimensions: alevel site time1
out_name: phalf
type: real
!----------------------------------
!
+!============
+variable_entry: longitude
+!============
+modeling_realm: atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name: longitude
+units: degrees_east
+cell_methods: 0.0
+long_name: Longitude
+comment: Note that the CF convention and CMOR2 require that this field will be included in each file that contains a variable that is a function of the ""site"" dimension, so there is no need to save this field by itself. It is included here simply to indicate that longitudes should be stored for the site grid in each file written.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions: site
+out_name: lon
+type: real
+valid_min: 360.0
+!----------------------------------
+!
+
+!============
+variable_entry: latitude
+!============
+modeling_realm: atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name: latitude
+units: degrees_north
+cell_methods: -90.0
+long_name: Latitude
+comment: the above comment also applies to latitude.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions: site
+out_name: lat
+type: real
+valid_min: 90.0
+!----------------------------------
+!
+
diff --git a/Tables/CMIP5_day b/Tables/CMIP5_day
index becd4d6..cbe9f5c 100644
--- a/Tables/CMIP5_day
+++ b/Tables/CMIP5_day
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: day
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 05 November 2010 ! date this table was constructed
+table_date: 12 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -123,7 +123,6 @@ long_name: pressure
out_name: plev
stored_direction: decreasing
tolerance: 0.001
-
type: double
requested: 100000. 85000. 70000. 50000. 25000. 10000. 5000. 1000. ! space-separated list of requested coordinates
must_have_bounds: no
diff --git a/Tables/CMIP5_fx b/Tables/CMIP5_fx
index 43ab030..abd345b 100644
--- a/Tables/CMIP5_fx
+++ b/Tables/CMIP5_fx
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: fx
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 05 November 2010 ! date this table was constructed
+table_date: 12 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_grids b/Tables/CMIP5_grids
index 20ddf62..94f6d08 100644
--- a/Tables/CMIP5_grids
+++ b/Tables/CMIP5_grids
@@ -4,7 +4,7 @@ table_id: Table grids
cmor_version: 2.0 ! version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 19 October 2010 ! date this table was constructed
+table_date: 12 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -62,22 +62,6 @@ parameter: false_northing
coordinates: rlon rlat
!
!============
-axis_entry: site
-!============
-!
-!------------
-!
-! Axis attributes:
-!----------------------------------
-out_name: site
-units: 1
-long_name: site index
-type: integer
-index_only: ok
-!----------------------------------
-!
-!
-!============
axis_entry: i_index
!============
!
diff --git a/Tables/md5s b/Tables/md5s
index 609362f..ad356ee 100644
--- a/Tables/md5s
+++ b/Tables/md5s
@@ -1 +1 @@
-{'CMIP5': {'cfSites': {'11 May 2010': '80506c07ed63befd33f9f727b78bde55', '19 October 2010': '80264b0dd9e203ce916542fa15c6d272', '12 May 2010': '0ebecf85ba30b2223360a29ece880be4', '23 August 2010': '4a2774cbbde4d5f69c9541e6b6248d00', '01 June 2010': '2eb2e9a6a1db0e18dac73e04e0dfbe47', '01 July 2010': '96628b3875e74a8a515d0a1e500710d8', '29 April 2010': '27c4a93f80a4282ef69f23391c699f01', '12 March 2010': '192f07ba869af3794494ea0dc3a72a54', '22 March 2010': 'fe60fd7cfbaccc08c75a91dc67a68b [...]
\ No newline at end of file
+{'CMIP5': {'cf3hr': {'11 May 2010': 'a59ca1270ff3036d417a7f2217598266', '19 October 2010': '8b5c2f197b70a103393838ebd4075c6c', '12 May 2010': '905f7ccdd5a31cb71e2a6e3b339cd0e1', '23 August 2010': '5ccea11a7c3d165c76df3d9eede395d0', '01 June 2010': '619aa3c816bc25a53335589698e64968', '01 July 2010': 'c0fe9e92115d75292f5009e13761cb4b', '11 November 2010': '35a8e11c7f57f3128517d21d177a8204', '12 March 2010': 'ae9a82f01824d9012aa0657cd7896a9a', '22 March 2010': '712cd14ab6a28116da828ff555e00 [...]
\ No newline at end of file
diff --git a/Tables_csv/aero.csv b/Tables_csv/aero.csv
index 15039c8..94e6d9a 100644
--- a/Tables_csv/aero.csv
+++ b/Tables_csv/aero.csv
@@ -14,10 +14,10 @@ In CMOR Table aero: 2-D fields on atmospheric grid,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,
priority,long name,units ,comment ,questions,output variable name ,standard name,unconfirmed or proposed standard name,unformatted units,cell_methods,valid min,valid max,mean absolute min,mean absolute max,positive,type,CMOR dimensions,CMOR variable name,realm,frequency,cell_measures,flag_values,flag_meanings
,Aerosol Optics,,,,,,,,,,,,,,,,,,,,,
-1.0,Ambient Aerosol Opitical Thickness at 550 nm,1.0,"AOD from the ambient aerosls (i.e., includes aerosol water). Does not include AOD from stratospheric aerosols if these are prescribed but includes other possible background aerosol types.",,od550aer,atmosphere_optical_thickness_due_to_ambient_aerosol,,1.0,time: mean,,,,,,real,longitude latitude time,od550aer,aerosol,,area: areacella,,
-1.0,Ambient Fine Aerosol Opitical Thickness at 550 nm,1.0,"od550 due to particles with wet diameter less than 1 um (""ambient"" means ""wetted""). When models do not include explicit size information, it can be assumed that all anthropogenic aerosols and natural secondary aerosols have diameter less than 1 um. ",,od550lt1aer,atmosphere_optical_thickness_due_to_pm1_ambient_aerosol,,1.0,time: mean,,,,,,real,longitude latitude time,od550lt1aer,aerosol,,area: areacella,,
+1.0,Ambient Aerosol Optical Thickness at 550 nm,1.0,"AOD from the ambient aerosls (i.e., includes aerosol water). Does not include AOD from stratospheric aerosols if these are prescribed but includes other possible background aerosol types.",,od550aer,atmosphere_optical_thickness_due_to_ambient_aerosol,,1.0,time: mean,,,,,,real,longitude latitude time,od550aer,aerosol,,area: areacella,,
+1.0,Ambient Fine Aerosol Optical Thickness at 550 nm,1.0,"od550 due to particles with wet diameter less than 1 um (""ambient"" means ""wetted""). When models do not include explicit size information, it can be assumed that all anthropogenic aerosols and natural secondary aerosols have diameter less than 1 um. ",,od550lt1aer,atmosphere_optical_thickness_due_to_pm1_ambient_aerosol,,1.0,time: mean,,,,,,real,longitude latitude time,od550lt1aer,aerosol,,area: areacella,,
1.0,Ambient Aerosol Absorption Optical Thickness at 550 nm,1.0,,,abs550aer,atmosphere_absorption_optical_thickness_due_to_ambient_aerosol,,1.0,time: mean,,,,,,real,longitude latitude time,abs550aer,aerosol,,area: areacella,,
-2.0,Ambient Aerosol Opitical Thickness at 870 nm,1.0,"AOD from the ambient aerosls (i.e., includes aerosol water). Does not include AOD from stratospheric aerosols if these are prescribed but includes other possible background aerosol types.",,od870aer,atmosphere_optical_thickness_due_to_ambient_aerosol,,1.0,time: mean,,,,,,real,longitude latitude time,od870aer,aerosol,,area: areacella,,
+2.0,Ambient Aerosol Optical Thickness at 870 nm,1.0,"AOD from the ambient aerosls (i.e., includes aerosol water). Does not include AOD from stratospheric aerosols if these are prescribed but includes other possible background aerosol types.",,od870aer,atmosphere_optical_thickness_due_to_ambient_aerosol,,1.0,time: mean,,,,,,real,longitude latitude time,od870aer,aerosol,,area: areacella,,
,Aerosol Budgets,,,,,,,,,,,,,,,,,,,,,
1.0,Rate of Emission and Production of Dry Aerosol Total Organic Matter,kg m-2 s-1,"tendency of atmosphere mass content of organic matter dry aerosol due to net production and emission. This is the sum of total emission of POA and total production of SOA (see next two entries), and it should only be reported if POA and SOA cannot be separately reported. ""Mass"" refers to the mass of organic matter, not mass of organic carbon alone. ",,emioa,tendency_of_atmosphere_mass_content_of_partic [...]
1.0,Emission Rate of Dry Aerosol Primary Organic Matter,kg m-2 s-1,"tendency of atmosphere mass content of primary organic aerosol due to emission: ""mass"" refers to the mass of primary organic matter, not mass of organic carbon alone.","In a previous message you said production referred to SOA, not POA, so I've removed ""production"" here and only use ""emission"". Is this o.k.?",emipoa,tendency_of_atmosphere_mass_content_of_primary_particulate_organic_matter_dry_aerosol_due_to_emiss [...]
diff --git a/Tables_csv/cf3hr.csv b/Tables_csv/cf3hr.csv
index 2af4141..944dbcf 100644
--- a/Tables_csv/cf3hr.csv
+++ b/Tables_csv/cf3hr.csv
@@ -23,8 +23,8 @@ priority,long name,units ,comment ,questions,output variable name ,standard name
1.0,CALIPSO Low Level Cloud Fraction ,%,,,cllcalipso,cloud_area_fraction_in_atmosphere_layer,,%,time: point,,,,,,real,location time1 p840,cllcalipso,atmos,,,,
1.0,CALIPSO Mid Level Cloud Fraction ,%,,,clmcalipso,cloud_area_fraction_in_atmosphere_layer,,%,time: point,,,,,,real,location time1 p560,clmcalipso,atmos,,,,
1.0,CALIPSO High Level Cloud Fraction ,%,,,clhcalipso,cloud_area_fraction_in_atmosphere_layer,,%,time: point,,,,,,real,location time1 p220,clhcalipso,atmos,,,,
-1.0,Longitude,degrees_east,"function of time. Note that the CF convention and CMOR2 expect that this field will be included in each file that contains a variable that is a function of the ""location"" dimension, so it shouldn't be necessary to also save this field by itself.",,lon,longitude,,degrees_east,time: point,,,,,,real,location time1,lon,atmos,,,,
-1.0,Latitude,degrees_north,the above comment also applies to latitude.,,lat,latitude,,degrees_north,time: point,,,,,,real,location time1,lat,atmos,,,,
+1.0,Longitude,degrees_east,"is a function of time. Note that the CF convention and CMOR2 require that this field will be included in each file that contains a variable that is a function of the ""location"" dimension, so there is no need to save this field by itself.",,lon,longitude,,degrees_east,time: point,0.0,360.0,,,,real,location time1,longitude,atmos,,,,
+1.0,Latitude,degrees_north,the above comment also applies to latitude.,,lat,latitude,,degrees_north,time: point,-90.0,90.0,,,,real,location time1,latitude,atmos,,,,
1.0,Offset Time,day,"this ""offset time"" should be added to the value stored in the ""time dimension"" to get the actual time. This actual time is the time (UTC) of the corresponding point in the satellite orbit used to extract the model data.",,toffset,time,,day,,,,,,,real,location time1,toffset,atmos,,,,
"In CMOR Table cf3hr: ""CFMIP 3-hourly inline"" -- 2-D fields as specified in the Amon table plus convective cloud fraction and 3-D fields on model levels (or half levels, as indicated) sampled synoptically every 3 hours (i.e., not time-mean) at 0Z, 3Z, 6Z, 9Z, 12Z, 15Z, 18Z, and 21Z.",,,,,,,,,,,,,,,,,,,,,,
priority,long name,units ,comment ,questions,output variable name ,standard name,unconfirmed or proposed standard name,unformatted units,cell_methods,valid min,valid max,mean absolute min,mean absolute max,positive,type,CMOR dimensions,CMOR variable name,realm,frequency,cell_measures,flag_values,flag_meanings
diff --git a/Tables_csv/cfSites.csv b/Tables_csv/cfSites.csv
index 42998f7..bea64b9 100644
--- a/Tables_csv/cfSites.csv
+++ b/Tables_csv/cfSites.csv
@@ -13,41 +13,43 @@ CMOR Table cfSites: CFMIP high frequency Cloud Diagnostic Fields,,,,,cfSites,sub
,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,
priority,long name,units ,comment ,questions,output variable name ,standard name,unconfirmed or proposed standard name,unformatted units,cell_methods,valid min,valid max,mean absolute min,mean absolute max,positive,type,CMOR dimensions,CMOR variable name,realm,frequency,cell_measures,flag_values,flag_meanings
-1.0,(use names from Amon 2D table),,"This table includes the 2-D variables listed in the ""Amon"" spreadsheet, omitting, however, the daily maximum and minimum temperatures. All variables should be reported as synoptic fields, not daily means. ",,include Amon 2D,,,,time: point,,,,,,real,longitude latitude time1,,atmos,,,,
-1.0,Cloud Area Fraction,%,Include both large-scale and convective cloud.,,cl,cloud_area_fraction_in_atmosphere_layer,,%,time: point,,,,,,real,alevel longitude latitude time1,cl,atmos,,,,
-1.0,Mass Fraction of Cloud Liquid Water,1.0,Include both large-scale and convective cloud. Calculate as the mass of cloud liquid water in the grid cell divided by the mass of air (including the water in all phases) in the grid cell. Include precipitating hydrometeors ONLY if the precipitating hydrometeor affects the calculation of radiative transfer in model. ,,clw,mass_fraction_of_cloud_liquid_water_in_air,,1.0,time: point,,,,,,real,alevel longitude latitude time1,clw,atmos,,,,
-1.0,Mass Fraction of Cloud Ice,1.0,Include both large-scale and convective cloud. Calculate as the mass of cloud ice in the grid cell divided by the mass of air (including the water in all phases) in the grid cell. Include precipitating hydrometeors ONLY if the precipitating hydrometeor affects the calculation of radiative transfer in model. ,,cli,mass_fraction_of_cloud_ice_in_air,,1.0,time: point,,,,,,real,alevel longitude latitude time1,cli,atmos,,,,
-1.0,Convective Mass Flux,kg m-2 s-1,"Report on model half-levels (i.e., model layer bounds and not standard pressures). The net mass flux should represent the difference between the updraft and downdraft components. Calculate as the convective mass flux divided by the area of the whole grid cell (not just the area of the updrafts).",,mc,atmosphere_net_upward_convective_mass_flux,,kg m-2 s-1,time: point,,,,,up,real,alevhalf longitude latitude time1,mc,atmos,,,,
-1.0,Air Temperature,K,,,ta,air_temperature,,K,time: point,,,,,,real,alevel longitude latitude time1,ta,atmos,,,,
-1.0,Eastward Wind,m s-1,,,ua,eastward_wind,,m s-1,time: point,,,,,,real,alevel longitude latitude time1,ua,atmos,,,,
-1.0,Northward Wind,m s-1,,,va,northward_wind,,m s-1,time: point,,,,,,real,alevel longitude latitude time1,va,atmos,,,,
-1.0,Specific Humidity,1.0,,,hus,specific_humidity,,1.0,time: point,,,,,,real,alevel longitude latitude time1,hus,atmos,,,,
-1.0,Relative Humidity,%,"This is the relative humidity with respect to liquid water for T> 0 C, and with respect to ice for T<0 C.",,hur,relative_humidity,,%,time: point,,,,,,real,alevel longitude latitude time1,hur,atmos,,,,
-1.0,omega (=dp/dt),Pa s-1,"commonly referred to as ""omega"", this represents the vertical component of velocity in pressure coordinates (positive down)",,wap,lagrangian_tendency_of_air_pressure,,Pa s-1,time: point,,,,,,real,alevel longitude latitude time1,wap,atmos,,,,
-1.0,Geopotential Height,m,,,zg,geopotential_height,,m,time: point,,,,,,real,alevel longitude latitude time1,zg,atmos,,,,
-1.0,Upwelling Longwave Radiation,W m-2,,,rlu,upwelling_longwave_flux_in_air,,W m-2,time: point,,,,,up,real,alevel longitude latitude time1,rlu,atmos,,,,
-1.0,Upwelling Shortwave Radiation,W m-2,,,rsu,upwelling_shortwave_flux_in_air,,W m-2,time: point,,,,,up,real,alevel longitude latitude time1,rsu,atmos,,,,
-1.0,Downwelling Longwave Radiation,W m-2,,,rld,downwelling_longwave_flux_in_air,,W m-2,time: point,,,,,down,real,alevel longitude latitude time1,rld,atmos,,,,
-1.0,Downwelling Shortwave Radiation,W m-2,,,rsd,downwelling_shortwave_flux_in_air,,W m-2,time: point,,,,,down,real,alevel longitude latitude time1,rsd,atmos,,,,
-1.0,Upwelling Clear-Sky Longwave Radiation,W m-2,,,rlucs,upwelling_longwave_flux_in_air_assuming_clear_sky,,W m-2,time: point,,,,,up,real,alevel longitude latitude time1,rlucs,atmos,,,,
-1.0,Upwelling Clear-Sky Shortwave Radiation,W m-2,,,rsucs,upwelling_shortwave_flux_in_air_assuming_clear_sky,,W m-2,time: point,,,,,up,real,alevel longitude latitude time1,rsucs,atmos,,,,
-1.0,Downwelling Clear-Sky Longwave Radiation,W m-2,,,rldcs,downwelling_longwave_flux_in_air_assuming_clear_sky,,W m-2,time: point,,,,,down,real,alevel longitude latitude time1,rldcs,atmos,,,,
-1.0,Downwelling Clear-Sky Shortwave Radiation,W m-2,,,rsdcs,downwelling_shortwave_flux_in_air_assuming_clear_sky,,W m-2,time: point,,,,,down,real,alevel longitude latitude time1,rsdcs,atmos,,,,
-1.0,Tendency of Air Temperature,K s-1,,,tnt ,tendency_of_air_temperature,,K s-1,time: point,,,,,,real,alevel longitude latitude time1,tnt ,atmos,,,,
-1.0,Tendency of Air Temperature due to Advection,K s-1,,,tnta ,tendency_of_air_temperature_due_to_advection,,K s-1,time: point,,,,,,real,alevel longitude latitude time1,tnta ,atmos,,,,
-1.0,Tendency of Air Temperature due to Diabatic Processes,K s-1,,,tntmp,tendency_of_air_temperature_due_to_model_physics,,K s-1,time: point,,,,,,real,alevel longitude latitude time1,tntmp,atmos,,,,
-1.0,Tendency of Air Temperature due to Stratiform Cloud Condensation and Evaporation,K s-1,,,tntscpbl ,tendency_of_air_temperature_due_to_stratiform_cloud_and_precipitation_and_boundary_layer_mixing,,K s-1,time: point,,,,,,real,alevel longitude latitude time1,tntscpbl ,atmos,,,,
-1.0,Tendency of Air Temperature due to Radiative Heating,K s-1,,,tntr ,tendency_of_air_temperature_due_to_radiative_heating,,K s-1,time: point,,,,,,real,alevel longitude latitude time1,tntr ,atmos,,,,
-1.0,Tendency of Air Temperature due to Moist Convection,K s-1,,,tntc,tendency_of_air_temperature_due_to_convection,,K s-1,time: point,,,,,,real,alevel longitude latitude time1,tntc,atmos,,,,
-1.0,Tendency of Specific Humidity,s-1,,,tnhus,tendency_of_specific_humidity,,s-1,time: point,,,,,,real,alevel longitude latitude time1,tnhus,atmos,,,,
-1.0,Tendency of Specific Humidity due to Advection,s-1,,,tnhusa ,tendency_of_specific_humidity_due_to_advection,,s-1,time: point,,,,,,real,alevel longitude latitude time1,tnhusa ,atmos,,,,
-1.0,Tendency of Specific Humidity due to Convection,s-1,,,tnhusc ,tendency_of_specific_humidity_due_to_convection,,s-1,time: point,,,,,,real,alevel longitude latitude time1,tnhusc ,atmos,,,,
-1.0,Tendency of Specific Humidity due to Diffusion,s-1,,,tnhusd ,tendency_of_specific_humidity_due_to_diffusion,,s-1,time: point,,,,,,real,alevel longitude latitude time1,tnhusd ,atmos,,,,
-1.0,Tendency of Specific Humidity due to Stratiform Cloud Condensation and Evaporation,s-1,,,tnhusscpbl ,tendency_of_specific_humidity_due_to_stratiform_cloud_and_precipitation_and_boundary_layer_mixing,,s-1,time: point,,,,,,real,alevel longitude latitude time1,tnhusscpbl ,atmos,,,,
-1.0,Tendency of Specific Humidity due to Model Physics,s-1,,,tnhusmp ,tendency_of_specific_humidity_due_to_model_physics,,s-1,time: point,,,,,,real,alevel longitude latitude time1,tnhusmp ,atmos,,,,
-1.0,Eddy Viscosity Coefficient for Momentum Variables,m2 s-1,,,evu,atmosphere_momentum_diffusivity,,m2 s-1,time: point,,,,,,real,alevel longitude latitude time1,evu,atmos,,,,
-1.0,Eddy Diffusivity Coefficient for Temperature Variable,m2 s-1,,,edt,atmosphere_heat_diffusivity,,m2 s-1,time: point,,,,,,real,alevel longitude latitude time1,edt,atmos,,,,
-1.0,Pressure on Model Levels,Pa,"This field is needed only for models in which the pressure can't be calculated from the vertical coordinate information stored already for each variable. Thus, the pressures are needed for height or theta-coordinate models, for example, but not sigma- or eta-coordinate models.",,pfull,air_pressure,,Pa,time: point,,,,,,real,alevel longitude latitude time1,pfull,atmos,,,,
-1.0,Pressure on Model Half-Levels,Pa,"This field is needed only for models in which the pressure can't be calculated from the vertical coordinate information stored already for each variable. Thus, the pressures are needed for height or theta-coordinate models, for example, but not sigma- or eta-coordinate models.",,phalf,air_pressure,,Pa,time: point,,,,,,real,alevel longitude latitude time1,phalf,atmos,,,,
+1.0,(use names from Amon 2D table),,"This table includes the 2-D variables listed in the ""Amon"" spreadsheet, omitting, however, the daily maximum and minimum temperatures. All variables should be reported as synoptic fields, not daily means. ",,include Amon 2D,,,,time: point,,,,,,real,site time1,,atmos,,,,
+1.0,Cloud Area Fraction,%,Include both large-scale and convective cloud.,,cl,cloud_area_fraction_in_atmosphere_layer,,%,time: point,,,,,,real,alevel site time1,cl,atmos,,,,
+1.0,Mass Fraction of Cloud Liquid Water,1.0,Include both large-scale and convective cloud. Calculate as the mass of cloud liquid water in the grid cell divided by the mass of air (including the water in all phases) in the grid cell. Include precipitating hydrometeors ONLY if the precipitating hydrometeor affects the calculation of radiative transfer in model. ,,clw,mass_fraction_of_cloud_liquid_water_in_air,,1.0,time: point,,,,,,real,alevel site time1,clw,atmos,,,,
+1.0,Mass Fraction of Cloud Ice,1.0,Include both large-scale and convective cloud. Calculate as the mass of cloud ice in the grid cell divided by the mass of air (including the water in all phases) in the grid cell. Include precipitating hydrometeors ONLY if the precipitating hydrometeor affects the calculation of radiative transfer in model. ,,cli,mass_fraction_of_cloud_ice_in_air,,1.0,time: point,,,,,,real,alevel site time1,cli,atmos,,,,
+1.0,Convective Mass Flux,kg m-2 s-1,"Report on model half-levels (i.e., model layer bounds and not standard pressures). The net mass flux should represent the difference between the updraft and downdraft components. Calculate as the convective mass flux divided by the area of the whole grid cell (not just the area of the updrafts).",,mc,atmosphere_net_upward_convective_mass_flux,,kg m-2 s-1,time: point,,,,,up,real,alevhalf site time1,mc,atmos,,,,
+1.0,Air Temperature,K,,,ta,air_temperature,,K,time: point,,,,,,real,alevel site time1,ta,atmos,,,,
+1.0,Eastward Wind,m s-1,,,ua,eastward_wind,,m s-1,time: point,,,,,,real,alevel site time1,ua,atmos,,,,
+1.0,Northward Wind,m s-1,,,va,northward_wind,,m s-1,time: point,,,,,,real,alevel site time1,va,atmos,,,,
+1.0,Specific Humidity,1.0,,,hus,specific_humidity,,1.0,time: point,,,,,,real,alevel site time1,hus,atmos,,,,
+1.0,Relative Humidity,%,"This is the relative humidity with respect to liquid water for T> 0 C, and with respect to ice for T<0 C.",,hur,relative_humidity,,%,time: point,,,,,,real,alevel site time1,hur,atmos,,,,
+1.0,omega (=dp/dt),Pa s-1,"commonly referred to as ""omega"", this represents the vertical component of velocity in pressure coordinates (positive down)",,wap,lagrangian_tendency_of_air_pressure,,Pa s-1,time: point,,,,,,real,alevel site time1,wap,atmos,,,,
+1.0,Geopotential Height,m,,,zg,geopotential_height,,m,time: point,,,,,,real,alevel site time1,zg,atmos,,,,
+1.0,Upwelling Longwave Radiation,W m-2,,,rlu,upwelling_longwave_flux_in_air,,W m-2,time: point,,,,,up,real,alevel site time1,rlu,atmos,,,,
+1.0,Upwelling Shortwave Radiation,W m-2,,,rsu,upwelling_shortwave_flux_in_air,,W m-2,time: point,,,,,up,real,alevel site time1,rsu,atmos,,,,
+1.0,Downwelling Longwave Radiation,W m-2,,,rld,downwelling_longwave_flux_in_air,,W m-2,time: point,,,,,down,real,alevel site time1,rld,atmos,,,,
+1.0,Downwelling Shortwave Radiation,W m-2,,,rsd,downwelling_shortwave_flux_in_air,,W m-2,time: point,,,,,down,real,alevel site time1,rsd,atmos,,,,
+1.0,Upwelling Clear-Sky Longwave Radiation,W m-2,,,rlucs,upwelling_longwave_flux_in_air_assuming_clear_sky,,W m-2,time: point,,,,,up,real,alevel site time1,rlucs,atmos,,,,
+1.0,Upwelling Clear-Sky Shortwave Radiation,W m-2,,,rsucs,upwelling_shortwave_flux_in_air_assuming_clear_sky,,W m-2,time: point,,,,,up,real,alevel site time1,rsucs,atmos,,,,
+1.0,Downwelling Clear-Sky Longwave Radiation,W m-2,,,rldcs,downwelling_longwave_flux_in_air_assuming_clear_sky,,W m-2,time: point,,,,,down,real,alevel site time1,rldcs,atmos,,,,
+1.0,Downwelling Clear-Sky Shortwave Radiation,W m-2,,,rsdcs,downwelling_shortwave_flux_in_air_assuming_clear_sky,,W m-2,time: point,,,,,down,real,alevel site time1,rsdcs,atmos,,,,
+1.0,Tendency of Air Temperature,K s-1,,,tnt ,tendency_of_air_temperature,,K s-1,time: point,,,,,,real,alevel site time1,tnt ,atmos,,,,
+1.0,Tendency of Air Temperature due to Advection,K s-1,,,tnta ,tendency_of_air_temperature_due_to_advection,,K s-1,time: point,,,,,,real,alevel site time1,tnta ,atmos,,,,
+1.0,Tendency of Air Temperature due to Diabatic Processes,K s-1,,,tntmp,tendency_of_air_temperature_due_to_model_physics,,K s-1,time: point,,,,,,real,alevel site time1,tntmp,atmos,,,,
+1.0,Tendency of Air Temperature due to Stratiform Cloud Condensation and Evaporation,K s-1,,,tntscpbl ,tendency_of_air_temperature_due_to_stratiform_cloud_and_precipitation_and_boundary_layer_mixing,,K s-1,time: point,,,,,,real,alevel site time1,tntscpbl ,atmos,,,,
+1.0,Tendency of Air Temperature due to Radiative Heating,K s-1,,,tntr ,tendency_of_air_temperature_due_to_radiative_heating,,K s-1,time: point,,,,,,real,alevel site time1,tntr ,atmos,,,,
+1.0,Tendency of Air Temperature due to Moist Convection,K s-1,,,tntc,tendency_of_air_temperature_due_to_convection,,K s-1,time: point,,,,,,real,alevel site time1,tntc,atmos,,,,
+1.0,Tendency of Specific Humidity,s-1,,,tnhus,tendency_of_specific_humidity,,s-1,time: point,,,,,,real,alevel site time1,tnhus,atmos,,,,
+1.0,Tendency of Specific Humidity due to Advection,s-1,,,tnhusa ,tendency_of_specific_humidity_due_to_advection,,s-1,time: point,,,,,,real,alevel site time1,tnhusa ,atmos,,,,
+1.0,Tendency of Specific Humidity due to Convection,s-1,,,tnhusc ,tendency_of_specific_humidity_due_to_convection,,s-1,time: point,,,,,,real,alevel site time1,tnhusc ,atmos,,,,
+1.0,Tendency of Specific Humidity due to Diffusion,s-1,,,tnhusd ,tendency_of_specific_humidity_due_to_diffusion,,s-1,time: point,,,,,,real,alevel site time1,tnhusd ,atmos,,,,
+1.0,Tendency of Specific Humidity due to Stratiform Cloud Condensation and Evaporation,s-1,,,tnhusscpbl ,tendency_of_specific_humidity_due_to_stratiform_cloud_and_precipitation_and_boundary_layer_mixing,,s-1,time: point,,,,,,real,alevel site time1,tnhusscpbl ,atmos,,,,
+1.0,Tendency of Specific Humidity due to Model Physics,s-1,,,tnhusmp ,tendency_of_specific_humidity_due_to_model_physics,,s-1,time: point,,,,,,real,alevel site time1,tnhusmp ,atmos,,,,
+1.0,Eddy Viscosity Coefficient for Momentum Variables,m2 s-1,,,evu,atmosphere_momentum_diffusivity,,m2 s-1,time: point,,,,,,real,alevel site time1,evu,atmos,,,,
+1.0,Eddy Diffusivity Coefficient for Temperature Variable,m2 s-1,,,edt,atmosphere_heat_diffusivity,,m2 s-1,time: point,,,,,,real,alevel site time1,edt,atmos,,,,
+1.0,Pressure on Model Levels,Pa,"This field is needed only for models in which the pressure can't be calculated from the vertical coordinate information stored already for each variable. Thus, the pressures are needed for height or theta-coordinate models, for example, but not sigma- or eta-coordinate models.",,pfull,air_pressure,,Pa,time: point,,,,,,real,alevel site time1,pfull,atmos,,,,
+1.0,Pressure on Model Half-Levels,Pa,"This field is needed only for models in which the pressure can't be calculated from the vertical coordinate information stored already for each variable. Thus, the pressures are needed for height or theta-coordinate models, for example, but not sigma- or eta-coordinate models.",,phalf,air_pressure,,Pa,time: point,,,,,,real,alevel site time1,phalf,atmos,,,,
+1.0,Longitude,degrees_east,"Note that the CF convention and CMOR2 require that this field will be included in each file that contains a variable that is a function of the ""site"" dimension, so there is no need to save this field by itself. It is included here simply to indicate that longitudes should be stored for the site grid in each file written.",,lon,longitude,,degrees_east,0.0,360.0,,,,,real,site,longitude,atmos,,,,
+1.0,Latitude,degrees_north,the above comment also applies to latitude.,,lat,latitude,,degrees_north,-90.0,90.0,,,,,real,site,latitude,atmos,,,,
diff --git a/Tables_csv/dims.csv b/Tables_csv/dims.csv
index 882fe75..521cd9d 100644
--- a/Tables_csv/dims.csv
+++ b/Tables_csv/dims.csv
@@ -1,49 +1,49 @@
-CMOR Dimensions,,,,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,
-CMOR table(s),CMOR dimension,output dimension name,description,standard name,long name,axis,units,index axis?,coords_attrib,bounds?,stored direction,valid_min,valid_max,type,positive,value,bounds _values,requested,bounds_ requested,tol_on_requests: variance from requested values that is tolerated
-"fx, Amon, Lmon, LImon, OImon, aero, day, 6hrLev, 6hrPlev, 3hr, Oclim, Oyr, Omon, cfMon, cfOff, cfDay, cf3hr, cfSites",longitude,lon,,longitude,longitude,X,degrees_east,,,yes,increasing,0.0,360.0,double,,,,,,
-"fx, Amon, Lmon, LImon, OImon, aero, day, 6hrLev, 6hrPlev, 3hr, Oclim, Oyr, Omon, cfMon, cfOff, cfDay, cf3hr, cfSites",latitude,lat,,latitude,latitude,Y,degrees_north,,,yes,increasing,-90.0,90.0,double,,,,,,
-Amon,plevs,plev,There are 17 mandatory levels and up to 6 additional levels requested of models with sufficient resolution in the stratosphere.,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down,,,100000. 92500. 85000. 70000. 60000. 50000. 40000. 30000. 25000. 20000. 15000. 10000. 7000. 5000. 3000. 2000. 1000.,,0.001
-day,plev8,plev,,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down,,,100000. 85000. 70000. 50000. 25000. 10000. 5000. 1000.,,0.001
-6hrPlev,plev3,plev,,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down,,,85000. 50000. 25000. ,,0.001
-"cfMon, cfDay",plev7,plev,7 pressure layers defined by ISCCP simulator,air_pressure,pressure,Z,Pa,,,yes,decreasing,,,double,down,,,90000. 74000. 62000. 50000. 37500. 24500. 9000.,100000. 80000. 80000. 68000. 68000. 56000. 56000. 44000. 44000. 31000. 31000. 18000. 18000. 0.,0.001
-cfDay,p500,plev,500 hPa,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down,50000.,,,,
-cfDay,p700,plev,700 hPa,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down,70000.,,,,
-"cfMon, cfOff, cf3hr",p220,plev,pressure layer of high-level cloud in ISCCP simulator,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down,22000.,44000. 0.0,,,
-"cfMon, cfOff, cf3hr",p560,plev,pressure layer of mid-level cloud in ISCCP simulator,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down,56000.,68000. 44000.,,,
-"cfMon, cfOff, cf3hr",p840,plev,pressure layer of low-level cloud in ISCCP simulator,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down,84000.,100000. 68000.,,,
-"Amon, aero, 6hrLev, cfMon, cfDay, cf3hr, cfSites",alevel,lev,generic atmospheric model vertical coordinate (nondimensional or dimensional),,atmospheric model level,Z,,ok,,yes,,,,double,up,,,,,
-"Amon, cfMon, cfDay, cf3hr, cfSites",alevhalf,lev,"atmospheric model ""half"" level",,atmospheric model half-level,Z,,ok,,no,,,,double,up,,,,,
-aero,alev1,lev,atmospheric model's lowest level,,lowest atmospheric model level,Z,,ok,,yes,,,,double,,,,,,
-"cfMon, cfOff, cfDay, cf3hr",alt40,alt40,CloudSat vertical coordinate heights,altitude,altitude,Z,m,,,yes,increasing,,,double,up,,,240. 720. 1200. 1680. 2160. 2640. 3120. 3600. 4080. 4560. 5040. 5520. 6000. 6480. 6960. 7440. 7920. 8400. 8880. 9360. 9840. 10320. 10800. 11280. 11760. 12240. 12720. 13200. 13680. 14160. 14640. 15120. 15600. 16080. 16560. 17040. 17520. 18000. 18480. 18960.,0. 480. 480. 960. 960. 1440. 1440. 1920. 1920. 2400. 2400. 2880. 2880. 3360. 3360. 3840. 3840. 4320. 432 [...]
-"Oyr, Amon, Lmon, LImon, OImon, aero, day, 3hr, Omon, cfMon, cfOff, cfDay, cf3hr",time,time,for time-mean fields,time,time,T,days since ?,,,yes,increasing,,,double,,,,,,
-"6hrLev, 6hrPlev, 3hr, cf3hr, cfSites",time1,time,synoptic times (for fields that are not time-means),time,time,T,days since ?,,,no,increasing,,,double,,,,,,
-"Oclim, Amon",time2,time,climatological times,time,time,T,days since ?,,,yes,increasing,,,double,,,,,,
-"Amon, day, 3hr, cf3hr, cfSites",height2m,height,~2 m standard surface air temperature and surface humidity height,height,height,Z,m,,,no,increasing,1.0,10.0,double,up,2.,,,,
-"Amon, day, 3hr, cf3hr, cfSites",height10m,height,~10 m standard wind speed height,height,height,Z,m,,,no,increasing,1.0,30.0,double,up,10.,,,,
-"Lmon, LImon",sdepth,depth,coordinate values for soil layers (depth),depth,depth,Z,m,,,yes,increasing,0.0,200.0,double,down,,,,,
-"Lmon, day, 3hr",sdepth1 ,depth,coordinate value for topmost 0.1 meter layer of soil,depth,depth,Z,m,,,yes,increasing,0.0,0.2,double,down,0.05,0.0 0.1,,,
-"cfMon, cfDay",tau,tau,isccp optical depth categories,atmosphere_optical_thickness_due_to_cloud,cloud optical thickness,,1.0,,,yes,increasing,,,double,,,,0.15 0.8 2.45 6.5 16.2 41.5 100.,0.0 0.3 0.3 1.3 1.3 3.6 3.6 9.4 9.4 23.0 23.0 60.0 60.0 100000.,0.001
-"cfOff, cf3hr",scatratio,scatratio,15 bins of scattering ratio for the CALIPSO simulator CFAD,backscattering_ratio,lidar backscattering ratio,,1.0,,,yes,increasing,,,double,,,,0.0605 2.1 4. 6. 8.5 12.5 17.5 22.5 27.5 35. 45. 55. 70. 539.5 1004.,0.01 1.2 1.2 3. 3. 5. 5. 7. 7. 10. 10. 15. 15. 20. 20. 25. 25. 30. 30. 40. 40. 50. 50. 60. 60. 80. 80. 999. 999. 1009.,0.001
-"cfOff, cf3hr",dbze,dbze,15 bins of radar reflectivity for CloudSat simulator CFAD,equivalent_reflectivity_factor,CloudSat simulator equivalent radar reflectivity factor,,dBZ,,,yes,increasing,,,double,,,,-47.5 -42.5 -37.5 -32.5 -27.5 -22.5 -17.5 -12.5 -7.5 -2.5 2.5 7.5 12.5 17.5 22.5,-50. -45. -45. -40. -40. -35. -35. -30. -30. -25. -25. -20. -20. -15. -15. -10. -10. -5. -5. 0. 0. 5. 5. 10. 10. 15. 15. 20. 20. 25.,0.001
-"cfMon, cfOff, cfDay, cf3hr",sza5,sza,5 solar zenith angles for PARASOL reflectances,solar_zenith_angle,solar zenith angle,,degree,,,no,increasing,,,double,,,,0. 20. 40. 60. 80.,,0.001
-,site,site,an integer assigned to each of 119 stations (standard) and 73 stations (aquaplanet),,site index,,1.0,ok,,no,,,,integer,,,,,,
-Omon,basin,basin,,region,ocean basin,,1.0,,region,no,,,,character,,,,atlantic_arctic_ocean indian_pacific_ocean global_ocean,,
-Omon,rho,rho,density? Potential density++++? Check units,,density++++?,Z,kg m-3,,,yes,decreasing,,,double,down,,, ,,
-"fx, Oclim, Oyr, Omon",olevel,lev,generic ocean model vertical coordinate (nondimensional or dimensional),,ocean model level,Z,,ok,,yes,,,,double,down,,,,,
-Omon,oline,line,"opening, passage, strait, channel, etc. ",region,ocean passage ,,1.0,,passage,no,,,,character,,,,barents_opening bering_strait canadian_archipelago denmark_strait drake_passage english_channel pacific_equatorial_undercurrent faroe_scotland_channel florida_bahamas_strait fram_strait iceland_faroe_channel indonesian_thoughflow mozambique_channel taiwan_luzon_straits windward_passage,,
-cf3hr,location,loc,COSP profile in instantaneous curtain mode,,location index,,1.0,ok,,no,increasing,,,integer,,,,,,
-Lmon,vegtype,type,plant functional type. Several plant functional types have been defined in the area_type table available at: cf-pcmdi.llnl.gov/documents/cf-standard-names/area-type-table/current/,area_type,plant functional type,,1.0,,type_description,no,,,,character,,,,,,
-Lmon,typebare,type,,area_type,surface type,,1.0,,type_description,no,,,,character,,bare_ground,,,,
-Lmon,typepdec,type,,area_type,surface type,,1.0,,type_description,no,,,,character,,primary_deciduous_trees,,,,
-Lmon,typepever,type,,area_type,surface type,,1.0,,type_description,no,,,,character,,primary_evergreen_trees,,,,
-Lmon,typesdec,type,,area_type,surface type,,1.0,,type_description,no,,,,character,,secondary_decidous_trees,,,,
-Lmon,typesever ,type,,area_type,surface type,,1.0,,type_description,no,,,,character,,secondary_evergreen_trees,,,,
-Lmon,typec3pft,type,,area_type,surface type,,1.0,,type_description,no,,,,character,,c3_plant_functional_types,,,,
-Lmon,typec4pft,type,,area_type,surface type,,1.0,,type_description,no,,,,character,,c4_plant_functional_types,,,,
-,,,,,,,,,,,,,,,,,,,,
-Omon,olayer100m,depth,coordinate for 100 m ocean surface layer,depth,depth,Z,m,,,no,increasing,0.0,100.0,double,down,50.,0. 100.,,,
-Omon,depth100m,depth,coordinate value for 100 m ocean depth,depth,depth,Z,m,,,no,increasing,80.0,120.0,double,down,100.,,,,
-Omon,depth0m,depth,vertical coordinate for ocean surface,depth,depth,Z,m,,,no,increasing,0.0,100.0,double,down,0.,,,,
+CMOR Dimensions,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,
+CMOR table(s),CMOR dimension,output dimension name,description,standard name,long name,axis,units,index axis?,coords_attrib,bounds?,stored direction,valid_min,valid_max,type,positive,value,bounds _values,requested,bounds_ requested,tol_on_requests: variance from requested values that is tolerated,grid?
+"fx, Amon, Lmon, LImon, OImon, aero, day, 6hrLev, 6hrPlev, 3hr, Oclim, Oyr, Omon, cfMon, cfOff, cfDay, cf3hr",longitude,lon,,longitude,longitude,X,degrees_east,,,yes,increasing,0.0,360.0,double,,,,,,,
+"fx, Amon, Lmon, LImon, OImon, aero, day, 6hrLev, 6hrPlev, 3hr, Oclim, Oyr, Omon, cfMon, cfOff, cfDay, cf3hr",latitude,lat,,latitude,latitude,Y,degrees_north,,,yes,increasing,-90.0,90.0,double,,,,,,,
+Amon,plevs,plev,There are 17 mandatory levels and up to 6 additional levels requested of models with sufficient resolution in the stratosphere.,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down,,,100000. 92500. 85000. 70000. 60000. 50000. 40000. 30000. 25000. 20000. 15000. 10000. 7000. 5000. 3000. 2000. 1000.,,0.001,
+day,plev8,plev,,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down,,,100000. 85000. 70000. 50000. 25000. 10000. 5000. 1000.,,0.001,
+6hrPlev,plev3,plev,,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down,,,85000. 50000. 25000. ,,0.001,
+"cfMon, cfDay",plev7,plev,7 pressure layers defined by ISCCP simulator,air_pressure,pressure,Z,Pa,,,yes,decreasing,,,double,down,,,90000. 74000. 62000. 50000. 37500. 24500. 9000.,100000. 80000. 80000. 68000. 68000. 56000. 56000. 44000. 44000. 31000. 31000. 18000. 18000. 0.,0.001,
+cfDay,p500,plev,500 hPa,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down,50000.,,,,,
+cfDay,p700,plev,700 hPa,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down,70000.,,,,,
+"cfMon, cfOff, cf3hr",p220,plev,pressure layer of high-level cloud in ISCCP simulator,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down,22000.,44000. 0.0,,,,
+"cfMon, cfOff, cf3hr",p560,plev,pressure layer of mid-level cloud in ISCCP simulator,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down,56000.,68000. 44000.,,,,
+"cfMon, cfOff, cf3hr",p840,plev,pressure layer of low-level cloud in ISCCP simulator,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down,84000.,100000. 68000.,,,,
+"Amon, aero, 6hrLev, cfMon, cfDay, cf3hr, cfSites",alevel,lev,generic atmospheric model vertical coordinate (nondimensional or dimensional),,atmospheric model level,Z,,ok,,yes,,,,double,up,,,,,,
+"Amon, cfMon, cfDay, cf3hr, cfSites",alevhalf,lev,"atmospheric model ""half"" level",,atmospheric model half-level,Z,,ok,,no,,,,double,up,,,,,,
+aero,alev1,lev,atmospheric model's lowest level,,lowest atmospheric model level,Z,,ok,,yes,,,,double,,,,,,,
+"cfMon, cfOff, cfDay, cf3hr",alt40,alt40,CloudSat vertical coordinate heights,altitude,altitude,Z,m,,,yes,increasing,,,double,up,,,240. 720. 1200. 1680. 2160. 2640. 3120. 3600. 4080. 4560. 5040. 5520. 6000. 6480. 6960. 7440. 7920. 8400. 8880. 9360. 9840. 10320. 10800. 11280. 11760. 12240. 12720. 13200. 13680. 14160. 14640. 15120. 15600. 16080. 16560. 17040. 17520. 18000. 18480. 18960.,0. 480. 480. 960. 960. 1440. 1440. 1920. 1920. 2400. 2400. 2880. 2880. 3360. 3360. 3840. 3840. 4320. 432 [...]
+"Oyr, Amon, Lmon, LImon, OImon, aero, day, 3hr, Omon, cfMon, cfOff, cfDay, cf3hr",time,time,for time-mean fields,time,time,T,days since ?,,,yes,increasing,,,double,,,,,,,
+"6hrLev, 6hrPlev, 3hr, cf3hr, cfSites",time1,time,synoptic times (for fields that are not time-means),time,time,T,days since ?,,,no,increasing,,,double,,,,,,,
+"Oclim, Amon",time2,time,climatological times,time,time,T,days since ?,,,yes,increasing,,,double,,,,,,,
+"Amon, day, 3hr, cf3hr, cfSites",height2m,height,~2 m standard surface air temperature and surface humidity height,height,height,Z,m,,,no,increasing,1.0,10.0,double,up,2.,,,,,
+"Amon, day, 3hr, cf3hr, cfSites",height10m,height,~10 m standard wind speed height,height,height,Z,m,,,no,increasing,1.0,30.0,double,up,10.,,,,,
+"Lmon, LImon",sdepth,depth,coordinate values for soil layers (depth),depth,depth,Z,m,,,yes,increasing,0.0,200.0,double,down,,,,,,
+"Lmon, day, 3hr",sdepth1 ,depth,coordinate value for topmost 0.1 meter layer of soil,depth,depth,Z,m,,,yes,increasing,0.0,0.2,double,down,0.05,0.0 0.1,,,,
+"cfMon, cfDay",tau,tau,isccp optical depth categories,atmosphere_optical_thickness_due_to_cloud,cloud optical thickness,,1.0,,,yes,increasing,,,double,,,,0.15 0.8 2.45 6.5 16.2 41.5 100.,0.0 0.3 0.3 1.3 1.3 3.6 3.6 9.4 9.4 23.0 23.0 60.0 60.0 100000.,0.001,
+"cfOff, cf3hr",scatratio,scatratio,15 bins of scattering ratio for the CALIPSO simulator CFAD,backscattering_ratio,lidar backscattering ratio,,1.0,,,yes,increasing,,,double,,,,0.0605 2.1 4. 6. 8.5 12.5 17.5 22.5 27.5 35. 45. 55. 70. 539.5 1004.,0.01 1.2 1.2 3. 3. 5. 5. 7. 7. 10. 10. 15. 15. 20. 20. 25. 25. 30. 30. 40. 40. 50. 50. 60. 60. 80. 80. 999. 999. 1009.,0.001,
+"cfOff, cf3hr",dbze,dbze,15 bins of radar reflectivity for CloudSat simulator CFAD,equivalent_reflectivity_factor,CloudSat simulator equivalent radar reflectivity factor,,dBZ,,,yes,increasing,,,double,,,,-47.5 -42.5 -37.5 -32.5 -27.5 -22.5 -17.5 -12.5 -7.5 -2.5 2.5 7.5 12.5 17.5 22.5,-50. -45. -45. -40. -40. -35. -35. -30. -30. -25. -25. -20. -20. -15. -15. -10. -10. -5. -5. 0. 0. 5. 5. 10. 10. 15. 15. 20. 20. 25.,0.001,
+"cfMon, cfOff, cfDay, cf3hr",sza5,sza,5 solar zenith angles for PARASOL reflectances,solar_zenith_angle,solar zenith angle,,degree,,,no,increasing,,,double,,,,0. 20. 40. 60. 80.,,0.001,
+cfSites,site,site,an integer assigned to each of 119 stations (standard) and 73 stations (aquaplanet),,site index,,1.0,ok,,no,,,,integer,,,,,,,yes
+Omon,basin,basin,,region,ocean basin,,1.0,,region,no,,,,character,,,,atlantic_arctic_ocean indian_pacific_ocean global_ocean,,,
+Omon,rho,rho,density? Potential density++++? Check units,,density++++?,Z,kg m-3,,,yes,decreasing,,,double,down,,, ,,,
+"fx, Oclim, Oyr, Omon",olevel,lev,generic ocean model vertical coordinate (nondimensional or dimensional),,ocean model level,Z,,ok,,yes,,,,double,down,,,,,,
+Omon,oline,line,"opening, passage, strait, channel, etc. ",region,ocean passage ,,1.0,,passage,no,,,,character,,,,barents_opening bering_strait canadian_archipelago denmark_strait drake_passage english_channel pacific_equatorial_undercurrent faroe_scotland_channel florida_bahamas_strait fram_strait iceland_faroe_channel indonesian_thoughflow mozambique_channel taiwan_luzon_straits windward_passage,,,
+cf3hr,location,loc,COSP profile in instantaneous curtain mode,,location index,,1.0,ok,,no,increasing,,,integer,,,,,,,yes
+Lmon,vegtype,type,plant functional type. Several plant functional types have been defined in the area_type table available at: cf-pcmdi.llnl.gov/documents/cf-standard-names/area-type-table/current/,area_type,plant functional type,,1.0,,type_description,no,,,,character,,,,,,,
+Lmon,typebare,type,,area_type,surface type,,1.0,,type_description,no,,,,character,,bare_ground,,,,,
+Lmon,typepdec,type,,area_type,surface type,,1.0,,type_description,no,,,,character,,primary_deciduous_trees,,,,,
+Lmon,typepever,type,,area_type,surface type,,1.0,,type_description,no,,,,character,,primary_evergreen_trees,,,,,
+Lmon,typesdec,type,,area_type,surface type,,1.0,,type_description,no,,,,character,,secondary_decidous_trees,,,,,
+Lmon,typesever ,type,,area_type,surface type,,1.0,,type_description,no,,,,character,,secondary_evergreen_trees,,,,,
+Lmon,typec3pft,type,,area_type,surface type,,1.0,,type_description,no,,,,character,,c3_plant_functional_types,,,,,
+Lmon,typec4pft,type,,area_type,surface type,,1.0,,type_description,no,,,,character,,c4_plant_functional_types,,,,,
+,,,,,,,,,,,,,,,,,,,,,
+Omon,olayer100m,depth,coordinate for 100 m ocean surface layer,depth,depth,Z,m,,,no,increasing,0.0,100.0,double,down,50.,0. 100.,,,,
+Omon,depth100m,depth,coordinate value for 100 m ocean depth,depth,depth,Z,m,,,no,increasing,80.0,120.0,double,down,100.,,,,,
+Omon,depth0m,depth,vertical coordinate for ocean surface,depth,depth,Z,m,,,no,increasing,0.0,100.0,double,down,0.,,,,,
diff --git a/configure b/configure
index a92e47e..da25586 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for cmip5-cmor-tables 1.2.1.
+# Generated by GNU Autoconf 2.61 for cmip5-cmor-tables 1.3.0.
#
# Report bugs to <doutriaux1 at llnl.gov>.
#
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='cmip5-cmor-tables'
PACKAGE_TARNAME='cmip5-cmor-tables'
-PACKAGE_VERSION='1.2.1'
-PACKAGE_STRING='cmip5-cmor-tables 1.2.1'
+PACKAGE_VERSION='1.3.0'
+PACKAGE_STRING='cmip5-cmor-tables 1.3.0'
PACKAGE_BUGREPORT='doutriaux1 at llnl.gov'
ac_default_prefix=/usr/local
@@ -1136,7 +1136,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures cmip5-cmor-tables 1.2.1 to adapt to many kinds of systems.
+\`configure' configures cmip5-cmor-tables 1.3.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1202,7 +1202,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of cmip5-cmor-tables 1.2.1:";;
+ short | recursive ) echo "Configuration of cmip5-cmor-tables 1.3.0:";;
esac
cat <<\_ACEOF
@@ -1267,7 +1267,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-cmip5-cmor-tables configure 1.2.1
+cmip5-cmor-tables configure 1.3.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1281,7 +1281,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by cmip5-cmor-tables $as_me 1.2.1, which was
+It was created by cmip5-cmor-tables $as_me 1.3.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2227,7 +2227,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by cmip5-cmor-tables $as_me 1.2.1, which was
+This file was extended by cmip5-cmor-tables $as_me 1.3.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2270,7 +2270,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-cmip5-cmor-tables config.status 1.2.1
+cmip5-cmor-tables config.status 1.3.0
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index aad2e75..fe4ff35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl -*- Autoconf -*-
dnl Process this file with autoconf to produce a configure script.
dnl AC_PREREQ(2.59)
-AC_INIT(cmip5-cmor-tables, 1.2.1, doutriaux1 at llnl.gov)
+AC_INIT(cmip5-cmor-tables, 1.3.0, doutriaux1 at llnl.gov)
GIT_TAG=`./get_git_version.sh`
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor-tables.git
More information about the debian-science-commits
mailing list