[cmor-tables] 68/83: 2011-04-27 : day table has updated comment on wrong standard name 2011-04-27 : fx table has corrected depth axis entry and a bunch of axes that depend on eta 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

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 6dc5daf0e185a4523c9eb297014fcd5b696173b9
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date:   Wed Apr 27 16:11:46 2011 -0700

    2011-04-27 : day table has updated comment on wrong standard name
    2011-04-27 : fx table has corrected depth axis entry and a bunch of axes that depend on eta
    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
---
 RELEASE-NOTES                   |   2 +
 Tables/CMIP5_3hr                |   2 +-
 Tables/CMIP5_6hrLev             |   2 +-
 Tables/CMIP5_6hrPlev            |   2 +-
 Tables/CMIP5_Amon               |   6 +--
 Tables/CMIP5_LImon              |   2 +-
 Tables/CMIP5_Lmon               |   2 +-
 Tables/CMIP5_OImon              |   2 +-
 Tables/CMIP5_Oclim              |   2 +-
 Tables/CMIP5_Omon               |   2 +-
 Tables/CMIP5_Oyr                |   2 +-
 Tables/CMIP5_aero               |   2 +-
 Tables/CMIP5_cf3hr              |   6 +--
 Tables/CMIP5_cfDay              |   2 +-
 Tables/CMIP5_cfMon              |   2 +-
 Tables/CMIP5_cfOff              |   2 +-
 Tables/CMIP5_cfSites            |   6 +--
 Tables/CMIP5_day                |   4 +-
 Tables/CMIP5_fx                 | 102 ++++++++++++++++++++++++++++++++++++++--
 Tables/md5s                     |   2 +-
 Tables_csv/Amon.csv             |   2 +-
 Tables_csv/Amon_2D.csv          |   2 +-
 Tables_csv/add_dims2_notime.txt | 100 ++++++++++++++++++++++++++++++++++++++-
 Tables_csv/day.csv              |   4 +-
 Tables_csv/general.csv          |   6 +--
 Tables_csv/standard_output.xls  | Bin 705536 -> 704512 bytes
 26 files changed, 231 insertions(+), 37 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index da78906..d00bee9 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,5 @@
+2011-04-27 : day table has updated comment on wrong standard name
+2011-04-27 : fx table has corrected depth axis entry and a bunch of axes that depend on eta
 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
diff --git a/Tables/CMIP5_3hr b/Tables/CMIP5_3hr
index 95f9437..c705b92 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:   11 April 2011 ! date this table was constructed
+table_date:   27 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 fe18d79..35bbb82 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:   11 April 2011 ! date this table was constructed
+table_date:   27 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 6edb22a..34905ee 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:   11 April 2011 ! date this table was constructed
+table_date:   27 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 f8c824b..25fa98f 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:   11 April 2011 ! date this table was constructed
+table_date:   27 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 
@@ -1574,7 +1574,7 @@ type:              real
 !
 
 !============
-variable_entry:    ci 
+variable_entry:    ci
 !============
 modeling_realm:    atmos
 !----------------------------------
@@ -1590,7 +1590,7 @@ comment:           Fraction of time that convection occurs in the grid cell .
 ! Additional variable information:
 !----------------------------------
 dimensions:        longitude latitude time
-out_name:          ci 
+out_name:          ci
 type:              real
 !----------------------------------
 !
diff --git a/Tables/CMIP5_LImon b/Tables/CMIP5_LImon
index 991e28e..a1565c0 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:   11 April 2011 ! date this table was constructed
+table_date:   27 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 1174b70..5feeaaa 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:   11 April 2011 ! date this table was constructed
+table_date:   27 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 5ed1946..8133eb7 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:   11 April 2011 ! date this table was constructed
+table_date:   27 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 44ce2ba..4d21f5b 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:   11 April 2011 ! date this table was constructed
+table_date:   27 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_Omon b/Tables/CMIP5_Omon
index 97567b5..e4c5c42 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:   11 April 2011 ! date this table was constructed
+table_date:   27 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_Oyr b/Tables/CMIP5_Oyr
index d4cfc24..d45ba4a 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:   11 April 2011 ! date this table was constructed
+table_date:   27 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_aero b/Tables/CMIP5_aero
index 61424fb..fd99e87 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:   11 April 2011 ! date this table was constructed
+table_date:   27 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 103205e..50b3c18 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:   11 April 2011 ! date this table was constructed
+table_date:   27 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 
@@ -1803,7 +1803,7 @@ type:              real
 !
 
 !============
