[cmor-tables] 71/83: Newest set of tables from Karl
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sun Aug 30 08:06:24 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 fcec367f5d20df4bce033ade5c0130287bcf0d4e
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date: Tue Jul 26 15:20:58 2011 -0700
Newest set of tables from Karl
---
Lib/table_generator.py | 6 +-
Lib/tables_manip_tools.py | 13 +++-
Tables/CMIP5_3hr | 4 +-
Tables/CMIP5_6hrLev | 4 +-
Tables/CMIP5_6hrPlev | 4 +-
Tables/CMIP5_Amon | 4 +-
Tables/CMIP5_LImon | 4 +-
Tables/CMIP5_Lmon | 4 +-
Tables/CMIP5_OImon | 4 +-
Tables/CMIP5_Oclim | 24 ++++----
Tables/CMIP5_Omon | 131 ++++++++++++++++++++++++++++++++++++++++-
Tables/CMIP5_Oyr | 4 +-
Tables/CMIP5_aero | 4 +-
Tables/CMIP5_cf3hr | 4 +-
Tables/CMIP5_cfDay | 6 +-
Tables/CMIP5_cfMon | 4 +-
Tables/CMIP5_cfOff | 4 +-
Tables/CMIP5_cfSites | 6 +-
Tables/CMIP5_day | 4 +-
Tables/CMIP5_fx | 25 +++++++-
Tables/md5s | 2 +-
Tables_csv/3hr.csv | 2 +-
Tables_csv/6hrLev.csv | 6 +-
Tables_csv/Oclim.csv | 20 +++----
Tables_csv/Omon.csv | 11 +++-
Tables_csv/cfDay.csv | 2 +-
Tables_csv/fx.csv | 1 +
Tables_csv/general.csv | 8 +--
Tables_csv/other.csv | 2 +-
Tables_csv/standard_output.xls | Bin 704512 -> 705024 bytes
configure.ac | 2 +-
31 files changed, 243 insertions(+), 76 deletions(-)
diff --git a/Lib/table_generator.py b/Lib/table_generator.py
index bd78d26..786c1cc 100644
--- a/Lib/table_generator.py
+++ b/Lib/table_generator.py
@@ -3,7 +3,7 @@ import sys,time,os,genutil,numpy
prefix = "CMIP5"
-general = """cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
+general = """cmor_version: 2.6 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: %s ! project id
table_date: %s ! date this table was constructed
@@ -370,6 +370,10 @@ def create_table_header(tbnm, table_file, dims_file, fqcy):
print >> fo, """approx_interval: %f ! approximate spacing between successive time
! samples (in units of the output time
! coordinate.""" % interval
+ if tbnm == "cfSites":
+ print >> fo,"""approx_interval_warning: 0.25 ! Level at which a warning is issued because the time axis values are too far appart from the official interval
+approx_interval_error: 0.75 ! Level at which an error is issued because the time axis values are too far appart from the official interval"""
+
D = open(dims_file)
dlines = D.readlines()[2:]
diff --git a/Lib/tables_manip_tools.py b/Lib/tables_manip_tools.py
index 700371a..fdc2ccc 100644
--- a/Lib/tables_manip_tools.py
+++ b/Lib/tables_manip_tools.py
@@ -27,11 +27,10 @@ class CMORTables:
def preprocess(self,table,date=None,md5=None):
if date is None and md5 is None:
- table,date,md5 = splitTableString(table)
+ table,date,md5 = self.splitTableString(table)
return table,date,md5
def fetchLatestTable(self,table):
- table,data,md5 = self.preprocess(table)
self.H.request("GET","/gitweb/?p=%s.git;a=blob_plain;f=Tables/%s_%s;hb=HEAD" % (self.repo_name,self.repo_prefix,table))
r = self.H.getresponse()
return r.read()
@@ -45,6 +44,13 @@ class CMORTables:
def fetchTable(self,table,date=None):
table,date,md5 = self.preprocess(table,date)
self.checkTable(table,date)
+ #First check if it is the latest table
+ t=self.fetchLatestTable(table)
+ j=t.find("\ntable_date:")
+ tdate = t[j+12:j+100]
+ tdate = tdate.split("\n")[0].split("!")[0].strip()
+ if tdate == date:
+ return t
# Ok now fetch the history
self.H.request("GET","/gitweb/?p=%s.git;a=history;f=Tables/%s_%s;hb=HEAD" % (self.repo_name,self.repo_prefix,table))
r = self.H.getresponse().read()
@@ -80,7 +86,8 @@ if __name__=="__main__":
repo_url = "uv-cdat.llnl.gov"
repo_prefix="CMIP5"
Tables = CMORTables(repo_name,repo_prefix,repo_url)
- t = Tables.fetchTable("Oclim","12 May 2010")
+ t = Tables.fetchTable("cfSites","27 April 2011")
+ #t=Tables.fetchLatestTable("cfSites")
print t
diff --git a/Tables/CMIP5_3hr b/Tables/CMIP5_3hr
index c705b92..eff216c 100644
--- a/Tables/CMIP5_3hr
+++ b/Tables/CMIP5_3hr
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: 3hr
-cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.6 ! 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: 27 April 2011 ! date this table was constructed
+table_date: 26 July 2011 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_6hrLev b/Tables/CMIP5_6hrLev
index 35bbb82..c3a52ff 100644
--- a/Tables/CMIP5_6hrLev
+++ b/Tables/CMIP5_6hrLev
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: 6hr
-cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.6 ! 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: 27 April 2011 ! date this table was constructed
+table_date: 26 July 2011 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_6hrPlev b/Tables/CMIP5_6hrPlev
index 34905ee..2fd4450 100644
--- a/Tables/CMIP5_6hrPlev
+++ b/Tables/CMIP5_6hrPlev
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: 6hr
-cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.6 ! 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: 27 April 2011 ! date this table was constructed
+table_date: 26 July 2011 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_Amon b/Tables/CMIP5_Amon
index 25fa98f..6858411 100644
--- a/Tables/CMIP5_Amon
+++ b/Tables/CMIP5_Amon
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: mon
-cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.6 ! 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: 27 April 2011 ! date this table was constructed
+table_date: 26 July 2011 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_LImon b/Tables/CMIP5_LImon
index a1565c0..0ed8493 100644
--- a/Tables/CMIP5_LImon
+++ b/Tables/CMIP5_LImon
@@ -3,10 +3,10 @@ modeling_realm: land
frequency: mon
-cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.6 ! 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: 27 April 2011 ! date this table was constructed
+table_date: 26 July 2011 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_Lmon b/Tables/CMIP5_Lmon
index 5feeaaa..bff7c68 100644
--- a/Tables/CMIP5_Lmon
+++ b/Tables/CMIP5_Lmon
@@ -3,10 +3,10 @@ modeling_realm: land
frequency: mon
-cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.6 ! 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: 27 April 2011 ! date this table was constructed
+table_date: 26 July 2011 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_OImon b/Tables/CMIP5_OImon
index 8133eb7..1209560 100644
--- a/Tables/CMIP5_OImon
+++ b/Tables/CMIP5_OImon
@@ -3,10 +3,10 @@ modeling_realm: ocean
frequency: mon
-cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.6 ! 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: 27 April 2011 ! date this table was constructed
+table_date: 26 July 2011 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_Oclim b/Tables/CMIP5_Oclim
index 4d21f5b..6274205 100644
--- a/Tables/CMIP5_Oclim
+++ b/Tables/CMIP5_Oclim
@@ -3,10 +3,10 @@ modeling_realm: ocean
frequency: monClim
-cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.6 ! 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: 27 April 2011 ! date this table was constructed
+table_date: 26 July 2011 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -1011,7 +1011,7 @@ long_name: Ocean Tracer Bolus Laplacian Diffusivity
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time2
+dimensions: longitude latitude time2
out_name: diftrblo
type: real
!----------------------------------
@@ -1032,7 +1032,7 @@ long_name: Ocean Tracer Bolus Biharmonic Diffusivity
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time2
+dimensions: longitude latitude time2
out_name: diftrbbo
type: real
!----------------------------------
@@ -1053,7 +1053,7 @@ long_name: Ocean Tracer Epineutral Laplacian Diffusivity
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time2
+dimensions: longitude latitude time2
out_name: diftrelo
type: real
!----------------------------------
@@ -1074,7 +1074,7 @@ long_name: Ocean Tracer Epineutral Biharmonic Diffusivity
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time2
+dimensions: longitude latitude time2
out_name: diftrebo
type: real
!----------------------------------
@@ -1095,7 +1095,7 @@ long_name: Ocean Tracer XY Laplacian Diffusivity
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time2
+dimensions: longitude latitude time2
out_name: diftrxylo
type: real
!----------------------------------
@@ -1116,7 +1116,7 @@ long_name: Ocean Tracer XY Biharmonic Diffusivity
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time2
+dimensions: longitude latitude time2
out_name: diftrxybo
type: real
!----------------------------------
@@ -1137,7 +1137,7 @@ long_name: Tendency of Ocean Eddy Kinetic Energy Content due to Bolus Tr
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time2
+dimensions: longitude latitude time2
out_name: tnkebto
type: real
!----------------------------------
@@ -1158,7 +1158,7 @@ long_name: Ocean Momentum XY Laplacian Diffusivity
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time2
+dimensions: longitude latitude time2
out_name: difmxylo
type: real
!----------------------------------
@@ -1179,7 +1179,7 @@ long_name: Ocean Momentum XY Biharmonic Diffusivity
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time2
+dimensions: longitude latitude time2
out_name: difmxybo
type: real
!----------------------------------
@@ -1200,7 +1200,7 @@ long_name: Ocean Kinetic Energy Dissipation Per Unit Area due to XY Fric
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time2
+dimensions: longitude latitude time2
out_name: dispkexyfo
type: real
!----------------------------------
diff --git a/Tables/CMIP5_Omon b/Tables/CMIP5_Omon
index e4c5c42..e2e41ef 100644
--- a/Tables/CMIP5_Omon
+++ b/Tables/CMIP5_Omon
@@ -3,10 +3,10 @@ modeling_realm: ocean
frequency: mon
-cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.6 ! 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: 27 April 2011 ! date this table was constructed
+table_date: 26 July 2011 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -3920,6 +3920,28 @@ type: real
!
!============
+variable_entry: ficeberg2d
+!============
+modeling_realm: ocean
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name: water_flux_into_sea_water_from_icebergs
+units: kg m-2 s-1
+cell_methods: time: mean area: mean where sea
+cell_measures: area: areacello
+long_name: Water Flux into Sea Water From Icebergs
+comment: computed as the iceberg melt water flux into the ocean divided by the area of the ocean portion of the grid cell.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions: longitude latitude time
+out_name: ficeberg
+type: real
+!----------------------------------
+!
+
+!============
variable_entry: fsitherm
!============
modeling_realm: ocean seaIce
@@ -4272,6 +4294,27 @@ type: real
!
!============
+variable_entry: hfrunoffds2d
+!============
+modeling_realm: ocean
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name: temperature_flux_due_to_runoff_expressed_as_heat_flux_into_sea_water
+units: W m-2
+cell_methods: time: mean area: mean where sea
+cell_measures: area: areacello
+long_name: Temperature Flux due to Runoff Expressed as Heat Flux into Sea Water
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions: longitude latitude time
+out_name: hfrunoffds
+type: real
+!----------------------------------
+!
+
+!============
variable_entry: hfsnthermds
!============
modeling_realm: ocean
@@ -4293,6 +4336,27 @@ type: real
!
!============
+variable_entry: hfsnthermds2d
+!============
+modeling_realm: ocean
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name: heat_flux_into_sea_water_due_to_snow_thermodynamics
+units: W m-2
+cell_methods: time: mean area: mean where sea
+cell_measures: area: areacello
+long_name: Heat Flux into Sea Water due to Snow Thermodynamics
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions: longitude latitude time
+out_name: hfsnthermds
+type: real
+!----------------------------------
+!
+
+!============
variable_entry: hfsifrazil
!============
modeling_realm: ocean seaIce
@@ -4314,6 +4378,27 @@ type: real
!
!============
+variable_entry: hfsifrazil2d
+!============
+modeling_realm: ocean seaIce
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name: heat_flux_into_sea_water_due_to_freezing_of_frazil_ice
+units: W m-2
+cell_methods: time: mean area: mean where sea
+cell_measures: area: areacello
+long_name: Heat Flux into Sea Water due to Frazil Ice Formation
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions: longitude latitude time
+out_name: hfsifrazil
+type: real
+!----------------------------------
+!
+
+!============
variable_entry: hfsithermds
!============
modeling_realm: ocean seaIce
@@ -4335,6 +4420,27 @@ type: real
!
!============
+variable_entry: hfsithermds2d
+!============
+modeling_realm: ocean seaIce
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name: heat_flux_into_sea_water_due_to_sea_ice_thermodynamics
+units: W m-2
+cell_methods: time: mean area: mean where sea
+cell_measures: area: areacello
+long_name: Heat Flux into Sea Water due to Sea Ice Thermodynamics
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions: longitude latitude time
+out_name: hfsithermds
+type: real
+!----------------------------------
+!
+
+!============
variable_entry: hfibthermds
!============
modeling_realm: ocean
@@ -4356,6 +4462,27 @@ type: real
!
!============
+variable_entry: hfibthermds2d
+!============
+modeling_realm: ocean
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name: heat_flux_into_sea_water_due_to_iceberg_thermodynamics
+units: W m-2
+cell_methods: time: mean area: mean where sea
+cell_measures: area: areacello
+long_name: Heat Flux into Sea Water due to Iceberg Thermodynamics
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions: longitude latitude time
+out_name: hfibthermds
+type: real
+!----------------------------------
+!
+
+!============
variable_entry: rlds
!============
modeling_realm: ocean
diff --git a/Tables/CMIP5_Oyr b/Tables/CMIP5_Oyr
index d45ba4a..bf881b8 100644
--- a/Tables/CMIP5_Oyr
+++ b/Tables/CMIP5_Oyr
@@ -3,10 +3,10 @@ modeling_realm: ocean
frequency: yr
-cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.6 ! 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: 27 April 2011 ! date this table was constructed
+table_date: 26 July 2011 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_aero b/Tables/CMIP5_aero
index fd99e87..ed7cc37 100644
--- a/Tables/CMIP5_aero
+++ b/Tables/CMIP5_aero
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: mon
-cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.6 ! 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: 27 April 2011 ! date this table was constructed
+table_date: 26 July 2011 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_cf3hr b/Tables/CMIP5_cf3hr
index 50b3c18..81bdf9e 100644
--- a/Tables/CMIP5_cf3hr
+++ b/Tables/CMIP5_cf3hr
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: 3hr
-cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.6 ! 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: 27 April 2011 ! date this table was constructed
+table_date: 26 July 2011 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_cfDay b/Tables/CMIP5_cfDay
index 45555cd..224bb5c 100644
--- a/Tables/CMIP5_cfDay
+++ b/Tables/CMIP5_cfDay
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: day
-cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.6 ! 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: 27 April 2011 ! date this table was constructed
+table_date: 26 July 2011 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -1573,7 +1573,7 @@ long_name: ISCCP Cloud Area Fraction
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude tau plev7 time
+dimensions: longitude latitude plev7 tau time
out_name: clisccp
type: real
!----------------------------------
diff --git a/Tables/CMIP5_cfMon b/Tables/CMIP5_cfMon
index 5384a3b..0c2b729 100644
--- a/Tables/CMIP5_cfMon
+++ b/Tables/CMIP5_cfMon
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: mon
-cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.6 ! 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: 27 April 2011 ! date this table was constructed
+table_date: 26 July 2011 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_cfOff b/Tables/CMIP5_cfOff
index 0c4736d..56fac17 100644
--- a/Tables/CMIP5_cfOff
+++ b/Tables/CMIP5_cfOff
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: mon
-cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.6 ! 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: 27 April 2011 ! date this table was constructed
+table_date: 26 July 2011 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_cfSites b/Tables/CMIP5_cfSites
index 1c1dd10..19656f9 100644
--- a/Tables/CMIP5_cfSites
+++ b/Tables/CMIP5_cfSites
@@ -8,10 +8,10 @@ modeling_realm: atmos
frequency: subhr
-cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.6 ! 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: 27 April 2011 ! date this table was constructed
+table_date: 26 July 2011 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -66,6 +66,8 @@ expt_id_ok: 'AMIP plus 4K anomaly' 'amip4K'
approx_interval: 0.017361 ! approximate spacing between successive time
! samples (in units of the output time
! coordinate.
+approx_interval_warning: 0.25 ! Level at which a warning is issued because the time axis values are too far appart from the official interval
+approx_interval_error: 0.75 ! Level at which an error is issued because the time axis values are too far appart from the official interval
generic_levels: alevel alevhalf
diff --git a/Tables/CMIP5_day b/Tables/CMIP5_day
index 8e97eba..6bfa45c 100644
--- a/Tables/CMIP5_day
+++ b/Tables/CMIP5_day
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: day
-cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.6 ! 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: 27 April 2011 ! date this table was constructed
+table_date: 26 July 2011 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_fx b/Tables/CMIP5_fx
index 07f08b8..0f7c42b 100644
--- a/Tables/CMIP5_fx
+++ b/Tables/CMIP5_fx
@@ -3,10 +3,10 @@ modeling_realm: atmos
frequency: fx
-cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.6 ! 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: 27 April 2011 ! date this table was constructed
+table_date: 26 July 2011 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
@@ -785,3 +785,24 @@ positive: up
!----------------------------------
!
+!============
+variable_entry: thkcello
+!============
+modeling_realm: ocean
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name: cell_thickness
+units: m
+cell_methods: time: mean
+cell_measures: area: areacello volume: volcello
+long_name: Ocean Model Cell Thickness
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions: longitude latitude olevel
+out_name: thkcello
+type: real
+!----------------------------------
+!
+
diff --git a/Tables/md5s b/Tables/md5s
index cd6450e..7907d30 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', '11 April 2011': 'd4bd92f600f09b1599927f929db7fe5d', '01 July 2010': '96628b3875e74a8a515d0a1e500710d8', '11 November 2010': '6be9b509f02f6118bfd2b006 [...]
\ No newline at end of file
+{'CMIP5': {'cf3hr': {'11 May 2010': 'a59ca1270ff3036d417a7f2217598266', '19 October 2010': '8b5c2f197b70a103393838ebd4075c6c', '12 May 2010': '905f7ccdd5a31cb71e2a6e3b339cd0e1', '23 August 2010': '5ccea11a7c3d165c76df3d9eede395d0', '01 June 2010': '619aa3c816bc25a53335589698e64968', '11 April 2011': 'c39107ec4994d0b31572fc740afe1879', '01 July 2010': 'c0fe9e92115d75292f5009e13761cb4b', '29 April 2010': 'fdc4fb38dd4cfb7f066329ed43a9e805', '12 March 2010': 'ae9a82f01824d9012aa0657cd7896a9a [...]
\ No newline at end of file
diff --git a/Tables_csv/3hr.csv b/Tables_csv/3hr.csv
index eca2772..d7b8258 100644
--- a/Tables_csv/3hr.csv
+++ b/Tables_csv/3hr.csv
@@ -10,7 +10,7 @@ The 3-hourly data should be collected only for the following experiments and yea
,,,1 percent per year CO2,last 30 years,,,,,,,,,,,,,,,,,,
,,,control SST climatology (6.2a),all years,,,,,,,,,,,,,,,,,,
,,,"CO2 forcing (6.2b), anthropogenic aerosol forcing (6.4a), and sulfate aerosol forcing (6.4b)",all years,,,,,,,,,,,,,,,,,,
-,,,abrupt 4XCO2 (6.3),first 5 years and last 30 years,,,,,,,,,,,,,,,,,,
+,,,abrupt 4XCO2 (6.3),first 5 years and years 121-150 years,,,,,,,,,,,,,,,,,,
,,,abrupt 4XCO2 ensemble (6.3-E),all years,,,,,,,,,,,,,,,,,,
priority,long name,units ,comment ,questions & notes,output variable name ,standard name,unconfirmed or proposed standard name,unformatted units,cell_methods,valid min,valid max,mean absolute min,mean absolute max,positive,type,CMOR dimensions,CMOR variable name,realm,frequency,cell_measures,flag_values,flag_meanings
1.0,Precipitation,kg m-2 s-1,at surface; includes both liquid and solid phases. This is the 3-hour mean precipitation flux.,,pr,precipitation_flux,,kg m-2 s-1,time:mean,,,,,,real,longitude latitude time,pr,atmos,,area: areacella,,
diff --git a/Tables_csv/6hrLev.csv b/Tables_csv/6hrLev.csv
index 079163d..3dbf675 100644
--- a/Tables_csv/6hrLev.csv
+++ b/Tables_csv/6hrLev.csv
@@ -1,11 +1,11 @@
CMOR Table 6hrLev: Fields (Sampled Every 6 Hours) for Driving Regional Models,,,,,6hrLev,6hr,,,,,,,,,,,,,,,,
-"The 6-hourly data on model levels should be sampled as ""snapshots"" (not as 6-hour means) at 0Z, 6Z, 12Z, and 18Z and should be collected only for the following experiments and years:",,,,,,,,,,,,,,,,,,,,,,
+"The 6-hourly data on model levels should be sampled as synoptic ""snapshots"" (not as 6-hour means) at 0Z, 6Z, 12Z, and 18Z and should be collected only for the following experiments and years:",,,,,,,,,,,,,,,,,,,,,,
,,,experiment,reporting time-period ,ensemble size,priority,,,,,,,,,,,,,,,,
,,,historical,Jan 1950 - Dec 2005,1.0,highest,,,,,,,,,,,,,,,,
,,,AMIP,all years,1.0,highest,,,,,,,,,,,,,,,,
,,,RCP4.5 and RCP8.5,Jan 2006 - Dec 2100,1 for each expt.,highest,,,,,,,,,,,,,,,,
-,,,decadal hindcasts/forecasts runs inititalized in late 2005 and late 1980,late 2016 - Dec 2035 and late 1991 - Dec 2010,3 for each period,lower,,,,,,,,,,,,,,,,
-,,,decadal hindcasts/forecasts runs inititalized in late 1990,all years,3.0,lower,,,,,,,,,,,,,,,,
+,,,"decadal hindcasts/forecasts runs inititalized in late 2005, late 1980, and late 1990",all years,3 for each period,lower,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,
diff --git a/Tables_csv/Oclim.csv b/Tables_csv/Oclim.csv
index 21d183c..8ad86bb 100644
--- a/Tables_csv/Oclim.csv
+++ b/Tables_csv/Oclim.csv
@@ -38,16 +38,16 @@ priority,long name,units ,comment ,questions & notes,output variable name ,stand
3.0,Ocean Momentum XY Biharmonic Diffusivity,m4 s-1,,3-d time dependent field,difmxybo,ocean_momentum_xy_biharmonic_diffusivity,,m4 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude olevel time2,difmxybo,ocean,,area: areacello volume: volcello,,
3.0,Ocean Kinetic Energy Dissipation Per Unit Area due to XY Friction,W m-2,,3-d time dependent field,dispkexyfo,ocean_kinetic_energy_dissipation_per_unit_area_due_to_xy_friction,,W m-2,time: mean within years time: mean over years,,,,,,real,longitude latitude olevel time2,dispkexyfo,ocean,,area: areacello volume: volcello,,
,,,,,,,,,,,,,,,,,,,,,,
-3.0,Ocean Tracer Bolus Laplacian Diffusivity ,m2 s-1,,2-d time dependent field,diftrblo,ocean_tracer_bolus_laplacian_diffusivity,,m2 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude olevel time2,diftrblo2d,ocean,,area: areacello ,,
-3.0,Ocean Tracer Bolus Biharmonic Diffusivity ,m4 s-1,,2-d time dependent field,diftrbbo,ocean_tracer_bolus_biharmonic_diffusivity,,m4 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude olevel time2,diftrbbo2d,ocean,,area: areacello ,,
-3.0,Ocean Tracer Epineutral Laplacian Diffusivity ,m2 s-1,,2-d time dependent field,diftrelo,ocean_tracer_epineutral_laplacian_diffusivity,,m2 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude olevel time2,diftrelo2d,ocean,,area: areacello ,,
-3.0,Ocean Tracer Epineutral Biharmonic Diffusivity ,m4 s-1,,2-d time dependent field,diftrebo,ocean_tracer_epineutral_biharmonic_diffusivity,,m4 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude olevel time2,diftrebo2d,ocean,,area: areacello ,,
-3.0,Ocean Tracer XY Laplacian Diffusivity ,m2 s-1,,2-d time dependent field,diftrxylo,ocean_tracer_xy_laplacian_diffusivity,,m2 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude olevel time2,diftrxylo2d,ocean,,area: areacello ,,
-3.0,Ocean Tracer XY Biharmonic Diffusivity ,m4 s-1,,2-d time dependent field,diftrxybo,ocean_tracer_xy_biharmonic_diffusivity,,m4 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude olevel time2,diftrxybo2d,ocean,,area: areacello ,,
-3.0,Tendency of Ocean Eddy Kinetic Energy Content due to Bolus Transport ,W m-2,,2-d time dependent field,tnkebto,tendency_of_ocean_eddy_kinetic_energy_content_due_to_bolus_transport,,W m-2,time: mean within years time: mean over years,,,,,,real,longitude latitude olevel time2,tnkebto2d,ocean,,area: areacello ,,
-3.0,Ocean Momentum XY Laplacian Diffusivity,m2 s-1,,2-d time dependent field,difmxylo,ocean_momentum_xy_laplacian_diffusivity,,m2 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude olevel time2,difmxylo2d,ocean,,area: areacello ,,
-3.0,Ocean Momentum XY Biharmonic Diffusivity,m4 s-1,,2-d time dependent field,difmxybo,ocean_momentum_xy_biharmonic_diffusivity,,m4 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude olevel time2,difmxybo2d,ocean,,area: areacello ,,
-3.0,Ocean Kinetic Energy Dissipation Per Unit Area due to XY Friction,W m-2,,2-d time dependent field,dispkexyfo,ocean_kinetic_energy_dissipation_per_unit_area_due_to_xy_friction,,W m-2,time: mean within years time: mean over years,,,,,,real,longitude latitude olevel time2,dispkexyfo2d,ocean,,area: areacello ,,
+3.0,Ocean Tracer Bolus Laplacian Diffusivity ,m2 s-1,,2-d time dependent field,diftrblo,ocean_tracer_bolus_laplacian_diffusivity,,m2 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude time2,diftrblo2d,ocean,,area: areacello ,,
+3.0,Ocean Tracer Bolus Biharmonic Diffusivity ,m4 s-1,,2-d time dependent field,diftrbbo,ocean_tracer_bolus_biharmonic_diffusivity,,m4 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude time2,diftrbbo2d,ocean,,area: areacello ,,
+3.0,Ocean Tracer Epineutral Laplacian Diffusivity ,m2 s-1,,2-d time dependent field,diftrelo,ocean_tracer_epineutral_laplacian_diffusivity,,m2 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude time2,diftrelo2d,ocean,,area: areacello ,,
+3.0,Ocean Tracer Epineutral Biharmonic Diffusivity ,m4 s-1,,2-d time dependent field,diftrebo,ocean_tracer_epineutral_biharmonic_diffusivity,,m4 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude time2,diftrebo2d,ocean,,area: areacello ,,
+3.0,Ocean Tracer XY Laplacian Diffusivity ,m2 s-1,,2-d time dependent field,diftrxylo,ocean_tracer_xy_laplacian_diffusivity,,m2 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude time2,diftrxylo2d,ocean,,area: areacello ,,
+3.0,Ocean Tracer XY Biharmonic Diffusivity ,m4 s-1,,2-d time dependent field,diftrxybo,ocean_tracer_xy_biharmonic_diffusivity,,m4 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude time2,diftrxybo2d,ocean,,area: areacello ,,
+3.0,Tendency of Ocean Eddy Kinetic Energy Content due to Bolus Transport ,W m-2,,2-d time dependent field,tnkebto,tendency_of_ocean_eddy_kinetic_energy_content_due_to_bolus_transport,,W m-2,time: mean within years time: mean over years,,,,,,real,longitude latitude time2,tnkebto2d,ocean,,area: areacello ,,
+3.0,Ocean Momentum XY Laplacian Diffusivity,m2 s-1,,2-d time dependent field,difmxylo,ocean_momentum_xy_laplacian_diffusivity,,m2 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude time2,difmxylo2d,ocean,,area: areacello ,,
+3.0,Ocean Momentum XY Biharmonic Diffusivity,m4 s-1,,2-d time dependent field,difmxybo,ocean_momentum_xy_biharmonic_diffusivity,,m4 s-1,time: mean within years time: mean over years,,,,,,real,longitude latitude time2,difmxybo2d,ocean,,area: areacello ,,
+3.0,Ocean Kinetic Energy Dissipation Per Unit Area due to XY Friction,W m-2,,2-d time dependent field,dispkexyfo,ocean_kinetic_energy_dissipation_per_unit_area_due_to_xy_friction,,W m-2,time: mean within years time: mean over years,,,,,,real,longitude latitude time2,dispkexyfo2d,ocean,,area: areacello ,,
Ocean layer depth field requested only from models where it can't be calculated from the vertical coordinate information stored in the file.,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,
diff --git a/Tables_csv/Omon.csv b/Tables_csv/Omon.csv
index 73f4ff1..18a8fe5 100644
--- a/Tables_csv/Omon.csv
+++ b/Tables_csv/Omon.csv
@@ -136,6 +136,7 @@ priority,long name,units ,comment ,questions & notes,output variable name ,stand
2.0,Water Evaporation Flux Where Ice Free Ocean over Sea,kg m-2 s-1,computed as the total mass of water vapor evaporating from the ice-free portion of the ocean divided by the area of the ocean portion of the grid cell.,,evs,water_evaporation_flux,,kg m-2 s-1,time: mean area: mean where ice_free_sea over sea,,,,,,real,longitude latitude time,evs,ocean,,area: areacello,,
2.0,Water Flux into Sea Water From Rivers ,kg m-2 s-1,computed as the river flux of water into the ocean divided by the area of the ocean portion of the grid cell.,,friver,water_flux_into_sea_water_from_rivers,,kg m-2 s-1,time: mean area: mean where sea,,,,,,real,longitude latitude time,friver,ocean,,area: areacello,,
2.0,Water Flux into Sea Water From Icebergs ,kg m-2 s-1,computed as the iceberg melt water flux into the ocean divided by the area of the ocean portion of the grid cell.,,ficeberg,water_flux_into_sea_water_from_icebergs,,kg m-2 s-1,time: mean area: mean where sea,,,,,,real,longitude latitude olevel time,ficeberg,ocean,,area: areacello volume: volcello,,
+2.0,Water Flux into Sea Water From Icebergs ,kg m-2 s-1,computed as the iceberg melt water flux into the ocean divided by the area of the ocean portion of the grid cell.,"If only the vertically integrated melt water flux is available, report as this 2-d field; otherwise the row above should be used.",ficeberg,water_flux_into_sea_water_from_icebergs,,kg m-2 s-1,time: mean area: mean where sea,,,,,,real,longitude latitude time,ficeberg2d,ocean,,area: areacello,,
1.0,Water Flux into Sea Water due to Sea Ice Thermodynamics ,kg m-2 s-1,computed as the sea ice thermodynamic water flux into the ocean divided by the area of the ocean portion of the grid cell.,The priority set by the WGOMD was 2 for this field. The sea-ice folks requested that the priority be raised to 1.,fsitherm,water_flux_into_sea_water_due_to_sea_ice_thermodynamics,,kg m-2 s-1,time: mean area: mean where sea,,,,,,real,longitude latitude time,fsitherm,ocean seaIce,,area: areacello,,
2.0,Water Flux into Sea Water ,kg m-2 s-1,computed as the water flux into the ocean divided by the area of the ocean portion of the grid cell. This is the sum of the next two variables in this table.,,wfo,water_flux_into_sea_water,,kg m-2 s-1,time: mean area: mean where sea,,,,,,real,longitude latitude time,wfo,ocean,,area: areacello,,
2.0,Water Flux into Sea Water Without Flux Correction ,kg m-2 s-1,computed as the water flux (without flux correction) into the ocean divided by the area of the ocean portion of the grid cell. ,This should probably be the sum of the first 6 variables in this table.,wfonocorr,water_flux_into_sea_water_without_flux_correction,,kg m-2 s-1,time: mean area: mean where sea,,,,,,real,longitude latitude time,wfonocorr,ocean,,area: areacello,,
@@ -156,11 +157,15 @@ priority,long name,units ,comment ,questions & notes,output variable name ,stand
2.0,Temperature Flux due to Rainfall Expressed as Heat Flux into Sea Water ,W m-2,"This is defined as ""where ice_free_sea over sea""; i.e., the total flux (considered here) entering the ice-free portion of the grid cell divided by the area of the ocean portion of the grid cell.",,hfrainds,temperature_flux_due_to_rainfall_expressed_as_heat_flux_into_sea_water,,W m-2,time: mean area: mean where ice_free_sea over sea,,,,,down,real,longitude latitude time,hfrainds,ocean,,area: areacello,,
2.0,Temperature Flux due to Evaporation Expressed as Heat Flux Out of Sea Water ,W m-2,"This is defined as ""where ice_free_sea over sea""",,hfevapds,temperature_flux_due_to_evaporation_expressed_as_heat_flux_out_of_sea_water,,W m-2,time: mean area: mean where ice_free_sea over sea,,,,,up,real,longitude latitude time,hfevapds,ocean,,area: areacello,,
2.0,Temperature Flux due to Runoff Expressed as Heat Flux into Sea Water ,W m-2,,"In general this should be reported as a function of depth, (i.e., it will be a function of the generic ""XYZ"" dimensions). Include enough depth levels to represent the non-zero values of this field everywhere on the globe. ",hfrunoffds,temperature_flux_due_to_runoff_expressed_as_heat_flux_into_sea_water,,W m-2,time: mean area: mean where sea,,,,,,real,longitude latitude olevel time,hfrunoffds,ocean,,are [...]
+2.0,Temperature Flux due to Runoff Expressed as Heat Flux into Sea Water ,W m-2,,"If only the vertically integrated runoff flux is available, report as this 2-d field; otherwise the row above should be used.",hfrunoffds,temperature_flux_due_to_runoff_expressed_as_heat_flux_into_sea_water,,W m-2,time: mean area: mean where sea,,,,,,real,longitude latitude time,hfrunoffds2d,ocean,,area: areacello,,
2.0,Heat Flux into Sea Water due to Snow Thermodynamics ,W m-2,,"In general this should be reported as a function of depth, (i.e., it will be a function of the generic ""XYZ"" dimensions). Include enough depth levels to represent the non-zero values of this field everywhere on the globe. ",hfsnthermds,heat_flux_into_sea_water_due_to_snow_thermodynamics,,W m-2,time: mean area: mean where sea,,,,,,real,longitude latitude olevel time,hfsnthermds,ocean,,area: areacello volume: volcello,,
-,,,,,,,,,,,,,,,,,,,,,,
-1.0,Heat Flux into Sea Water due to Frazil Ice Formation ,W m-2,,"As of May 2010, the WGOMD document recommends that this field should be saved instead of the field listed immediately below. In general this should be reported as a function of depth, (i.e., it will be a function of the generic ""XYZ"" dimensions). Include enough depth levels to represent the non-zero values of this field everywhere on the globe. ",hfsifrazil,heat_flux_into_sea_water_due_to_freezing_of_frazil_ice,,W m- [...]
-1.0,Heat Flux into Sea Water due to Sea Ice Thermodynamics ,W m-2,,"The priority set by the WGOMD was 2 for this field. The sea-ice folks requested that the priority be raised to 1. As of May 2010, the WGOMD document recommends that instead of saving this field, the field listed immediately above should be saved instead. In general this should be reported as a function of depth, (i.e., it will be a function of the generic ""XYZ"" dimensions). Include enough depth levels to represent [...]
+2.0,Heat Flux into Sea Water due to Snow Thermodynamics ,W m-2,,"If only the vertically integrated heat flux is available, report as this 2-d field; otherwise the row above should be used.",hfsnthermds,heat_flux_into_sea_water_due_to_snow_thermodynamics,,W m-2,time: mean area: mean where sea,,,,,,real,longitude latitude time,hfsnthermds2d,ocean,,area: areacello,,
+1.0,Heat Flux into Sea Water due to Frazil Ice Formation ,W m-2,,"As of May 2010, the WGOMD document recommends that this field should be saved instead of the field listed 2-lines below. In general this should be reported as a function of depth, (i.e., it will be a function of the generic ""XYZ"" dimensions). Include enough depth levels to represent the non-zero values of this field everywhere on the globe. ",hfsifrazil,heat_flux_into_sea_water_due_to_freezing_of_frazil_ice,,W m-2,ti [...]
+1.0,Heat Flux into Sea Water due to Frazil Ice Formation ,W m-2,,"If only the vertically integrated heat flux is available, report as this 2-d field; otherwise the row above should be used.",hfsifrazil,heat_flux_into_sea_water_due_to_freezing_of_frazil_ice,,W m-2,time: mean area: mean where sea,,,,,,real,longitude latitude time,hfsifrazil2d,ocean seaIce,,area: areacello,,
+1.0,Heat Flux into Sea Water due to Sea Ice Thermodynamics ,W m-2,,"The priority set by the WGOMD was 2 for this field. The sea-ice folks requested that the priority be raised to 1. As of May 2010, the WGOMD document recommends that instead of saving this field, the field listed 2-lines above should be saved instead. In general this should be reported as a function of depth, (i.e., it will be a function of the generic ""XYZ"" dimensions). Include enough depth levels to represent th [...]
+1.0,Heat Flux into Sea Water due to Sea Ice Thermodynamics ,W m-2,,"If only the vertically integrated heat flux is available, report as this 2-d field; otherwise the row above should be used.",hfsithermds,heat_flux_into_sea_water_due_to_sea_ice_thermodynamics,,W m-2,time: mean area: mean where sea,,,,,,real,longitude latitude time,hfsithermds2d,ocean seaIce,,area: areacello,,
2.0,Heat Flux into Sea Water due to Iceberg Thermodynamics ,W m-2,,"In general this should be reported as a function of depth, (i.e., it will be a function of the generic ""XYZ"" dimensions). Include enough depth levels to represent the non-zero values of this field everywhere on the globe. ",hfibthermds,heat_flux_into_sea_water_due_to_iceberg_thermodynamics,,W m-2,time: mean area: mean where sea,,,,,,real,longitude latitude olevel time,hfibthermds,ocean,,area: areacello volume: volcello,,
+2.0,Heat Flux into Sea Water due to Iceberg Thermodynamics ,W m-2,,"If only the vertically integrated heat flux is available, report as this 2-d field; otherwise the row above should be used.",hfibthermds,heat_flux_into_sea_water_due_to_iceberg_thermodynamics,,W m-2,time: mean area: mean where sea,,,,,,real,longitude latitude time,hfibthermds2d,ocean,,area: areacello,,
2.0,Surface Net Downward Longwave Radiation,W m-2,"This is defined as ""where ice_free_sea over sea""",,rlds,surface_net_downward_longwave_flux,,W m-2,time: mean area: mean where ice_free_sea over sea,,,,,down,real,longitude latitude time,rlds,ocean,,area: areacello,,
2.0,Surface Downward Latent Heat Flux,W m-2,"This is defined as ""where ice_free_sea over sea""",,hfls,surface_downward_latent_heat_flux,,W m-2,time: mean area: mean where ice_free_sea over sea,,,,,down,real,longitude latitude time,hfls,ocean,,area: areacello,,
2.0,Surface Downward Sensible Heat Flux,W m-2,"This is defined as ""where ice_free_sea over sea""",,hfss,surface_downward_sensible_heat_flux,,W m-2,time: mean area: mean where ice_free_sea over sea,,,,,down,real,longitude latitude time,hfss,ocean,,area: areacello,,
diff --git a/Tables_csv/cfDay.csv b/Tables_csv/cfDay.csv
index 5e1c33f..9b0ca82 100644
--- a/Tables_csv/cfDay.csv
+++ b/Tables_csv/cfDay.csv
@@ -58,7 +58,7 @@ priority,long name,units ,comment ,questions & notes,output variable name ,stand
1.0,Mass Fraction of Cloud Ice,1.0,Calculated as the mass of cloud ice in the grid cell divided by the mass of air (including the water in all phases) in the grid cell. This includes precipitating hydrometeors ONLY if the precipitating hydrometeors affect the calculation of radiative transfer in model. ,,cli,mass_fraction_of_cloud_ice_in_air,,1.0,time: mean,,,,,,real,longitude latitude alevel time,cli,atmos,,area: areacella,,
1.0,Convective Mass Flux,kg m-2 s-1 ,The net mass flux should represent the difference between the updraft and downdraft components. This is calculated as the convective mass flux divided by the area of the whole grid cell (not just the area of the cloud).,"Report on model half-levels (i.e., model layer bounds and not standard pressures). ",mc,atmosphere_net_upward_convective_mass_flux,,kg m-2 s-1 ,time: mean,,,,,up,real,longitude latitude alevhalf time,mc,atmos,,area: areacella,,
1.0,CALIPSO Cloud Fraction,%,,40 levels,clcalipso ,cloud_area_fraction_in_atmosphere_layer,,%,time: mean,,,,,,real,longitude latitude alt40 time,clcalipso ,atmos,,area: areacella,,
-1.0,ISCCP Cloud Area Fraction,%,,7 levels x 7 tau,clisccp,cloud_area_fraction_in_atmosphere_layer,,%,time: mean,,,,,,real,longitude latitude tau plev7 time,clisccp,atmos,,area: areacella,,
+1.0,ISCCP Cloud Area Fraction,%,,7 levels x 7 tau,clisccp,cloud_area_fraction_in_atmosphere_layer,,%,time: mean,,,,,,real,longitude latitude plev7 tau time,clisccp,atmos,,area: areacella,,
1.0,Pressure on Model Levels,Pa,,"This field is needed only for models in which the pressure can't be calculated from the vertical coordinate information stored already for each variable. Thus, the pressures are needed for height or theta-coordinate models, for example, but not sigma- or eta-coordinate models.",pfull,air_pressure,,Pa,time: mean,,,,,,real,longitude latitude alevel time,pfull,atmos,,area: areacella,,
1.0,Pressure on Model Half-Levels,Pa,,"This field is needed only for models in which the pressure can't be calculated from the vertical coordinate information stored already for each variable. Thus, the pressures are needed for height or theta-coordinate models, for example, but not sigma- or eta-coordinate models.",phalf,air_pressure,,Pa,time: mean,,,,,,real,longitude latitude alevhalf time,phalf,atmos,,area: areacella,,
diff --git a/Tables_csv/fx.csv b/Tables_csv/fx.csv
index 51b76be..affb90f 100644
--- a/Tables_csv/fx.csv
+++ b/Tables_csv/fx.csv
@@ -28,6 +28,7 @@ priority,long name,units ,comment ,questions & notes,output variable name ,stand
1.0,Sea Area Fraction,%, This is the area fraction at the ocean surface.,"Should this be recorded as a function of depth? Report on the same grid that ocean fields are reported (i.e., the ocean native grid, or the grid that ocean data has been provided to CMIP. For completeness, provide this even if the ocean grid is the same as the atmospheric grid.",sftof,sea_area_fraction,,%,,0.0,100.0,,,,real,longitude latitude,sftof,ocean,,area: areacello,,
1.0,Region Selection Index,1.0, ,"Report on the same grid as the temperature field. flag_values=0,1,2,3,4,5,6,7,8,9,10 corresponding to flag_meanings=global_land, southern_ocean, atlantic_ocean, pacific_ocean, arctic_ocean, indian_ocean, mediterranean_sea, black_sea, hudson_bay, baltic_sea, red_sea. ",basin,region,,1.0,,1.0,10.0,,,,integer,longitude latitude,basin,ocean,,area: areacello,0 1 2 3 4 5 6 7 8 9 10,global_land southern_ocean atlantic_ocean pacific_ocean arctic_ocean indian_oce [...]
2.0,Upward Geothermal Heat Flux at Sea Floor ,W m-2,,If this field is time-dependent then save it instead as one of your Omon fields (see the Omon table),hfgeou,upward_geothermal_heat_flux_at_sea_floor,,W m-2,area: mean where sea,,,,,up,real,longitude latitude,hfgeou,ocean,,area: areacello,,
+2.0,Ocean Model Cell Thickness ,m ,,If this field is time-dependent then save it instead as one of your Omon fields (see the Omon table),thkcello,cell_thickness,,m ,time: mean,,,,,,real,longitude latitude olevel,thkcello,ocean,,area: areacello volume: volcello,,
,,,,eliminated basinv because it can be estimated from basin; also some models would also need a basinu for completeness,,,,,,,,,,,,,,,,,,
diff --git a/Tables_csv/general.csv b/Tables_csv/general.csv
index a69cdb2..22fe58c 100644
--- a/Tables_csv/general.csv
+++ b/Tables_csv/general.csv
@@ -3,13 +3,13 @@ General information,,,
,,,
"The specifications for archiving model output, as described in the following tables, assume the following (please advise us if the assumptions are incorrect): ",,Key,
,,,questions
-1. Sea ice fields and ocean biogeochemistry fields will be archived on the same grid as ocean fields.,,,need standard name
+1. Sea ice fields and ocean biogeochemistry fields will be archived on the same grid as ocean fields.,,,
,,,
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 17 September and 8 November 2010
,,,modifed between 8 November 2010 and 4 January 2011
-The following rules and recommendations for how to calculate quantities should be followed unless a different method is explicitly indicated in the notes that appear in the following tables.,,,modified between 4 January 2011 and 28 March 2011.
-,,,modified after 28 March 2011.
+,,,modified between 4 January 2011 and 28 March 2011.
+The following rules and recommendations for how to calculate quantities should be followed unless a different method is explicitly indicated in the notes that appear in the following tables.,,,modified between 28 March 2011 and 10 June 2011.
+,,,modified after 10 June 2011.
"1. It is recommended that ocean and sea-ice output (including Oclim, Oyr, Omon, and OImon) be reported on the ocean's native grid. Unless noted otherwise in the tables, all other output should be reported on the atmospheric grid.",,,
,,,
"2. Unless otherwise specified, the ocean and sea-ice output (including Oclim, Oyr, Omon, and OImon) represents a mean over only the sea portion of each grid cell (i.e., it is interpreted as ""where ocean over ocean""), and a value of 0.0 should be reported where the sea fraction is 0.",,,
diff --git a/Tables_csv/other.csv b/Tables_csv/other.csv
index c14a2b7..f8d4ea0 100644
--- a/Tables_csv/other.csv
+++ b/Tables_csv/other.csv
@@ -77,7 +77,7 @@ ESM feedback 2,"carbon cycle ""sees"" control CO2, but radiatation sees historic
1 percent per year CO2,imposed 1%/yr increase in CO2 to quadrupling,6.1,,all*,all,all**,all,all,all,all,,,,all,,,last 30
control SST climatology,An atmosphere-only run driven by prescribed climatological SST and sea ice.,6.2a,,,all,,,all,all,all,all,,,all,,,all
CO2 forcing,"as in expt. 6.2a, but with 4XCO2 imposed",6.2b,,,all,,,all,all,all,,,,all,,,all
-abrupt 4XCO2,"impose an instantaneous quadrupling of CO2, then hold fixed",6.3,,,all,all**,all,all,all,all,,,,all,,,first 20 years and years 121-140
+abrupt 4XCO2,"impose an instantaneous quadrupling of CO2, then hold fixed",6.3,,,all,all**,all,all,all,all,,,,all,,,first 5 years and years 121-150
abrupt 4XCO2,"generate an ensemble of runs like expt. 6.3, initialized in different months, and terminated after 5 years",6.3-E,,,all,all**,all,all,all,all,,,,all,,,all
anthropogenic aerosol forcing,"as in expt. 6.2a, but with anthropogenic aerosols from year 2000 of expt. 3.2",6.4a,,,all,,,all,all,all,all,,,all,,,all
sulfate aerosol forcing,"as in expt. 6.2a, but with sulfate aerosols from year 2000 of expt. 3.2",6.4b,,,all,,,all,all,all,all,,,all,,,all
diff --git a/Tables_csv/standard_output.xls b/Tables_csv/standard_output.xls
index 8889b0e..be4c5f6 100644
Binary files a/Tables_csv/standard_output.xls and b/Tables_csv/standard_output.xls differ
diff --git a/configure.ac b/configure.ac
index 6002355..372f078 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.9, doutriaux1 at llnl.gov)
+AC_INIT(cmip5-cmor-tables, 1.3.10, 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