[cmor-tables] 56/83: 2010-11-30 : edited min/maxs to be added only for monthly tables 2010-11-30 : min/max are adjusted with greater of 5% or 3*std instead of just 3*std 2010-11-30 : typos fixed by Karl 2010-11-30 : formulas do not have indices on coefficients anymore (because of unstructured grids)
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sun Aug 30 08:06:12 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository cmor-tables.
commit b94579719423986d550a4da1a7ec204309a2a4a5
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date: Tue Nov 30 12:53:49 2010 -0800
2010-11-30 : edited min/maxs to be added only for monthly tables
2010-11-30 : min/max are adjusted with greater of 5% or 3*std instead of just 3*std
2010-11-30 : typos fixed by Karl
2010-11-30 : formulas do not have indices on coefficients anymore (because of unstructured grids)
---
Lib/table_generator.py | 65 +++++++++++-------
RELEASE-NOTES | 4 ++
Tables/CMIP5_3hr | 89 ++----------------------
Tables/CMIP5_6hrLev | 41 +++--------
Tables/CMIP5_6hrPlev | 19 +----
Tables/CMIP5_Amon | 117 +++++++++++++++----------------
Tables/CMIP5_LImon | 5 +-
Tables/CMIP5_Lmon | 3 +-
Tables/CMIP5_OImon | 11 +--
Tables/CMIP5_Oclim | 15 ++--
Tables/CMIP5_Omon | 55 +++++++--------
Tables/CMIP5_Oyr | 15 ++--
Tables/CMIP5_aero | 27 ++++----
Tables/CMIP5_cf3hr | 155 ++++-------------------------------------
Tables/CMIP5_cfDay | 133 +++--------------------------------
Tables/CMIP5_cfMon | 31 +++++----
Tables/CMIP5_cfOff | 3 +-
Tables/CMIP5_cfSites | 183 ++++---------------------------------------------
Tables/CMIP5_day | 139 +------------------------------------
Tables/CMIP5_fx | 17 +----
Tables/md5s | 2 +-
Tables_csv/3hr.csv | 8 +--
Tables_csv/Amon.csv | 2 +-
Tables_csv/Amon_2D.csv | 2 +-
Tables_csv/Lmon.csv | 2 +-
Tables_csv/OImon.csv | 8 +--
Tables_csv/Oclim.csv | 4 +-
Tables_csv/Omon.csv | 2 +-
Tables_csv/aero.csv | 4 +-
Tables_csv/dims.csv | 2 +-
Tables_csv/general.csv | 6 +-
configure | 18 ++---
configure.ac | 2 +-
33 files changed, 280 insertions(+), 909 deletions(-)
diff --git a/Lib/table_generator.py b/Lib/table_generator.py
index 313f143..caf5216 100644
--- a/Lib/table_generator.py
+++ b/Lib/table_generator.py
@@ -238,7 +238,8 @@ def process_template(tmpl,cnames,cols,voids={},minmax={},iadd=-1):
std/=len(mnmx.keys())
if numpy.allclose(std,0.):
std=val*pmean
- setattr(F,"valid min","%.4g" % (val-nstd*std))
+ delta=max(nstd*std,abs(val*.05))
+ setattr(F,"valid min","%.4g" % (val-delta))
keys.remove("valid min")
if 'valid max' in keys:
#ok let's see if we can figure this one out
@@ -252,7 +253,8 @@ def process_template(tmpl,cnames,cols,voids={},minmax={},iadd=-1):
std/=len(mnmx.keys())
if numpy.allclose(std,0.):
std=val*pmean
- setattr(F,"valid max","%.4g" % (val+nstd*std))
+ delta=max(nstd*std,abs(val*.05))
+ setattr(F,"valid max","%.4g" % (val+delta))
keys.remove("valid max")
if "mean absolute min" in keys:
mnmx = minmax[ve]
@@ -265,7 +267,8 @@ def process_template(tmpl,cnames,cols,voids={},minmax={},iadd=-1):
std/=len(mnmx.keys())
if numpy.allclose(std,0.):
std=val*pmean
- setattr(F,"mean absolute min","%.4g" % (val-nstd*std))
+ delta=max(nstd*std,abs(val*.05))
+ setattr(F,"mean absolute min","%.4g" % (val-delta))
keys.remove("mean absolute min")
if "mean absolute max" in keys:
mnmx = minmax[ve]
@@ -278,7 +281,8 @@ def process_template(tmpl,cnames,cols,voids={},minmax={},iadd=-1):
std/=len(mnmx.keys())
if numpy.allclose(std,0.):
std=val*pmean
- setattr(F,"mean absolute max","%.4g" % (val+nstd*std))
+ delta=max(nstd*std,abs(val*.05))
+ setattr(F,"mean absolute max","%.4g" % (val+delta))
keys.remove("mean absolute max")
### Need to add lines for absolute mean min/max
@@ -312,6 +316,30 @@ def process_template(tmpl,cnames,cols,voids={},minmax={},iadd=-1):
out = ""
return out
+def get_interval(tbnm):
+ if tbnm.lower().find("mon")>-1:
+ interval = 30.
+ elif tbnm.lower().find('clim')>-1:
+ interval = 30.
+ elif tbnm.lower().find('aero')>-1:
+ interval = 30.
+ elif tbnm.lower().find('yr')>-1:
+ interval = 365.
+ elif tbnm.lower().find('da')>-1:
+ interval = 1.
+ elif tbnm.lower().find("hr")>-1:
+ indx = tbnm.lower().find("hr")
+ interval = float(tbnm[indx-1])/24.
+ elif tbnm.lower().find("cfoff")>-1:
+ interval = 30.
+ elif tbnm.lower().find("cfsites")>-1:
+ interval = 25./(24.*60.)
+ elif tbnm.lower().find("min")>-1:
+ interval = float(tbnm[2:tbnm.find("min")])/1440.
+ else:
+ interval = 0.
+ return interval
+
def create_table_header(tbnm, table_file, dims_file, fqcy):
#First of All create the header
fnm = "Tables/" + prefix + '_'+tbnm
@@ -336,27 +364,7 @@ def create_table_header(tbnm, table_file, dims_file, fqcy):
# looking for approx interval, ASSUMING UNITS ARE IN DAYS SINCE
print 'Table nm:',tbnm,'__________________________________________'
- if tbnm.lower().find("mon")>-1:
- interval = 30.
- elif tbnm.lower().find('clim')>-1:
- interval = 30.
- elif tbnm.lower().find('aero')>-1:
- interval = 30.
- elif tbnm.lower().find('yr')>-1:
- interval = 365.
- elif tbnm.lower().find('da')>-1:
- interval = 1.
- elif tbnm.lower().find("hr")>-1:
- indx = tbnm.lower().find("hr")
- interval = float(tbnm[indx-1])/24.
- elif tbnm.lower().find("cfoff")>-1:
- interval = 30.
- elif tbnm.lower().find("cfsites")>-1:
- interval = 25./(24.*60.)
- elif tbnm.lower().find("min")>-1:
- interval = float(tbnm[2:tbnm.find("min")])/1440.
- else:
- interval = 0.
+ interval = get_interval(tbnm)
#print 'Interval:',interval,'________________________'
print >> fo, """approx_interval: %f ! approximate spacing between successive time
! samples (in units of the output time
@@ -518,7 +526,12 @@ def create_table(table_file, dims_file,minmax={}):
print 'Creating table:',tbnm
fo = create_table_header(tbnm,table_file,dims_file,fqcy)
tables[tbnm]=fo
- print >> fo, process_template(var_tmpl,cnms,sp,{'CMOR variable name':['?','0','0.0']},minmax=minmax,iadd=iadd)
+ if get_interval(tbnm)!=30.:
+ print 'Interval is:',get_interval(tbnm)
+ minmaxpassed={}
+ else:
+ minmaxpassed=minmax
+ 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 3edd1e4..cfdaba7 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,7 @@
+2010-11-30 : edited min/maxs to be added only for monthly tables
+2010-11-30 : min/max are adjusted with greater of 5% or 3*std instead of just 3*std
+2010-11-30 : typos fixed by Karl
+2010-11-30 : formulas do not have indices on coefficients anymore (because of unstructured grids)
2010-11-15 : fixed typo in cfSite longitude/latitude had wrong min/max
2010-11-12 : added site longitude latitude to cfSite, added must_call_cmor_grid attribute, need CMOR 2.5
2010-10-25 : Fixed cfSites still had some lat/lon...
diff --git a/Tables/CMIP5_3hr b/Tables/CMIP5_3hr
index 31e2871..65f1c53 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: 12 November 2010 ! date this table was constructed
+table_date: 30 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -24,6 +24,7 @@ expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
expt_id_ok: 'pre-industrial control' 'piControl'
expt_id_ok: 'historical' 'historical'
+expt_id_ok: 'historical extension' 'historicalExt'
expt_id_ok: 'mid-Holocene' 'midHolocene'
expt_id_ok: 'last glacial maximum' 'lgm'
expt_id_ok: 'last millennium' 'past1000'
@@ -242,10 +243,6 @@ comment: at surface; includes both liquid and solid phases. This is t
dimensions: longitude latitude time
out_name: pr
type: real
-valid_min: 0
-valid_max: 0.001254
-ok_min_mean_abs: 2.156e-05
-ok_max_mean_abs: 3.215e-05
!----------------------------------
!
@@ -268,10 +265,6 @@ comment: near-surface (usually, 2 meter) air temperature, sampled syno
dimensions: longitude latitude time1 height2m
out_name: tas
type: real
-valid_min: 180.6
-valid_max: 325.7
-ok_min_mean_abs: 273.5
-ok_max_mean_abs: 281.7
!----------------------------------
!
@@ -295,10 +288,6 @@ dimensions: longitude latitude time
out_name: hfls
type: real
positive: up
-valid_min: -76.77
-valid_max: 790.7
-ok_min_mean_abs: 50.39
-ok_max_mean_abs: 73.2
!----------------------------------
!
@@ -322,10 +311,6 @@ dimensions: longitude latitude time
out_name: hfss
type: real
positive: up
-valid_min: -264.5
-valid_max: 844.8
-ok_min_mean_abs: 10.7
-ok_max_mean_abs: 34.84
!----------------------------------
!
@@ -349,10 +334,6 @@ dimensions: longitude latitude time
out_name: rlds
type: real
positive: down
-valid_min: 30.71
-valid_max: 520.5
-ok_min_mean_abs: 271.2
-ok_max_mean_abs: 323.6
!----------------------------------
!
@@ -376,10 +357,6 @@ dimensions: longitude latitude time
out_name: rlus
type: real
positive: up
-valid_min: 43.75
-valid_max: 658
-ok_min_mean_abs: 331.1
-ok_max_mean_abs: 369.9
!----------------------------------
!
@@ -403,10 +380,6 @@ dimensions: longitude latitude time
out_name: rsds
type: real
positive: down
-valid_min: -0.002946
-valid_max: 524.4
-ok_min_mean_abs: 143.9
-ok_max_mean_abs: 181.6
!----------------------------------
!
@@ -430,10 +403,6 @@ dimensions: longitude latitude time
out_name: rsus
type: real
positive: up
-valid_min: -0.006589
-valid_max: 422.2
-ok_min_mean_abs: 26.22
-ok_max_mean_abs: 43.77
!----------------------------------
!
@@ -452,13 +421,9 @@ comment: sampled synoptically.
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1 height2m
+dimensions: longitude latitude time1 height10m
out_name: uas
type: real
-valid_min: -19.01
-valid_max: 18.68
-ok_min_mean_abs: 1.668
-ok_max_mean_abs: 4.106
!----------------------------------
!
@@ -477,13 +442,9 @@ comment: sampled synoptically.
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude time1 height2m
+dimensions: longitude latitude time1 height10m
out_name: vas
type: real
-valid_min: -18.04
-valid_max: 22.84
-ok_min_mean_abs: 1.065
-ok_max_mean_abs: 2.678
!----------------------------------
!
@@ -506,10 +467,6 @@ comment: near-surface (usually 2 m) specific humidity, sampled synopti
dimensions: longitude latitude time1 height2m
out_name: huss
type: real
-valid_min: -7.21e-06
-valid_max: 0.02992
-ok_min_mean_abs: 0.006391
-ok_max_mean_abs: 0.008749
!----------------------------------
!
@@ -532,10 +489,6 @@ comment: Compute the mass of water in all phases in the upper 0.1 mete
dimensions: longitude latitude time1 sdepth1
out_name: mrsos
type: real
-valid_min: -2.008
-valid_max: 146.5
-ok_min_mean_abs: -35.89
-ok_max_mean_abs: 123.3
!----------------------------------
!
@@ -602,10 +555,6 @@ comment: at surface. This is a 3-hour mean convective precipitation f
dimensions: longitude latitude time
out_name: prc
type: real
-valid_min: 0
-valid_max: 0.0006323
-ok_min_mean_abs: -2.528e-06
-ok_max_mean_abs: 3.209e-05
!----------------------------------
!
@@ -628,10 +577,6 @@ comment: at surface. Includes all forms of precipitating solid phase
dimensions: longitude latitude time
out_name: prsn
type: real
-valid_min: 0
-valid_max: 0.0002987
-ok_min_mean_abs: 1.449e-06
-ok_max_mean_abs: 6.11e-06
!----------------------------------
!
@@ -654,10 +599,6 @@ comment: compute the total runoff (including ""drainage"" through the
dimensions: longitude latitude time
out_name: mrro
type: real
-valid_min: -0.0002019
-valid_max: 0.001065
-ok_min_mean_abs: -6.668e-06
-ok_max_mean_abs: 1.874e-05
!----------------------------------
!
@@ -681,10 +622,6 @@ dimensions: longitude latitude time
out_name: rldscs
type: real
positive: down
-valid_min: 33.55
-valid_max: 543.6
-ok_min_mean_abs: 238.6
-ok_max_mean_abs: 293.8
!----------------------------------
!
@@ -708,15 +645,11 @@ dimensions: longitude latitude time
out_name: rsdscs
type: real
positive: down
-valid_min: -1.748e+30
-valid_max: 518
-ok_min_mean_abs: 206.9
-ok_max_mean_abs: 238.6
!----------------------------------
!
!============
-variable_entry: rluscs
+variable_entry: rsuscs
!============
modeling_realm: atmos
!----------------------------------
@@ -732,7 +665,7 @@ comment: This is a 3-hour mean flux.
! Additional variable information:
!----------------------------------
dimensions: longitude latitude time
-out_name: rluscs
+out_name: rsuscs
type: real
positive: up
!----------------------------------
@@ -757,10 +690,6 @@ comment: sampled synoptically to diagnose atmospheric tides, this is b
dimensions: longitude latitude time1
out_name: ps
type: real
-valid_min: 4.792e+04
-valid_max: 1.093e+05
-ok_min_mean_abs: 9.606e+04
-ok_max_mean_abs: 9.743e+04
!----------------------------------
!
@@ -783,10 +712,6 @@ comment: for the whole atmospheric column, as seen from the surface or
dimensions: longitude latitude time
out_name: clt
type: real
-valid_min: -0.0001822
-valid_max: 100.2
-ok_min_mean_abs: 39.37
-ok_max_mean_abs: 84.98
!----------------------------------
!
@@ -801,7 +726,7 @@ standard_name: surface_diffuse_downwelling_shortwave_flux_in_air
units: W m-2
cell_methods: time: mean
cell_measures: area: areacella
-long_name: Surface Downward Diffuse Shortwave Radiation
+long_name: Surface Diffuse Downwelling Shortwave Radiation
comment: This is a 3-hour mean flux.
!----------------------------------
! Additional variable information:
diff --git a/Tables/CMIP5_6hrLev b/Tables/CMIP5_6hrLev
index 2c2e1aa..c2c8a55 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: 12 November 2010 ! date this table was constructed
+table_date: 30 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -24,6 +24,7 @@ expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
expt_id_ok: 'pre-industrial control' 'piControl'
expt_id_ok: 'historical' 'historical'
+expt_id_ok: 'historical extension' 'historicalExt'
expt_id_ok: 'mid-Holocene' 'midHolocene'
expt_id_ok: 'last glacial maximum' 'lgm'
expt_id_ok: 'last millennium' 'past1000'
@@ -155,7 +156,7 @@ must_have_bounds: yes
stored_direction: increasing
valid_min: -200.
valid_max: 800000.
-formula: z(n,k,j,i) = a(k)*ztop + b1(k)*zsurf1(n,j,i) + b2(k)*zsurf2(n,j,i)
+formula: z = a*ztop + b1*zsurf1 + b2*zsurf2
z_factors: a: a b1: b1 b2: b2 ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2
z_bounds_factors: a: a_bnds b1: b1_bnds b2: b2_bnds ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2
!----------------------------------
@@ -185,7 +186,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: -1.
valid_max: 20.
-formula: p(k) = p0 * exp(-lev(k))
+formula: p = p0 * exp(-lev)
z_factors: p0: p0 lev: lev
z_bounds_factors: p0: p0 lev: lev_bnds
!----------------------------------
@@ -215,7 +216,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = ptop + sigma(k)*(ps(n,j,i) - ptop)
+formula: p = ptop + sigma*(ps - ptop)
z_factors: ptop: ptop sigma: lev ps: ps
z_bounds_factors: ptop: ptop sigma: lev_bnds ps: ps
!----------------------------------
@@ -226,7 +227,7 @@ axis_entry: standard_hybrid_sigma
!============
!
! This coordinate is dimensionless and varies from a small value at the model top to 1.0 at the surface.
-! The values of a(k)+ b(k), which appear in the formula below, should be stored as standard_hybrid_sigma.
+! The values of a+ b, which appear in the formula below, should be stored as standard_hybrid_sigma.
! Note that in the netCDF file the variable will be named "lev", not standard_hybrid_sigma.
!
!---------------------------------
@@ -245,7 +246,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = a(k)*p0 + b(k)*ps(n,j,i)
+formula: p = a*p0 + b*ps
z_factors: p0: p0 a: a b: b ps: ps
z_bounds_factors: p0: p0 a: a_bnds b: b_bnds ps: ps
!----------------------------------
@@ -256,7 +257,7 @@ axis_entry: alternate_hybrid_sigma
!============
!
! This coordinate is dimensionless and varies from a small value at the model top to 1.0 at the surface.
-! The values of ap(k)/p0 + b(k), which appear in the formula below, should be stored as alternate_hybrid_sigma.
+! The values of ap/p0 + b, which appear in the formula below, should be stored as alternate_hybrid_sigma.
! Note that in the netCDF file the variable will be named "lev", not alternate_hybrid_sigma.
!
!------------
@@ -277,7 +278,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = ap(k) + b(k)*ps(n,j,i)
+formula: p = ap + b*ps
z_factors: ap: ap b: b ps: ps
z_bounds_factors: ap: ap_bnds b: b_bnds ps: ps
!----------------------------------
@@ -288,7 +289,7 @@ axis_entry: hybrid_height
!============
!
! This coordinate has dimension of meters (m) and increases upward.
-! The values of a(k) which appear in the formula below, should be stored as hybrid_height.
+! The values of a which appear in the formula below, should be stored as hybrid_height.
! Note that in the netCDF file the variable will be named "lev", not hybrid_height.
!
!------------
@@ -308,7 +309,7 @@ out_name: lev
must_have_bounds: yes
stored_direction: increasing
valid_min: 0.0
-formula: z(k,j,i) = a(k) + b(k)*orog(j,i)
+formula: z = a + b*orog
z_factors: a: lev b: b orog: orog
z_bounds_factors: a: lev_bnds b: b_bnds orog: orog
!----------------------------------
@@ -505,10 +506,6 @@ comment: on all model levels
dimensions: longitude latitude alevel time1
out_name: ta
type: real
-valid_min: 157.1
-valid_max: 326.4
-ok_min_mean_abs: 200.2
-ok_max_mean_abs: 289.9
!----------------------------------
!
@@ -529,10 +526,6 @@ comment: on all model levels
dimensions: longitude latitude alevel time1
out_name: ua
type: real
-valid_min: -68.65
-valid_max: 136.6
-ok_min_mean_abs: 1.101
-ok_max_mean_abs: 22.42
!----------------------------------
!
@@ -553,10 +546,6 @@ comment: on all model levels
dimensions: longitude latitude alevel time1
out_name: va
type: real
-valid_min: -71.1
-valid_max: 69.93
-ok_min_mean_abs: 0.9886
-ok_max_mean_abs: 4.679
!----------------------------------
!
@@ -578,10 +567,6 @@ comment: on all model levels
dimensions: longitude latitude alevel time1
out_name: hus
type: real
-valid_min: -0.000299
-valid_max: 0.02812
-ok_min_mean_abs: -0.0003539
-ok_max_mean_abs: 0.01027
!----------------------------------
!
@@ -603,10 +588,6 @@ comment: surface pressure, not mean sea level pressure
dimensions: longitude latitude time1
out_name: ps
type: real
-valid_min: 4.792e+04
-valid_max: 1.093e+05
-ok_min_mean_abs: 9.606e+04
-ok_max_mean_abs: 9.743e+04
!----------------------------------
!
diff --git a/Tables/CMIP5_6hrPlev b/Tables/CMIP5_6hrPlev
index be4e0a0..8c3ade5 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: 12 November 2010 ! date this table was constructed
+table_date: 30 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -24,6 +24,7 @@ expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
expt_id_ok: 'pre-industrial control' 'piControl'
expt_id_ok: 'historical' 'historical'
+expt_id_ok: 'historical extension' 'historicalExt'
expt_id_ok: 'mid-Holocene' 'midHolocene'
expt_id_ok: 'last glacial maximum' 'lgm'
expt_id_ok: 'last millennium' 'past1000'
@@ -167,10 +168,6 @@ comment: on the following pressure levels: 850, 500, 250 hPa
dimensions: longitude latitude plev3 time1
out_name: ua
type: real
-valid_min: -68.65
-valid_max: 136.6
-ok_min_mean_abs: 1.101
-ok_max_mean_abs: 22.42
!----------------------------------
!
@@ -191,10 +188,6 @@ comment: on the following pressure levels: 850, 500, 250 hPa
dimensions: longitude latitude plev3 time1
out_name: va
type: real
-valid_min: -71.1
-valid_max: 69.93
-ok_min_mean_abs: 0.9886
-ok_max_mean_abs: 4.679
!----------------------------------
!
@@ -216,10 +209,6 @@ comment: on the following pressure levels: 850, 500, 250 hPa
dimensions: longitude latitude plev3 time1
out_name: ta
type: real
-valid_min: 157.1
-valid_max: 326.4
-ok_min_mean_abs: 200.2
-ok_max_mean_abs: 289.9
!----------------------------------
!
@@ -240,10 +229,6 @@ long_name: Sea Level Pressure
dimensions: longitude latitude time1
out_name: psl
type: real
-valid_min: 9.477e+04
-valid_max: 1.124e+05
-ok_min_mean_abs: 1.003e+05
-ok_max_mean_abs: 1.017e+05
!----------------------------------
!
diff --git a/Tables/CMIP5_Amon b/Tables/CMIP5_Amon
index 281583c..8a4d9a3 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: 12 November 2010 ! date this table was constructed
+table_date: 30 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -24,6 +24,7 @@ expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
expt_id_ok: 'pre-industrial control' 'piControl'
expt_id_ok: 'historical' 'historical'
+expt_id_ok: 'historical extension' 'historicalExt'
expt_id_ok: 'mid-Holocene' 'midHolocene'
expt_id_ok: 'last glacial maximum' 'lgm'
expt_id_ok: 'last millennium' 'past1000'
@@ -251,7 +252,7 @@ must_have_bounds: yes
stored_direction: increasing
valid_min: -200.
valid_max: 800000.
-formula: z(n,k,j,i) = a(k)*ztop + b1(k)*zsurf1(n,j,i) + b2(k)*zsurf2(n,j,i)
+formula: z = a*ztop + b1*zsurf1 + b2*zsurf2
z_factors: a: a b1: b1 b2: b2 ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2
z_bounds_factors: a: a_bnds b1: b1_bnds b2: b2_bnds ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2
!----------------------------------
@@ -281,7 +282,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: -1.
valid_max: 20.
-formula: p(k) = p0 * exp(-lev(k))
+formula: p = p0 * exp(-lev)
z_factors: p0: p0 lev: lev
z_bounds_factors: p0: p0 lev: lev_bnds
!----------------------------------
@@ -311,7 +312,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = ptop + sigma(k)*(ps(n,j,i) - ptop)
+formula: p = ptop + sigma*(ps - ptop)
z_factors: ptop: ptop sigma: lev ps: ps
z_bounds_factors: ptop: ptop sigma: lev_bnds ps: ps
!----------------------------------
@@ -322,7 +323,7 @@ axis_entry: standard_hybrid_sigma
!============
!
! This coordinate is dimensionless and varies from a small value at the model top to 1.0 at the surface.
-! The values of a(k)+ b(k), which appear in the formula below, should be stored as standard_hybrid_sigma.
+! The values of a+ b, which appear in the formula below, should be stored as standard_hybrid_sigma.
! Note that in the netCDF file the variable will be named "lev", not standard_hybrid_sigma.
!
!---------------------------------
@@ -341,7 +342,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = a(k)*p0 + b(k)*ps(n,j,i)
+formula: p = a*p0 + b*ps
z_factors: p0: p0 a: a b: b ps: ps
z_bounds_factors: p0: p0 a: a_bnds b: b_bnds ps: ps
!----------------------------------
@@ -352,7 +353,7 @@ axis_entry: alternate_hybrid_sigma
!============
!
! This coordinate is dimensionless and varies from a small value at the model top to 1.0 at the surface.
-! The values of ap(k)/p0 + b(k), which appear in the formula below, should be stored as alternate_hybrid_sigma.
+! The values of ap/p0 + b, which appear in the formula below, should be stored as alternate_hybrid_sigma.
! Note that in the netCDF file the variable will be named "lev", not alternate_hybrid_sigma.
!
!------------
@@ -373,7 +374,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = ap(k) + b(k)*ps(n,j,i)
+formula: p = ap + b*ps
z_factors: ap: ap b: b ps: ps
z_bounds_factors: ap: ap_bnds b: b_bnds ps: ps
!----------------------------------
@@ -384,7 +385,7 @@ axis_entry: hybrid_height
!============
!
! This coordinate has dimension of meters (m) and increases upward.
-! The values of a(k) which appear in the formula below, should be stored as hybrid_height.
+! The values of a which appear in the formula below, should be stored as hybrid_height.
! Note that in the netCDF file the variable will be named "lev", not hybrid_height.
!
!------------
@@ -404,7 +405,7 @@ out_name: lev
must_have_bounds: yes
stored_direction: increasing
valid_min: 0.0
-formula: z(k,j,i) = a(k) + b(k)*orog(j,i)
+formula: z = a + b*orog
z_factors: a: lev b: b orog: orog
z_bounds_factors: a: lev_bnds b: b_bnds orog: orog
!----------------------------------
@@ -603,9 +604,9 @@ dimensions: longitude latitude time height2m
out_name: tas
type: real
valid_min: 180.6
-valid_max: 325.7
-ok_min_mean_abs: 273.5
-ok_max_mean_abs: 281.7
+valid_max: 335.1
+ok_min_mean_abs: 262.4
+ok_max_mean_abs: 293
!----------------------------------
!
@@ -629,9 +630,9 @@ dimensions: longitude latitude time
out_name: ts
type: real
valid_min: 176.8
-valid_max: 331.8
-ok_min_mean_abs: 274.2
-ok_max_mean_abs: 281.8
+valid_max: 339.6
+ok_min_mean_abs: 262.8
+ok_max_mean_abs: 293.3
!----------------------------------
!
@@ -654,10 +655,10 @@ comment: monthly mean of the daily-minimum near-surface (usually, 2 me
dimensions: longitude latitude time height2m
out_name: tasmin
type: real
-valid_min: 183.6
-valid_max: 309.8
-ok_min_mean_abs: 271.8
-ok_max_mean_abs: 279.6
+valid_min: 182.8
+valid_max: 323
+ok_min_mean_abs: 260.9
+ok_max_mean_abs: 290.6
!----------------------------------
!
@@ -681,9 +682,9 @@ dimensions: longitude latitude time height2m
out_name: tasmax
type: real
valid_min: 181.9
-valid_max: 330.6
-ok_min_mean_abs: 277.3
-ok_max_mean_abs: 281.4
+valid_max: 341.9
+ok_min_mean_abs: 264.9
+ok_max_mean_abs: 294
!----------------------------------
!
@@ -706,10 +707,10 @@ comment: not, in general, the same as surface pressure
dimensions: longitude latitude time
out_name: psl
type: real
-valid_min: 9.477e+04
-valid_max: 1.124e+05
-ok_min_mean_abs: 1.003e+05
-ok_max_mean_abs: 1.017e+05
+valid_min: 9.122e+04
+valid_max: 1.137e+05
+ok_min_mean_abs: 9.57e+04
+ok_max_mean_abs: 1.063e+05
!----------------------------------
!
@@ -732,10 +733,10 @@ comment: not, in general, the same as mean sea-level pressure
dimensions: longitude latitude time
out_name: ps
type: real
-valid_min: 4.792e+04
-valid_max: 1.093e+05
-ok_min_mean_abs: 9.606e+04
-ok_max_mean_abs: 9.743e+04
+valid_min: 4.791e+04
+valid_max: 1.119e+05
+ok_min_mean_abs: 9.165e+04
+ok_max_mean_abs: 1.019e+05
!----------------------------------
!
@@ -965,7 +966,7 @@ modeling_realm: atmos
!----------------------------------
! Variable attributes:
!----------------------------------
-standard_name: water_sublimation_flux
+standard_name: surface_snow_and_ice_sublimation_flux
units: kg m-2 s-1
cell_methods: time: mean
cell_measures: area: areacella
@@ -1134,8 +1135,8 @@ type: real
positive: up
valid_min: 43.75
valid_max: 658
-ok_min_mean_abs: 331.1
-ok_max_mean_abs: 369.9
+ok_min_mean_abs: 325.6
+ok_max_mean_abs: 376.3
!----------------------------------
!
@@ -1211,9 +1212,9 @@ out_name: rsdscs
type: real
positive: down
valid_min: -1.748e+30
-valid_max: 518
+valid_max: 522.4
ok_min_mean_abs: 206.9
-ok_max_mean_abs: 238.6
+ok_max_mean_abs: 239
!----------------------------------
!
@@ -1290,9 +1291,9 @@ out_name: rsdt
type: real
positive: down
valid_min: 0
-valid_max: 555.5
-ok_min_mean_abs: 294.4
-ok_max_mean_abs: 303.8
+valid_max: 580.4
+ok_min_mean_abs: 282.6
+ok_max_mean_abs: 315.8
!----------------------------------
!
@@ -1317,7 +1318,7 @@ out_name: rsut
type: real
positive: up
valid_min: -0.02689
-valid_max: 416.9
+valid_max: 421.9
ok_min_mean_abs: 96.72
ok_max_mean_abs: 114.1
!----------------------------------
@@ -1345,8 +1346,8 @@ type: real
positive: up
valid_min: 67.48
valid_max: 383.2
-ok_min_mean_abs: 214.1
-ok_max_mean_abs: 227.5
+ok_min_mean_abs: 207.4
+ok_max_mean_abs: 234.4
!----------------------------------
!
@@ -1370,9 +1371,9 @@ out_name: rlutcs
type: real
positive: up
valid_min: 70.59
-valid_max: 372.3
-ok_min_mean_abs: 235.1
-ok_max_mean_abs: 253.8
+valid_max: 377.5
+ok_min_mean_abs: 228.9
+ok_max_mean_abs: 260.4
!----------------------------------
!
@@ -1448,7 +1449,7 @@ dimensions: longitude latitude time
out_name: clt
type: real
valid_min: -0.0001822
-valid_max: 100.2
+valid_max: 105
ok_min_mean_abs: 39.37
ok_max_mean_abs: 84.98
!----------------------------------
@@ -1528,8 +1529,8 @@ type: real
positive: down
valid_min: -232.8
valid_max: 218.7
-ok_min_mean_abs: 77.62
-ok_max_mean_abs: 88.34
+ok_min_mean_abs: 76.91
+ok_max_mean_abs: 89.25
!----------------------------------
!
@@ -1708,9 +1709,9 @@ dimensions: longitude latitude alevel time
out_name: cl
type: real
valid_min: 0
-valid_max: 100.2
+valid_max: 105
ok_min_mean_abs: -0.04479
-ok_max_mean_abs: 24.87
+ok_max_mean_abs: 26.07
!----------------------------------
!
@@ -1800,9 +1801,9 @@ dimensions: longitude latitude plevs time
out_name: ta
type: real
valid_min: 157.1
-valid_max: 326.4
-ok_min_mean_abs: 200.2
-ok_max_mean_abs: 289.9
+valid_max: 336.3
+ok_min_mean_abs: 194.3
+ok_max_mean_abs: 299.8
!----------------------------------
!
@@ -1873,9 +1874,9 @@ dimensions: longitude latitude plevs time
out_name: hus
type: real
valid_min: -0.000299
-valid_max: 0.02812
+valid_max: 0.02841
ok_min_mean_abs: -0.0003539
-ok_max_mean_abs: 0.01027
+ok_max_mean_abs: 0.01041
!----------------------------------
!
@@ -1950,9 +1951,9 @@ dimensions: longitude latitude plevs time
out_name: zg
type: real
valid_min: -719.7
-valid_max: 3.306e+04
+valid_max: 3.437e+04
ok_min_mean_abs: -113.4
-ok_max_mean_abs: 3.164e+04
+ok_max_mean_abs: 3.299e+04
!----------------------------------
!
@@ -1978,7 +1979,7 @@ type: real
valid_min: -419.2
valid_max: 1.162e+04
ok_min_mean_abs: -149.1
-ok_max_mean_abs: 7363
+ok_max_mean_abs: 7558
!----------------------------------
!
diff --git a/Tables/CMIP5_LImon b/Tables/CMIP5_LImon
index aac5b52..8ee9629 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: 12 November 2010 ! date this table was constructed
+table_date: 30 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -24,6 +24,7 @@ expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
expt_id_ok: 'pre-industrial control' 'piControl'
expt_id_ok: 'historical' 'historical'
+expt_id_ok: 'historical extension' 'historicalExt'
expt_id_ok: 'mid-Holocene' 'midHolocene'
expt_id_ok: 'last glacial maximum' 'lgm'
expt_id_ok: 'last millennium' 'past1000'
@@ -170,7 +171,7 @@ dimensions: longitude latitude time
out_name: snc
type: real
valid_min: 0
-valid_max: 102.1
+valid_max: 105
ok_min_mean_abs: -29.01
ok_max_mean_abs: 78.46
!----------------------------------
diff --git a/Tables/CMIP5_Lmon b/Tables/CMIP5_Lmon
index 1d70cbe..860073f 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: 12 November 2010 ! date this table was constructed
+table_date: 30 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -24,6 +24,7 @@ expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
expt_id_ok: 'pre-industrial control' 'piControl'
expt_id_ok: 'historical' 'historical'
+expt_id_ok: 'historical extension' 'historicalExt'
expt_id_ok: 'mid-Holocene' 'midHolocene'
expt_id_ok: 'last glacial maximum' 'lgm'
expt_id_ok: 'last millennium' 'past1000'
diff --git a/Tables/CMIP5_OImon b/Tables/CMIP5_OImon
index f62a4ee..97cc803 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: 12 November 2010 ! date this table was constructed
+table_date: 30 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -24,6 +24,7 @@ expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
expt_id_ok: 'pre-industrial control' 'piControl'
expt_id_ok: 'historical' 'historical'
+expt_id_ok: 'historical extension' 'historicalExt'
expt_id_ok: 'mid-Holocene' 'midHolocene'
expt_id_ok: 'last glacial maximum' 'lgm'
expt_id_ok: 'last millennium' 'past1000'
@@ -608,8 +609,8 @@ standard_name: surface_downwelling_shortwave_flux_in_air
units: W m-2
cell_methods: time: mean area: mean where sea_ice over sea
cell_measures: area: areacello
-long_name: Downward Shortwave over Sea Ice
-comment: Compute the downward shortwave flux in regions of sea ice divided by the area of the ocean portion of the grid cell.
+long_name: Downwelling Shortwave over Sea Ice
+comment: Compute the downwelling shortwave flux in regions of sea ice divided by the area of the ocean portion of the grid cell.
!----------------------------------
! Additional variable information:
!----------------------------------
@@ -654,8 +655,8 @@ standard_name: surface_downwelling_longwave_flux_in_air
units: W m-2
cell_methods: time: mean area: mean where sea_ice over sea
cell_measures: area: areacello
-long_name: Downward Long Wave over Sea Ice
-comment: Compute the downward longwave flux in regions of sea ice divided by the area of the ocean portion of the grid cell.
+long_name: Downwelling Long Wave over Sea Ice
+comment: Compute the downwelling longwave flux in regions of sea ice divided by the area of the ocean portion of the grid cell.
!----------------------------------
! Additional variable information:
!----------------------------------
diff --git a/Tables/CMIP5_Oclim b/Tables/CMIP5_Oclim
index 7e39441..c61d651 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: 12 November 2010 ! date this table was constructed
+table_date: 30 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -24,6 +24,7 @@ expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
expt_id_ok: 'pre-industrial control' 'piControl'
expt_id_ok: 'historical' 'historical'
+expt_id_ok: 'historical extension' 'historicalExt'
expt_id_ok: 'mid-Holocene' 'midHolocene'
expt_id_ok: 'last glacial maximum' 'lgm'
expt_id_ok: 'last millennium' 'past1000'
@@ -175,7 +176,7 @@ long_name: ocean double sigma coordinate
!----------------------------------
out_name: lev
must_have_bounds: yes
-formula: for k <= k_c:\n z(k,j,i)= sigma(k)*f(j,i) \n for k > k_c:\n z(k,j,i)= f(j,i) + (sigma(k)-1)*(depth(j,i)-f(j,i)) \n f(j,i)= 0.5*(z1+ z2) + 0.5*(z1-z2)* tanh(2*a/(z1-z2)*(depth(j,i)-href))
+formula: for k <= k_c:\n z= sigma*f \n for k > k_c:\n z= f + (sigma-1)*(depth-f) \n f= 0.5*(z1+ z2) + 0.5*(z1-z2)* tanh(2*a/(z1-z2)*(depth-href))
z_factors: sigma: sigma depth: depth z1: z1 z2: z2 a: a_coeff href: href k_c: k_c
z_bounds_factors: sigma: sigma_bnds depth: depth z1: z1 z2: z2 a: a href: href k_c: k_c
!----------------------------------
@@ -197,7 +198,7 @@ long_name: ocean sigma over z coordinate
!----------------------------------
out_name: lev
must_have_bounds: yes
-formula: for k <= nsigma: z(n,k,j,i) = eta(n,j,i) + sigma(k)*(min(depth_c,depth(j,i))+eta(n,j,i)) ; for k > nsigma: z(n,k,j,i) = zlev(k)
+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
!----------------------------------
@@ -207,7 +208,7 @@ 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(k), which appears in the formula below, should be stored as ocean_s.
+! 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.
!
!------------
@@ -227,7 +228,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: -1.
valid_max: 0.
-formula: z(n,k,j,i) = eta(n,j,i)*(1+s(k)) + depth_c*s(k) + (depth(j,i)-depth_c)*C(k) \n where \n C(k)=(1-b)*sinh(a*s(k))/sinh(a) +\n b*(tanh(a*(s(k)+0.5))/(2*tanh(0.5*a)) - 0.5)
+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
!----------------------------------
@@ -237,7 +238,7 @@ 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(k), which appears in the formula below, should be stored as ocean_sigma.
+! 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.
!
!------------
@@ -257,7 +258,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: -1.
valid_max: 0.
-formula: z(n,k,j,i) = eta(n,j,i) + sigma(k)*(depth(j,i)+eta(n,j,i))
+formula: z = eta + sigma*(depth+eta)
z_factors: sigma: lev eta: eta depth: depth
z_bounds_factors: sigma: lev_bnds eta: eta depth: depth
!----------------------------------
diff --git a/Tables/CMIP5_Omon b/Tables/CMIP5_Omon
index 918828c..dbbdf81 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: 17 November 2010 ! date this table was constructed
+table_date: 30 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -24,6 +24,7 @@ expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
expt_id_ok: 'pre-industrial control' 'piControl'
expt_id_ok: 'historical' 'historical'
+expt_id_ok: 'historical extension' 'historicalExt'
expt_id_ok: 'mid-Holocene' 'midHolocene'
expt_id_ok: 'last glacial maximum' 'lgm'
expt_id_ok: 'last millennium' 'past1000'
@@ -159,12 +160,12 @@ axis_entry: rho
units: kg m-3
axis: Z ! X, Y, Z, T (default: undeclared)
positive: down ! up or down (default: undeclared)
-long_name: density++++?
+long_name: potential density referenced to 2000 dbar
!----------------------------------
! Additional axis information:
!----------------------------------
out_name: rho
-stored_direction: decreasing
+stored_direction: increasing
type: double
must_have_bounds: yes
!----------------------------------
@@ -313,7 +314,7 @@ long_name: ocean double sigma coordinate
!----------------------------------
out_name: lev
must_have_bounds: yes
-formula: for k <= k_c:\n z(k,j,i)= sigma(k)*f(j,i) \n for k > k_c:\n z(k,j,i)= f(j,i) + (sigma(k)-1)*(depth(j,i)-f(j,i)) \n f(j,i)= 0.5*(z1+ z2) + 0.5*(z1-z2)* tanh(2*a/(z1-z2)*(depth(j,i)-href))
+formula: for k <= k_c:\n z= sigma*f \n for k > k_c:\n z= f + (sigma-1)*(depth-f) \n f= 0.5*(z1+ z2) + 0.5*(z1-z2)* tanh(2*a/(z1-z2)*(depth-href))
z_factors: sigma: sigma depth: depth z1: z1 z2: z2 a: a_coeff href: href k_c: k_c
z_bounds_factors: sigma: sigma_bnds depth: depth z1: z1 z2: z2 a: a href: href k_c: k_c
!----------------------------------
@@ -335,7 +336,7 @@ long_name: ocean sigma over z coordinate
!----------------------------------
out_name: lev
must_have_bounds: yes
-formula: for k <= nsigma: z(n,k,j,i) = eta(n,j,i) + sigma(k)*(min(depth_c,depth(j,i))+eta(n,j,i)) ; for k > nsigma: z(n,k,j,i) = zlev(k)
+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
!----------------------------------
@@ -345,7 +346,7 @@ 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(k), which appears in the formula below, should be stored as ocean_s.
+! 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.
!
!------------
@@ -365,7 +366,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: -1.
valid_max: 0.
-formula: z(n,k,j,i) = eta(n,j,i)*(1+s(k)) + depth_c*s(k) + (depth(j,i)-depth_c)*C(k) \n where \n C(k)=(1-b)*sinh(a*s(k))/sinh(a) +\n b*(tanh(a*(s(k)+0.5))/(2*tanh(0.5*a)) - 0.5)
+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
!----------------------------------
@@ -375,7 +376,7 @@ 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(k), which appears in the formula below, should be stored as ocean_sigma.
+! 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.
!
!------------
@@ -395,7 +396,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: -1.
valid_max: 0.
-formula: z(n,k,j,i) = eta(n,j,i) + sigma(k)*(depth(j,i)+eta(n,j,i))
+formula: z = eta + sigma*(depth+eta)
z_factors: sigma: lev eta: eta depth: depth
z_bounds_factors: sigma: lev_bnds eta: eta depth: depth
!----------------------------------
@@ -2853,9 +2854,9 @@ dimensions: longitude latitude olevel time
out_name: thetao
type: real
valid_min: -9.37e+17
-valid_max: 1.009e+20
+valid_max: 1.05e+20
ok_min_mean_abs: -9.37e+17
-ok_max_mean_abs: 1.009e+20
+ok_max_mean_abs: 1.05e+20
!----------------------------------
!
@@ -2898,10 +2899,10 @@ comment: "this may differ from ""surface temperature"" in regions of s
dimensions: longitude latitude time
out_name: tos
type: real
-valid_min: 270.6
-valid_max: 313.9
-ok_min_mean_abs: 283.7
-ok_max_mean_abs: 291.7
+valid_min: 257.4
+valid_max: 325.2
+ok_min_mean_abs: 272
+ok_max_mean_abs: 303.5
!----------------------------------
!
@@ -2945,9 +2946,9 @@ dimensions: longitude latitude olevel time
out_name: so
type: real
valid_min: -9.37e+17
-valid_max: 1.009e+20
+valid_max: 1.05e+20
ok_min_mean_abs: -9.37e+17
-ok_max_mean_abs: 1.009e+20
+ok_max_mean_abs: 1.05e+20
!----------------------------------
!
@@ -3011,9 +3012,9 @@ dimensions: longitude latitude olevel time
out_name: rhopoto
type: real
valid_min: -3.257
-valid_max: 1057
+valid_max: 1094
ok_min_mean_abs: 10.38
-ok_max_mean_abs: 1042
+ok_max_mean_abs: 1079
!----------------------------------
!
@@ -3183,9 +3184,9 @@ dimensions: longitude latitude olevel time
out_name: uo
type: real
valid_min: -1.041e+18
-valid_max: 1.01e+20
+valid_max: 1.05e+20
ok_min_mean_abs: -1.041e+18
-ok_max_mean_abs: 1.01e+20
+ok_max_mean_abs: 1.05e+20
!----------------------------------
!
@@ -3207,9 +3208,9 @@ dimensions: longitude latitude olevel time
out_name: vo
type: real
valid_min: -1.041e+18
-valid_max: 1.01e+20
+valid_max: 1.05e+20
ok_min_mean_abs: -1.041e+18
-ok_max_mean_abs: 1.01e+20
+ok_max_mean_abs: 1.05e+20
!----------------------------------
!
@@ -3729,7 +3730,7 @@ comment: function of latitude, basin
dimensions: latitude basin time
out_name: htovgyre
type: real
-valid_min: -6.75e+14
+valid_min: -1.772e+15
valid_max: 2.691e+15
ok_min_mean_abs: 5.91e+13
ok_max_mean_abs: 2.364e+14
@@ -3754,7 +3755,7 @@ comment: function of latitude, basin
dimensions: latitude basin time
out_name: htovovrt
type: real
-valid_min: -2.386e+15
+valid_min: -6.263e+15
valid_max: 1.305e+16
ok_min_mean_abs: 2.039e+14
ok_max_mean_abs: 8.156e+14
@@ -3779,7 +3780,7 @@ comment: function of latitude, basin
dimensions: latitude basin time
out_name: sltovgyre
type: real
-valid_min: -2.132e+10
+valid_min: -5.596e+10
valid_max: 5.333e+10
ok_min_mean_abs: 1.503e+09
ok_max_mean_abs: 6.01e+09
@@ -3804,7 +3805,7 @@ comment: function of latitude, basin
dimensions: latitude basin time
out_name: sltovovrt
type: real
-valid_min: -1.651e+11
+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 0d929f9..cdcd930 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: 12 November 2010 ! date this table was constructed
+table_date: 30 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -24,6 +24,7 @@ expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
expt_id_ok: 'pre-industrial control' 'piControl'
expt_id_ok: 'historical' 'historical'
+expt_id_ok: 'historical extension' 'historicalExt'
expt_id_ok: 'mid-Holocene' 'midHolocene'
expt_id_ok: 'last glacial maximum' 'lgm'
expt_id_ok: 'last millennium' 'past1000'
@@ -174,7 +175,7 @@ long_name: ocean double sigma coordinate
!----------------------------------
out_name: lev
must_have_bounds: yes
-formula: for k <= k_c:\n z(k,j,i)= sigma(k)*f(j,i) \n for k > k_c:\n z(k,j,i)= f(j,i) + (sigma(k)-1)*(depth(j,i)-f(j,i)) \n f(j,i)= 0.5*(z1+ z2) + 0.5*(z1-z2)* tanh(2*a/(z1-z2)*(depth(j,i)-href))
+formula: for k <= k_c:\n z= sigma*f \n for k > k_c:\n z= f + (sigma-1)*(depth-f) \n f= 0.5*(z1+ z2) + 0.5*(z1-z2)* tanh(2*a/(z1-z2)*(depth-href))
z_factors: sigma: sigma depth: depth z1: z1 z2: z2 a: a_coeff href: href k_c: k_c
z_bounds_factors: sigma: sigma_bnds depth: depth z1: z1 z2: z2 a: a href: href k_c: k_c
!----------------------------------
@@ -196,7 +197,7 @@ long_name: ocean sigma over z coordinate
!----------------------------------
out_name: lev
must_have_bounds: yes
-formula: for k <= nsigma: z(n,k,j,i) = eta(n,j,i) + sigma(k)*(min(depth_c,depth(j,i))+eta(n,j,i)) ; for k > nsigma: z(n,k,j,i) = zlev(k)
+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
!----------------------------------
@@ -206,7 +207,7 @@ 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(k), which appears in the formula below, should be stored as ocean_s.
+! 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.
!
!------------
@@ -226,7 +227,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: -1.
valid_max: 0.
-formula: z(n,k,j,i) = eta(n,j,i)*(1+s(k)) + depth_c*s(k) + (depth(j,i)-depth_c)*C(k) \n where \n C(k)=(1-b)*sinh(a*s(k))/sinh(a) +\n b*(tanh(a*(s(k)+0.5))/(2*tanh(0.5*a)) - 0.5)
+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
!----------------------------------
@@ -236,7 +237,7 @@ 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(k), which appears in the formula below, should be stored as ocean_sigma.
+! 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.
!
!------------
@@ -256,7 +257,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: -1.
valid_max: 0.
-formula: z(n,k,j,i) = eta(n,j,i) + sigma(k)*(depth(j,i)+eta(n,j,i))
+formula: z = eta + sigma*(depth+eta)
z_factors: sigma: lev eta: eta depth: depth
z_bounds_factors: sigma: lev_bnds eta: eta depth: depth
!----------------------------------
diff --git a/Tables/CMIP5_aero b/Tables/CMIP5_aero
index 52dc5b1..58825ec 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: 12 November 2010 ! date this table was constructed
+table_date: 30 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -24,6 +24,7 @@ expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
expt_id_ok: 'pre-industrial control' 'piControl'
expt_id_ok: 'historical' 'historical'
+expt_id_ok: 'historical extension' 'historicalExt'
expt_id_ok: 'mid-Holocene' 'midHolocene'
expt_id_ok: 'last glacial maximum' 'lgm'
expt_id_ok: 'last millennium' 'past1000'
@@ -155,7 +156,7 @@ must_have_bounds: yes
stored_direction: increasing
valid_min: -200.
valid_max: 800000.
-formula: z(n,k,j,i) = a(k)*ztop + b1(k)*zsurf1(n,j,i) + b2(k)*zsurf2(n,j,i)
+formula: z = a*ztop + b1*zsurf1 + b2*zsurf2
z_factors: a: a b1: b1 b2: b2 ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2
z_bounds_factors: a: a_bnds b1: b1_bnds b2: b2_bnds ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2
!----------------------------------
@@ -185,7 +186,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: -1.
valid_max: 20.
-formula: p(k) = p0 * exp(-lev(k))
+formula: p = p0 * exp(-lev)
z_factors: p0: p0 lev: lev
z_bounds_factors: p0: p0 lev: lev_bnds
!----------------------------------
@@ -215,7 +216,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = ptop + sigma(k)*(ps(n,j,i) - ptop)
+formula: p = ptop + sigma*(ps - ptop)
z_factors: ptop: ptop sigma: lev ps: ps
z_bounds_factors: ptop: ptop sigma: lev_bnds ps: ps
!----------------------------------
@@ -226,7 +227,7 @@ axis_entry: standard_hybrid_sigma
!============
!
! This coordinate is dimensionless and varies from a small value at the model top to 1.0 at the surface.
-! The values of a(k)+ b(k), which appear in the formula below, should be stored as standard_hybrid_sigma.
+! The values of a+ b, which appear in the formula below, should be stored as standard_hybrid_sigma.
! Note that in the netCDF file the variable will be named "lev", not standard_hybrid_sigma.
!
!---------------------------------
@@ -245,7 +246,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = a(k)*p0 + b(k)*ps(n,j,i)
+formula: p = a*p0 + b*ps
z_factors: p0: p0 a: a b: b ps: ps
z_bounds_factors: p0: p0 a: a_bnds b: b_bnds ps: ps
!----------------------------------
@@ -256,7 +257,7 @@ axis_entry: alternate_hybrid_sigma
!============
!
! This coordinate is dimensionless and varies from a small value at the model top to 1.0 at the surface.
-! The values of ap(k)/p0 + b(k), which appear in the formula below, should be stored as alternate_hybrid_sigma.
+! The values of ap/p0 + b, which appear in the formula below, should be stored as alternate_hybrid_sigma.
! Note that in the netCDF file the variable will be named "lev", not alternate_hybrid_sigma.
!
!------------
@@ -277,7 +278,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = ap(k) + b(k)*ps(n,j,i)
+formula: p = ap + b*ps
z_factors: ap: ap b: b ps: ps
z_bounds_factors: ap: ap_bnds b: b_bnds ps: ps
!----------------------------------
@@ -288,7 +289,7 @@ axis_entry: hybrid_height
!============
!
! This coordinate has dimension of meters (m) and increases upward.
-! The values of a(k) which appear in the formula below, should be stored as hybrid_height.
+! The values of a which appear in the formula below, should be stored as hybrid_height.
! Note that in the netCDF file the variable will be named "lev", not hybrid_height.
!
!------------
@@ -308,7 +309,7 @@ out_name: lev
must_have_bounds: yes
stored_direction: increasing
valid_min: 0.0
-formula: z(k,j,i) = a(k) + b(k)*orog(j,i)
+formula: z = a + b*orog
z_factors: a: lev b: b orog: orog
z_bounds_factors: a: lev_bnds b: b_bnds orog: orog
!----------------------------------
@@ -1670,11 +1671,11 @@ modeling_realm: aerosol land
!----------------------------------
! Variable attributes:
!----------------------------------
-standard_name: diffuse_downwelling_shortwave_flux_in_air
+standard_name: surface_diffuse_downwelling_shortwave_flux_in_air
units: W m-2
cell_methods: time: mean
cell_measures: area: areacella
-long_name: Surface Diffuse Downward Shortwave Radiation
+long_name: Surface Diffuse Dowwelling Shortwave Radiation
comment: downwelling_diffuse_shortwave_flux_in_air
!----------------------------------
! Additional variable information:
@@ -1696,7 +1697,7 @@ standard_name: diffuse_downwelling_shortwave_flux_in_air_assuming_clear_sky
units: W m-2
cell_methods: time: mean
cell_measures: area: areacella
-long_name: Surface Diffuse Downward Clear Sky Shortwave Radiation
+long_name: Surface Diffuse Downwelling Clear Sky Shortwave Radiation
comment: downwelling_diffuse_shortwave_flux_in_air_assuming_clear_sky
!----------------------------------
! Additional variable information:
diff --git a/Tables/CMIP5_cf3hr b/Tables/CMIP5_cf3hr
index d6eeb0b..1c9a8d3 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: 12 November 2010 ! date this table was constructed
+table_date: 30 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -24,6 +24,7 @@ expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
expt_id_ok: 'pre-industrial control' 'piControl'
expt_id_ok: 'historical' 'historical'
+expt_id_ok: 'historical extension' 'historicalExt'
expt_id_ok: 'mid-Holocene' 'midHolocene'
expt_id_ok: 'last glacial maximum' 'lgm'
expt_id_ok: 'last millennium' 'past1000'
@@ -413,7 +414,7 @@ must_have_bounds: yes
stored_direction: increasing
valid_min: -200.
valid_max: 800000.
-formula: z(n,k,j,i) = a(k)*ztop + b1(k)*zsurf1(n,j,i) + b2(k)*zsurf2(n,j,i)
+formula: z = a*ztop + b1*zsurf1 + b2*zsurf2
z_factors: a: a b1: b1 b2: b2 ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2
z_bounds_factors: a: a_bnds b1: b1_bnds b2: b2_bnds ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2
!----------------------------------
@@ -443,7 +444,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: -1.
valid_max: 20.
-formula: p(k) = p0 * exp(-lev(k))
+formula: p = p0 * exp(-lev)
z_factors: p0: p0 lev: lev
z_bounds_factors: p0: p0 lev: lev_bnds
!----------------------------------
@@ -473,7 +474,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = ptop + sigma(k)*(ps(n,j,i) - ptop)
+formula: p = ptop + sigma*(ps - ptop)
z_factors: ptop: ptop sigma: lev ps: ps
z_bounds_factors: ptop: ptop sigma: lev_bnds ps: ps
!----------------------------------
@@ -484,7 +485,7 @@ axis_entry: standard_hybrid_sigma
!============
!
! This coordinate is dimensionless and varies from a small value at the model top to 1.0 at the surface.
-! The values of a(k)+ b(k), which appear in the formula below, should be stored as standard_hybrid_sigma.
+! The values of a+ b, which appear in the formula below, should be stored as standard_hybrid_sigma.
! Note that in the netCDF file the variable will be named "lev", not standard_hybrid_sigma.
!
!---------------------------------
@@ -503,7 +504,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = a(k)*p0 + b(k)*ps(n,j,i)
+formula: p = a*p0 + b*ps
z_factors: p0: p0 a: a b: b ps: ps
z_bounds_factors: p0: p0 a: a_bnds b: b_bnds ps: ps
!----------------------------------
@@ -514,7 +515,7 @@ axis_entry: alternate_hybrid_sigma
!============
!
! This coordinate is dimensionless and varies from a small value at the model top to 1.0 at the surface.
-! The values of ap(k)/p0 + b(k), which appear in the formula below, should be stored as alternate_hybrid_sigma.
+! The values of ap/p0 + b, which appear in the formula below, should be stored as alternate_hybrid_sigma.
! Note that in the netCDF file the variable will be named "lev", not alternate_hybrid_sigma.
!
!------------
@@ -535,7 +536,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = ap(k) + b(k)*ps(n,j,i)
+formula: p = ap + b*ps
z_factors: ap: ap b: b ps: ps
z_bounds_factors: ap: ap_bnds b: b_bnds ps: ps
!----------------------------------
@@ -546,7 +547,7 @@ axis_entry: hybrid_height
!============
!
! This coordinate has dimension of meters (m) and increases upward.
-! The values of a(k) which appear in the formula below, should be stored as hybrid_height.
+! The values of a which appear in the formula below, should be stored as hybrid_height.
! Note that in the netCDF file the variable will be named "lev", not hybrid_height.
!
!------------
@@ -566,7 +567,7 @@ out_name: lev
must_have_bounds: yes
stored_direction: increasing
valid_min: 0.0
-formula: z(k,j,i) = a(k) + b(k)*orog(j,i)
+formula: z = a + b*orog
z_factors: a: lev b: b orog: orog
z_bounds_factors: a: lev_bnds b: b_bnds orog: orog
!----------------------------------
@@ -1015,10 +1016,6 @@ comment: near-surface (usually, 2 meter) air temperature.
dimensions: longitude latitude time1 height2m
out_name: tas
type: real
-valid_min: 180.6
-valid_max: 325.7
-ok_min_mean_abs: 273.5
-ok_max_mean_abs: 281.7
!----------------------------------
!
@@ -1041,10 +1038,6 @@ comment: ""skin"" temperature (i.e., SST for open ocean)
dimensions: longitude latitude time1
out_name: ts
type: real
-valid_min: 176.8
-valid_max: 331.8
-ok_min_mean_abs: 274.2
-ok_max_mean_abs: 281.8
!----------------------------------
!
@@ -1067,10 +1060,6 @@ comment: not, in general, the same as surface pressure
dimensions: longitude latitude time1
out_name: psl
type: real
-valid_min: 9.477e+04
-valid_max: 1.124e+05
-ok_min_mean_abs: 1.003e+05
-ok_max_mean_abs: 1.017e+05
!----------------------------------
!
@@ -1093,10 +1082,6 @@ comment: not, in general, the same as mean sea-level pressure
dimensions: longitude latitude time1
out_name: ps
type: real
-valid_min: 4.792e+04
-valid_max: 1.093e+05
-ok_min_mean_abs: 9.606e+04
-ok_max_mean_abs: 9.743e+04
!----------------------------------
!
@@ -1118,10 +1103,6 @@ comment: near-surface (usually, 10 meters) eastward component of wind.
dimensions: longitude latitude time1 height10m
out_name: uas
type: real
-valid_min: -19.01
-valid_max: 18.68
-ok_min_mean_abs: 1.668
-ok_max_mean_abs: 4.106
!----------------------------------
!
@@ -1143,10 +1124,6 @@ comment: near-surface (usually, 10 meters) northward component of wind
dimensions: longitude latitude time1 height10m
out_name: vas
type: real
-valid_min: -18.04
-valid_max: 22.84
-ok_min_mean_abs: 1.065
-ok_max_mean_abs: 2.678
!----------------------------------
!
@@ -1212,10 +1189,6 @@ comment: near-surface (usually, 2 meters) specific humidity.
dimensions: longitude latitude time1 height2m
out_name: huss
type: real
-valid_min: -7.21e-06
-valid_max: 0.02992
-ok_min_mean_abs: 0.006391
-ok_max_mean_abs: 0.008749
!----------------------------------
!
@@ -1238,10 +1211,6 @@ comment: at surface; includes both liquid and solid phases from all ty
dimensions: longitude latitude time1
out_name: pr
type: real
-valid_min: 0
-valid_max: 0.001254
-ok_min_mean_abs: 2.156e-05
-ok_max_mean_abs: 3.215e-05
!----------------------------------
!
@@ -1264,10 +1233,6 @@ comment: at surface; includes precipitation of all forms of water in t
dimensions: longitude latitude time1
out_name: prsn
type: real
-valid_min: 0
-valid_max: 0.0002987
-ok_min_mean_abs: 1.449e-06
-ok_max_mean_abs: 6.11e-06
!----------------------------------
!
@@ -1290,10 +1255,6 @@ comment: at surface; includes both liquid and solid phases.
dimensions: longitude latitude time1
out_name: prc
type: real
-valid_min: 0
-valid_max: 0.0006323
-ok_min_mean_abs: -2.528e-06
-ok_max_mean_abs: 3.209e-05
!----------------------------------
!
@@ -1326,7 +1287,7 @@ modeling_realm: atmos
!----------------------------------
! Variable attributes:
!----------------------------------
-standard_name: water_sublimation_flux
+standard_name: surface_snow_and_ice_sublimation_flux
units: kg m-2 s-1
cell_methods: time: point
cell_measures: area: areacella
@@ -1338,10 +1299,6 @@ comment: The snow and ice sublimation flux is the loss of snow and ice
dimensions: longitude latitude time1
out_name: sbl
type: real
-valid_min: -0.004959
-valid_max: 0.0009936
-ok_min_mean_abs: -5.521e-05
-ok_max_mean_abs: 9.61e-05
!----------------------------------
!
@@ -1363,10 +1320,6 @@ dimensions: longitude latitude time1
out_name: tauu
type: real
positive: down
-valid_min: -2.729
-valid_max: 2.934
-ok_min_mean_abs: 0.03979
-ok_max_mean_abs: 0.1065
!----------------------------------
!
@@ -1388,10 +1341,6 @@ dimensions: longitude latitude time1
out_name: tauv
type: real
positive: down
-valid_min: -2.472
-valid_max: 2.527
-ok_min_mean_abs: 0.01447
-ok_max_mean_abs: 0.08134
!----------------------------------
!
@@ -1415,10 +1364,6 @@ dimensions: longitude latitude time1
out_name: hfls
type: real
positive: up
-valid_min: -76.77
-valid_max: 790.7
-ok_min_mean_abs: 50.39
-ok_max_mean_abs: 73.2
!----------------------------------
!
@@ -1441,10 +1386,6 @@ dimensions: longitude latitude time1
out_name: hfss
type: real
positive: up
-valid_min: -264.5
-valid_max: 844.8
-ok_min_mean_abs: 10.7
-ok_max_mean_abs: 34.84
!----------------------------------
!
@@ -1467,10 +1408,6 @@ dimensions: longitude latitude time1
out_name: rlds
type: real
positive: down
-valid_min: 30.71
-valid_max: 520.5
-ok_min_mean_abs: 271.2
-ok_max_mean_abs: 323.6
!----------------------------------
!
@@ -1493,10 +1430,6 @@ dimensions: longitude latitude time1
out_name: rlus
type: real
positive: up
-valid_min: 43.75
-valid_max: 658
-ok_min_mean_abs: 331.1
-ok_max_mean_abs: 369.9
!----------------------------------
!
@@ -1519,10 +1452,6 @@ dimensions: longitude latitude time1
out_name: rsds
type: real
positive: down
-valid_min: -0.002946
-valid_max: 524.4
-ok_min_mean_abs: 143.9
-ok_max_mean_abs: 181.6
!----------------------------------
!
@@ -1545,10 +1474,6 @@ dimensions: longitude latitude time1
out_name: rsus
type: real
positive: up
-valid_min: -0.006589
-valid_max: 422.2
-ok_min_mean_abs: 26.22
-ok_max_mean_abs: 43.77
!----------------------------------
!
@@ -1571,10 +1496,6 @@ dimensions: longitude latitude time1
out_name: rsdscs
type: real
positive: down
-valid_min: -1.748e+30
-valid_max: 518
-ok_min_mean_abs: 206.9
-ok_max_mean_abs: 238.6
!----------------------------------
!
@@ -1597,10 +1518,6 @@ dimensions: longitude latitude time1
out_name: rsuscs
type: real
positive: up
-valid_min: -0.01446
-valid_max: 462.2
-ok_min_mean_abs: 31.65
-ok_max_mean_abs: 61.59
!----------------------------------
!
@@ -1623,10 +1540,6 @@ dimensions: longitude latitude time1
out_name: rldscs
type: real
positive: down
-valid_min: 33.55
-valid_max: 543.6
-ok_min_mean_abs: 238.6
-ok_max_mean_abs: 293.8
!----------------------------------
!
@@ -1650,10 +1563,6 @@ dimensions: longitude latitude time1
out_name: rsdt
type: real
positive: down
-valid_min: 0
-valid_max: 555.5
-ok_min_mean_abs: 294.4
-ok_max_mean_abs: 303.8
!----------------------------------
!
@@ -1677,10 +1586,6 @@ dimensions: longitude latitude time1
out_name: rsut
type: real
positive: up
-valid_min: -0.02689
-valid_max: 416.9
-ok_min_mean_abs: 96.72
-ok_max_mean_abs: 114.1
!----------------------------------
!
@@ -1704,10 +1609,6 @@ dimensions: longitude latitude time1
out_name: rlut
type: real
positive: up
-valid_min: 67.48
-valid_max: 383.2
-ok_min_mean_abs: 214.1
-ok_max_mean_abs: 227.5
!----------------------------------
!
@@ -1730,10 +1631,6 @@ dimensions: longitude latitude time1
out_name: rlutcs
type: real
positive: up
-valid_min: 70.59
-valid_max: 372.3
-ok_min_mean_abs: 235.1
-ok_max_mean_abs: 253.8
!----------------------------------
!
@@ -1756,10 +1653,6 @@ dimensions: longitude latitude time1
out_name: rsutcs
type: real
positive: up
-valid_min: 0
-valid_max: 444
-ok_min_mean_abs: 54.7
-ok_max_mean_abs: 73.36
!----------------------------------
!
@@ -1782,10 +1675,6 @@ comment: vertically integrated through the atmospheric column
dimensions: longitude latitude time1
out_name: prw
type: real
-valid_min: -0.0006775
-valid_max: 78.04
-ok_min_mean_abs: 12.75
-ok_max_mean_abs: 23.09
!----------------------------------
!
@@ -1808,10 +1697,6 @@ comment: for the whole atmospheric column, as seen from the surface or
dimensions: longitude latitude time1
out_name: clt
type: real
-valid_min: -0.0001822
-valid_max: 100.2
-ok_min_mean_abs: 39.37
-ok_max_mean_abs: 84.98
!----------------------------------
!
@@ -1834,10 +1719,6 @@ comment: calculate mass of condensed (liquid + ice) water in the colum
dimensions: longitude latitude time1
out_name: clwvi
type: real
-valid_min: -3.827e-06
-valid_max: 3.364
-ok_min_mean_abs: -0.03549
-ok_max_mean_abs: 0.2846
!----------------------------------
!
@@ -1860,10 +1741,6 @@ comment: calculate mass of ice water in the column divided by the area
dimensions: longitude latitude time1
out_name: clivi
type: real
-valid_min: -1.872e-06
-valid_max: 1.535
-ok_min_mean_abs: -0.0348
-ok_max_mean_abs: 0.1187
!----------------------------------
!
@@ -1887,10 +1764,6 @@ dimensions: longitude latitude time1
out_name: rtmt
type: real
positive: down
-valid_min: -232.8
-valid_max: 218.7
-ok_min_mean_abs: 77.62
-ok_max_mean_abs: 88.34
!----------------------------------
!
@@ -2179,10 +2052,6 @@ long_name: Air Temperature
dimensions: longitude latitude alevel time1
out_name: ta
type: real
-valid_min: 157.1
-valid_max: 326.4
-ok_min_mean_abs: 200.2
-ok_max_mean_abs: 289.9
!----------------------------------
!
diff --git a/Tables/CMIP5_cfDay b/Tables/CMIP5_cfDay
index 6c7f80b..c33780f 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: 12 November 2010 ! date this table was constructed
+table_date: 30 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -24,6 +24,7 @@ expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
expt_id_ok: 'pre-industrial control' 'piControl'
expt_id_ok: 'historical' 'historical'
+expt_id_ok: 'historical extension' 'historicalExt'
expt_id_ok: 'mid-Holocene' 'midHolocene'
expt_id_ok: 'last glacial maximum' 'lgm'
expt_id_ok: 'last millennium' 'past1000'
@@ -296,7 +297,7 @@ must_have_bounds: yes
stored_direction: increasing
valid_min: -200.
valid_max: 800000.
-formula: z(n,k,j,i) = a(k)*ztop + b1(k)*zsurf1(n,j,i) + b2(k)*zsurf2(n,j,i)
+formula: z = a*ztop + b1*zsurf1 + b2*zsurf2
z_factors: a: a b1: b1 b2: b2 ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2
z_bounds_factors: a: a_bnds b1: b1_bnds b2: b2_bnds ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2
!----------------------------------
@@ -326,7 +327,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: -1.
valid_max: 20.
-formula: p(k) = p0 * exp(-lev(k))
+formula: p = p0 * exp(-lev)
z_factors: p0: p0 lev: lev
z_bounds_factors: p0: p0 lev: lev_bnds
!----------------------------------
@@ -356,7 +357,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = ptop + sigma(k)*(ps(n,j,i) - ptop)
+formula: p = ptop + sigma*(ps - ptop)
z_factors: ptop: ptop sigma: lev ps: ps
z_bounds_factors: ptop: ptop sigma: lev_bnds ps: ps
!----------------------------------
@@ -367,7 +368,7 @@ axis_entry: standard_hybrid_sigma
!============
!
! This coordinate is dimensionless and varies from a small value at the model top to 1.0 at the surface.
-! The values of a(k)+ b(k), which appear in the formula below, should be stored as standard_hybrid_sigma.
+! The values of a+ b, which appear in the formula below, should be stored as standard_hybrid_sigma.
! Note that in the netCDF file the variable will be named "lev", not standard_hybrid_sigma.
!
!---------------------------------
@@ -386,7 +387,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = a(k)*p0 + b(k)*ps(n,j,i)
+formula: p = a*p0 + b*ps
z_factors: p0: p0 a: a b: b ps: ps
z_bounds_factors: p0: p0 a: a_bnds b: b_bnds ps: ps
!----------------------------------
@@ -397,7 +398,7 @@ axis_entry: alternate_hybrid_sigma
!============
!
! This coordinate is dimensionless and varies from a small value at the model top to 1.0 at the surface.
-! The values of ap(k)/p0 + b(k), which appear in the formula below, should be stored as alternate_hybrid_sigma.
+! The values of ap/p0 + b, which appear in the formula below, should be stored as alternate_hybrid_sigma.
! Note that in the netCDF file the variable will be named "lev", not alternate_hybrid_sigma.
!
!------------
@@ -418,7 +419,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = ap(k) + b(k)*ps(n,j,i)
+formula: p = ap + b*ps
z_factors: ap: ap b: b ps: ps
z_bounds_factors: ap: ap_bnds b: b_bnds ps: ps
!----------------------------------
@@ -429,7 +430,7 @@ axis_entry: hybrid_height
!============
!
! This coordinate has dimension of meters (m) and increases upward.
-! The values of a(k) which appear in the formula below, should be stored as hybrid_height.
+! The values of a which appear in the formula below, should be stored as hybrid_height.
! Note that in the netCDF file the variable will be named "lev", not hybrid_height.
!
!------------
@@ -449,7 +450,7 @@ out_name: lev
must_have_bounds: yes
stored_direction: increasing
valid_min: 0.0
-formula: z(k,j,i) = a(k) + b(k)*orog(j,i)
+formula: z = a + b*orog
z_factors: a: lev b: b orog: orog
z_bounds_factors: a: lev_bnds b: b_bnds orog: orog
!----------------------------------
@@ -646,10 +647,6 @@ long_name: Surface Air Pressure
dimensions: longitude latitude time
out_name: ps
type: real
-valid_min: 4.792e+04
-valid_max: 1.093e+05
-ok_min_mean_abs: 9.606e+04
-ok_max_mean_abs: 9.743e+04
!----------------------------------
!
@@ -672,10 +669,6 @@ dimensions: longitude latitude time
out_name: rsdt
type: real
positive: down
-valid_min: 0
-valid_max: 555.5
-ok_min_mean_abs: 294.4
-ok_max_mean_abs: 303.8
!----------------------------------
!
@@ -698,10 +691,6 @@ dimensions: longitude latitude time
out_name: rsut
type: real
positive: up
-valid_min: -0.02689
-valid_max: 416.9
-ok_min_mean_abs: 96.72
-ok_max_mean_abs: 114.1
!----------------------------------
!
@@ -724,10 +713,6 @@ dimensions: longitude latitude time
out_name: rsdscs
type: real
positive: down
-valid_min: -1.748e+30
-valid_max: 518
-ok_min_mean_abs: 206.9
-ok_max_mean_abs: 238.6
!----------------------------------
!
@@ -750,10 +735,6 @@ dimensions: longitude latitude time
out_name: rsuscs
type: real
positive: up
-valid_min: -0.01446
-valid_max: 462.2
-ok_min_mean_abs: 31.65
-ok_max_mean_abs: 61.59
!----------------------------------
!
@@ -776,10 +757,6 @@ dimensions: longitude latitude time
out_name: rldscs
type: real
positive: down
-valid_min: 33.55
-valid_max: 543.6
-ok_min_mean_abs: 238.6
-ok_max_mean_abs: 293.8
!----------------------------------
!
@@ -802,10 +779,6 @@ dimensions: longitude latitude time
out_name: rlutcs
type: real
positive: up
-valid_min: 70.59
-valid_max: 372.3
-ok_min_mean_abs: 235.1
-ok_max_mean_abs: 253.8
!----------------------------------
!
@@ -828,10 +801,6 @@ dimensions: longitude latitude time
out_name: rsutcs
type: real
positive: up
-valid_min: 0
-valid_max: 444
-ok_min_mean_abs: 54.7
-ok_max_mean_abs: 73.36
!----------------------------------
!
@@ -854,10 +823,6 @@ comment: for the whole atmospheric column, as seen from the surface or
dimensions: longitude latitude time
out_name: clt
type: real
-valid_min: -0.0001822
-valid_max: 100.2
-ok_min_mean_abs: 39.37
-ok_max_mean_abs: 84.98
!----------------------------------
!
@@ -880,10 +845,6 @@ comment: calculate mass of condensed (liquid + ice) water in the colum
dimensions: longitude latitude time
out_name: clwvi
type: real
-valid_min: -3.827e-06
-valid_max: 3.364
-ok_min_mean_abs: -0.03549
-ok_max_mean_abs: 0.2846
!----------------------------------
!
@@ -906,10 +867,6 @@ comment: calculate mass of ice water in the column divided by the area
dimensions: longitude latitude time
out_name: clivi
type: real
-valid_min: -1.872e-06
-valid_max: 1.535
-ok_min_mean_abs: -0.0348
-ok_max_mean_abs: 0.1187
!----------------------------------
!
@@ -1017,10 +974,6 @@ long_name: Convective Precipitation
dimensions: longitude latitude time
out_name: prc
type: real
-valid_min: 0
-valid_max: 0.0006323
-ok_min_mean_abs: -2.528e-06
-ok_max_mean_abs: 3.209e-05
!----------------------------------
!
@@ -1043,10 +996,6 @@ dimensions: longitude latitude time
out_name: hfls
type: real
positive: up
-valid_min: -76.77
-valid_max: 790.7
-ok_min_mean_abs: 50.39
-ok_max_mean_abs: 73.2
!----------------------------------
!
@@ -1069,10 +1018,6 @@ dimensions: longitude latitude time
out_name: hfss
type: real
positive: up
-valid_min: -264.5
-valid_max: 844.8
-ok_min_mean_abs: 10.7
-ok_max_mean_abs: 34.84
!----------------------------------
!
@@ -1095,10 +1040,6 @@ dimensions: longitude latitude time
out_name: rlds
type: real
positive: down
-valid_min: 30.71
-valid_max: 520.5
-ok_min_mean_abs: 271.2
-ok_max_mean_abs: 323.6
!----------------------------------
!
@@ -1121,10 +1062,6 @@ dimensions: longitude latitude time
out_name: rlus
type: real
positive: up
-valid_min: 43.75
-valid_max: 658
-ok_min_mean_abs: 331.1
-ok_max_mean_abs: 369.9
!----------------------------------
!
@@ -1147,10 +1084,6 @@ dimensions: longitude latitude time
out_name: rsds
type: real
positive: down
-valid_min: -0.002946
-valid_max: 524.4
-ok_min_mean_abs: 143.9
-ok_max_mean_abs: 181.6
!----------------------------------
!
@@ -1173,10 +1106,6 @@ dimensions: longitude latitude time
out_name: rsus
type: real
positive: up
-valid_min: -0.006589
-valid_max: 422.2
-ok_min_mean_abs: 26.22
-ok_max_mean_abs: 43.77
!----------------------------------
!
@@ -1199,10 +1128,6 @@ dimensions: longitude latitude time
out_name: rlut
type: real
positive: up
-valid_min: 67.48
-valid_max: 383.2
-ok_min_mean_abs: 214.1
-ok_max_mean_abs: 227.5
!----------------------------------
!
@@ -1394,10 +1319,6 @@ long_name: Eastward Wind
dimensions: longitude latitude alevel time
out_name: ua
type: real
-valid_min: -68.65
-valid_max: 136.6
-ok_min_mean_abs: 1.101
-ok_max_mean_abs: 22.42
!----------------------------------
!
@@ -1418,10 +1339,6 @@ long_name: Northward Wind
dimensions: longitude latitude alevel time
out_name: va
type: real
-valid_min: -71.1
-valid_max: 69.93
-ok_min_mean_abs: 0.9886
-ok_max_mean_abs: 4.679
!----------------------------------
!
@@ -1443,10 +1360,6 @@ long_name: Air Temperature
dimensions: longitude latitude alevel time
out_name: ta
type: real
-valid_min: 157.1
-valid_max: 326.4
-ok_min_mean_abs: 200.2
-ok_max_mean_abs: 289.9
!----------------------------------
!
@@ -1468,10 +1381,6 @@ long_name: Specific Humidity
dimensions: longitude latitude alevel time
out_name: hus
type: real
-valid_min: -0.000299
-valid_max: 0.02812
-ok_min_mean_abs: -0.0003539
-ok_max_mean_abs: 0.01027
!----------------------------------
!
@@ -1494,10 +1403,6 @@ comment: commonly referred to as ""omega"", this represents the vertic
dimensions: longitude latitude alevel time
out_name: wap
type: real
-valid_min: -1.126
-valid_max: 2.319
-ok_min_mean_abs: -0.005083
-ok_max_mean_abs: 0.04256
!----------------------------------
!
@@ -1519,10 +1424,6 @@ long_name: Geopotential Height
dimensions: longitude latitude alevel time
out_name: zg
type: real
-valid_min: -719.7
-valid_max: 3.306e+04
-ok_min_mean_abs: -113.4
-ok_max_mean_abs: 3.164e+04
!----------------------------------
!
@@ -1545,10 +1446,6 @@ comment: This is the relative humidity with respect to liquid water fo
dimensions: longitude latitude alevel time
out_name: hur
type: real
-valid_min: -2.642
-valid_max: 135.7
-ok_min_mean_abs: -10.31
-ok_max_mean_abs: 97
!----------------------------------
!
@@ -1570,10 +1467,6 @@ long_name: Cloud Area Fraction in Atmosphere Layer
dimensions: longitude latitude alevel time
out_name: cl
type: real
-valid_min: 0
-valid_max: 100.2
-ok_min_mean_abs: -0.04479
-ok_max_mean_abs: 24.87
!----------------------------------
!
@@ -1685,10 +1578,6 @@ comment: 7 levels x 7 tau
dimensions: longitude latitude tau plev7 time
out_name: clisccp
type: real
-valid_min: 0
-valid_max: 1.399
-ok_min_mean_abs: 0.0004413
-ok_max_mean_abs: 0.04866
!----------------------------------
!
diff --git a/Tables/CMIP5_cfMon b/Tables/CMIP5_cfMon
index 83d2186..373d9bc 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: 12 November 2010 ! date this table was constructed
+table_date: 30 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -24,6 +24,7 @@ expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
expt_id_ok: 'pre-industrial control' 'piControl'
expt_id_ok: 'historical' 'historical'
+expt_id_ok: 'historical extension' 'historicalExt'
expt_id_ok: 'mid-Holocene' 'midHolocene'
expt_id_ok: 'last glacial maximum' 'lgm'
expt_id_ok: 'last millennium' 'past1000'
@@ -322,7 +323,7 @@ must_have_bounds: yes
stored_direction: increasing
valid_min: -200.
valid_max: 800000.
-formula: z(n,k,j,i) = a(k)*ztop + b1(k)*zsurf1(n,j,i) + b2(k)*zsurf2(n,j,i)
+formula: z = a*ztop + b1*zsurf1 + b2*zsurf2
z_factors: a: a b1: b1 b2: b2 ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2
z_bounds_factors: a: a_bnds b1: b1_bnds b2: b2_bnds ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2
!----------------------------------
@@ -352,7 +353,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: -1.
valid_max: 20.
-formula: p(k) = p0 * exp(-lev(k))
+formula: p = p0 * exp(-lev)
z_factors: p0: p0 lev: lev
z_bounds_factors: p0: p0 lev: lev_bnds
!----------------------------------
@@ -382,7 +383,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = ptop + sigma(k)*(ps(n,j,i) - ptop)
+formula: p = ptop + sigma*(ps - ptop)
z_factors: ptop: ptop sigma: lev ps: ps
z_bounds_factors: ptop: ptop sigma: lev_bnds ps: ps
!----------------------------------
@@ -393,7 +394,7 @@ axis_entry: standard_hybrid_sigma
!============
!
! This coordinate is dimensionless and varies from a small value at the model top to 1.0 at the surface.
-! The values of a(k)+ b(k), which appear in the formula below, should be stored as standard_hybrid_sigma.
+! The values of a+ b, which appear in the formula below, should be stored as standard_hybrid_sigma.
! Note that in the netCDF file the variable will be named "lev", not standard_hybrid_sigma.
!
!---------------------------------
@@ -412,7 +413,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = a(k)*p0 + b(k)*ps(n,j,i)
+formula: p = a*p0 + b*ps
z_factors: p0: p0 a: a b: b ps: ps
z_bounds_factors: p0: p0 a: a_bnds b: b_bnds ps: ps
!----------------------------------
@@ -423,7 +424,7 @@ axis_entry: alternate_hybrid_sigma
!============
!
! This coordinate is dimensionless and varies from a small value at the model top to 1.0 at the surface.
-! The values of ap(k)/p0 + b(k), which appear in the formula below, should be stored as alternate_hybrid_sigma.
+! The values of ap/p0 + b, which appear in the formula below, should be stored as alternate_hybrid_sigma.
! Note that in the netCDF file the variable will be named "lev", not alternate_hybrid_sigma.
!
!------------
@@ -444,7 +445,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = ap(k) + b(k)*ps(n,j,i)
+formula: p = ap + b*ps
z_factors: ap: ap b: b ps: ps
z_bounds_factors: ap: ap_bnds b: b_bnds ps: ps
!----------------------------------
@@ -455,7 +456,7 @@ axis_entry: hybrid_height
!============
!
! This coordinate has dimension of meters (m) and increases upward.
-! The values of a(k) which appear in the formula below, should be stored as hybrid_height.
+! The values of a which appear in the formula below, should be stored as hybrid_height.
! Note that in the netCDF file the variable will be named "lev", not hybrid_height.
!
!------------
@@ -475,7 +476,7 @@ out_name: lev
must_have_bounds: yes
stored_direction: increasing
valid_min: 0.0
-formula: z(k,j,i) = a(k) + b(k)*orog(j,i)
+formula: z = a + b*orog
z_factors: a: lev b: b orog: orog
z_bounds_factors: a: lev_bnds b: b_bnds orog: orog
!----------------------------------
@@ -877,9 +878,9 @@ dimensions: longitude latitude alevel time
out_name: ta
type: real
valid_min: 157.1
-valid_max: 326.4
-ok_min_mean_abs: 200.2
-ok_max_mean_abs: 289.9
+valid_max: 336.3
+ok_min_mean_abs: 194.3
+ok_max_mean_abs: 299.8
!----------------------------------
!
@@ -1028,9 +1029,9 @@ dimensions: longitude latitude alevel time
out_name: hus
type: real
valid_min: -0.000299
-valid_max: 0.02812
+valid_max: 0.02841
ok_min_mean_abs: -0.0003539
-ok_max_mean_abs: 0.01027
+ok_max_mean_abs: 0.01041
!----------------------------------
!
diff --git a/Tables/CMIP5_cfOff b/Tables/CMIP5_cfOff
index f9d395c..0b5a8bf 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: 12 November 2010 ! date this table was constructed
+table_date: 30 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -24,6 +24,7 @@ expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
expt_id_ok: 'pre-industrial control' 'piControl'
expt_id_ok: 'historical' 'historical'
+expt_id_ok: 'historical extension' 'historicalExt'
expt_id_ok: 'mid-Holocene' 'midHolocene'
expt_id_ok: 'last glacial maximum' 'lgm'
expt_id_ok: 'last millennium' 'past1000'
diff --git a/Tables/CMIP5_cfSites b/Tables/CMIP5_cfSites
index c2a301d..8447fa0 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: 15 November 2010 ! date this table was constructed
+table_date: 30 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -29,6 +29,7 @@ expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
expt_id_ok: 'pre-industrial control' 'piControl'
expt_id_ok: 'historical' 'historical'
+expt_id_ok: 'historical extension' 'historicalExt'
expt_id_ok: 'mid-Holocene' 'midHolocene'
expt_id_ok: 'last glacial maximum' 'lgm'
expt_id_ok: 'last millennium' 'past1000'
@@ -185,7 +186,7 @@ must_have_bounds: yes
stored_direction: increasing
valid_min: -200.
valid_max: 800000.
-formula: z(n,k,j,i) = a(k)*ztop + b1(k)*zsurf1(n,j,i) + b2(k)*zsurf2(n,j,i)
+formula: z = a*ztop + b1*zsurf1 + b2*zsurf2
z_factors: a: a b1: b1 b2: b2 ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2
z_bounds_factors: a: a_bnds b1: b1_bnds b2: b2_bnds ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2
!----------------------------------
@@ -215,7 +216,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: -1.
valid_max: 20.
-formula: p(k) = p0 * exp(-lev(k))
+formula: p = p0 * exp(-lev)
z_factors: p0: p0 lev: lev
z_bounds_factors: p0: p0 lev: lev_bnds
!----------------------------------
@@ -245,7 +246,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = ptop + sigma(k)*(ps(n,j,i) - ptop)
+formula: p = ptop + sigma*(ps - ptop)
z_factors: ptop: ptop sigma: lev ps: ps
z_bounds_factors: ptop: ptop sigma: lev_bnds ps: ps
!----------------------------------
@@ -256,7 +257,7 @@ axis_entry: standard_hybrid_sigma
!============
!
! This coordinate is dimensionless and varies from a small value at the model top to 1.0 at the surface.
-! The values of a(k)+ b(k), which appear in the formula below, should be stored as standard_hybrid_sigma.
+! The values of a+ b, which appear in the formula below, should be stored as standard_hybrid_sigma.
! Note that in the netCDF file the variable will be named "lev", not standard_hybrid_sigma.
!
!---------------------------------
@@ -275,7 +276,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = a(k)*p0 + b(k)*ps(n,j,i)
+formula: p = a*p0 + b*ps
z_factors: p0: p0 a: a b: b ps: ps
z_bounds_factors: p0: p0 a: a_bnds b: b_bnds ps: ps
!----------------------------------
@@ -286,7 +287,7 @@ axis_entry: alternate_hybrid_sigma
!============
!
! This coordinate is dimensionless and varies from a small value at the model top to 1.0 at the surface.
-! The values of ap(k)/p0 + b(k), which appear in the formula below, should be stored as alternate_hybrid_sigma.
+! The values of ap/p0 + b, which appear in the formula below, should be stored as alternate_hybrid_sigma.
! Note that in the netCDF file the variable will be named "lev", not alternate_hybrid_sigma.
!
!------------
@@ -307,7 +308,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = ap(k) + b(k)*ps(n,j,i)
+formula: p = ap + b*ps
z_factors: ap: ap b: b ps: ps
z_bounds_factors: ap: ap_bnds b: b_bnds ps: ps
!----------------------------------
@@ -318,7 +319,7 @@ axis_entry: hybrid_height
!============
!
! This coordinate has dimension of meters (m) and increases upward.
-! The values of a(k) which appear in the formula below, should be stored as hybrid_height.
+! The values of a which appear in the formula below, should be stored as hybrid_height.
! Note that in the netCDF file the variable will be named "lev", not hybrid_height.
!
!------------
@@ -338,7 +339,7 @@ out_name: lev
must_have_bounds: yes
stored_direction: increasing
valid_min: 0.0
-formula: z(k,j,i) = a(k) + b(k)*orog(j,i)
+formula: z = a + b*orog
z_factors: a: lev b: b orog: orog
z_bounds_factors: a: lev_bnds b: b_bnds orog: orog
!----------------------------------
@@ -536,10 +537,6 @@ comment: near-surface (usually, 2 meter) air temperature.
dimensions: site time1 height2m
out_name: tas
type: real
-valid_min: 180.6
-valid_max: 325.7
-ok_min_mean_abs: 273.5
-ok_max_mean_abs: 281.7
!----------------------------------
!
@@ -562,10 +559,6 @@ comment: ""skin"" temperature (i.e., SST for open ocean)
dimensions: site time1
out_name: ts
type: real
-valid_min: 176.8
-valid_max: 331.8
-ok_min_mean_abs: 274.2
-ok_max_mean_abs: 281.8
!----------------------------------
!
@@ -588,10 +581,6 @@ comment: not, in general, the same as surface pressure
dimensions: site time1
out_name: psl
type: real
-valid_min: 9.477e+04
-valid_max: 1.124e+05
-ok_min_mean_abs: 1.003e+05
-ok_max_mean_abs: 1.017e+05
!----------------------------------
!
@@ -614,10 +603,6 @@ comment: not, in general, the same as mean sea-level pressure
dimensions: site time1
out_name: ps
type: real
-valid_min: 4.792e+04
-valid_max: 1.093e+05
-ok_min_mean_abs: 9.606e+04
-ok_max_mean_abs: 9.743e+04
!----------------------------------
!
@@ -639,10 +624,6 @@ comment: near-surface (usually, 10 meters) eastward component of wind.
dimensions: site time1 height10m
out_name: uas
type: real
-valid_min: -19.01
-valid_max: 18.68
-ok_min_mean_abs: 1.668
-ok_max_mean_abs: 4.106
!----------------------------------
!
@@ -664,10 +645,6 @@ comment: near-surface (usually, 10 meters) northward component of wind
dimensions: site time1 height10m
out_name: vas
type: real
-valid_min: -18.04
-valid_max: 22.84
-ok_min_mean_abs: 1.065
-ok_max_mean_abs: 2.678
!----------------------------------
!
@@ -733,10 +710,6 @@ comment: near-surface (usually, 2 meters) specific humidity.
dimensions: site time1 height2m
out_name: huss
type: real
-valid_min: -7.21e-06
-valid_max: 0.02992
-ok_min_mean_abs: 0.006391
-ok_max_mean_abs: 0.008749
!----------------------------------
!
@@ -759,10 +732,6 @@ comment: at surface; includes both liquid and solid phases from all ty
dimensions: site time1
out_name: pr
type: real
-valid_min: 0
-valid_max: 0.001254
-ok_min_mean_abs: 2.156e-05
-ok_max_mean_abs: 3.215e-05
!----------------------------------
!
@@ -785,10 +754,6 @@ comment: at surface; includes precipitation of all forms of water in t
dimensions: site time1
out_name: prsn
type: real
-valid_min: 0
-valid_max: 0.0002987
-ok_min_mean_abs: 1.449e-06
-ok_max_mean_abs: 6.11e-06
!----------------------------------
!
@@ -811,10 +776,6 @@ comment: at surface; includes both liquid and solid phases.
dimensions: site time1
out_name: prc
type: real
-valid_min: 0
-valid_max: 0.0006323
-ok_min_mean_abs: -2.528e-06
-ok_max_mean_abs: 3.209e-05
!----------------------------------
!
@@ -847,7 +808,7 @@ modeling_realm: atmos
!----------------------------------
! Variable attributes:
!----------------------------------
-standard_name: water_sublimation_flux
+standard_name: surface_snow_and_ice_sublimation_flux
units: kg m-2 s-1
cell_methods: time: point
cell_measures: area: areacella
@@ -859,10 +820,6 @@ comment: The snow and ice sublimation flux is the loss of snow and ice
dimensions: site time1
out_name: sbl
type: real
-valid_min: -0.004959
-valid_max: 0.0009936
-ok_min_mean_abs: -5.521e-05
-ok_max_mean_abs: 9.61e-05
!----------------------------------
!
@@ -884,10 +841,6 @@ dimensions: site time1
out_name: tauu
type: real
positive: down
-valid_min: -2.729
-valid_max: 2.934
-ok_min_mean_abs: 0.03979
-ok_max_mean_abs: 0.1065
!----------------------------------
!
@@ -909,10 +862,6 @@ dimensions: site time1
out_name: tauv
type: real
positive: down
-valid_min: -2.472
-valid_max: 2.527
-ok_min_mean_abs: 0.01447
-ok_max_mean_abs: 0.08134
!----------------------------------
!
@@ -936,10 +885,6 @@ dimensions: site time1
out_name: hfls
type: real
positive: up
-valid_min: -76.77
-valid_max: 790.7
-ok_min_mean_abs: 50.39
-ok_max_mean_abs: 73.2
!----------------------------------
!
@@ -962,10 +907,6 @@ dimensions: site time1
out_name: hfss
type: real
positive: up
-valid_min: -264.5
-valid_max: 844.8
-ok_min_mean_abs: 10.7
-ok_max_mean_abs: 34.84
!----------------------------------
!
@@ -988,10 +929,6 @@ dimensions: site time1
out_name: rlds
type: real
positive: down
-valid_min: 30.71
-valid_max: 520.5
-ok_min_mean_abs: 271.2
-ok_max_mean_abs: 323.6
!----------------------------------
!
@@ -1014,10 +951,6 @@ dimensions: site time1
out_name: rlus
type: real
positive: up
-valid_min: 43.75
-valid_max: 658
-ok_min_mean_abs: 331.1
-ok_max_mean_abs: 369.9
!----------------------------------
!
@@ -1040,10 +973,6 @@ dimensions: site time1
out_name: rsds
type: real
positive: down
-valid_min: -0.002946
-valid_max: 524.4
-ok_min_mean_abs: 143.9
-ok_max_mean_abs: 181.6
!----------------------------------
!
@@ -1066,10 +995,6 @@ dimensions: site time1
out_name: rsus
type: real
positive: up
-valid_min: -0.006589
-valid_max: 422.2
-ok_min_mean_abs: 26.22
-ok_max_mean_abs: 43.77
!----------------------------------
!
@@ -1092,10 +1017,6 @@ dimensions: site time1
out_name: rsdscs
type: real
positive: down
-valid_min: -1.748e+30
-valid_max: 518
-ok_min_mean_abs: 206.9
-ok_max_mean_abs: 238.6
!----------------------------------
!
@@ -1118,10 +1039,6 @@ dimensions: site time1
out_name: rsuscs
type: real
positive: up
-valid_min: -0.01446
-valid_max: 462.2
-ok_min_mean_abs: 31.65
-ok_max_mean_abs: 61.59
!----------------------------------
!
@@ -1144,10 +1061,6 @@ dimensions: site time1
out_name: rldscs
type: real
positive: down
-valid_min: 33.55
-valid_max: 543.6
-ok_min_mean_abs: 238.6
-ok_max_mean_abs: 293.8
!----------------------------------
!
@@ -1171,10 +1084,6 @@ dimensions: site time1
out_name: rsdt
type: real
positive: down
-valid_min: 0
-valid_max: 555.5
-ok_min_mean_abs: 294.4
-ok_max_mean_abs: 303.8
!----------------------------------
!
@@ -1198,10 +1107,6 @@ dimensions: site time1
out_name: rsut
type: real
positive: up
-valid_min: -0.02689
-valid_max: 416.9
-ok_min_mean_abs: 96.72
-ok_max_mean_abs: 114.1
!----------------------------------
!
@@ -1225,10 +1130,6 @@ dimensions: site time1
out_name: rlut
type: real
positive: up
-valid_min: 67.48
-valid_max: 383.2
-ok_min_mean_abs: 214.1
-ok_max_mean_abs: 227.5
!----------------------------------
!
@@ -1251,10 +1152,6 @@ dimensions: site time1
out_name: rlutcs
type: real
positive: up
-valid_min: 70.59
-valid_max: 372.3
-ok_min_mean_abs: 235.1
-ok_max_mean_abs: 253.8
!----------------------------------
!
@@ -1277,10 +1174,6 @@ dimensions: site time1
out_name: rsutcs
type: real
positive: up
-valid_min: 0
-valid_max: 444
-ok_min_mean_abs: 54.7
-ok_max_mean_abs: 73.36
!----------------------------------
!
@@ -1303,10 +1196,6 @@ comment: vertically integrated through the atmospheric column
dimensions: site time1
out_name: prw
type: real
-valid_min: -0.0006775
-valid_max: 78.04
-ok_min_mean_abs: 12.75
-ok_max_mean_abs: 23.09
!----------------------------------
!
@@ -1329,10 +1218,6 @@ comment: for the whole atmospheric column, as seen from the surface or
dimensions: site time1
out_name: clt
type: real
-valid_min: -0.0001822
-valid_max: 100.2
-ok_min_mean_abs: 39.37
-ok_max_mean_abs: 84.98
!----------------------------------
!
@@ -1355,10 +1240,6 @@ comment: calculate mass of condensed (liquid + ice) water in the colum
dimensions: site time1
out_name: clwvi
type: real
-valid_min: -3.827e-06
-valid_max: 3.364
-ok_min_mean_abs: -0.03549
-ok_max_mean_abs: 0.2846
!----------------------------------
!
@@ -1381,10 +1262,6 @@ comment: calculate mass of ice water in the column divided by the area
dimensions: site time1
out_name: clivi
type: real
-valid_min: -1.872e-06
-valid_max: 1.535
-ok_min_mean_abs: -0.0348
-ok_max_mean_abs: 0.1187
!----------------------------------
!
@@ -1408,10 +1285,6 @@ dimensions: site time1
out_name: rtmt
type: real
positive: down
-valid_min: -232.8
-valid_max: 218.7
-ok_min_mean_abs: 77.62
-ok_max_mean_abs: 88.34
!----------------------------------
!
@@ -1588,10 +1461,6 @@ comment: Include both large-scale and convective cloud.
dimensions: alevel site time1
out_name: cl
type: real
-valid_min: 0
-valid_max: 100.2
-ok_min_mean_abs: -0.04479
-ok_max_mean_abs: 24.87
!----------------------------------
!
@@ -1676,10 +1545,6 @@ long_name: Air Temperature
dimensions: alevel site time1
out_name: ta
type: real
-valid_min: 157.1
-valid_max: 326.4
-ok_min_mean_abs: 200.2
-ok_max_mean_abs: 289.9
!----------------------------------
!
@@ -1700,10 +1565,6 @@ long_name: Eastward Wind
dimensions: alevel site time1
out_name: ua
type: real
-valid_min: -68.65
-valid_max: 136.6
-ok_min_mean_abs: 1.101
-ok_max_mean_abs: 22.42
!----------------------------------
!
@@ -1724,10 +1585,6 @@ long_name: Northward Wind
dimensions: alevel site time1
out_name: va
type: real
-valid_min: -71.1
-valid_max: 69.93
-ok_min_mean_abs: 0.9886
-ok_max_mean_abs: 4.679
!----------------------------------
!
@@ -1748,10 +1605,6 @@ long_name: Specific Humidity
dimensions: alevel site time1
out_name: hus
type: real
-valid_min: -0.000299
-valid_max: 0.02812
-ok_min_mean_abs: -0.0003539
-ok_max_mean_abs: 0.01027
!----------------------------------
!
@@ -1773,10 +1626,6 @@ comment: This is the relative humidity with respect to liquid water fo
dimensions: alevel site time1
out_name: hur
type: real
-valid_min: -2.642
-valid_max: 135.7
-ok_min_mean_abs: -10.31
-ok_max_mean_abs: 97
!----------------------------------
!
@@ -1798,10 +1647,6 @@ comment: commonly referred to as ""omega"", this represents the vertic
dimensions: alevel site time1
out_name: wap
type: real
-valid_min: -1.126
-valid_max: 2.319
-ok_min_mean_abs: -0.005083
-ok_max_mean_abs: 0.04256
!----------------------------------
!
@@ -1822,10 +1667,6 @@ long_name: Geopotential Height
dimensions: alevel site time1
out_name: zg
type: real
-valid_min: -719.7
-valid_max: 3.306e+04
-ok_min_mean_abs: -113.4
-ok_max_mean_abs: 3.164e+04
!----------------------------------
!
diff --git a/Tables/CMIP5_day b/Tables/CMIP5_day
index cbe9f5c..c7a90fa 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: 12 November 2010 ! date this table was constructed
+table_date: 30 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -24,6 +24,7 @@ expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
expt_id_ok: 'pre-industrial control' 'piControl'
expt_id_ok: 'historical' 'historical'
+expt_id_ok: 'historical extension' 'historicalExt'
expt_id_ok: 'mid-Holocene' 'midHolocene'
expt_id_ok: 'last glacial maximum' 'lgm'
expt_id_ok: 'last millennium' 'past1000'
@@ -245,10 +246,6 @@ comment: near-surface (usually, 2 meter) specific humidity.
dimensions: longitude latitude time height2m
out_name: huss
type: real
-valid_min: -7.21e-06
-valid_max: 0.02992
-ok_min_mean_abs: 0.006391
-ok_max_mean_abs: 0.008749
!----------------------------------
!
@@ -271,10 +268,6 @@ comment: daily-minimum near-surface (usually, 2 meter) air temperature
dimensions: longitude latitude time height2m
out_name: tasmin
type: real
-valid_min: 183.6
-valid_max: 309.8
-ok_min_mean_abs: 271.8
-ok_max_mean_abs: 279.6
!----------------------------------
!
@@ -297,10 +290,6 @@ comment: daily-maximum near-surface (usually, 2 meter) air temperature
dimensions: longitude latitude time height2m
out_name: tasmax
type: real
-valid_min: 181.9
-valid_max: 330.6
-ok_min_mean_abs: 277.3
-ok_max_mean_abs: 281.4
!----------------------------------
!
@@ -323,10 +312,6 @@ comment: daily-mean near-surface (usually, 2 meter) air temperature.
dimensions: longitude latitude time height2m
out_name: tas
type: real
-valid_min: 180.6
-valid_max: 325.7
-ok_min_mean_abs: 273.5
-ok_max_mean_abs: 281.7
!----------------------------------
!
@@ -349,10 +334,6 @@ comment: at surface; includes both liquid and solid phases from all ty
dimensions: longitude latitude time
out_name: pr
type: real
-valid_min: 0
-valid_max: 0.001254
-ok_min_mean_abs: 2.156e-05
-ok_max_mean_abs: 3.215e-05
!----------------------------------
!
@@ -374,10 +355,6 @@ long_name: Sea Level Pressure
dimensions: longitude latitude time
out_name: psl
type: real
-valid_min: 9.477e+04
-valid_max: 1.124e+05
-ok_min_mean_abs: 1.003e+05
-ok_max_mean_abs: 1.017e+05
!----------------------------------
!
@@ -443,10 +420,6 @@ comment: temperature of liquid ocean. Report on the ocean grid. This
dimensions: longitude latitude time
out_name: tos
type: real
-valid_min: 270.6
-valid_max: 313.9
-ok_min_mean_abs: 283.7
-ok_max_mean_abs: 291.7
!----------------------------------
!
@@ -491,10 +464,6 @@ comment: Compute the mass of water in all phases in the upper 0.1 mete
dimensions: longitude latitude time sdepth1
out_name: mrsos
type: real
-valid_min: -2.008
-valid_max: 146.5
-ok_min_mean_abs: -35.89
-ok_max_mean_abs: 123.3
!----------------------------------
!
@@ -582,10 +551,6 @@ long_name: Snow Area Fraction
dimensions: longitude latitude time
out_name: snc
type: real
-valid_min: 0
-valid_max: 102.1
-ok_min_mean_abs: -29.01
-ok_max_mean_abs: 78.46
!----------------------------------
!
@@ -608,10 +573,6 @@ comment: for the whole atmospheric column, as seen from the surface or
dimensions: longitude latitude time
out_name: clt
type: real
-valid_min: -0.0001822
-valid_max: 100.2
-ok_min_mean_abs: 39.37
-ok_max_mean_abs: 84.98
!----------------------------------
!
@@ -656,10 +617,6 @@ comment: Compute as the mass of surface snow on the land portion of th
dimensions: longitude latitude time
out_name: snw
type: real
-valid_min: -0.007542
-valid_max: 9.555e+05
-ok_min_mean_abs: -6025
-ok_max_mean_abs: 1.213e+04
!----------------------------------
!
@@ -682,10 +639,6 @@ comment: at surface; includes both liquid and solid phases.
dimensions: longitude latitude time
out_name: prc
type: real
-valid_min: 0
-valid_max: 0.0006323
-ok_min_mean_abs: -2.528e-06
-ok_max_mean_abs: 3.209e-05
!----------------------------------
!
@@ -708,10 +661,6 @@ comment: at surface; includes precipitation of all forms of water in t
dimensions: longitude latitude time
out_name: prsn
type: real
-valid_min: 0
-valid_max: 0.0002987
-ok_min_mean_abs: 1.449e-06
-ok_max_mean_abs: 6.11e-06
!----------------------------------
!
@@ -734,10 +683,6 @@ comment: "compute as the total runoff (including ""drainage"" through
dimensions: longitude latitude time
out_name: mrro
type: real
-valid_min: -0.0002019
-valid_max: 0.001065
-ok_min_mean_abs: -6.668e-06
-ok_max_mean_abs: 1.874e-05
!----------------------------------
!
@@ -759,10 +704,6 @@ comment: near-surface (usually, 10 meters) eastward component of wind.
dimensions: longitude latitude time height10m
out_name: uas
type: real
-valid_min: -19.01
-valid_max: 18.68
-ok_min_mean_abs: 1.668
-ok_max_mean_abs: 4.106
!----------------------------------
!
@@ -784,10 +725,6 @@ comment: near-surface (usually, 10 meters) northward component of wind
dimensions: longitude latitude time height10m
out_name: vas
type: real
-valid_min: -18.04
-valid_max: 22.84
-ok_min_mean_abs: 1.065
-ok_max_mean_abs: 2.678
!----------------------------------
!
@@ -831,10 +768,6 @@ dimensions: longitude latitude time
out_name: hfls
type: real
positive: up
-valid_min: -76.77
-valid_max: 790.7
-ok_min_mean_abs: 50.39
-ok_max_mean_abs: 73.2
!----------------------------------
!
@@ -857,10 +790,6 @@ dimensions: longitude latitude time
out_name: hfss
type: real
positive: up
-valid_min: -264.5
-valid_max: 844.8
-ok_min_mean_abs: 10.7
-ok_max_mean_abs: 34.84
!----------------------------------
!
@@ -883,10 +812,6 @@ dimensions: longitude latitude time
out_name: rlds
type: real
positive: down
-valid_min: 30.71
-valid_max: 520.5
-ok_min_mean_abs: 271.2
-ok_max_mean_abs: 323.6
!----------------------------------
!
@@ -909,10 +834,6 @@ dimensions: longitude latitude time
out_name: rlus
type: real
positive: up
-valid_min: 43.75
-valid_max: 658
-ok_min_mean_abs: 331.1
-ok_max_mean_abs: 369.9
!----------------------------------
!
@@ -935,10 +856,6 @@ dimensions: longitude latitude time
out_name: rsds
type: real
positive: down
-valid_min: -0.002946
-valid_max: 524.4
-ok_min_mean_abs: 143.9
-ok_max_mean_abs: 181.6
!----------------------------------
!
@@ -961,10 +878,6 @@ dimensions: longitude latitude time
out_name: rsus
type: real
positive: up
-valid_min: -0.006589
-valid_max: 422.2
-ok_min_mean_abs: 26.22
-ok_max_mean_abs: 43.77
!----------------------------------
!
@@ -988,10 +901,6 @@ dimensions: longitude latitude time
out_name: rlut
type: real
positive: up
-valid_min: 67.48
-valid_max: 383.2
-ok_min_mean_abs: 214.1
-ok_max_mean_abs: 227.5
!----------------------------------
!
@@ -1013,10 +922,6 @@ comment: "Report on ocean's grid. Report as ""missing"" in regions fr
dimensions: longitude latitude time
out_name: usi
type: real
-valid_min: -1.469
-valid_max: 1.634
-ok_min_mean_abs: -0.03933
-ok_max_mean_abs: 0.1016
!----------------------------------
!
@@ -1038,10 +943,6 @@ comment: "Report on ocean's grid. Report as ""missing"" in regions fr
dimensions: longitude latitude time
out_name: vsi
type: real
-valid_min: -2.081
-valid_max: 2.193
-ok_min_mean_abs: -0.02994
-ok_max_mean_abs: 0.07904
!----------------------------------
!
@@ -1064,10 +965,6 @@ comment: fraction of grid cell covered by sea ice. Report on ocean's g
dimensions: longitude latitude time
out_name: sic
type: real
-valid_min: -0.000225
-valid_max: 166.1
-ok_min_mean_abs: -13.33
-ok_max_mean_abs: 36.65
!----------------------------------
!
@@ -1090,10 +987,6 @@ comment: Report on ocean's grid. Compute the mean thickness of sea ic
dimensions: longitude latitude time
out_name: sit
type: real
-valid_min: -0.006698
-valid_max: 104.4
-ok_min_mean_abs: -0.9217
-ok_max_mean_abs: 2.582
!----------------------------------
!
@@ -1115,10 +1008,6 @@ long_name: Air Temperature
dimensions: longitude latitude plev8 time
out_name: ta
type: real
-valid_min: 157.1
-valid_max: 326.4
-ok_min_mean_abs: 200.2
-ok_max_mean_abs: 289.9
!----------------------------------
!
@@ -1141,10 +1030,6 @@ comment: This is the relative humidity with respect to liquid water fo
dimensions: longitude latitude plev8 time
out_name: hur
type: real
-valid_min: -2.642
-valid_max: 135.7
-ok_min_mean_abs: -10.31
-ok_max_mean_abs: 97
!----------------------------------
!
@@ -1166,10 +1051,6 @@ long_name: Specific Humidity
dimensions: longitude latitude plev8 time
out_name: hus
type: real
-valid_min: -0.000299
-valid_max: 0.02812
-ok_min_mean_abs: -0.0003539
-ok_max_mean_abs: 0.01027
!----------------------------------
!
@@ -1192,10 +1073,6 @@ comment: commonly referred to as ""omega"", this represents the vertic
dimensions: longitude latitude plev8 time
out_name: wap
type: real
-valid_min: -1.126
-valid_max: 2.319
-ok_min_mean_abs: -0.005083
-ok_max_mean_abs: 0.04256
!----------------------------------
!
@@ -1216,10 +1093,6 @@ long_name: Northward Wind
dimensions: longitude latitude plev8 time
out_name: va
type: real
-valid_min: -71.1
-valid_max: 69.93
-ok_min_mean_abs: 0.9886
-ok_max_mean_abs: 4.679
!----------------------------------
!
@@ -1240,10 +1113,6 @@ long_name: Eastward Wind
dimensions: longitude latitude plev8 time
out_name: ua
type: real
-valid_min: -68.65
-valid_max: 136.6
-ok_min_mean_abs: 1.101
-ok_max_mean_abs: 22.42
!----------------------------------
!
@@ -1265,10 +1134,6 @@ long_name: Geopotential Height
dimensions: longitude latitude plev8 time
out_name: zg
type: real
-valid_min: -719.7
-valid_max: 3.306e+04
-ok_min_mean_abs: -113.4
-ok_max_mean_abs: 3.164e+04
!----------------------------------
!
diff --git a/Tables/CMIP5_fx b/Tables/CMIP5_fx
index abd345b..57c494e 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: 12 November 2010 ! date this table was constructed
+table_date: 30 November 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -24,6 +24,7 @@ expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
expt_id_ok: 'pre-industrial control' 'piControl'
expt_id_ok: 'historical' 'historical'
+expt_id_ok: 'historical extension' 'historicalExt'
expt_id_ok: 'mid-Holocene' 'midHolocene'
expt_id_ok: 'last glacial maximum' 'lgm'
expt_id_ok: 'last millennium' 'past1000'
@@ -153,7 +154,7 @@ long_name: ocean double sigma coordinate
!----------------------------------
out_name: lev
must_have_bounds: yes
-formula: for k <= k_c:\n z(k,j,i)= sigma(k)*f(j,i) \n for k > k_c:\n z(k,j,i)= f(j,i) + (sigma(k)-1)*(depth(j,i)-f(j,i)) \n f(j,i)= 0.5*(z1+ z2) + 0.5*(z1-z2)* tanh(2*a/(z1-z2)*(depth(j,i)-href))
+formula: for k <= k_c:\n z= sigma*f \n for k > k_c:\n z= f + (sigma-1)*(depth-f) \n f= 0.5*(z1+ z2) + 0.5*(z1-z2)* tanh(2*a/(z1-z2)*(depth-href))
z_factors: sigma: sigma depth: depth z1: z1 z2: z2 a: a_coeff href: href k_c: k_c
z_bounds_factors: sigma: sigma_bnds depth: depth z1: z1 z2: z2 a: a href: href k_c: k_c
!----------------------------------
@@ -439,8 +440,6 @@ out_name: orog
type: real
valid_min: -700.0
valid_max: 10000.0
-ok_min_mean_abs: 327.9
-ok_max_mean_abs: 431.3
!----------------------------------
!
@@ -464,8 +463,6 @@ out_name: sftlf
type: real
valid_min: 0.0
valid_max: 100.0
-ok_min_mean_abs: 30.58
-ok_max_mean_abs: 37.07
!----------------------------------
!
@@ -489,8 +486,6 @@ out_name: sftgif
type: real
valid_min: 0.0
valid_max: 100.0
-ok_min_mean_abs: 7.328
-ok_max_mean_abs: 14.93
!----------------------------------
!
@@ -512,10 +507,6 @@ comment: """where land"": divide the total water holding capacity of a
dimensions: longitude latitude
out_name: mrsofc
type: real
-valid_min: -52.65
-valid_max: 4910
-ok_min_mean_abs: -865
-ok_max_mean_abs: 2220
!----------------------------------
!
@@ -539,8 +530,6 @@ out_name: rootd
type: real
valid_min: 0.0
valid_max: 30.0
-ok_min_mean_abs: 0.8
-ok_max_mean_abs: 3.2
!----------------------------------
!
diff --git a/Tables/md5s b/Tables/md5s
index 44b6633..b60485d 100644
--- a/Tables/md5s
+++ b/Tables/md5s
@@ -1 +1 @@
-{'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', '01 July 2010': '96628b3875e74a8a515d0a1e500710d8', '11 November 2010': '6be9b509f02f6118bfd2b0062f27df9a', '12 March 2010': '192f07ba869af3794494ea0d [...]
\ No newline at end of file
+{'CMIP5': {'cf3hr': {'11 May 2010': 'a59ca1270ff3036d417a7f2217598266', '19 October 2010': '8b5c2f197b70a103393838ebd4075c6c', '12 May 2010': '905f7ccdd5a31cb71e2a6e3b339cd0e1', '23 August 2010': '5ccea11a7c3d165c76df3d9eede395d0', '01 June 2010': '619aa3c816bc25a53335589698e64968', '01 July 2010': 'c0fe9e92115d75292f5009e13761cb4b', '29 April 2010': 'fdc4fb38dd4cfb7f066329ed43a9e805', '12 March 2010': 'ae9a82f01824d9012aa0657cd7896a9a', '22 March 2010': '712cd14ab6a28116da828ff555e00c4d [...]
\ No newline at end of file
diff --git a/Tables_csv/3hr.csv b/Tables_csv/3hr.csv
index 00a4b2e..a329ada 100644
--- a/Tables_csv/3hr.csv
+++ b/Tables_csv/3hr.csv
@@ -22,8 +22,8 @@ priority,long name,units ,comment ,questions,output variable name ,standard name
1.0,Surface Downwelling Shortwave Radiation,W m-2,This is the 3-hour mean flux.,,rsds,surface_downwelling_shortwave_flux_in_air,,W m-2,time: mean,,,,,down,real,longitude latitude time,rsds,atmos,,area: areacella,,
1.0,Surface Upwelling Shortwave Radiation,W m-2,This is the 3-hour mean flux.,,rsus,surface_upwelling_shortwave_flux_in_air,,W m-2,time: mean,,,,,up,real,longitude latitude time,rsus,atmos,,area: areacella,,
,,,,,,,,,,,,,,,,,,atmos,,area: areacella,,
-1.0,Eastward Near-Surface Wind Speed,m s-1,sampled synoptically.,,uas,eastward_wind,,m s-1,time: point,,,,,,real,longitude latitude time1 height2m,uas,atmos,,,,
-1.0,Northward Near-Surface Wind Speed,m s-1,sampled synoptically.,,vas,northward_wind,,m s-1,time: point,,,,,,real,longitude latitude time1 height2m,vas,atmos,,,,
+1.0,Eastward Near-Surface Wind Speed,m s-1,sampled synoptically.,,uas,eastward_wind,,m s-1,time: point,,,,,,real,longitude latitude time1 height10m,uas,atmos,,,,
+1.0,Northward Near-Surface Wind Speed,m s-1,sampled synoptically.,,vas,northward_wind,,m s-1,time: point,,,,,,real,longitude latitude time1 height10m,vas,atmos,,,,
1.0,Near-Surface Specific Humidity,1.0,"near-surface (usually 2 m) specific humidity, sampled synoptically.",,huss,specific_humidity,,1.0,time: point,,,,,,real,longitude latitude time1 height2m,huss,atmos,,area: areacella,,
1.0,Moisture in Upper 0.1 m of Soil Column,kg m-2,Compute the mass of water in all phases in the upper 0.1 meters of soil.,,mrsos,moisture_content_of_soil_layer,,kg m-2,time: point area: mean where land,,,,,,real,longitude latitude time1 sdepth1,mrsos,land,,area: areacella,,
1.0, Surface Temperature Where Land or Sea Ice,K,"""skin"" temperature of all surfaces except open ocean, sampled synoptically. ",,tslsi,surface_temperature,,K,time: point,,,,,,real,longitude latitude time1,tslsi,land,,area: areacella,,
@@ -33,9 +33,9 @@ priority,long name,units ,comment ,questions,output variable name ,standard name
1.0,Total Runoff,kg m-2 s-1,"compute the total runoff (including ""drainage"" through the base of the soil model) leaving the land portion of the grid cell divided by the land area in the grid cell, averaged over the 3-hour interval.",,mrro,runoff_flux,,kg m-2 s-1,time: mean area: mean where land,,,,,,real,longitude latitude time,mrro,land,,area: areacella,,
1.0,Surface Downwelling Clear-Sky Longwave Radiation,W m-2,This is a 3-hour mean flux.,,rldscs,downwelling_longwave_flux_in_air_assuming_clear_sky,,W m-2,time: mean,,,,,down,real,longitude latitude time,rldscs,atmos,,area: areacella,,
1.0,Surface Downwelling Clear-Sky Shortwave Radiation,W m-2,This is a 3-hour mean flux.,,rsdscs,surface_downwelling_shortwave_flux_in_air_assuming_clear_sky,,W m-2,time: mean,,,,,down,real,longitude latitude time,rsdscs,atmos,,area: areacella,,
-1.0,Surface Upwelling Clear-Sky Shortwave Radiation,W m-2,This is a 3-hour mean flux.,,rluscs,surface_upwelling_shortwave_flux_in_air_assuming_clear_sky,,W m-2,time: mean,,,,,up,real,longitude latitude time,rluscs,atmos,,area: areacella,,
+1.0,Surface Upwelling Clear-Sky Shortwave Radiation,W m-2,This is a 3-hour mean flux.,,rsuscs,surface_upwelling_shortwave_flux_in_air_assuming_clear_sky,,W m-2,time: mean,,,,,up,real,longitude latitude time,rsuscs,atmos,,area: areacella,,
1.0,Surface Pressure,Pa,"sampled synoptically to diagnose atmospheric tides, this is better than mean sea level pressure.",,ps,surface_air_pressure,,Pa,time: point,,,,,,real,longitude latitude time1,ps,atmos,,area: areacella,,
1.0,Total Cloud Fraction,%,"for the whole atmospheric column, as seen from the surface or the top of the atmosphere. Include both large-scale and convective cloud. This is a 3-hour mean.",,clt,cloud_area_fraction,,%,time: mean,,,,,,real,longitude latitude time,clt,atmos,,area: areacella,,
-1.0,Surface Downward Diffuse Shortwave Radiation,W m-2,This is a 3-hour mean flux.,,rsdsdiff,surface_diffuse_downwelling_shortwave_flux_in_air,,W m-2,time: mean,,,,,,real,longitude latitude time,rsdsdiff,atmos,,area: areacella,,
+1.0,Surface Diffuse Downwelling Shortwave Radiation,W m-2,This is a 3-hour mean flux.,,rsdsdiff,surface_diffuse_downwelling_shortwave_flux_in_air,,W m-2,time: mean,,,,,,real,longitude latitude time,rsdsdiff,atmos,,area: areacella,,
diff --git a/Tables_csv/Amon.csv b/Tables_csv/Amon.csv
index b259b43..47cea71 100644
--- a/Tables_csv/Amon.csv
+++ b/Tables_csv/Amon.csv
@@ -29,7 +29,7 @@ priority,long name,units ,comment ,questions,output variable name ,standard name
1.0,Snowfall Flux,kg m-2 s-1,at surface; includes precipitation of all forms of water in the solid phase,,prsn,snowfall_flux,,kg m-2 s-1,time: mean,,,,,,real,longitude latitude time,prsn,atmos,,area: areacella,,
1.0,Convective Precipitation,kg m-2 s-1,at surface; includes both liquid and solid phases.,,prc,convective_precipitation_flux,,kg m-2 s-1,time: mean,,,,,,real,longitude latitude time,prc,atmos,,area: areacella,,
1.0,Evaporation,kg m-2 s-1,at surface; flux of water into the atmosphere due to conversion of both liquid and solid phases to vapor (from underlying surface and vegetation),,evspsbl,water_evaporation_flux,,kg m-2 s-1,time: mean,,,,,,real,longitude latitude time,evspsbl,atmos,,area: areacella,,
-1.0,Surface Snow and Ice Sublimation Flux,kg m-2 s-1,"The snow and ice sublimation flux is the loss of snow and ice mass from the surface resulting from their conversion to water vapor that enters the atmosphere. This differs from sbl appearing in table Limon in that the flux is averaged over the entire grid cell, not just the land portion.",,sbl,water_sublimation_flux,,kg m-2 s-1,time: mean,,,,,,real,longitude latitude time,sbl,atmos,,area: areacella,,
+1.0,Surface Snow and Ice Sublimation Flux,kg m-2 s-1,"The snow and ice sublimation flux is the loss of snow and ice mass from the surface resulting from their conversion to water vapor that enters the atmosphere. This differs from sbl appearing in table Limon in that the flux is averaged over the entire grid cell, not just the land portion.",,sbl,surface_snow_and_ice_sublimation_flux,,kg m-2 s-1,time: mean,,,,,,real,longitude latitude time,sbl,atmos,,area: areacella,,
,,,,,,,,,,,,,,,,,,atmos,,area: areacella,,
1.0,Surface Downward Eastward Wind Stress,Pa,,,tauu,surface_downward_eastward_stress,,Pa,time: mean,,,,,down,real,longitude latitude time,tauu,atmos,,,,
1.0,Surface Downward Northward Wind Stress,Pa,,,tauv,surface_downward_northward_stress,,Pa,time: mean,,,,,down,real,longitude latitude time,tauv,atmos,,,,
diff --git a/Tables_csv/Amon_2D.csv b/Tables_csv/Amon_2D.csv
index 98e0cd9..9c5bd87 100644
--- a/Tables_csv/Amon_2D.csv
+++ b/Tables_csv/Amon_2D.csv
@@ -14,7 +14,7 @@
1.0,Snowfall Flux,kg m-2 s-1,at surface; includes precipitation of all forms of water in the solid phase,,prsn,snowfall_flux,,kg m-2 s-1,time: mean,,,,,,real,longitude latitude time,prsn,atmos,,area: areacella,,
1.0,Convective Precipitation,kg m-2 s-1,at surface; includes both liquid and solid phases.,,prc,convective_precipitation_flux,,kg m-2 s-1,time: mean,,,,,,real,longitude latitude time,prc,atmos,,area: areacella,,
1.0,Evaporation,kg m-2 s-1,at surface; flux of water into the atmosphere due to conversion of both liquid and solid phases to vapor (from underlying surface and vegetation),,evspsbl,water_evaporation_flux,,kg m-2 s-1,time: mean,,,,,,real,longitude latitude time,evspsbl,atmos,,area: areacella,,
-1.0,Surface Snow and Ice Sublimation Flux,kg m-2 s-1,"The snow and ice sublimation flux is the loss of snow and ice mass from the surface resulting from their conversion to water vapor that enters the atmosphere. This differs from sbl appearing in table Limon in that the flux is averaged over the entire grid cell, not just the land portion.",,sbl,water_sublimation_flux,,kg m-2 s-1,time: mean,,,,,,real,longitude latitude time,sbl,atmos,,area: areacella,,
+1.0,Surface Snow and Ice Sublimation Flux,kg m-2 s-1,"The snow and ice sublimation flux is the loss of snow and ice mass from the surface resulting from their conversion to water vapor that enters the atmosphere. This differs from sbl appearing in table Limon in that the flux is averaged over the entire grid cell, not just the land portion.",,sbl,surface_snow_and_ice_sublimation_flux,,kg m-2 s-1,time: mean,,,,,,real,longitude latitude time,sbl,atmos,,area: areacella,,
,,,,,,,,,,,,,,,,,,atmos,,area: areacella,,
1.0,Surface Downward Eastward Wind Stress,Pa,,,tauu,surface_downward_eastward_stress,,Pa,time: mean,,,,,down,real,longitude latitude time,tauu,atmos,,,,
1.0,Surface Downward Northward Wind Stress,Pa,,,tauv,surface_downward_northward_stress,,Pa,time: mean,,,,,down,real,longitude latitude time,tauv,atmos,,,,
diff --git a/Tables_csv/Lmon.csv b/Tables_csv/Lmon.csv
index 8ab8166..ca09c34 100644
--- a/Tables_csv/Lmon.csv
+++ b/Tables_csv/Lmon.csv
@@ -23,7 +23,7 @@ priority,long name,units ,comment ,questions,output variable name ,standard name
,,,,,,,,,,,,,,,,,,,,area: areacella,,
1.0,Water Evaporation from Soil,kg m-2 s-1,includes sublimation. ,,evspsblsoi,water_evaporation_flux_from_soil,,kg m-2 s-1,time: mean area: mean where land,,,,,up,real,longitude latitude time,evspsblsoi,land,,area: areacella,,
1.0,Transpiration,kg m-2 s-1,,,tran,transpiration_flux,,kg m-2 s-1,time: mean area: mean where land,,,,,up,real,longitude latitude time,tran,land,,area: areacella,,
-1.0, Water Content of Soil Layer,kg m-2,"in each soil layer, the mass of water in all phases, including ice.",,mrlsl,moisture_content_of_soil_layer,water_content_of_soil_layer,kg m-2,time: mean area: mean where land,,,,,,real,longitude latitude sdepth time,mrlsl,land,,area: areacella,,
+1.0, Water Content of Soil Layer,kg m-2,"in each soil layer, the mass of water in all phases, including ice.",,mrlsl,moisture_content_of_soil_layer,,kg m-2,time: mean area: mean where land,,,,,,real,longitude latitude sdepth time,mrlsl,land,,area: areacella,,
2.0,Temperature of Soil,K,"Temperature of each soil layer. Report as ""missing"" for grid cells occupied entirely by ""sea"".",,tsl,soil_temperature,,K,time: mean,,,,,,real,longitude latitude sdepth time,tsl,land,,area: areacella,,
1.0,Tree Cover Fraction,%,fraction of entire grid cell that is covered by trees. ,"add scalar coordinate typetree and add ""tree"" to the CF area type table.",treeFrac,area_fraction,,%,time: mean,,,,,,real,longitude latitude time,treeFrac,land,,area: areacella,,
1.0,Natural Grass Fraction,%,fraction of entire grid cell that is covered by natural grass. ,"add scalar coordinate typegrass and add ""natural_grass"" to the CF area type table.",grassFrac,area_fraction,,%,time: mean,,,,,,real,longitude latitude time,grassFrac,land,,area: areacella,,
diff --git a/Tables_csv/OImon.csv b/Tables_csv/OImon.csv
index 2fdec55..1a8cec8 100644
--- a/Tables_csv/OImon.csv
+++ b/Tables_csv/OImon.csv
@@ -37,15 +37,15 @@ priority,long name,units ,comment ,questions,output variable name ,standard name
1.0,Rate of Melt at Upper Surface of Sea Ice,kg m-2 s-1,"Compute the rate of change of sea ice mass due to melting at its upper surface, divided by the area of the ocean portion of the grid cell. Report as 0.0 in regions free of sea ice. Do not include rate of change of snow mass.",, tmelt,tendency_of_sea_ice_amount_due_to_surface_melting,,kg m-2 s-1,time: mean area: mean where sea,,,,,,real,longitude latitude time, tmelt,seaIce,,area: areacello,,
1.0,Rate of Melt at Sea Ice Base,kg m-2 s-1,"Compute the rate of change of sea ice mass due to melting at its lower surface, divided by the area of the ocean portion of the grid cell. Report as 0.0 in regions free of sea ice. ",, bmelt,tendency_of_sea_ice_amount_due_to_basal_melting,,kg m-2 s-1,time: mean area: mean where sea,,,,,,real,longitude latitude time, bmelt,seaIce,,area: areacello,,
2.0,Sea Ice Heat Content,J m-2,"Ice at 0 Celsius is assumed taken to have a heat content of 0 J. When averaging over time, this quantity is weighted by the mass of sea ice. Report as ""missing in regions free of sea ice. Do not include heat content of snow.",, hcice,integral_of_sea_ice_temperature_wrt_depth_expressed_as_heat_content,,J m-2,time: mean (weighted by mass of sea ice),,,,,,real,longitude latitude time, hcice,seaIce,,area: areacello,,
-1.0,Downward Shortwave over Sea Ice,W m-2,Compute the downward shortwave flux in regions of sea ice divided by the area of the ocean portion of the grid cell.,priority was raised from 2 to 1 because snow albedo was deleted., rsdssi,surface_downwelling_shortwave_flux_in_air,,W m-2,time: mean area: mean where sea_ice over sea,,,,,down,real,longitude latitude time, rsdssi,seaIce,,area: areacello,,
+1.0,Downwelling Shortwave over Sea Ice,W m-2,Compute the downwelling shortwave flux in regions of sea ice divided by the area of the ocean portion of the grid cell.,priority was raised from 2 to 1 because snow albedo was deleted., rsdssi,surface_downwelling_shortwave_flux_in_air,,W m-2,time: mean area: mean where sea_ice over sea,,,,,down,real,longitude latitude time, rsdssi,seaIce,,area: areacello,,
1.0,Upward Shortwave over Sea Ice,W m-2,Compute the upward shortwave flux in regions of sea ice divided by the area of the ocean portion of the grid cell.,priority was raised from 2 to 1 because snow albedo was deleted., rsussi,surface_upwelling_shortwave_flux_in_air,,W m-2,time: mean area: mean where sea_ice over sea,,,,,up,real,longitude latitude time, rsussi,seaIce,,area: areacello,,
-2.0,Downward Long Wave over Sea Ice,W m-2,Compute the downward longwave flux in regions of sea ice divided by the area of the ocean portion of the grid cell.,, rldssi,surface_downwelling_longwave_flux_in_air,,W m-2,time: mean area: mean where sea_ice over sea,,,,,down,real,longitude latitude time, rldssi,seaIce,,area: areacello,,
+2.0,Downwelling Long Wave over Sea Ice,W m-2,Compute the downwelling longwave flux in regions of sea ice divided by the area of the ocean portion of the grid cell.,, rldssi,surface_downwelling_longwave_flux_in_air,,W m-2,time: mean area: mean where sea_ice over sea,,,,,down,real,longitude latitude time, rldssi,seaIce,,area: areacello,,
2.0,Upward Long Wave over Sea Ice,W m-2,Compute the upward longwave flux in regions of sea ice divided by the area of the ocean portion of the grid cell.,, rlussi,surface_upwelling_longwave_flux_in_air,,W m-2,time: mean area: mean where sea_ice over sea,,,,,up,real,longitude latitude time, rlussi,seaIce,,area: areacello,,
2.0,Surface Upward Sensible Heat Flux over Sea Ice,W m-2,Compute the upward sensible heat flux in regions of sea ice divided by the area of the ocean portion of the grid cell.,, hfssi,surface_upward_sensible_heat_flux,,W m-2,time: mean area: mean where sea_ice over sea,,,,,up,real,longitude latitude time, hfssi,seaIce,,area: areacello,,
2.0,Surface Upward Latent Heat Flux over Sea Ice,W m-2,Compute the upward latent heat flux in regions of sea ice divided by the area of the ocean portion of the grid cell.,, hflssi,surface_upward_latent_heat_flux,,W m-2,time: mean area: mean where sea_ice over sea,,,,,up,real,longitude latitude time, hflssi,seaIce,,area: areacello,,
2.0,Sublimation over Sea Ice,kg m-2 s-1,Compute the upward flux of water vapor to the atmosphere due to sublimation of snow and sea ice in regions of sea ice divided by the area of the ocean portion of the grid cell.,, sblsi,surface_snow_and_ice_sublimation_flux,,kg m-2 s-1,time: mean area: mean where sea_ice over sea,,,,,up,real,longitude latitude time, sblsi,seaIce,,area: areacello,,
-1.0,X-Component of Sea Ice Mass Transport,kg s-1,The sea ice mass transport is 0.0 in ice-free regions of the ocean. Include snow in calculation of mass.,,transix,sea_ice_x_transport,sea_ice_x_mass_transport,kg s-1,time: mean,,,,,,real,longitude latitude time,transix,seaIce,,,,
-1.0,Y-Component of Sea Ice Mass Transport,kg s-1,The sea ice mass transport is 0.0 in ice-free regions of the ocean. Include snow in calculation of mass.,,transiy,sea_ice_y_transport,sea_ice_y_mass_transport,kg s-1,time: mean,,,,,,real,longitude latitude time,transiy,seaIce,,,,
+1.0,X-Component of Sea Ice Mass Transport,kg s-1,The sea ice mass transport is 0.0 in ice-free regions of the ocean. Include snow in calculation of mass.,,transix,sea_ice_x_transport,,kg s-1,time: mean,,,,,,real,longitude latitude time,transix,seaIce,,,,
+1.0,Y-Component of Sea Ice Mass Transport,kg s-1,The sea ice mass transport is 0.0 in ice-free regions of the ocean. Include snow in calculation of mass.,,transiy,sea_ice_y_transport,,kg s-1,time: mean,,,,,,real,longitude latitude time,transiy,seaIce,,,,
2.0,Sea Ice Mass Transport Through Fram Strait,kg s-1,,,transifs,sea_ice_transport_across_line,,kg s-1,time: mean,,,,,,real,time,transifs,seaIce,,,,
2.0,X-Component of Atmospheric Stress On Sea Ice,N m-2,"When computing the time-mean here, the time samples, weighted by the area of sea ice, are accumulated and then divided by the sum of the weights. Report as ""missing"" in regions free of sea ice. ",,strairx,surface_downward_x_stress,,N m-2,time: mean (weighted by area of sea ice),,,,,down,real,longitude latitude time,strairx,seaIce,,,,
2.0,Y-Component of Atmospheric Stress On Sea Ice,N m-2,"When computing the time-mean here, the time samples, weighted by the area of sea ice, are accumulated and then divided by the sum of the weights. Report as ""missing"" in regions free of sea ice. ",,strairy,surface_downward_y_stress,,N m-2,time: mean (weighted by area of sea ice),,,,,down,real,longitude latitude time,strairy,seaIce,,,,
diff --git a/Tables_csv/Oclim.csv b/Tables_csv/Oclim.csv
index dce6f4e..c47e4ca 100644
--- a/Tables_csv/Oclim.csv
+++ b/Tables_csv/Oclim.csv
@@ -1,6 +1,6 @@
CMOR Table Oclim: Monthly Mean Ocean Climatology (Jan. 1986-Dec. 2005 of historical run),,,,,Oclim,monClim,,,,,,,,,,,,,,,,
(All Saved on the Ocean Grid),,,,,,,,,,,,,,,,,,,,,,
-"Further explanation of the fields in the following tables can be found in Griffies et al., available at http://eprints.soton.ac.uk/65415/01/137_WGOMD_ModelOutput.pdf . Some of the information in that document will be transcribed into the ""comment"" column of this spreadsheet.",,,,,,,,,,,,,,,,,,,\,,,
+"Further explanation of the fields in the following tables can be found in Griffies et al., available at http://www.clivar.org/organization/wgomd/references/WGOMD_CMIP5_ocean_fields.pdf . Some of the information in that document will be transcribed into the ""comment"" column of this spreadsheet.",,,,,,,,,,,,,,,,,,,\,,,
,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,
@@ -14,7 +14,7 @@ In CMOR Table Oclim: WGOMD Table 2.9,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,
priority,long name,units ,comment ,questions,output variable name ,standard name,unconfirmed or proposed standard name,unformatted units,cell_methods,valid min,valid max,mean absolute min,mean absolute max,positive,type,CMOR dimensions,CMOR variable name,realm,frequency,cell_measures,flag_values,flag_meanings
3.0,Ocean Vertical Heat Diffusivity,m2 s-1,,,difvho,ocean_vertical_heat_diffusivity,,m2 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude olevel time2,difvho,ocean,,area: areacello volume: volcello,,
-3.0,Ocean Vertical Salt Diffusivity ,m2 s-1,,,difvso,ocean_vertical_salt_diffusivity,ocean_vertical_salt_diffusivity_due_to_background,m2 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude olevel time2,difvso,ocean,,area: areacello volume: volcello,,
+3.0,Ocean Vertical Salt Diffusivity ,m2 s-1,,,difvso,ocean_vertical_salt_diffusivity,,m2 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude olevel time2,difvso,ocean,,area: areacello volume: volcello,,
3.0,Ocean Vertical Tracer Diffusivity due to Background ,m2 s-1,,,difvtrbo,ocean_vertical_tracer_diffusivity_due_to_background,,m2 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude olevel time2,difvtrbo,ocean,,area: areacello volume: volcello,,
3.0,Ocean Vertical Tracer Diffusivity due to Tides ,m2 s-1,,,difvtrto,ocean_vertical_tracer_diffusivity_due_to_tides,,m2 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude olevel time2,difvtrto,ocean,,area: areacello volume: volcello,,
3.0,Tendency of Ocean Potential Energy Content ,W m-2,,,tnpeo,tendency_of_ocean_potential_energy_content,,W m-2,time: mean within years time: mean over years,,,,,,real,longitude latitude olevel time2,tnpeo,ocean,,area: areacello volume: volcello,,
diff --git a/Tables_csv/Omon.csv b/Tables_csv/Omon.csv
index 750e190..7ae12a4 100644
--- a/Tables_csv/Omon.csv
+++ b/Tables_csv/Omon.csv
@@ -61,7 +61,7 @@ priority,long name,units ,comment ,questions,output variable name ,standard name
3.0,Rate of Change in Upper 100 m of Dissolved Inorganic Iron due to Biological Activity,mol m-2 s-1,vertical integral of net biological terms in time rate of change of dissolved inorganic iron in upper 100m,,fbddtdife,tendency_of_ocean_mole_content_of_dissolved_inorganic_iron_due_to_biological_processes,,mol m-2 s-1,time: mean area: mean where sea,,,,,,real,longitude latitude time olayer100m,fbddtdife,ocnBgchem,,area: areacello,,
3.0,Rate of Change in Upper 100 m of Dissolved Inorganic Silicate due to Biological Activity,mol m-2 s-1,vertical integral of net biological terms in time rate of change of dissolved inorganic silicate in upper 100m,,fbddtdisi,tendency_of_ocean_mole_content_of_dissolved_inorganic_silicon_due_to_biological_processes,,mol m-2 s-1,time: mean area: where sea,,,,,,real,longitude latitude time olayer100m,fbddtdisi,ocnBgchem,,area: areacello,,
3.0,Rate of Change in Upper 100 m of Biological Alkalinity due to Biological Activity,mol m-2 s-1,vertical integral of net biological terms in time rate of change of alkalinity in upper 100m,,fbddtalk,integral_wrt_depth_of_tendency_of_sea_water_alkalinity_expressed_as_mole_equivalent_due_to_biological_processes,,mol m-2 s-1,time: mean area: mean where sea,,,,,,real,longitude latitude time olayer100m,fbddtalk,ocnBgchem,,area: areacello,,
-"Further explanation of the fields in the following tables can be found in Griffies et al., available at http://eprints.soton.ac.uk/65415/01/137_WGOMD_ModelOutput.pdf . ",,,,,,,,,,,,,,,,,,,,,,
+"Further explanation of the fields in the following tables can be found in Griffies et al., available at http://www.clivar.org/organization/wgomd/references/WGOMD_CMIP5_ocean_fields.pdf . ",,,,,,,,,,,,,,,,,,,,,,
In CMOR Table Omon: WGOMD Table 2.2,,,,,,,,,,,,,,,,,,,,,,
priority,long name,units ,comment ,questions,output variable name ,standard name,unconfirmed or proposed standard name,unformatted units,cell_methods,valid min,valid max,mean absolute min,mean absolute max,positive,type,CMOR dimensions,CMOR variable name,realm,frequency,cell_measures,flag_values,flag_meanings
1.0,Sea Water Mass ,kg ,,,masso,sea_water_mass,,kg ,time: mean area: sum where sea,,,,,,real,time,masso,ocean,,,,
diff --git a/Tables_csv/aero.csv b/Tables_csv/aero.csv
index 94e6d9a..02d4302 100644
--- a/Tables_csv/aero.csv
+++ b/Tables_csv/aero.csv
@@ -72,8 +72,8 @@ priority,long name,units ,comment ,questions,output variable name ,standard name
3.0,Surface Concentration of NO3,kg m-3,Mass concentration in model lowest layer (The location of the model's lowest layer should be recorded in the netCDF output file). ,,sconcno3,mass_concentration_of_nitrate_dry_aerosol_in_air,,kg m-3,time: mean,,,,,,real,longitude latitude alev1 time,sconcno3,aerosol,,area: areacella,,
3.0,Surface Concentration of NH4,kg m-3,Mass concentration in model lowest layer (The location of the model's lowest layer should be recorded in the netCDF output file). ,,sconcnh4,mass_concentration_of_ammonium_dry_aerosol_in_air,,kg m-3,time: mean,,,,,,real,longitude latitude alev1 time,sconcnh4,aerosol,,area: areacella,,
,Clouds and Radiation,,,,,,,,,,,,,,,,,,,,,
-2.0,Surface Diffuse Downward Shortwave Radiation,W m-2,downwelling_diffuse_shortwave_flux_in_air,,rsdsdiff,diffuse_downwelling_shortwave_flux_in_air,,W m-2,time: mean,,,,,,real,longitude latitude time,rsdsdiff,aerosol land,,area: areacella,,
-2.0,Surface Diffuse Downward Clear Sky Shortwave Radiation,W m-2,downwelling_diffuse_shortwave_flux_in_air_assuming_clear_sky,,rsdscsdiff,diffuse_downwelling_shortwave_flux_in_air_assuming_clear_sky,,W m-2,time: mean,,,,,,real,longitude latitude time,rsdscsdiff,aerosol land,,area: areacella,,
+2.0,Surface Diffuse Dowwelling Shortwave Radiation,W m-2,downwelling_diffuse_shortwave_flux_in_air,,rsdsdiff,surface_diffuse_downwelling_shortwave_flux_in_air,,W m-2,time: mean,,,,,,real,longitude latitude time,rsdsdiff,aerosol land,,area: areacella,,
+2.0,Surface Diffuse Downwelling Clear Sky Shortwave Radiation,W m-2,downwelling_diffuse_shortwave_flux_in_air_assuming_clear_sky,,rsdscsdiff,diffuse_downwelling_shortwave_flux_in_air_assuming_clear_sky,,W m-2,time: mean,,,,,,real,longitude latitude time,rsdscsdiff,aerosol land,,area: areacella,,
1.0,Cloud-Top Effective Droplet Radius,m,"Droplets are liquid only. Report effective radius ""as seen from space"" over liquid cloudy portion of grid cell. This is the value from uppermost model layer with liquid cloud or, if available, it is better to sum over all liquid cloud tops, no matter where they occur, as long as they are seen from the top of the atmosphere. Weight by total liquid cloud top fraction of (as seen from TOA) each time sample when computing monthly mean.",,reffclw [...]
1.0,Cloud Droplet Number Concentration of Cloud Tops,m-3,"Droplets are liquid only. Report concentration ""as seen from space"" over liquid cloudy portion of grid cell. This is the value from uppermost model layer with liquid cloud or, if available, it is better to sum over all liquid cloud tops, no matter where they occur, as long as they are seen from the top of the atmosphere. Weight by total liquid cloud top fraction of (as seen from TOA) each time sample when computing monthly me [...]
1.0,Ice Crystal Number Concentration of Cloud Tops,m-3,"Report concentration ""as seen from space"" over ice-cloud portion of grid cell. This is the value from uppermost model layer with ice cloud or, if available, it is better to sum over all ice cloud tops, no matter where they occur, as long as they are seen from the top of the atmosphere. Weight by total ice cloud top fraction (as seen from TOA) of each time sample when computing monthly mean.",,cldnci,number_concentration_of_ice_cr [...]
diff --git a/Tables_csv/dims.csv b/Tables_csv/dims.csv
index 521cd9d..2a537d1 100644
--- a/Tables_csv/dims.csv
+++ b/Tables_csv/dims.csv
@@ -29,7 +29,7 @@ aero,alev1,lev,atmospheric model's lowest level,,lowest atmospheric model level,
"cfMon, cfOff, cfDay, cf3hr",sza5,sza,5 solar zenith angles for PARASOL reflectances,solar_zenith_angle,solar zenith angle,,degree,,,no,increasing,,,double,,,,0. 20. 40. 60. 80.,,0.001,
cfSites,site,site,an integer assigned to each of 119 stations (standard) and 73 stations (aquaplanet),,site index,,1.0,ok,,no,,,,integer,,,,,,,yes
Omon,basin,basin,,region,ocean basin,,1.0,,region,no,,,,character,,,,atlantic_arctic_ocean indian_pacific_ocean global_ocean,,,
-Omon,rho,rho,density? Potential density++++? Check units,,density++++?,Z,kg m-3,,,yes,decreasing,,,double,down,,, ,,,
+Omon,rho,rho,potential density referenced to 2000 dbar,,potential density referenced to 2000 dbar,Z,kg m-3,,,yes,increasing,,,double,down,,, ,,,
"fx, Oclim, Oyr, Omon",olevel,lev,generic ocean model vertical coordinate (nondimensional or dimensional),,ocean model level,Z,,ok,,yes,,,,double,down,,,,,,
Omon,oline,line,"opening, passage, strait, channel, etc. ",region,ocean passage ,,1.0,,passage,no,,,,character,,,,barents_opening bering_strait canadian_archipelago denmark_strait drake_passage english_channel pacific_equatorial_undercurrent faroe_scotland_channel florida_bahamas_strait fram_strait iceland_faroe_channel indonesian_thoughflow mozambique_channel taiwan_luzon_straits windward_passage,,,
cf3hr,location,loc,COSP profile in instantaneous curtain mode,,location index,,1.0,ok,,no,increasing,,,integer,,,,,,,yes
diff --git a/Tables_csv/general.csv b/Tables_csv/general.csv
index c515a17..1357a3a 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 20 May 2010 and 21 June 2010
,,,modified between 21 June 2010 and 25 July 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.,,,modified after 25 July 2010
-,,,modified after 17 September 2010
+,,,modified between 25 July & 17 Sept. 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.,,,modified between 17 September and 8 November 2010
+,,,modifed after 8 November 2010
"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/configure b/configure
index 82b12e0..5c1b1d6 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.1.
+# Generated by GNU Autoconf 2.61 for cmip5-cmor-tables 1.3.2.
#
# 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.1'
-PACKAGE_STRING='cmip5-cmor-tables 1.3.1'
+PACKAGE_VERSION='1.3.2'
+PACKAGE_STRING='cmip5-cmor-tables 1.3.2'
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.1 to adapt to many kinds of systems.
+\`configure' configures cmip5-cmor-tables 1.3.2 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.1:";;
+ short | recursive ) echo "Configuration of cmip5-cmor-tables 1.3.2:";;
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.1
+cmip5-cmor-tables configure 1.3.2
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.1, which was
+It was created by cmip5-cmor-tables $as_me 1.3.2, 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.1, which was
+This file was extended by cmip5-cmor-tables $as_me 1.3.2, 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.1
+cmip5-cmor-tables config.status 1.3.2
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 ad70e97..26e87dd 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.1, doutriaux1 at llnl.gov)
+AC_INIT(cmip5-cmor-tables, 1.3.2, 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