-variable_entry:    ci 
+variable_entry:    ci
 !============
 modeling_realm:    atmos
 !----------------------------------
@@ -1819,7 +1819,7 @@ comment:           Fraction of time that convection occurs in the grid cell .
 ! Additional variable information:
 !----------------------------------
 dimensions:        longitude latitude time1
-out_name:          ci 
+out_name:          ci
 type:              real
 !----------------------------------
 !
diff --git a/Tables/CMIP5_cfDay b/Tables/CMIP5_cfDay
index 63062ff..45555cd 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:   11 April 2011 ! date this table was constructed
+table_date:   27 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 4fd5e4c..5384a3b 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:   11 April 2011 ! date this table was constructed
+table_date:   27 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 e1874e8..0c4736d 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:   11 April 2011 ! date this table was constructed
+table_date:   27 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 95b1190..1c1dd10 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:   11 April 2011 ! date this table was constructed
+table_date:   27 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 
@@ -1327,7 +1327,7 @@ type:              real
 !
 
 !============
-variable_entry:    ci 
+variable_entry:    ci
 !============
 modeling_realm:    atmos
 !----------------------------------
@@ -1343,7 +1343,7 @@ comment:           Fraction of time that convection occurs in the grid cell .
 ! Additional variable information:
 !----------------------------------
 dimensions:        site time1
-out_name:          ci 
+out_name:          ci
 type:              real
 !----------------------------------
 !
diff --git a/Tables/CMIP5_day b/Tables/CMIP5_day
index e79236c..8e97eba 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:   11 April 2011 ! date this table was constructed
+table_date:   27 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 
@@ -409,7 +409,7 @@ units:             K
 cell_methods:      time: mean
 cell_measures:     area: areacello
 long_name:         Sea Surface Temperature
-comment:           temperature of liquid ocean. 
+comment:           temperature of liquid ocean.  Note that the correct standard_name for this variable is ""sea_surface_temperature"", not ""surface_temperature"", but this was discovered too late to correct.  To maintain consistency across CMIP5 models, the wrong standard_name will continue to be used.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
diff --git a/Tables/CMIP5_fx b/Tables/CMIP5_fx
index a00e5ad..07f08b8 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:   11 April 2011 ! date this table was constructed
+table_date:   27 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 
@@ -124,7 +124,7 @@ axis_entry: depth_coord
 standard_name:    depth
 units:            m
 axis:             Z
-positive:	  down
+positive:	  down 
 long_name:        ocean depth coordinate
 !----------------------------------	
 !
@@ -132,7 +132,7 @@ long_name:        ocean depth coordinate
 !----------------------------------	
 out_name:         lev
 must_have_bounds: yes
-stored_direction: decreasing
+stored_direction: increasing
 valid_min:        0.
 valid_max:        12000.
 !----------------------------------	
@@ -178,6 +178,86 @@ z_factors:        sigma: sigma depth: depth z1: z1 z2: z2 a: a_coeff href: href
 z_bounds_factors: sigma: sigma_bnds depth: depth z1: z1 z2: z2 a: a href: href k_c: k_c
 !----------------------------------	
 !
