[cmor-tables] 64/83: 2011-04-11 : added olev axis_entry as vertical coordinate 2011-04-11 : changed min and valid_abs_min on areacello and volcello 2011-04-11 : changed min and abs_valid_min of sltovgyre and sltovovrt 2011-03-28 : a couple of realm specifications in the cmor day table 2011-03-28 : some grid coordinate specifications were removed because they were wrong
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sun Aug 30 08:06:23 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 d35f71719156210cb449b99cfdde273267ba19bb
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date: Mon Apr 11 12:10:56 2011 -0700
2011-04-11 : added olev axis_entry as vertical coordinate
2011-04-11 : changed min and valid_abs_min on areacello and volcello
2011-04-11 : changed min and abs_valid_min of sltovgyre and sltovovrt
2011-03-28 : a couple of realm specifications in the cmor day table
2011-03-28 : some grid coordinate specifications were removed because they were wrong
---
Lib/table_generator.py | 6 ++++++
RELEASE-NOTES | 5 +++++
Tables/CMIP5_3hr | 2 +-
Tables/CMIP5_6hrLev | 2 +-
Tables/CMIP5_6hrPlev | 2 +-
Tables/CMIP5_Amon | 2 +-
Tables/CMIP5_LImon | 2 +-
Tables/CMIP5_Lmon | 2 +-
Tables/CMIP5_OImon | 2 +-
Tables/CMIP5_Oclim | 20 +++++++++++++++++++-
Tables/CMIP5_Omon | 28 +++++++++++++++++++---------
Tables/CMIP5_Oyr | 20 +++++++++++++++++++-
Tables/CMIP5_aero | 2 +-
Tables/CMIP5_cf3hr | 2 +-
Tables/CMIP5_cfDay | 2 +-
Tables/CMIP5_cfMon | 2 +-
Tables/CMIP5_cfOff | 2 +-
Tables/CMIP5_cfSites | 2 +-
Tables/CMIP5_day | 2 +-
Tables/CMIP5_fx | 28 +++++++++++++++++++++++-----
Tables/CMIP5_grids | 2 +-
Tables/md5s | 2 +-
Tables_csv/Amon.csv | 2 +-
Tables_csv/add_dims2.txt | 18 ++++++++++++++++++
Tables_csv/add_dims2_notime.txt | 18 ++++++++++++++++++
Tables_csv/fx.csv | 4 ++--
Tables_csv/other.csv | 2 +-
Tables_csv/standard_output.xls | Bin 705536 -> 705536 bytes
configure | 18 +++++++++---------
configure.ac | 2 +-
30 files changed, 157 insertions(+), 46 deletions(-)
diff --git a/Lib/table_generator.py b/Lib/table_generator.py
index f372745..bd78d26 100644
--- a/Lib/table_generator.py
+++ b/Lib/table_generator.py
@@ -532,6 +532,12 @@ def create_table(table_file, dims_file,minmax={}):
minmaxpassed={}
else:
minmaxpassed=minmax
+ for v in ["sltovovrt","sltovgyre"]:
+ try:
+ del(minmaxpassed[v])
+ except:
+ pass
+
print >> fo, process_template(var_tmpl,cnms,sp,{'CMOR variable name':['?','0','0.0']},minmax=minmaxpassed,iadd=iadd)
print 'Created tables:',tables.keys()
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9f4889d..da78906 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,8 @@
+2011-04-11 : added olev axis_entry as vertical coordinate
+2011-04-11 : changed min and valid_abs_min on areacello and volcello
+2011-04-11 : changed min and abs_valid_min of sltovgyre and sltovovrt
+2011-03-28 : a couple of "realm" specifications in the cmor "day" table
+2011-03-28 : some grid coordinate specifications were removed because they were wrong
2011-02-10 : replaced arecella with areacello for sic and sit
2011-01-31 : fixed "depth" stored direction
2011-01-31 : added an experiment
diff --git a/Tables/CMIP5_3hr b/Tables/CMIP5_3hr
index 0b8bc79..95f9437 100644
--- a/Tables/CMIP5_3hr
+++ b/Tables/CMIP5_3hr
@@ -6,7 +6,7 @@ frequency: 3hr
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: 28 March 2011 ! date this table was constructed
+table_date: 11 April 2011 ! 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 7a8b4a2..fe18d79 100644
--- a/Tables/CMIP5_6hrLev
+++ b/Tables/CMIP5_6hrLev
@@ -6,7 +6,7 @@ frequency: 6hr
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: 28 March 2011 ! date this table was constructed
+table_date: 11 April 2011 ! 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 9ccc15b..6edb22a 100644
--- a/Tables/CMIP5_6hrPlev
+++ b/Tables/CMIP5_6hrPlev
@@ -6,7 +6,7 @@ frequency: 6hr
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: 28 March 2011 ! date this table was constructed
+table_date: 11 April 2011 ! 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 ea14f07..f8c824b 100644
--- a/Tables/CMIP5_Amon
+++ b/Tables/CMIP5_Amon
@@ -6,7 +6,7 @@ frequency: mon
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: 28 March 2011 ! date this table was constructed
+table_date: 11 April 2011 ! 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 8ed9908..991e28e 100644
--- a/Tables/CMIP5_LImon
+++ b/Tables/CMIP5_LImon
@@ -6,7 +6,7 @@ frequency: mon
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: 28 March 2011 ! date this table was constructed
+table_date: 11 April 2011 ! 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 2bd1b37..1174b70 100644
--- a/Tables/CMIP5_Lmon
+++ b/Tables/CMIP5_Lmon
@@ -6,7 +6,7 @@ frequency: mon
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: 28 March 2011 ! date this table was constructed
+table_date: 11 April 2011 ! 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 c7cc70e..5ed1946 100644
--- a/Tables/CMIP5_OImon
+++ b/Tables/CMIP5_OImon
@@ -6,7 +6,7 @@ frequency: mon
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: 28 March 2011 ! date this table was constructed
+table_date: 11 April 2011 ! 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 b51fd3d..44ce2ba 100644
--- a/Tables/CMIP5_Oclim
+++ b/Tables/CMIP5_Oclim
@@ -6,7 +6,7 @@ frequency: monClim
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: 28 March 2011 ! date this table was constructed
+table_date: 11 April 2011 ! 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
@@ -160,6 +160,24 @@ valid_max: 12000.
!----------------------------------
!
!============
+axis_entry: olev
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+axis: Z ! X, Y, Z, T (default: undeclared)
+positive: down ! up or down (default: undeclared)
+long_name: generic ocean level
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name: lev
+stored_direction: increasing
+type: double
+must_have_bounds: no
+!----------------------------------
+!
+!============
axis_entry: ocean_double_sigma
!============
!
diff --git a/Tables/CMIP5_Omon b/Tables/CMIP5_Omon
index 7d53639..97567b5 100644
--- a/Tables/CMIP5_Omon
+++ b/Tables/CMIP5_Omon
@@ -6,7 +6,7 @@ frequency: mon
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: 28 March 2011 ! date this table was constructed
+table_date: 11 April 2011 ! 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
@@ -297,6 +297,24 @@ valid_max: 12000.
!----------------------------------
!
!============
+axis_entry: olev
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+axis: Z ! X, Y, Z, T (default: undeclared)
+positive: down ! up or down (default: undeclared)
+long_name: generic ocean level
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name: lev
+stored_direction: increasing
+type: double
+must_have_bounds: no
+!----------------------------------
+!
+!============
axis_entry: ocean_double_sigma
!============
!
@@ -3740,10 +3758,6 @@ long_name: Northward Ocean Salt Transport due to Gyre
dimensions: latitude basin time
out_name: sltovgyre
type: real
-valid_min: -5.596e+10
-valid_max: 5.333e+10
-ok_min_mean_abs: 1.503e+09
-ok_max_mean_abs: 6.01e+09
!----------------------------------
!
@@ -3764,10 +3778,6 @@ long_name: Northward Ocean Salt Transport due to Overturning
dimensions: latitude basin time
out_name: sltovovrt
type: real
-valid_min: -4.334e+11
-valid_max: 7.307e+11
-ok_min_mean_abs: 1.069e+10
-ok_max_mean_abs: 4.276e+10
!----------------------------------
!
diff --git a/Tables/CMIP5_Oyr b/Tables/CMIP5_Oyr
index 9492acd..d4cfc24 100644
--- a/Tables/CMIP5_Oyr
+++ b/Tables/CMIP5_Oyr
@@ -6,7 +6,7 @@ frequency: yr
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: 28 March 2011 ! date this table was constructed
+table_date: 11 April 2011 ! 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
@@ -159,6 +159,24 @@ valid_max: 12000.
!----------------------------------
!
!============
+axis_entry: olev
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+axis: Z ! X, Y, Z, T (default: undeclared)
+positive: down ! up or down (default: undeclared)
+long_name: generic ocean level
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name: lev
+stored_direction: increasing
+type: double
+must_have_bounds: no
+!----------------------------------
+!
+!============
axis_entry: ocean_double_sigma
!============
!
diff --git a/Tables/CMIP5_aero b/Tables/CMIP5_aero
index 0a61418..61424fb 100644
--- a/Tables/CMIP5_aero
+++ b/Tables/CMIP5_aero
@@ -6,7 +6,7 @@ frequency: mon
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: 28 March 2011 ! date this table was constructed
+table_date: 11 April 2011 ! 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 c1168be..103205e 100644
--- a/Tables/CMIP5_cf3hr
+++ b/Tables/CMIP5_cf3hr
@@ -6,7 +6,7 @@ frequency: 3hr
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: 28 March 2011 ! date this table was constructed
+table_date: 11 April 2011 ! 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_cfDay b/Tables/CMIP5_cfDay
index 37343ea..63062ff 100644
--- a/Tables/CMIP5_cfDay
+++ b/Tables/CMIP5_cfDay
@@ -6,7 +6,7 @@ frequency: day
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: 28 March 2011 ! date this table was constructed
+table_date: 11 April 2011 ! 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_cfMon b/Tables/CMIP5_cfMon
index 32f1467..4fd5e4c 100644
--- a/Tables/CMIP5_cfMon
+++ b/Tables/CMIP5_cfMon
@@ -6,7 +6,7 @@ frequency: mon
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: 28 March 2011 ! date this table was constructed
+table_date: 11 April 2011 ! 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_cfOff b/Tables/CMIP5_cfOff
index f6b5cf5..e1874e8 100644
--- a/Tables/CMIP5_cfOff
+++ b/Tables/CMIP5_cfOff
@@ -6,7 +6,7 @@ frequency: mon
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: 28 March 2011 ! date this table was constructed
+table_date: 11 April 2011 ! 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_cfSites b/Tables/CMIP5_cfSites
index 2dfcaf0..95b1190 100644
--- a/Tables/CMIP5_cfSites
+++ b/Tables/CMIP5_cfSites
@@ -11,7 +11,7 @@ frequency: subhr
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: 28 March 2011 ! date this table was constructed
+table_date: 11 April 2011 ! 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 7ee667e..e79236c 100644
--- a/Tables/CMIP5_day
+++ b/Tables/CMIP5_day
@@ -6,7 +6,7 @@ frequency: day
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: 28 March 2011 ! date this table was constructed
+table_date: 11 April 2011 ! 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_fx b/Tables/CMIP5_fx
index 77175a8..a00e5ad 100644
--- a/Tables/CMIP5_fx
+++ b/Tables/CMIP5_fx
@@ -6,7 +6,7 @@ frequency: fx
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: 28 March 2011 ! date this table was constructed
+table_date: 11 April 2011 ! 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
@@ -138,6 +138,24 @@ valid_max: 12000.
!----------------------------------
!
!============
+axis_entry: olev
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+axis: Z ! X, Y, Z, T (default: undeclared)
+positive: down ! up or down (default: undeclared)
+long_name: generic ocean level
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name: lev
+stored_direction: increasing
+type: double
+must_have_bounds: no
+!----------------------------------
+!
+!============
axis_entry: ocean_double_sigma
!============
!
@@ -574,9 +592,9 @@ comment: grid-cell volume ca. 2000.
dimensions: longitude latitude olevel
out_name: volcello
type: real
-valid_min: 100000.0
+valid_min: 0.0
valid_max: 1e+15
-ok_min_mean_abs: 100000.0
+ok_min_mean_abs: 0.0
ok_max_mean_abs: 1e+15
!----------------------------------
!
@@ -597,9 +615,9 @@ long_name: Ocean Grid-Cell Area
dimensions: longitude latitude
out_name: areacello
type: real
-valid_min: 100000.0
+valid_min: 0.0
valid_max: 1e+12
-ok_min_mean_abs: 100000.0
+ok_min_mean_abs: 0.0
ok_max_mean_abs: 1e+12
!----------------------------------
!
diff --git a/Tables/CMIP5_grids b/Tables/CMIP5_grids
index 7182cad..649bd1b 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: 28 March 2012 ! date this table was constructed
+table_date: 11 April 2011 ! 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/md5s b/Tables/md5s
index 254daa5..4499a6f 100644
--- a/Tables/md5s
+++ b/Tables/md5s
@@ -1 +1 @@
-{'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
+{'CMIP5': {'cf3hr': {'11 May 2010': 'a59ca1270ff3036d417a7f2217598266', '19 October 2010': '8b5c2f197b70a103393838ebd4075c6c', '12 May 2010': '905f7ccdd5a31cb71e2a6e3b339cd0e1', '23 August 2010': '5ccea11a7c3d165c76df3d9eede395d0', '01 June 2010': '619aa3c816bc25a53335589698e64968', '11 April 2011': 'c39107ec4994d0b31572fc740afe1879', '01 July 2010': 'c0fe9e92115d75292f5009e13761cb4b', '29 April 2010': 'fdc4fb38dd4cfb7f066329ed43a9e805', '12 March 2010': 'ae9a82f01824d9012aa0657cd7896a9a [...]
\ No newline at end of file
diff --git a/Tables_csv/Amon.csv b/Tables_csv/Amon.csv
index e5f771d..4a7c225 100644
--- a/Tables_csv/Amon.csv
+++ b/Tables_csv/Amon.csv
@@ -116,7 +116,7 @@ CMOR Table Amon: Monthly Mean Atmospheric Fields and Some Surface Fields,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,
-"These fields are derived from fields in the first table above. They have been ""bias-corrected"" to remove some of the unrealistic behavior caused by the initialization procedure. See recommendations for how this should be done at http://www.wcrp-climate.org/decadal/index.shtml. These fields should be reported only for decadal hindcast/forecast experiments. ",,,,,,,,,,,,,,,,,,,,,,
+"These fields are derived from fields in the first table above. They have been ""bias-corrected"" to remove some of the unrealistic behavior caused by the initialization procedure. See recommendations for how this should be done at http://eprints.soton.ac.uk/171975/1/150_Bias_Correction.pdf (Also see http://www.wcrp-climate.org/decadal/ .) These fields should be reported only for decadal hindcast/forecast experiments. ",,,,,,,,,,,,,,,,,,,,,,
priority,long name,units ,comment ,questions & notes,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,Bias-Corrected Near-Surface Air Temperature,K,,"normally, the temperature should be reported at the 2 meter height",tasAdjust,air_temperature,,K,time: mean,,,,,,real,longitude latitude time height2m,tasAdjust,atmos,,area: areacella,,
1.0,Bias-Corrected Surface Temperature,K,"""skin"" temperature (i.e., SST for open ocean)",,tsAdjust,surface_temperature,,K,time: mean,,,,,,real,longitude latitude time,tsAdjust,atmos,,area: areacella,,
diff --git a/Tables_csv/add_dims2.txt b/Tables_csv/add_dims2.txt
index 75f4871..34e11d4 100644
--- a/Tables_csv/add_dims2.txt
+++ b/Tables_csv/add_dims2.txt
@@ -27,6 +27,24 @@ valid_max: 12000.
!----------------------------------
!
!============
+axis_entry: olev
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+axis: Z ! X, Y, Z, T (default: undeclared)
+positive: down ! up or down (default: undeclared)
+long_name: generic ocean level
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name: lev
+stored_direction: increasing
+type: double
+must_have_bounds: no
+!----------------------------------
+!
+!============
axis_entry: ocean_double_sigma
!============
!
diff --git a/Tables_csv/add_dims2_notime.txt b/Tables_csv/add_dims2_notime.txt
index b78694b..976e587 100644
--- a/Tables_csv/add_dims2_notime.txt
+++ b/Tables_csv/add_dims2_notime.txt
@@ -27,6 +27,24 @@ valid_max: 12000.
!----------------------------------
!
!============
+axis_entry: olev
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+axis: Z ! X, Y, Z, T (default: undeclared)
+positive: down ! up or down (default: undeclared)
+long_name: generic ocean level
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name: lev
+stored_direction: increasing
+type: double
+must_have_bounds: no
+!----------------------------------
+!
+!============
axis_entry: ocean_double_sigma
!============
!
diff --git a/Tables_csv/fx.csv b/Tables_csv/fx.csv
index e59918a..51b76be 100644
--- a/Tables_csv/fx.csv
+++ b/Tables_csv/fx.csv
@@ -23,8 +23,8 @@ on ocean grid ,,,,,,,,,,,,,,,,,,,,,,
"The WGOMD has recommended that all ocean fields be saved on the model's native ocean grid. Many groups will also elect to save the sea ice fields on the ocean grid. (The alternative is to save sea ice fields on the atmosphere grid.) If data is ""interpolated"" from its native grid, it is important to preserve certain global mean properties (e.g., the total surface fluxes of heat, momentum, and water mass into the ocean).",,,,,,,,,,,,,,,,,,,,,,
priority,long name,units ,comment ,questions & notes,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,Sea Floor Depth,m,Ocean bathymetry. Reported here is the sea floor depth for present day. Reported as missing for land grid cells., ,deptho,sea_floor_depth_below_geoid,,m,,0.0,10000.0,2000.0,5000.0,,real,longitude latitude,deptho,ocean,,area: areacello,,
-1.0,Ocean Grid-Cell Volume,m3,grid-cell volume ca. 2000. ,"a 3-d field: For oceans with more than 1 mesh, report on grid that applies to temperature ",volcello,ocean_volume,,m3,,100000.0,1e+15,100000.0,1e+15,,real,longitude latitude olevel,volcello,ocean,,,,
-1.0,Ocean Grid-Cell Area,m2,,"For oceans with more than 1 mesh (e.g., staggered grids), report areas that apply to surface vertical fluxes of energy.",areacello,cell_area,,m2,,100000.0,1e+12,100000.0,1e+12,,real,longitude latitude,areacello,ocean,,,,
+1.0,Ocean Grid-Cell Volume,m3,grid-cell volume ca. 2000. ,"a 3-d field: For oceans with more than 1 mesh, report on grid that applies to temperature ",volcello,ocean_volume,,m3,,0.0,1e+15,0.0,1e+15,,real,longitude latitude olevel,volcello,ocean,,,,
+1.0,Ocean Grid-Cell Area,m2,,"For oceans with more than 1 mesh (e.g., staggered grids), report areas that apply to surface vertical fluxes of energy.",areacello,cell_area,,m2,,0.0,1e+12,0.0,1e+12,,real,longitude latitude,areacello,ocean,,,,
1.0,Sea Area Fraction,%, This is the area fraction at the ocean surface.,"Should this be recorded as a function of depth? Report on the same grid that ocean fields are reported (i.e., the ocean native grid, or the grid that ocean data has been provided to CMIP. For completeness, provide this even if the ocean grid is the same as the atmospheric grid.",sftof,sea_area_fraction,,%,,0.0,100.0,,,,real,longitude latitude,sftof,ocean,,area: areacello,,
1.0,Region Selection Index,1.0, ,"Report on the same grid as the temperature field. flag_values=0,1,2,3,4,5,6,7,8,9,10 corresponding to flag_meanings=global_land, southern_ocean, atlantic_ocean, pacific_ocean, arctic_ocean, indian_ocean, mediterranean_sea, black_sea, hudson_bay, baltic_sea, red_sea. ",basin,region,,1.0,,1.0,10.0,,,,integer,longitude latitude,basin,ocean,,area: areacello,0 1 2 3 4 5 6 7 8 9 10,global_land southern_ocean atlantic_ocean pacific_ocean arctic_ocean indian_oce [...]
2.0,Upward Geothermal Heat Flux at Sea Floor ,W m-2,,If this field is time-dependent then save it instead as one of your Omon fields (see the Omon table),hfgeou,upward_geothermal_heat_flux_at_sea_floor,,W m-2,area: mean where sea,,,,,up,real,longitude latitude,hfgeou,ocean,,area: areacello,,
diff --git a/Tables_csv/other.csv b/Tables_csv/other.csv
index 1403daf..c14a2b7 100644
--- a/Tables_csv/other.csv
+++ b/Tables_csv/other.csv
@@ -1,6 +1,6 @@
Requested output: years requested for each expt./output table combination (see CFMIP output sheet for information on time-periods for saving the special CFMIP-focused output.,,,,red font means output should be reported for only a single member in the case of an ensemble of simulations,,,,,,,,,,,,,
,,,,blue font means this is a lower priority request,,,,,,,,,,,,,
-"If a cell is shaded yellow, none of the variables will be part of the subset of model output that will be replicated at several locations (except, as noted by * or ** -- see note at right-- this may apply only to lower priority variables)",,,,"""all*"" indicates that although all years will be included in the ""replicated"" subset, only the high and medium priority variables will be included in the replicated subset. [...]
+"If a cell is shaded yellow/tan, none of the variables will be part of the subset of model output that will be replicated at several locations (except, as noted by * or ** -- see note at right-- this may apply only to lower priority variables)",,,,"""all*"" indicates that although all years will be included in the ""replicated"" subset, only the high and medium priority variables will be included in the replicated subset. [...]
,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,
diff --git a/Tables_csv/standard_output.xls b/Tables_csv/standard_output.xls
index cfa293c..05f8a86 100644
Binary files a/Tables_csv/standard_output.xls and b/Tables_csv/standard_output.xls differ
diff --git a/configure b/configure
index 6380a25..5977514 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.3.6.
+# Generated by GNU Autoconf 2.61 for cmip5-cmor-tables 1.3.7.
#
# 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.3.6'
-PACKAGE_STRING='cmip5-cmor-tables 1.3.6'
+PACKAGE_VERSION='1.3.7'
+PACKAGE_STRING='cmip5-cmor-tables 1.3.7'
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.3.6 to adapt to many kinds of systems.
+\`configure' configures cmip5-cmor-tables 1.3.7 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.3.6:";;
+ short | recursive ) echo "Configuration of cmip5-cmor-tables 1.3.7:";;
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.3.6
+cmip5-cmor-tables configure 1.3.7
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.3.6, which was
+It was created by cmip5-cmor-tables $as_me 1.3.7, 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.3.6, which was
+This file was extended by cmip5-cmor-tables $as_me 1.3.7, 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.3.6
+cmip5-cmor-tables config.status 1.3.7
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 ba32d9f..9f608bb 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.3.6, doutriaux1 at llnl.gov)
+AC_INIT(cmip5-cmor-tables, 1.3.7, 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