[cmor-tables] 33/83: Newest set of tables, added a script to define all axes and variables in tables (except CFSite (for now))
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sun Aug 30 08:06:09 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 d7737004a5c96608d529ae62927f03e29f871a4f
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date: Wed Jul 7 10:23:45 2010 -0700
Newest set of tables, added a script to define all axes and variables in tables (except CFSite (for now))
---
Lib/check_tables_okish.py | 100 ++++++++++++++++++++++++++++++++++++++++
Lib/table_generator.py | 2 +
Tables/CMIP5_3hr | 28 ++++++++++-
Tables/CMIP5_6hrLev | 2 +-
Tables/CMIP5_6hrPlev | 2 +-
Tables/CMIP5_Amon | 2 +-
Tables/CMIP5_LImon | 2 +-
Tables/CMIP5_Lmon | 28 ++++++++++-
Tables/CMIP5_OImon | 2 +-
Tables/CMIP5_Oclim | 4 +-
Tables/CMIP5_Omon | 8 ++--
Tables/CMIP5_Oyr | 2 +-
Tables/CMIP5_aero | 2 +-
Tables/CMIP5_cf3hr | 11 +++--
Tables/CMIP5_cfDay | 5 +-
Tables/CMIP5_cfMon | 5 +-
Tables/CMIP5_cfOff | 9 ++--
Tables/CMIP5_cfSites | 2 +-
Tables/CMIP5_day | 28 ++++++++++-
Tables/CMIP5_fx | 2 +-
Tables_csv/amon_2D.csv | 1 -
Tables_csv/cf3hr.csv | 2 +-
Tables_csv/dims.csv | 12 ++---
Tables_csv/omon.csv | 2 +-
Tables_csv/oyr_tracer.csv | 1 -
Tables_csv/standard_output.xlsx | Bin 264732 -> 676864 bytes
26 files changed, 223 insertions(+), 41 deletions(-)
diff --git a/Lib/check_tables_okish.py b/Lib/check_tables_okish.py
new file mode 100644
index 0000000..450e109
--- /dev/null
+++ b/Lib/check_tables_okish.py
@@ -0,0 +1,100 @@
+import cmor,numpy
+from cmor.check_CMOR_compliant import readTable
+
+tables = """CMIP5_3hr CMIP5_6hrPlev CMIP5_LImon CMIP5_OImon CMIP5_Omon CMIP5_aero CMIP5_cfDay CMIP5_cfOff CMIP5_day CMIP5_grids CMIP5_6hrLev CMIP5_Amon CMIP5_Lmon CMIP5_Oclim CMIP5_Oyr CMIP5_cf3hr CMIP5_cfMon CMIP5_cfSites CMIP5_fx"""
+tables = """CMIP5_3hr CMIP5_6hrPlev CMIP5_LImon CMIP5_OImon CMIP5_Omon CMIP5_aero CMIP5_cfDay CMIP5_cfOff CMIP5_day CMIP5_6hrLev CMIP5_Amon CMIP5_Lmon CMIP5_Oclim CMIP5_Oyr CMIP5_cf3hr CMIP5_cfMon CMIP5_fx"""
+
+for t in tables.split():
+ print 'Table:',t
+ tnm = "Tables/%s" % t
+ tbl = readTable(tnm)
+ vr = tbl['variable']
+ ax = tbl['axis']
+ g = tbl['general']
+ cmor.setup(inpath='Tables',set_verbosity=cmor.CMOR_QUIET,
+ netcdf_file_action = cmor.CMOR_REPLACE,exit_control=cmor.CMOR_EXIT_ON_MAJOR)
+ cmor.dataset('pre-industrial control', 'ukmo', 'HadCM3', '360_day',
+ institute_id = 'ukmo',
+ model_id = 'HadCM3',
+ forcing="TO",
+ contact="Derek Jeter",
+ history = 'some global history',
+ parent_experiment_id="lgm",branch_time=0)
+ cmor.load_table(tnm)
+ dims={}
+ print '\tDimensions:'
+ for a in ax:
+ A=ax[a]
+ print '\t\t',a,A.get('type','notype')
+ mn = float(A.get("valid_min",-1.e20))
+ mx = float(A.get("valid_max",1.e20))
+ val = (mn+mx)/2.
+ val = numpy.array([float(A.get("value",val)),])
+ if A.has_key("requested"):
+ val=[]
+ isnum=True
+ for v in A['requested']:
+ try:
+ val.append(float(v))
+ except:
+ isnum=False
+ val.append(v)
+ if isnum: val=numpy.array(val)
+ kargs = {'table_entry':a,'units':A.get('units','1'),'coord_vals':val}
+ if A.get("must_have_bounds","no")=="yes":
+ if A.get("requested_bounds",None) is not None:
+ rb = A['requested_bounds']
+ print rb, 'vs', A.get('requested',None)
+ bnds=[]
+ rsp=rb.split()
+ if len(rsp)>2 and rsp[1]!=rsp[2]:
+ for b in rsp:
+ print b
+ bnds.append(float(b))
+ else:
+ for b in rsp[::2]:
+ print b
+ bnds.append(float(b))
+ bnds.append(float(rsp[-1]))
+ kargs['cell_bounds']=numpy.array(bnds)
+ if A.get('requested',None) is None:
+ vals=[]
+ for i in range(len(bnds)-1):
+ vals.append((bnds[i]+bnds[i+1])/2.)
+ vals=numpy.array(vals)
+ kargs['coord_vals']=vals
+ elif A.get("bounds_values",None) is None:
+ if A.get("axis","N")=='T':
+ kargs['cell_bounds']=numpy.array([val[0],val[0]+float(g['approx_interval'])])
+ else:
+ if A.get("stored_direction","increasing")=="increasing":
+ kargs['cell_bounds']=numpy.array([val[0]-.1*abs(val[0]),val[0]+.1*abs(val[0])])
+ else:
+ kargs['cell_bounds']=numpy.array([val[0]+.1*abs(val[0]),val[0]-.1*abs(val[0])])
+ else:
+ b=A["bounds_values"].split()
+ kargs['cell_bounds']=numpy.array([float(b[0]),float(b[1])])
+ dims[a]=cmor.axis(**kargs)
+ print '\tVariables:'
+ for v in vr.keys():
+ Vr=vr[v]
+ print '\t\t',v,':',
+ try:
+ print Vr['dimensions']
+ except:
+ print 'No dims, skipped'
+ continue
+ vdims=[]
+ for d in Vr['dimensions']:
+ if d=='olevel':
+ vdims.append(dims['depth_coord'])
+ elif d=='alevel':
+ vdims.append(dims['smooth_level'])
+ else:
+ vdims.append(dims[d])
+ kargs={}
+ if Vr.has_key("positive"):
+ kargs['positive']=Vr['positive']
+ V=cmor.variable(table_entry=v,units=Vr.get('units','1'),axis_ids=numpy.array(vdims),**kargs)
+ cmor.close()
+print 'Done'
diff --git a/Lib/table_generator.py b/Lib/table_generator.py
index 0f5e3d9..cef269a 100644
--- a/Lib/table_generator.py
+++ b/Lib/table_generator.py
@@ -386,6 +386,8 @@ def create_table_header(tbnm, table_file, dims_file, fqcy):
lns=lns[:-20]
lns=''.join(lns)
lns=lns.replace("zlevel",zlevel_name)
+ if tbnm.find("Oclim")>-1:
+ lns=lns.replace("dimensions: longitude latitude time","dimensions: longitude latitude time2")
print >> fo, lns
return fo
diff --git a/Tables/CMIP5_3hr b/Tables/CMIP5_3hr
index 76c52fe..090091e 100644
--- a/Tables/CMIP5_3hr
+++ b/Tables/CMIP5_3hr
@@ -6,7 +6,7 @@ frequency: 3hr
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: 01 July 2010 ! date this table was constructed
+table_date: 07 July 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
@@ -213,6 +213,32 @@ must_have_bounds: no
!----------------------------------
!
+
+!============
+axis_entry: sdepth1
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name: depth
+units: m
+axis: Z ! X, Y, Z, T (default: undeclared)
+positive: down ! up or down (default: undeclared)
+long_name: depth
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name: depth
+valid_min: 0.0
+valid_max: 0.2
+stored_direction: increasing
+type: double
+value: 0.05 ! of scalar (singleton) dimension
+bounds_values: 0.0 0.1 ! of scalar (singleton) dimension bounds
+must_have_bounds: yes
+!----------------------------------
+!
+
!============
variable_entry: pr
!============
diff --git a/Tables/CMIP5_6hrLev b/Tables/CMIP5_6hrLev
index 5b137a8..509d279 100644
--- a/Tables/CMIP5_6hrLev
+++ b/Tables/CMIP5_6hrLev
@@ -6,7 +6,7 @@ frequency: 6hr
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: 01 July 2010 ! date this table was constructed
+table_date: 07 July 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 38a99bc..dca7018 100644
--- a/Tables/CMIP5_6hrPlev
+++ b/Tables/CMIP5_6hrPlev
@@ -6,7 +6,7 @@ frequency: 6hr
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: 01 July 2010 ! date this table was constructed
+table_date: 07 July 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_Amon b/Tables/CMIP5_Amon
index 818a86d..e411f76 100644
--- a/Tables/CMIP5_Amon
+++ b/Tables/CMIP5_Amon
@@ -6,7 +6,7 @@ frequency: mon
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: 01 July 2010 ! date this table was constructed
+table_date: 07 July 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_LImon b/Tables/CMIP5_LImon
index 9fe3020..be53261 100644
--- a/Tables/CMIP5_LImon
+++ b/Tables/CMIP5_LImon
@@ -6,7 +6,7 @@ frequency: mon
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: 01 July 2010 ! date this table was constructed
+table_date: 07 July 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 6847fc1..cf902c6 100644
--- a/Tables/CMIP5_Lmon
+++ b/Tables/CMIP5_Lmon
@@ -6,7 +6,7 @@ frequency: mon
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: 01 July 2010 ! date this table was constructed
+table_date: 07 July 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
@@ -168,6 +168,32 @@ must_have_bounds: yes
!============
+axis_entry: sdepth1
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name: depth
+units: m
+axis: Z ! X, Y, Z, T (default: undeclared)
+positive: down ! up or down (default: undeclared)
+long_name: depth
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name: depth
+valid_min: 0.0
+valid_max: 0.2
+stored_direction: increasing
+type: double
+value: 0.05 ! of scalar (singleton) dimension
+bounds_values: 0.0 0.1 ! of scalar (singleton) dimension bounds
+must_have_bounds: yes
+!----------------------------------
+!
+
+
+!============
axis_entry: vegtype
!============
!----------------------------------
diff --git a/Tables/CMIP5_OImon b/Tables/CMIP5_OImon
index 8b42df0..668914e 100644
--- a/Tables/CMIP5_OImon
+++ b/Tables/CMIP5_OImon
@@ -6,7 +6,7 @@ frequency: mon
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: 01 July 2010 ! date this table was constructed
+table_date: 07 July 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 7783383..a7b9583 100644
--- a/Tables/CMIP5_Oclim
+++ b/Tables/CMIP5_Oclim
@@ -6,7 +6,7 @@ frequency: monClim
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: 01 July 2010 ! date this table was constructed
+table_date: 07 July 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
@@ -295,7 +295,7 @@ long_name: Sea Surface Height
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time
+dimensions: longitude latitude time2
type: real
!----------------------------------
!
diff --git a/Tables/CMIP5_Omon b/Tables/CMIP5_Omon
index d08e69e..ae47dca 100644
--- a/Tables/CMIP5_Omon
+++ b/Tables/CMIP5_Omon
@@ -6,7 +6,7 @@ frequency: mon
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: 01 July 2010 ! date this table was constructed
+table_date: 07 July 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
@@ -170,7 +170,7 @@ axis_entry: rho
!----------------------------------
! Axis attributes:
!----------------------------------
-units: ?
+units: kg m-3
axis: Z ! X, Y, Z, T (default: undeclared)
positive: down ! up or down (default: undeclared)
long_name: density++++?
@@ -1785,7 +1785,7 @@ type: real
!
!============
-variable_entry: intpcalc
+variable_entry: intpcalcite
!============
modeling_realm: ocnBgchem
!----------------------------------
@@ -1801,7 +1801,7 @@ comment: Vertically integrated calcite production
! Additional variable information:
!----------------------------------
dimensions: longitude latitude time
-out_name: intpcalc
+out_name: intpcalcite
type: real
!----------------------------------
!
diff --git a/Tables/CMIP5_Oyr b/Tables/CMIP5_Oyr
index a6de8a6..8e186b1 100644
--- a/Tables/CMIP5_Oyr
+++ b/Tables/CMIP5_Oyr
@@ -6,7 +6,7 @@ frequency: yr
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: 01 July 2010 ! date this table was constructed
+table_date: 07 July 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 1c3667a..cc81b3f 100644
--- a/Tables/CMIP5_aero
+++ b/Tables/CMIP5_aero
@@ -6,7 +6,7 @@ frequency: mon
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: 01 July 2010 ! date this table was constructed
+table_date: 07 July 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_cf3hr b/Tables/CMIP5_cf3hr
index 0fec897..3c21584 100644
--- a/Tables/CMIP5_cf3hr
+++ b/Tables/CMIP5_cf3hr
@@ -6,7 +6,7 @@ frequency: 3hr
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: 01 July 2010 ! date this table was constructed
+table_date: 07 July 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
@@ -234,7 +234,7 @@ 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. 17 [...]
+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 [...]
must_have_bounds: yes
!----------------------------------
!
@@ -349,7 +349,8 @@ stored_direction: increasing
tolerance: 0.001
type: double
-requested_bounds: 0.01 1.2 3 5 7 10 15 20 25 30 40 50 60 80 999 1009 ! space-separated list of requested coordinate bounds
+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
must_have_bounds: yes
!----------------------------------
!
@@ -373,7 +374,7 @@ 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 -40 -35 -30 -25 -20 -15 -10 -5 0 5 10 15 20 25 ! space-separated list of requested coordinate bounds
+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
must_have_bounds: yes
!----------------------------------
!
@@ -2284,7 +2285,7 @@ type: real
!
!============
-variable_entry: clis
+variable_entry: clwc
!============
modeling_realm: atmos
!----------------------------------
diff --git a/Tables/CMIP5_cfDay b/Tables/CMIP5_cfDay
index 356c257..60ee10c 100644
--- a/Tables/CMIP5_cfDay
+++ b/Tables/CMIP5_cfDay
@@ -6,7 +6,7 @@ frequency: day
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: 01 July 2010 ! date this table was constructed
+table_date: 07 July 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
@@ -141,6 +141,7 @@ 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
must_have_bounds: yes
!----------------------------------
@@ -233,7 +234,7 @@ 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. 17 [...]
+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 [...]
must_have_bounds: yes
!----------------------------------
!
diff --git a/Tables/CMIP5_cfMon b/Tables/CMIP5_cfMon
index 84a5d21..3870d72 100644
--- a/Tables/CMIP5_cfMon
+++ b/Tables/CMIP5_cfMon
@@ -6,7 +6,7 @@ frequency: mon
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: 01 July 2010 ! date this table was constructed
+table_date: 07 July 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
@@ -141,6 +141,7 @@ 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
must_have_bounds: yes
!----------------------------------
@@ -259,7 +260,7 @@ 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. 17 [...]
+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 [...]
must_have_bounds: yes
!----------------------------------
!
diff --git a/Tables/CMIP5_cfOff b/Tables/CMIP5_cfOff
index 1fc1389..b5412bd 100644
--- a/Tables/CMIP5_cfOff
+++ b/Tables/CMIP5_cfOff
@@ -6,7 +6,7 @@ frequency: mon
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: 01 July 2010 ! date this table was constructed
+table_date: 07 July 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
@@ -214,7 +214,7 @@ 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. 17 [...]
+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 [...]
must_have_bounds: yes
!----------------------------------
!
@@ -258,7 +258,8 @@ stored_direction: increasing
tolerance: 0.001
type: double
-requested_bounds: 0.01 1.2 3 5 7 10 15 20 25 30 40 50 60 80 999 1009 ! space-separated list of requested coordinate bounds
+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
must_have_bounds: yes
!----------------------------------
!
@@ -282,7 +283,7 @@ 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 -40 -35 -30 -25 -20 -15 -10 -5 0 5 10 15 20 25 ! space-separated list of requested coordinate bounds
+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
must_have_bounds: yes
!----------------------------------
!
diff --git a/Tables/CMIP5_cfSites b/Tables/CMIP5_cfSites
index c3be2fe..dd392f1 100644
--- a/Tables/CMIP5_cfSites
+++ b/Tables/CMIP5_cfSites
@@ -6,7 +6,7 @@ frequency: subhr
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: 01 July 2010 ! date this table was constructed
+table_date: 07 July 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_day b/Tables/CMIP5_day
index bac55fa..e0a4578 100644
--- a/Tables/CMIP5_day
+++ b/Tables/CMIP5_day
@@ -6,7 +6,7 @@ frequency: day
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: 01 July 2010 ! date this table was constructed
+table_date: 07 July 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
@@ -217,6 +217,32 @@ must_have_bounds: no
!----------------------------------
!
+
+!============
+axis_entry: sdepth1
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name: depth
+units: m
+axis: Z ! X, Y, Z, T (default: undeclared)
+positive: down ! up or down (default: undeclared)
+long_name: depth
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name: depth
+valid_min: 0.0
+valid_max: 0.2
+stored_direction: increasing
+type: double
+value: 0.05 ! of scalar (singleton) dimension
+bounds_values: 0.0 0.1 ! of scalar (singleton) dimension bounds
+must_have_bounds: yes
+!----------------------------------
+!
+
!============
variable_entry: huss
!============
diff --git a/Tables/CMIP5_fx b/Tables/CMIP5_fx
index a921c6f..9f0c64b 100644
--- a/Tables/CMIP5_fx
+++ b/Tables/CMIP5_fx
@@ -6,7 +6,7 @@ frequency: fx
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: 01 July 2010 ! date this table was constructed
+table_date: 07 July 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_csv/amon_2D.csv b/Tables_csv/amon_2D.csv
index 3084e6e..f95cf30 100644
--- a/Tables_csv/amon_2D.csv
+++ b/Tables_csv/amon_2D.csv
@@ -49,4 +49,3 @@
1.0,Carbon Mass Flux into Atmosphere Due to All Anthropogenic Emissions of CO2,kg m-2 s-1,"This is requested only for the emission-driven coupled carbon climate model runs. Do not include natural fire sources, but include all anthropogenic sources, including fossil fuel use, cement production, agricultural burning, and sources associated with anthropogenic land use change excluding forest regrowth.",,fco2antt,,,kg m-2 s-1,time: mean,,,,,up,real,longitude latitude time,fco2antt,atmos,, [...]
1.0,Carbon Mass Flux into Atmosphere Due to Fossil Fuel Emissions of CO2,kg m-2 s-1,"This is requested only for the emission-driven coupled carbon climate model runs. Report the prescribed anthropogenic CO2 flux from fossil fuel use, including cement production, and flaring (but not from land-use changes, agricultural burning, forest regrowth, etc.)",,fco2fos,,,kg m-2 s-1,time: mean,,,,,up,real,longitude latitude time,fco2fos,atmos,,area: areacella,,
1.0,Surface Carbon Mass Flux into the Atmosphere Due to Natural Sources,kg m-2 s-1,"Report from all simulations (both emission-driven and concentration-driven) performed by models with fully interactive and responsive carbon cycles. This is what the atmosphere sees (on its own grid). This field should be equivalent to the combined natural fluxes of carbon (requested in the L_mon and O_mon tables) that account for natural exchanges between the atmosphere and land or ocean reservoirs (i. [...]
-
diff --git a/Tables_csv/cf3hr.csv b/Tables_csv/cf3hr.csv
index 69c1730..3655c66 100644
--- a/Tables_csv/cf3hr.csv
+++ b/Tables_csv/cf3hr.csv
@@ -38,7 +38,7 @@ priority,long name,units ,comment ,questions,output variable name ,standard name
2.0,Mass Fraction of Water,1.0,include all phases of water,,h2o,mass_fraction_of_water_in_air,,1.0,time: point,,,,,,real,longitude latitude alevel time1,h2o,atmos,,area: areacella,,
2.0,Mass Fraction of Stratiform Cloud Liquid Water,1.0,Calculate as the mass of stratiform 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. ,,clws,mass_fraction_of_stratiform_cloud_liquid_water_in_air,,1.0,time: point,,,,,,real,longitude latitude alevel time1,clws,atmos,,area: areacella,,
2.0,Mass Fraction of Stratiform Cloud Ice,1.0,Calculate as the mass of stratiform 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. ,,clis,mass_fraction_of_stratiform_cloud_ice_in_air,,1.0,time: point,,,,,,real,longitude latitude alevel time1,clis,atmos,,area: areacella,,
-2.0,Mass Fraction of Convective Cloud Liquid Water,1.0,Calculate as the mass of convective 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. ,,clwc,mass_fraction_of_convective_cloud_liquid_water_in_air,,1.0,time: point,,,,,,real,longitude latitude alevel time1,clis,atmos,,area: areacella,,
+2.0,Mass Fraction of Convective Cloud Liquid Water,1.0,Calculate as the mass of convective 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. ,,clwc,mass_fraction_of_convective_cloud_liquid_water_in_air,,1.0,time: point,,,,,,real,longitude latitude alevel time1,clwc,atmos,,area: areacella,,
2.0,Mass Fraction of Convective Cloud Ice,1.0,Calculate as the mass of convective 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. ,,clic,mass_fraction_of_convective_cloud_ice_in_air,,1.0,time: point,,,,,,real,longitude latitude alevel time1,clic,atmos,,area: areacella,,
2.0,Hydrometeor Effective Radius of Stratiform Cloud Liquid Water ,m,This is defined as the in-cloud ratio of the third moment over the second moment of the particle size distribution (obtained by considering only the cloudy portion of the grid cell). ,,reffclws,effective_radius_of_stratiform_cloud_liquid_water_particle,,m,time: point,,,,,,real,longitude latitude alevel time1,reffclws,atmos,,area: areacella,,
2.0,Hydrometeor Effective Radius of Stratiform Cloud Ice,m,This is defined as the in-cloud ratio of the third moment over the second moment of the particle size distribution (obtained by considering only the cloudy portion of the grid cell). ,,reffclis,effective_radius_of_stratiform_cloud_ice_particle,,m,time: point,,,,,,real,longitude latitude alevel time1,reffclis,atmos,,area: areacella,,
diff --git a/Tables_csv/dims.csv b/Tables_csv/dims.csv
index 1e246f8..9068380 100644
--- a/Tables_csv/dims.csv
+++ b/Tables_csv/dims.csv
@@ -6,7 +6,7 @@ CMOR table(s),CMOR dimension,output dimension name,description,standard name,lon
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,,,,100000. 80000. 80000. 68000. 68000. 56000. 56000. 44000. 44000. 31000. 31000. 18000. 18000. 0.,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,,,
@@ -15,21 +15,21 @@ cfDay,p700,plev,700 hPa,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down
"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,increasing,,,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. 4 [...]
+"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,,,,,
-`,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,,,
+"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.01 1.2 3 5 7 10 15 20 25 30 40 50 60 80 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 -40 -35 -30 -25 -20 -15 -10 -5 0 5 10 15 20 25,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,,,,,,
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++++? ,,density++++?,Z,?,,,yes,decreasing,,,double,down,,, ,,
+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. ",,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,,,,,,
diff --git a/Tables_csv/omon.csv b/Tables_csv/omon.csv
index 40b3ef9..7bb9b9a 100644
--- a/Tables_csv/omon.csv
+++ b/Tables_csv/omon.csv
@@ -24,7 +24,7 @@ priority,long name,units ,comment ,questions,output variable name ,standard name
3.0,Primary Organic Carbon Production by Other Phytoplankton,mol m-2 s-1,Vertically integrated total primary (organic carbon) production by other phytoplankton components alone,,intpmisc,net_primary_mole_productivity_of_carbon_by_miscellaneous_phytoplankton,,mol m-2 s-1,time: mean area: where sea,,,,,,real,longitude latitude time,intpmisc,ocnBgchem,,area: areacello,,
3.0,Iron Production,mol m-2 s-1,Vertically integrated biogenic iron production,,intpbfe,tendency_of_ocean_mole_content_of_iron_due_to_biological_production,,mol m-2 s-1,time: mean area: mean where sea,,,,,,real,longitude latitude time,intpbfe,ocnBgchem,,area: areacello,,
3.0,Silica Production,mol m-2 s-1,Vertically integrated biogenic silica production,,intpbsi,tendency_of_ocean_mole_content_of_silicon_due_to_biological_production,,mol m-2 s-1,time: mean area: where sea,,,,,,real,longitude latitude time,intpbsi,ocnBgchem,,area: areacello,,
-3.0,Calcite Production,mol m-2 s-1,Vertically integrated calcite production,,intpcalc,tendency_of_ocean_mole_content_of_calcite_expressed_as_carbon_due_to_biological_production,,mol m-2 s-1,time: mean area: mean where sea,,,,,,real,longitude latitude time,intpcalc,ocnBgchem,,area: areacello,,
+3.0,Calcite Production,mol m-2 s-1,Vertically integrated calcite production,,intpcalcite,tendency_of_ocean_mole_content_of_calcite_expressed_as_carbon_due_to_biological_production,,mol m-2 s-1,time: mean area: mean where sea,,,,,,real,longitude latitude time,intpcalcite,ocnBgchem,,area: areacello,,
3.0,Aragonite Production,mol m-2 s-1,Vertically integrated aragonite production,,intparag,tendency_of_ocean_mole_content_of_aragonite_expressed_as_carbon_due_to_biological_production,,mol m-2 s-1,time: mean area: where sea,,,,,,real,longitude latitude time,intparag,ocnBgchem,,area: areacello,,
1.0,Downward Flux of Particle Organic Carbon at 100M,mol m-2 s-1,sinking flux of organic carbon at 100m,,epc100,sinking_mole_flux_of_particulate_organic_matter_expressed_as_carbon_in_sea_water,,mol m-2 s-1,time: mean area: mean where sea,,,,,down,real,longitude latitude time depth100m,epc100,ocnBgchem,,area: areacello,,
3.0,Downward Flux of Particulate Iron at 100M,mol m-2 s-1,sinking flux of biogenic and scavenged iron at 100m,,epfe100,sinking_mole_flux_of_particulate_iron_in_sea_water,,mol m-2 s-1,time: mean area: where sea,,,,,down,real,longitude latitude time depth100m,epfe100,ocnBgchem,,area: areacello,,
diff --git a/Tables_csv/oyr_tracer.csv b/Tables_csv/oyr_tracer.csv
index 419fada..ca5cbf5 100644
--- a/Tables_csv/oyr_tracer.csv
+++ b/Tables_csv/oyr_tracer.csv
@@ -42,4 +42,3 @@
2.0,Mole Concentration of Carbonate expressed as Carbon in Sea Water,mol m-3,carbonate ion concentration,,co3,mole_concentration_of_carbonate_expressed_as_carbon_in_sea_water,,mol m-3,time: mean area: mean where sea ,,,,,,real,longitude latitude olevel time,co3,ocnBgchem,,area: areacello volume: volcello,,
2.0,Mole Concentration of Calcite expressed as Carbon in Sea Water at Saturation,mol m-3,carbonate ion concentration at calcite solution saturation,"is it clear what ""saturation"" refers to? Is this like ""saturation vapor pressure""? If so, should we say ""Saturation Mole Concentration""?",co3satcalc,mole_concentration_of_calcite_expressed_as_carbon_in_sea_water_at_saturation,,mol m-3,time: mean area: mean where sea ,,,,,,real,longitude latitude olevel time,co3satcalc,ocnBgchem,,area: [...]
2.0,Mole Concentration of Aragonite expressed as Carbon in Sea Water at Saturation,mol m-3,carbonate ion concentration at aragonite solution saturation,"is it clear what ""saturation"" refers to? Is this like ""saturation vapor pressure""? If so, should we say ""Saturation Mole Concentration""?",co3satarag,mole_concentration_of_aragonite_expressed_as_carbon_in_sea_water_at_saturation,,mol m-3,time: mean area: mean where sea ,,,,,,real,longitude latitude olevel time,co3satarag,ocnBgchem, [...]
-
diff --git a/Tables_csv/standard_output.xlsx b/Tables_csv/standard_output.xlsx
index 992f5a5..93f814b 100644
Binary files a/Tables_csv/standard_output.xlsx and b/Tables_csv/standard_output.xlsx differ
--
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