+!============
+axis_entry: ocean_sigma_z
+!============
+!
+!------------
+!
+! Axis attributes:
+!----------------------------------	
+standard_name:    ocean_sigma_z
+axis:             Z
+long_name:        ocean sigma over z coordinate
+!----------------------------------	
+!
+! Additional axis information:
+!----------------------------------	
+out_name:         lev
+must_have_bounds: yes
+formula:          for k <= nsigma: z = eta + sigma*(min(depth_c,depth)+eta) ; for k > nsigma: z = zlev
+z_factors:        sigma: sigma eta: eta depth: depth depth_c: depth_c nsigma: nsigma zlev: zlev
+z_bounds_factors: sigma: sigma_bnds eta: eta depth: depth depth_c: depth_c nsigma: nsigma zlev: zlev_bnds
+!----------------------------------	
+!
+!============
+axis_entry: ocean_s
+!============
+!
+!  This coordinate is dimensionless and varies from 0 at the surface to -1. at the ocean floor.
+!  The values of s, which appears in the formula below, should be stored as ocean_s.  
+!  Note that in the netCDF file the variable will be named "lev", not ocean_s.
+!
+!------------
+!
+! Axis attributes:
+!----------------------------------	
+standard_name:    ocean_s_coordinate
+axis:             Z
+positive:	  up
+long_name:        ocean s-coordinate
+!----------------------------------	
+!
+! Additional axis information:
+!----------------------------------	
+out_name:         lev
+must_have_bounds: yes
+stored_direction: decreasing
+valid_min:        -1.
+valid_max:        0.
+formula:          z = eta*(1+s) + depth_c*s + (depth-depth_c)*C \n where \n C=(1-b)*sinh(a*s)/sinh(a) +\n           b*(tanh(a*(s+0.5))/(2*tanh(0.5*a)) - 0.5)
+z_factors:        s: lev eta: eta depth: depth a: a_coeff b: b_coeff depth_c: depth_c
+z_bounds_factors: s: lev_bnds eta: eta depth: depth a: a b: b depth_c: depth_c
+!----------------------------------	
+!
+!============
+axis_entry: ocean_sigma
+!============
+!
+!  This coordinate is dimensionless and varies from 0 at the surface to -1. at the ocean floor.
+!  The values of sigma, which appears in the formula below, should be stored as ocean_sigma.  
+!  Note that in the netCDF file the variable will be named "lev", not ocean_sigma.
+!
+!------------
+!
+! Axis attributes:
+!----------------------------------	
+standard_name:    ocean_sigma_coordinate
+axis:             Z
+positive:	  up
+long_name:        ocean sigma coordinate
+!----------------------------------	
+!
+! Additional axis information:
+!----------------------------------	
+out_name:         lev
+must_have_bounds: yes
+stored_direction: decreasing
+valid_min:        -1.
+valid_max:        0.
+formula:          z = eta + sigma*(depth+eta)
+z_factors:        sigma: lev eta: eta depth: depth
+z_bounds_factors: sigma: lev_bnds eta: eta depth: depth
 !----------------------------------	
 !
 !
@@ -188,6 +268,22 @@ z_bounds_factors: sigma: sigma_bnds depth: depth z1: z1 z2: z2 a: a href: href k
 ! ***************************************************************
 !
 !============
+variable_entry: eta
+!============
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+units:            m
+long_name:        Sea Surface Height
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:      longitude latitude
+type:      real
+!----------------------------------
+!
+!
+!============
 variable_entry: depth
 !============
 !----------------------------------
diff --git a/Tables/md5s b/Tables/md5s
index 4499a6f..cd6450e 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', '11 April 2011': 'c39107ec4994d0b31572fc740afe1879', '01 July 2010': 'c0fe9e92115d75292f5009e13761cb4b', '29 April 2010': 'fdc4fb38dd4cfb7f066329ed43a9e805', '12 March 2010': 'ae9a82f01824d9012aa0657cd7896a9a [...]
\ No newline at end of file
+{'CMIP5': {'cfSites': {'11 May 2010': '80506c07ed63befd33f9f727b78bde55', '19 October 2010': '80264b0dd9e203ce916542fa15c6d272', '12 May 2010': '0ebecf85ba30b2223360a29ece880be4', '15 November 2010': '635f0e6676162c743b15d824033afb04', '23 August 2010': '4a2774cbbde4d5f69c9541e6b6248d00', '01 June 2010': '2eb2e9a6a1db0e18dac73e04e0dfbe47', '11 April 2011': 'd4bd92f600f09b1599927f929db7fe5d', '01 July 2010': '96628b3875e74a8a515d0a1e500710d8', '11 November 2010': '6be9b509f02f6118bfd2b006 [...]
\ No newline at end of file
diff --git a/Tables_csv/Amon.csv b/Tables_csv/Amon.csv
index 4a7c225..bac7e72 100644
--- a/Tables_csv/Amon.csv
+++ b/Tables_csv/Amon.csv
@@ -58,7 +58,7 @@ priority,long name,units ,comment ,questions & notes,output variable name ,stand
 1.0,Net Downward Flux at Top of Model,W m-2,"i.e., at the top of that portion of the atmosphere where dynamics are explicitly treated by the model. This is reported only if it differs from the net downward radiative flux at the top of the atmosphere.",,rtmt,net_downward_radiative_flux_at_top_of_atmosphere_model,,W m-2,time: mean,,,,,down,real,longitude latitude time,rtmt,atmos,,area: areacella,,
 1.0,Air Pressure at Convective Cloud Base,Pa,,,ccb,air_pressure_at_convective_cloud_base,,Pa,time: mean,,,,,,real,longitude latitude time,ccb,atmos,,area: areacella,,
 1.0,Air Pressure at Convective Cloud Top,Pa,,,cct,air_pressure_at_convective_cloud_top,,Pa,time: mean,,,,,,real,longitude latitude time,cct,atmos,,area: areacella,,
-1.0,Fraction of Time Convection Occurs,1.0,Fraction of time that convection occurs in the grid cell .,,ci ,convection_time_fraction,,1.0,time: mean,,,,,,real,longitude latitude time,ci ,atmos,,area: areacella,,
+1.0,Fraction of Time Convection Occurs,1.0,Fraction of time that convection occurs in the grid cell .,,ci,convection_time_fraction,,1.0,time: mean,,,,,,real,longitude latitude time,ci,atmos,,area: areacella,,
 1.0,Fraction of Time Shallow Convection Occurs,1.0,Fraction of time that shallow convection occurs in the grid cell. ,For models with a distinct shallow convection scheme only.,sci,shallow_convection_time_fraction,,1.0,time: mean,,,,,,real,longitude latitude time,sci,atmos,,area: areacella,,
 ,,,,,,,,,,,,,,,,,,,,area: areacella,,
 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.  Does not include natural fire sources but, includes all anthropogenic sources, including fossil fuel use, cement production, agricultural burning, and sources associated with anthropogenic land use change excluding forest regrowth.",,fco2antt,tendency_of_atmosphere_mass_content_of_carbon_dioxide_expressed_as_carbon_ [...]
diff --git a/Tables_csv/Amon_2D.csv b/Tables_csv/Amon_2D.csv
index e3b3c6a..457373c 100644
--- a/Tables_csv/Amon_2D.csv
+++ b/Tables_csv/Amon_2D.csv
@@ -43,7 +43,7 @@
 1.0,Net Downward Flux at Top of Model,W m-2,"i.e., at the top of that portion of the atmosphere where dynamics are explicitly treated by the model. This is reported only if it differs from the net downward radiative flux at the top of the atmosphere.",,rtmt,net_downward_radiative_flux_at_top_of_atmosphere_model,,W m-2,time: mean,,,,,down,real,longitude latitude time,rtmt,atmos,,area: areacella,,
 1.0,Air Pressure at Convective Cloud Base,Pa,,,ccb,air_pressure_at_convective_cloud_base,,Pa,time: mean,,,,,,real,longitude latitude time,ccb,atmos,,area: areacella,,
 1.0,Air Pressure at Convective Cloud Top,Pa,,,cct,air_pressure_at_convective_cloud_top,,Pa,time: mean,,,,,,real,longitude latitude time,cct,atmos,,area: areacella,,
-1.0,Fraction of Time Convection Occurs,1.0,Fraction of time that convection occurs in the grid cell .,,ci ,convection_time_fraction,,1.0,time: mean,,,,,,real,longitude latitude time,ci ,atmos,,area: areacella,,
+1.0,Fraction of Time Convection Occurs,1.0,Fraction of time that convection occurs in the grid cell .,,ci,convection_time_fraction,,1.0,time: mean,,,,,,real,longitude latitude time,ci,atmos,,area: areacella,,
 1.0,Fraction of Time Shallow Convection Occurs,1.0,Fraction of time that shallow convection occurs in the grid cell. ,For models with a distinct shallow convection scheme only.,sci,shallow_convection_time_fraction,,1.0,time: mean,,,,,,real,longitude latitude time,sci,atmos,,area: areacella,,
 ,,,,,,,,,,,,,,,,,,,,area: areacella,,
 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.  Does not include natural fire sources but, includes all anthropogenic sources, including fossil fuel use, cement production, agricultural burning, and sources associated with anthropogenic land use change excluding forest regrowth.",,fco2antt,tendency_of_atmosphere_mass_content_of_carbon_dioxide_expressed_as_carbon_ [...]
diff --git a/Tables_csv/add_dims2_notime.txt b/Tables_csv/add_dims2_notime.txt
index 976e587..26ba596 100644
--- a/Tables_csv/add_dims2_notime.txt
+++ b/Tables_csv/add_dims2_notime.txt
@@ -13,7 +13,7 @@ axis_entry: depth_coord
 standard_name:    depth
 units:            m
 axis:             Z
-positive:	  down
+positive:	  down 
 long_name:        ocean depth coordinate
 !----------------------------------	
 !
@@ -21,7 +21,7 @@ long_name:        ocean depth coordinate
 !----------------------------------	
 out_name:         lev
 must_have_bounds: yes
-stored_direction: decreasing
+stored_direction: increasing
 valid_min:        0.
 valid_max:        12000.
 !----------------------------------	
@@ -67,6 +67,86 @@ z_factors:        sigma: sigma depth: depth z1: z1 z2: z2 a: a_coeff href: href
 z_bounds_factors: sigma: sigma_bnds depth: depth z1: z1 z2: z2 a: a href: href k_c: k_c
 !----------------------------------	
 !
+!============
+axis_entry: ocean_sigma_z
+!============
+!
+!------------
+!
+! Axis attributes:
+!----------------------------------	
+standard_name:    ocean_sigma_z
+axis:             Z
+long_name:        ocean sigma over z coordinate
+!----------------------------------	
+!
+! Additional axis information:
+!----------------------------------	
+out_name:         lev
+must_have_bounds: yes
+formula:          for k <= nsigma: z = eta + sigma*(min(depth_c,depth)+eta) ; for k > nsigma: z = zlev
+z_factors:        sigma: sigma eta: eta depth: depth depth_c: depth_c nsigma: nsigma zlev: zlev
+z_bounds_factors: sigma: sigma_bnds eta: eta depth: depth depth_c: depth_c nsigma: nsigma zlev: zlev_bnds
+!----------------------------------	
+!
+!============
+axis_entry: ocean_s
+!============
+!
+!  This coordinate is dimensionless and varies from 0 at the surface to -1. at the ocean floor.
+!  The values of s, which appears in the formula below, should be stored as ocean_s.  
+!  Note that in the netCDF file the variable will be named "lev", not ocean_s.
+!
+!------------
+!
+! Axis attributes:
+!----------------------------------	
+standard_name:    ocean_s_coordinate
+axis:             Z
+positive:	  up
+long_name:        ocean s-coordinate
+!----------------------------------	
+!
+! Additional axis information:
+!----------------------------------	
+out_name:         lev
+must_have_bounds: yes
+stored_direction: decreasing
+valid_min:        -1.
+valid_max:        0.
+formula:          z = eta*(1+s) + depth_c*s + (depth-depth_c)*C \n where \n C=(1-b)*sinh(a*s)/sinh(a) +\n           b*(tanh(a*(s+0.5))/(2*tanh(0.5*a)) - 0.5)
+z_factors:        s: lev eta: eta depth: depth a: a_coeff b: b_coeff depth_c: depth_c
+z_bounds_factors: s: lev_bnds eta: eta depth: depth a: a b: b depth_c: depth_c
+!----------------------------------	
+!
+!============
+axis_entry: ocean_sigma
+!============
+!
+!  This coordinate is dimensionless and varies from 0 at the surface to -1. at the ocean floor.
+!  The values of sigma, which appears in the formula below, should be stored as ocean_sigma.  
+!  Note that in the netCDF file the variable will be named "lev", not ocean_sigma.
+!
+!------------
+!
+! Axis attributes:
+!----------------------------------	
+standard_name:    ocean_sigma_coordinate
+axis:             Z
+positive:	  up
+long_name:        ocean sigma coordinate
+!----------------------------------	
+!
+! Additional axis information:
+!----------------------------------	
+out_name:         lev
+must_have_bounds: yes
+stored_direction: decreasing
+valid_min:        -1.
+valid_max:        0.
+formula:          z = eta + sigma*(depth+eta)
+z_factors:        sigma: lev eta: eta depth: depth
+z_bounds_factors: sigma: lev_bnds eta: eta depth: depth
 !----------------------------------	
 !
 !
@@ -77,6 +157,22 @@ z_bounds_factors: sigma: sigma_bnds depth: depth z1: z1 z2: z2 a: a href: href k
 ! ***************************************************************
 !
 !============
+variable_entry: eta
+!============
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+units:            m
+long_name:        Sea Surface Height
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:      longitude latitude
+type:      real
+!----------------------------------
+!
+!
+!============
 variable_entry: depth
 !============
 !----------------------------------
diff --git a/Tables_csv/day.csv b/Tables_csv/day.csv
index 748ef38..3117f01 100644
--- a/Tables_csv/day.csv
+++ b/Tables_csv/day.csv
@@ -21,7 +21,7 @@ priority,long name,units ,comment ,questions & notes,output variable name ,stand
 1.0,Sea Level Pressure,Pa,,,psl,air_pressure_at_sea_level,,Pa,time: mean,,,,,,real,longitude latitude time,psl,atmos,,area: areacella,,
 1.0,Daily-Mean Near-Surface Wind Speed,m s-1,,normally report this at 10 meters above the surface,sfcWind,wind_speed,,m s-1,time: mean,,,,,,real,longitude latitude time height10m,sfcWind,atmos,,,,
 1.0,Square of Sea Surface Temperature,K2,"square of temperature of liquid ocean, averaged over the day. ",Report on the ocean grid.  This variable appears in WGOMD Table 2.2 ,tossq,square_of_sea_surface_temperature,,K2,time:mean,,,,,,real,longitude latitude time,tossq,ocean,,area: areacello,,
-1.0,Sea Surface Temperature,K,temperature of liquid ocean. ,Report on the ocean grid.  This variable appears in WGOMD Table 2.2 ,tos,surface_temperature,,K,time: mean,,,,,,real,longitude latitude time,tos,ocean,,area: areacello,,
+1.0,Sea Surface Temperature,K,"temperature of liquid ocean.  Note that the correct standard_name for this variable is ""sea_surface_temperature"", not ""surface_temperature"", but this was discovered too late to correct.  To maintain consistency across CMIP5 models, the wrong standard_name will continue to be used.",Report on the ocean grid.  This variable appears in WGOMD Table 2.2 ,tos,surface_temperature,,K,time: mean,,,,,,real,longitude latitude time,tos,ocean,,area: areacello,,
 1.0,Daily Maximum Ocean Mixed Layer Thickness Defined by Mixing Scheme ,m ,,Report on the ocean grid.  This variable appears in WGOMD Table 2.2 ,omldamax,ocean_mixed_layer_thickness_defined_by_mixing_scheme,,m ,time: maximum,,,,,,real,longitude latitude time,omldamax,ocean,,area: areacello,,
 The rest of the daily mean fields on this spreadsheet should be collected only for a single ensemble member of the following experiments.,,,,,,,,,,,,,,,,,,,,,,
 ,,,experiment,time-period requested,,,,,,,,,,,,,,,,,,
@@ -29,7 +29,7 @@ The rest of the daily mean fields on this spreadsheet should be collected only f
 ,,,historical,Jan 1950 -- Dec 2005,,,,,,,,,,,,,,,,,,
 ,,,future simulations driven by RCP concentrations or emissions,"only years 2006-2100, 2181-2200, and 2281-2300",,,,,,,,,,,,,,,,,,
 ,,,AMIP & 2030 time-slice run,all years,,,,,,,,,,,,,,,,,,
-"CMOR Table day: 2-D daily-mean atmospheric and surface fields (All fields should be reported on the atmospheric grid except (as noted below) the sea ice fields, which should be reported on the ocean grid.)",,,,,,,,,,,,,,,,,,,,,,
+"In CMOR Table day: 2-D daily-mean atmospheric and surface fields (All fields should be reported on the atmospheric grid except (as noted below) the sea ice fields, which should be reported on the ocean grid.)",,,,,,,,,,,,,,,,,,,,,,
 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,Moisture in Upper Portion of Soil Column,kg m-2,the mass of water in all phases in a thin surface soil layer.,integrate over uppermost 10 cm,mrsos,moisture_content_of_soil_layer,,kg m-2,time: mean area: mean where land ,,,,,,real,longitude latitude time sdepth1,mrsos,land,,area: areacella,,
 1.0,Near-Surface 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.",normally report this at 2 meters above the surface,rhs,relative_humidity,,%,time: mean,,,,,,real,longitude latitude time height2m,rhs,atmos,,area: areacella,,
diff --git a/Tables_csv/general.csv b/Tables_csv/general.csv
index 74f1bdb..a69cdb2 100644
--- a/Tables_csv/general.csv
+++ b/Tables_csv/general.csv
@@ -6,10 +6,10 @@ General information,,,
 1. Sea ice fields and ocean biogeochemistry fields will be archived on the same grid as ocean fields.,,,need standard name
 ,,,
 2. Land fields (including ice and snow on land) and land biogeochemistry fields will be archived on the same grid as the atmosphere.,,,
-,,,modified between 25 July & 17 Sept. 2010
 ,,,modified between 17 September and 8 November 2010
-The following rules and recommendations for how to  calculate quantities should be followed unless a different method is explicitly indicated in the notes that appear in the following tables.,,,modifed between 8 November 2010 and 4 January 2011
-,,,modified after 4 January 2011
+,,,modifed between 8 November 2010 and 4 January 2011
+The following rules and recommendations for how to  calculate quantities should be followed unless a different method is explicitly indicated in the notes that appear in the following tables.,,,modified between 4 January 2011 and 28 March 2011.
+,,,modified after 28 March 2011.
 "1. It is recommended that ocean and sea-ice output (including Oclim, Oyr, Omon, and OImon)  be reported on the ocean's native grid.  Unless noted otherwise in the tables, all other output should be reported on the atmospheric grid.",,,
 ,,,
 "2. Unless otherwise specified, the ocean and sea-ice output (including Oclim, Oyr, Omon, and OImon) represents a mean over only the sea portion of each grid cell (i.e., it is interpreted as ""where ocean over ocean""), and a value of 0.0 should be reported where the sea fraction is 0.",,,
diff --git a/Tables_csv/standard_output.xls b/Tables_csv/standard_output.xls
index 05f8a86..b3ed0b5 100644
Binary files a/Tables_csv/standard_output.xls and b/Tables_csv/standard_output.xls 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