[cmor-tables] 43/83: 2010-09-15 : updated Omon longname for var coming from Oyr, also changed olevel to depth0m for these
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sun Aug 30 08:06:10 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 7e16764dd391a7c0956405306493101194dcb609
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date: Wed Sep 15 09:41:10 2010 -0700
2010-09-15 : updated Omon longname for var coming from Oyr, also changed olevel to depth0m for these
---
Lib/table_generator.py | 32 ++++++----
RELEASE-NOTES | 1 +
Tables/CMIP5_3hr | 2 +-
Tables/CMIP5_6hrLev | 4 +-
Tables/CMIP5_6hrPlev | 4 +-
Tables/CMIP5_Amon | 4 +-
Tables/CMIP5_LImon | 2 +-
Tables/CMIP5_Lmon | 2 +-
Tables/CMIP5_OImon | 2 +-
Tables/CMIP5_Oclim | 2 +-
Tables/CMIP5_Omon | 170 ++++++++++++++++++++++++-------------------------
Tables/CMIP5_Oyr | 2 +-
Tables/CMIP5_aero | 2 +-
Tables/CMIP5_cf3hr | 2 +-
Tables/CMIP5_cfDay | 4 +-
Tables/CMIP5_cfMon | 2 +-
Tables/CMIP5_cfOff | 2 +-
Tables/CMIP5_cfSites | 2 +-
Tables/CMIP5_day | 4 +-
Tables/CMIP5_fx | 24 +------
Tables/md5s | 2 +-
Tables_csv/6hrLev.csv | 4 +-
Tables_csv/6hrPlev.csv | 4 +-
Tables_csv/aero.csv | 2 +-
Tables_csv/amon.csv | 4 +-
Tables_csv/cfDay.csv | 4 +-
Tables_csv/day.csv | 4 +-
Tables_csv/fx.csv | 2 +-
Tables_csv/omon.csv | 2 +-
configure.ac | 2 +-
30 files changed, 139 insertions(+), 160 deletions(-)
diff --git a/Lib/table_generator.py b/Lib/table_generator.py
index f587216..3f6d240 100644
--- a/Lib/table_generator.py
+++ b/Lib/table_generator.py
@@ -155,6 +155,9 @@ def process_a_line(line):
print
else:
debug=False
+ iadd = line.find("$$$$add at surface$$$")
+ if iadd>-1:
+ line=line.replace("$$$$add at surface$$$","")
line=line.replace("\r\n","\n") # dos character
line = line.replace('""','"$$$')
sps = line .split(",")
@@ -176,10 +179,10 @@ def process_a_line(line):
else:
s = ','.join([s,s2[:-1]])
sp.append(s.replace("$$$",'"'))
- return sp
+ return sp,iadd
-def process_template(tmpl,cnames,cols,voids={},minmax={}):
+def process_template(tmpl,cnames,cols,voids={},minmax={},iadd=-1):
F = genutil.StringConstructor(tmpl)
keys = F.keys()
@@ -196,6 +199,8 @@ def process_template(tmpl,cnames,cols,voids={},minmax={}):
if val.strip()=='time2':
setattr(F,"climatology","yes")
if "climatology" in keys: keys.remove("climatology")
+ if c=="long name" and iadd!=-1:
+ val+=" at Surface"
if val.strip()!="":
## if c=="valid max":
## print 'ok we havew a val max predefined at:',cols
@@ -347,7 +352,7 @@ def create_table_header(tbnm, table_file, dims_file, fqcy):
interval = float(tbnm[2:tbnm.find("min")])/1440.
else:
interval = 0.
- print 'Interval:',interval,'________________________'
+ #print 'Interval:',interval,'________________________'
print >> fo, """approx_interval: %f ! approximate spacing between successive time
! samples (in units of the output time
! coordinate.""" % interval
@@ -366,7 +371,7 @@ def create_table_header(tbnm, table_file, dims_file, fqcy):
addLines = False
generic_levels = []
for l in dlines[1:]:
- sp = process_a_line(l)
+ sp, iadd = process_a_line(l)
foundnm = False
for snm in sp[0].split(","):
if tbnm == snm.strip():
@@ -401,16 +406,17 @@ def create_table_header(tbnm, table_file, dims_file, fqcy):
if generic_levels!=[]:
print >> fo, "\ngeneric_levels: %s" % " ".join(generic_levels)
for l in dlines[1:]:
- sp = process_a_line(l)
+ sp, iadd = process_a_line(l)
foundnm = False
for snm in sp[0].split(","):
if tbnm == snm.strip():
foundnm = True
+ if iadd!=-1: print 'iadd is:',iadd
if foundnm:
if l.find("alevel")>-1 or l.find("alev1")>-1 or l.find("alevhalf")>-1 or l.find("olevel")>-1:
pass
else:
- print >> fo, process_template(axis_tmpl,cnms,sp)
+ print >> fo, process_template(axis_tmpl,cnms,sp,iadd=iadd)
if addLines is True:
print 'adding:',file_add,'to',tbnm
tmpf=open(file_add)
@@ -452,7 +458,7 @@ def create_table(table_file, dims_file,minmax={}):
if len(a_line)==0:
continue
if a_line[-1]!=',' : a_line=a_line+','
- sp = process_a_line(a_line)
+ sp, iadd = process_a_line(a_line)
## for i2 in range(len(sp)):
## if sp[i2]=='tasmax' : print i2,sp[i2]
if len(sp)>15 and 'time' in sp[16]:
@@ -474,13 +480,17 @@ def create_table(table_file, dims_file,minmax={}):
dlines2=dlines2+add_lines
elif dlines[i].find("include Oyr")>-1:
f=open("Tables_csv/Oyr_tracer.csv")
- dlines2=dlines2+f.readlines()
+ addedlines=[]
+ for l in f.xreadlines():
+ l=l.replace("olevel","depth0m")
+ l+='$$$$add at surface$$$'
+ addedlines.append(l)
+ dlines2=dlines2+addedlines
else:
dlines2.append(dlines[i])
dlines=dlines2
for l in dlines:
- #print 'processing:',l.strip()
- sp = process_a_line(l)
+ sp,iadd = process_a_line(l)
if 0<=sp[0].find("CMOR Table")<=1 and foundnm == False: # line that will give us the table name
i=1
while sp[i].strip()=="":
@@ -501,7 +511,7 @@ 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)
+ print >> fo, process_template(var_tmpl,cnms,sp,{'CMOR variable name':['?','0','0.0']},minmax=minmax,iadd=iadd)
print 'Created tables:',tables.keys()
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 89c0521..fe92372 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,4 @@
+2010-09-15 : updated Omon longname for var coming from Oyr, also changed olevel to depth0m for these
2010-08-23 : some tweaks from Karl, releasing them along with CMOR 2.1
2010-08-04 : added x/y grid with units of "degrees"
2010-06-09 : tables generated with min/max now being 3 sigma (from 2) and (20% form 5%)
diff --git a/Tables/CMIP5_3hr b/Tables/CMIP5_3hr
index f7803e4..c38a60d 100644
--- a/Tables/CMIP5_3hr
+++ b/Tables/CMIP5_3hr
@@ -6,7 +6,7 @@ frequency: 3hr
cmor_version: 2.0.1 ! 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: 23 August 2010 ! date this table was constructed
+table_date: 14 September 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_6hrLev b/Tables/CMIP5_6hrLev
index c0e7873..f01e754 100644
--- a/Tables/CMIP5_6hrLev
+++ b/Tables/CMIP5_6hrLev
@@ -6,7 +6,7 @@ frequency: 6hr
cmor_version: 2.0.1 ! 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: 23 August 2010 ! date this table was constructed
+table_date: 14 September 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
@@ -537,7 +537,6 @@ modeling_realm: atmos
!----------------------------------
standard_name: eastward_wind
units: m s-1
-cell_measures: area: areacella
long_name: Eastward Wind
comment: on all model levels
!----------------------------------
@@ -562,7 +561,6 @@ modeling_realm: atmos
!----------------------------------
standard_name: northward_wind
units: m s-1
-cell_measures: area: areacella
long_name: Northward Wind
comment: on all model levels
!----------------------------------
diff --git a/Tables/CMIP5_6hrPlev b/Tables/CMIP5_6hrPlev
index c746d84..c430e85 100644
--- a/Tables/CMIP5_6hrPlev
+++ b/Tables/CMIP5_6hrPlev
@@ -6,7 +6,7 @@ frequency: 6hr
cmor_version: 2.0.1 ! 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: 23 August 2010 ! date this table was constructed
+table_date: 14 September 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
@@ -176,7 +176,6 @@ modeling_realm: atmos
!----------------------------------
standard_name: eastward_wind
units: m s-1
-cell_measures: area: areacella
long_name: Eastward Wind
comment: on the following pressure levels: 850, 500, 250 hPa
!----------------------------------
@@ -201,7 +200,6 @@ modeling_realm: atmos
!----------------------------------
standard_name: northward_wind
units: m s-1
-cell_measures: area: areacella
long_name: Northward Wind
comment: on the following pressure levels: 850, 500, 250 hPa
!----------------------------------
diff --git a/Tables/CMIP5_Amon b/Tables/CMIP5_Amon
index 73feef6..4e9a134 100644
--- a/Tables/CMIP5_Amon
+++ b/Tables/CMIP5_Amon
@@ -6,7 +6,7 @@ frequency: mon
cmor_version: 2.0.1 ! 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: 23 August 2010 ! date this table was constructed
+table_date: 14 September 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
@@ -1833,7 +1833,6 @@ modeling_realm: atmos
standard_name: eastward_wind
units: m s-1
cell_methods: time: mean
-cell_measures: area: areacella
long_name: Eastward Wind
!----------------------------------
! Additional variable information:
@@ -1858,7 +1857,6 @@ modeling_realm: atmos
standard_name: northward_wind
units: m s-1
cell_methods: time: mean
-cell_measures: area: areacella
long_name: Northward Wind
!----------------------------------
! Additional variable information:
diff --git a/Tables/CMIP5_LImon b/Tables/CMIP5_LImon
index 6c9749c..765470d 100644
--- a/Tables/CMIP5_LImon
+++ b/Tables/CMIP5_LImon
@@ -6,7 +6,7 @@ frequency: mon
cmor_version: 2.0.1 ! 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: 23 August 2010 ! date this table was constructed
+table_date: 14 September 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_Lmon b/Tables/CMIP5_Lmon
index 32149d3..ee36116 100644
--- a/Tables/CMIP5_Lmon
+++ b/Tables/CMIP5_Lmon
@@ -6,7 +6,7 @@ frequency: mon
cmor_version: 2.0.1 ! 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: 23 August 2010 ! date this table was constructed
+table_date: 14 September 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_OImon b/Tables/CMIP5_OImon
index d1927b0..95d0cb8 100644
--- a/Tables/CMIP5_OImon
+++ b/Tables/CMIP5_OImon
@@ -6,7 +6,7 @@ frequency: mon
cmor_version: 2.0.1 ! 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: 23 August 2010 ! date this table was constructed
+table_date: 14 September 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_Oclim b/Tables/CMIP5_Oclim
index b380439..b316405 100644
--- a/Tables/CMIP5_Oclim
+++ b/Tables/CMIP5_Oclim
@@ -6,7 +6,7 @@ frequency: monClim
cmor_version: 2.0.1 ! 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: 23 August 2010 ! date this table was constructed
+table_date: 14 September 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_Omon b/Tables/CMIP5_Omon
index 1c86e64..a6d4abb 100644
--- a/Tables/CMIP5_Omon
+++ b/Tables/CMIP5_Omon
@@ -6,7 +6,7 @@ frequency: mon
cmor_version: 2.0.1 ! 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: 23 August 2010 ! date this table was constructed
+table_date: 14 September 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
@@ -678,12 +678,12 @@ standard_name: mole_concentration_of_dissolved_inorganic_carbon_in_sea_water
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Dissolved Inorganic Carbon Concentration
+long_name: Dissolved Inorganic Carbon Concentration at Surface
comment: Dissolved inorganic carbon (CO3+HCO3+H2CO3) concentration
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: dissic
type: real
!----------------------------------
@@ -700,12 +700,12 @@ standard_name: mole_concentration_of_dissolved_organic_carbon_in_sea_water
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Dissolved Organic Carbon Concentration
+long_name: Dissolved Organic Carbon Concentration at Surface
comment: Dissolved organic carbon concentration
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: dissoc
type: real
!----------------------------------
@@ -722,12 +722,12 @@ standard_name: mole_concentration_of_phytoplankton_expressed_as_carbon_in_se
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Phytoplankton Carbon Concentration
+long_name: Phytoplankton Carbon Concentration at Surface
comment: sum of phytoplankton carbon component concentrations. In most (all?) cases this is the sum of phycdiat and phycmisc (i.e., ""Diatom Carbon Concentration"" and ""Non-Diatom Phytoplankton Carbon Concentration""
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: phyc
type: real
!----------------------------------
@@ -744,12 +744,12 @@ standard_name: mole_concentration_of_zooplankton_expressed_as_carbon_in_sea_
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Zooplankton Carbon Concentration
+long_name: Zooplankton Carbon Concentration at Surface
comment: sum of zooplankton carbon component concentrations
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: zooc
type: real
!----------------------------------
@@ -766,12 +766,12 @@ standard_name: mole_concentration_of_bacteria_expressed_as_carbon_in_sea_wat
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Bacterial Carbon Concentration
+long_name: Bacterial Carbon Concentration at Surface
comment: sum of bacterial carbon component concentrations
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: bacc
type: real
!----------------------------------
@@ -788,12 +788,12 @@ standard_name: mole_concentration_of_organic_detritus_expressed_as_carbon_in
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Detrital Organic Carbon Concentration
+long_name: Detrital Organic Carbon Concentration at Surface
comment: sum of detrital organic carbon component concentrations
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: detoc
type: real
!----------------------------------
@@ -810,12 +810,12 @@ standard_name: mole_concentration_of_calcite_expressed_as_carbon_in_sea_wate
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Calcite Concentration
+long_name: Calcite Concentration at Surface
comment: sum of particulate calcite component concentrations (e.g. Phytoplankton, Detrital, etc.)
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: calc
type: real
!----------------------------------
@@ -832,12 +832,12 @@ standard_name: mole_concentration_of_aragonite_expressed_as_carbon_in_sea_wa
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Aragonite Concentration
+long_name: Aragonite Concentration at Surface
comment: sum of particulate aragonite components (e.g. Phytoplankton, Detrital, etc.)
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: arag
type: real
!----------------------------------
@@ -854,12 +854,12 @@ standard_name: mole_concentration_of_diatoms_expressed_as_carbon_in_sea_wate
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Mole Concentration of Diatoms expressed as Carbon in Sea Water
+long_name: Mole Concentration of Diatoms expressed as Carbon in Sea Water at Surface
comment: carbon from the diatom phytoplankton component concentration alone
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: phydiat
type: real
!----------------------------------
@@ -876,12 +876,12 @@ standard_name: mole_concentration_of_diazotrophs_expressed_as_carbon_in_sea_
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Mole Concentration of Diazotrophs Expressed as Carbon in Sea Water
+long_name: Mole Concentration of Diazotrophs Expressed as Carbon in Sea Water at Surface
comment: carbon concentration from the diazotrophic phytoplankton component alone
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: phydiaz
type: real
!----------------------------------
@@ -898,12 +898,12 @@ standard_name: mole_concentration_of_calcareous_phytoplankton_expressed_as_c
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Mole Concentration of Calcareous Phytoplankton expressed as Carbon in Sea Water
+long_name: Mole Concentration of Calcareous Phytoplankton expressed as Carbon in Sea Water at Surface
comment: carbon concentration from calcareous (calcite-producing) phytoplankton component alone
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: phycalc
type: real
!----------------------------------
@@ -920,12 +920,12 @@ standard_name: mole_concentration_of_picophytoplankton_expressed_as_carbon_i
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Mole Concentration of Picophytoplankton expressed as Carbon in Sea Water
+long_name: Mole Concentration of Picophytoplankton expressed as Carbon in Sea Water at Surface
comment: carbon concentration from the picophytoplankton (<2 um) component alone
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: phypico
type: real
!----------------------------------
@@ -942,12 +942,12 @@ standard_name: mole_concentration_of_miscellaneous_phytoplankton_expressed_a
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Mole Concentration of Miscellaneous Phytoplankton expressed as Carbon in Sea Water
+long_name: Mole Concentration of Miscellaneous Phytoplankton expressed as Carbon in Sea Water at Surface
comment: carbon concentration from additional phytoplankton component alone
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: phymisc
type: real
!----------------------------------
@@ -964,12 +964,12 @@ standard_name: mole_concentration_of_microzooplankton_expressed_as_carbon_in
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Mole Concentration of Microzooplankton expressed as Carbon in Sea Water
+long_name: Mole Concentration of Microzooplankton expressed as Carbon in Sea Water at Surface
comment: carbon concentration from the microzooplankton (<20 um) component alone
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: zmicro
type: real
!----------------------------------
@@ -986,12 +986,12 @@ standard_name: mole_concentration_of_mesozooplankton_expressed_as_carbon_in_
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Mole Concentration of Mesozooplankton expressed as Carbon in Sea Water
+long_name: Mole Concentration of Mesozooplankton expressed as Carbon in Sea Water at Surface
comment: carbon concentration from mesozooplankton (20-200 um) component alone
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: zmeso
type: real
!----------------------------------
@@ -1008,12 +1008,12 @@ standard_name: mole_concentration_of_miscellaneous_zooplankton_expressed_as_
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Other Zooplankton Carbon Concentration
+long_name: Other Zooplankton Carbon Concentration at Surface
comment: carbon from additional zooplankton component concentrations alone (e.g. Micro, meso). Since the models all have different numbers of components, this variable has been included to provide a check for intercomparison between models since some phytoplankton groups are supersets.
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: zoocmisc
type: real
!----------------------------------
@@ -1030,12 +1030,12 @@ standard_name: sea_water_alkalinity_expressed_as_mole_equivalent
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Total Alkalinity
+long_name: Total Alkalinity at Surface
comment: total alkalinity equivalent concentration (including carbonate, nitrogen, silicate, and borate components)
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: talk
type: real
!----------------------------------
@@ -1052,12 +1052,12 @@ standard_name: sea_water_ph_reported_on_total_scale
units: 1
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: pH
+long_name: pH at Surface
comment: negative log of hydrogen ion concentration with the concentration expressed as mol H kg-1.
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: ph
type: real
!----------------------------------
@@ -1074,12 +1074,12 @@ standard_name: mole_concentration_of_molecular_oxygen_in_sea_water
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Dissolve Oxygen Concentration
+long_name: Dissolve Oxygen Concentration at Surface
comment: dissolved oxygen gas concentration in sea water
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: o2
type: real
!----------------------------------
@@ -1096,12 +1096,12 @@ standard_name: mole_concentration_of_nitrate_in_sea_water
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Dissolved Nitrate Concentration
+long_name: Dissolved Nitrate Concentration at Surface
comment: dissolved nitrate concentration in sea water
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: no3
type: real
!----------------------------------
@@ -1118,12 +1118,12 @@ standard_name: mole_concentration_of_ammonium_in_sea_water
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Dissolved Ammonium Concentration
+long_name: Dissolved Ammonium Concentration at Surface
comment: dissolved ammonium concentration in sea water
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: nh4
type: real
!----------------------------------
@@ -1140,12 +1140,12 @@ standard_name: mole_concentration_of_phosphate_in_sea_water
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Dissolved Phosphate Concentration
+long_name: Dissolved Phosphate Concentration at Surface
comment: dissolved Phosphate concentration in sea water
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: po4
type: real
!----------------------------------
@@ -1162,12 +1162,12 @@ standard_name: mole_concentration_of_dissolved_iron_in_sea_water
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Dissolved Iron Concentration
+long_name: Dissolved Iron Concentration at Surface
comment: dissolved iron concentration in sea water
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: dfe
type: real
!----------------------------------
@@ -1184,12 +1184,12 @@ standard_name: mole_concentration_of_silicate_in_sea_water
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Dissolved Silicate Concentration
+long_name: Dissolved Silicate Concentration at Surface
comment: dissolved silicate concentration in sea water
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: si
type: real
!----------------------------------
@@ -1206,12 +1206,12 @@ standard_name: mass_concentration_of_phytoplankton_expressed_as_chlorophyll_
units: kg m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Total Chlorophyll Mass Concentration
+long_name: Total Chlorophyll Mass Concentration at Surface
comment: sum of chlorophyll from all phytoplankton group concentrations. In most models this is equal to chldiat+chlmisc, that is the sum of ""Diatom Chlorophyll Mass Concentration"" plus ""Other Phytoplankton Chlorophyll Mass Concentration""
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: chl
type: real
!----------------------------------
@@ -1228,12 +1228,12 @@ standard_name: mass_concentration_of_diatoms_expressed_as_chlorophyll_in_sea
units: kg m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Diatom Chlorophyll Mass Concentration
+long_name: Diatom Chlorophyll Mass Concentration at Surface
comment: chlorophyll from diatom phytoplankton component concentration alone
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: chldiat
type: real
!----------------------------------
@@ -1250,12 +1250,12 @@ standard_name: mass_concentration_of_diazotrophs_expressed_as_chlorophyll_in
units: kg m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Mass Concentration of Diazotrophs expressed as Chlorophyll in Sea Water
+long_name: Mass Concentration of Diazotrophs expressed as Chlorophyll in Sea Water at Surface
comment: chlorophyll concentration from the diazotrophic phytoplankton component alone
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: chldiaz
type: real
!----------------------------------
@@ -1272,12 +1272,12 @@ standard_name: mass_concentration_of_calcareous_phytoplankton_expressed_as_c
units: kg m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Mass Concentration of Calcareous Phytoplankton expressed as Chlorophyll in Sea Water
+long_name: Mass Concentration of Calcareous Phytoplankton expressed as Chlorophyll in Sea Water at Surface
comment: chlorophyll concentration from the calcite-producing phytoplankton component alone
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: chlcalc
type: real
!----------------------------------
@@ -1294,12 +1294,12 @@ standard_name: mass_concentration_of_picophytoplankton_expressed_as_chloroph
units: kg m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Mass Concentration of Picophytoplankton expressed as Chlorophyll in Sea Water
+long_name: Mass Concentration of Picophytoplankton expressed as Chlorophyll in Sea Water at Surface
comment: chlorophyll concentration from the picophytoplankton (<2 um) component alone
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: chlpico
type: real
!----------------------------------
@@ -1316,12 +1316,12 @@ standard_name: mass_concentration_of_miscellaneous_phytoplankton_expressed_a
units: kg m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Other Phytoplankton Chlorophyll Mass Concentration
+long_name: Other Phytoplankton Chlorophyll Mass Concentration at Surface
comment: chlorophyll from additional phytoplankton component concentrations alone
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: chlmisc
type: real
!----------------------------------
@@ -1338,12 +1338,12 @@ standard_name: mole_concentration_of_particulate_organic_matter_expressed_as
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Particulate Organic Nitrogen Concentration
+long_name: Particulate Organic Nitrogen Concentration at Surface
comment: sum of particulate organic nitrogen component concentrations
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: pon
type: real
!----------------------------------
@@ -1360,12 +1360,12 @@ standard_name: mole_concentration_of_particulate_organic_matter_expressed_as
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Particulate Organic Phosphorus Concentration
+long_name: Particulate Organic Phosphorus Concentration at Surface
comment: sum of particulate organic phosphorus component concentrations
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: pop
type: real
!----------------------------------
@@ -1382,12 +1382,12 @@ standard_name: mole_concentration_of_particulate_organic_matter_expressed_as
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Particulate Biogenic Iron Concentration
+long_name: Particulate Biogenic Iron Concentration at Surface
comment: sum of particulate organic iron component concentrations
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: bfe
type: real
!----------------------------------
@@ -1404,12 +1404,12 @@ standard_name: mole_concentration_of_particulate_matter_expressed_as_silicon
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Particulate Biogenic Silica Concentration
+long_name: Particulate Biogenic Silica Concentration at Surface
comment: sum of particulate silica component concentrations
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: bsi
type: real
!----------------------------------
@@ -1426,12 +1426,12 @@ standard_name: mole_concentration_of_phytoplankton_expressed_as_nitrogen_in_
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Phytoplankton Nitrogen Concentration
+long_name: Phytoplankton Nitrogen Concentration at Surface
comment: sum of phytoplankton nitrogen component concentrations
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: phyn
type: real
!----------------------------------
@@ -1448,12 +1448,12 @@ standard_name: mole_concentration_of_phytoplankton_expressed_as_phosphorus_i
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Phytoplankton Phosphorus Concentration
+long_name: Phytoplankton Phosphorus Concentration at Surface
comment: sum of phytoplankton phosphorus components
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: phyp
type: real
!----------------------------------
@@ -1470,12 +1470,12 @@ standard_name: mole_concentration_of_phytoplankton_expressed_as_iron_in_sea_
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Phytoplankton Iron Concentration
+long_name: Phytoplankton Iron Concentration at Surface
comment: sum of phytoplankton iron component concentrations
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: phyfe
type: real
!----------------------------------
@@ -1492,12 +1492,12 @@ standard_name: mole_concentration_of_phytoplankton_expressed_as_silicon_in_s
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Phytoplankton Silica Concentration
+long_name: Phytoplankton Silica Concentration at Surface
comment: sum of phytoplankton silica component concentrations
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: physi
type: real
!----------------------------------
@@ -1514,12 +1514,12 @@ standard_name: mole_concentration_of_dimethyl_sulfide_in_sea_water
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Dimethyl Sulphide Concentration
+long_name: Dimethyl Sulphide Concentration at Surface
comment: dimethyl sulphide concentration
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: dms
type: real
!----------------------------------
@@ -1536,12 +1536,12 @@ standard_name: mole_concentration_of_carbonate_expressed_as_carbon_in_sea_wa
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Mole Concentration of Carbonate expressed as Carbon in Sea Water
+long_name: Mole Concentration of Carbonate expressed as Carbon in Sea Water at Surface
comment: carbonate ion concentration
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: co3
type: real
!----------------------------------
@@ -1558,12 +1558,12 @@ standard_name: mole_concentration_of_calcite_expressed_as_carbon_in_sea_wate
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Mole Concentration of Calcite expressed as Carbon in Sea Water at Saturation
+long_name: Mole Concentration of Calcite expressed as Carbon in Sea Water at Saturation at Surface
comment: carbonate ion concentration at calcite solution saturation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: co3satcalc
type: real
!----------------------------------
@@ -1580,12 +1580,12 @@ standard_name: mole_concentration_of_aragonite_expressed_as_carbon_in_sea_wa
units: mol m-3
cell_methods: time: mean area: mean where sea
cell_measures: area: areacello volume: volcello
-long_name: Mole Concentration of Aragonite expressed as Carbon in Sea Water at Saturation
+long_name: Mole Concentration of Aragonite expressed as Carbon in Sea Water at Saturation at Surface
comment: carbonate ion concentration at aragonite solution saturation
!----------------------------------
! Additional variable information:
!----------------------------------
-dimensions: longitude latitude olevel time
+dimensions: longitude latitude depth0m time
out_name: co3satarag
type: real
!----------------------------------
diff --git a/Tables/CMIP5_Oyr b/Tables/CMIP5_Oyr
index 83c3d61..3a9c7c3 100644
--- a/Tables/CMIP5_Oyr
+++ b/Tables/CMIP5_Oyr
@@ -6,7 +6,7 @@ frequency: yr
cmor_version: 2.0.1 ! 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: 23 August 2010 ! date this table was constructed
+table_date: 14 September 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_aero b/Tables/CMIP5_aero
index 7364f02..43d9ef8 100644
--- a/Tables/CMIP5_aero
+++ b/Tables/CMIP5_aero
@@ -6,7 +6,7 @@ frequency: mon
cmor_version: 2.0.1 ! 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: 23 August 2010 ! date this table was constructed
+table_date: 14 September 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_cf3hr b/Tables/CMIP5_cf3hr
index 011cf04..7980fa6 100644
--- a/Tables/CMIP5_cf3hr
+++ b/Tables/CMIP5_cf3hr
@@ -6,7 +6,7 @@ frequency: 3hr
cmor_version: 2.0.1 ! 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: 23 August 2010 ! date this table was constructed
+table_date: 14 September 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_cfDay b/Tables/CMIP5_cfDay
index 0180c35..a795fc2 100644
--- a/Tables/CMIP5_cfDay
+++ b/Tables/CMIP5_cfDay
@@ -6,7 +6,7 @@ frequency: day
cmor_version: 2.0.1 ! 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: 23 August 2010 ! date this table was constructed
+table_date: 14 September 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
@@ -1406,7 +1406,6 @@ modeling_realm: atmos
standard_name: eastward_wind
units: m s-1
cell_methods: time: mean
-cell_measures: area: areacella
long_name: Eastward Wind
!----------------------------------
! Additional variable information:
@@ -1431,7 +1430,6 @@ modeling_realm: atmos
standard_name: northward_wind
units: m s-1
cell_methods: time: mean
-cell_measures: area: areacella
long_name: Northward Wind
!----------------------------------
! Additional variable information:
diff --git a/Tables/CMIP5_cfMon b/Tables/CMIP5_cfMon
index 3bf3f41..75089e2 100644
--- a/Tables/CMIP5_cfMon
+++ b/Tables/CMIP5_cfMon
@@ -6,7 +6,7 @@ frequency: mon
cmor_version: 2.0.1 ! 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: 23 August 2010 ! date this table was constructed
+table_date: 14 September 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_cfOff b/Tables/CMIP5_cfOff
index d09e50b..6b31871 100644
--- a/Tables/CMIP5_cfOff
+++ b/Tables/CMIP5_cfOff
@@ -6,7 +6,7 @@ frequency: mon
cmor_version: 2.0.1 ! 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: 23 August 2010 ! date this table was constructed
+table_date: 14 September 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_cfSites b/Tables/CMIP5_cfSites
index 315ef1d..3ab3476 100644
--- a/Tables/CMIP5_cfSites
+++ b/Tables/CMIP5_cfSites
@@ -6,7 +6,7 @@ frequency: subhr
cmor_version: 2.0.1 ! 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: 23 August 2010 ! date this table was constructed
+table_date: 14 September 2010 ! date this table was constructed
missing_value: 1.e20 ! value used to indicate a missing value
! in arrays output by netCDF as 32-bit IEEE
diff --git a/Tables/CMIP5_day b/Tables/CMIP5_day
index 619c153..c15de34 100644
--- a/Tables/CMIP5_day
+++ b/Tables/CMIP5_day
@@ -6,7 +6,7 @@ frequency: day
cmor_version: 2.0.1 ! 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: 23 August 2010 ! date this table was constructed
+table_date: 14 September 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
@@ -1232,7 +1232,6 @@ modeling_realm: atmos
standard_name: northward_wind
units: m s-1
cell_methods: time: mean
-cell_measures: area: areacella
long_name: Northward Wind
!----------------------------------
! Additional variable information:
@@ -1257,7 +1256,6 @@ modeling_realm: atmos
standard_name: eastward_wind
units: m s-1
cell_methods: time: mean
-cell_measures: area: areacella
long_name: Eastward Wind
!----------------------------------
! Additional variable information:
diff --git a/Tables/CMIP5_fx b/Tables/CMIP5_fx
index 3dcd261..372c9cf 100644
--- a/Tables/CMIP5_fx
+++ b/Tables/CMIP5_fx
@@ -6,7 +6,7 @@ frequency: fx
cmor_version: 2.0.1 ! 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: 23 August 2010 ! date this table was constructed
+table_date: 14 September 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
@@ -676,25 +676,3 @@ valid_max: 10.0
!----------------------------------
!
-!============
-variable_entry: basinv
-!============
-modeling_realm: ocean
-!----------------------------------
-! Variable attributes:
-!----------------------------------
-standard_name: region
-units: 1
-long_name: Region Selection Index
-comment: Report on the same grid as the ocean 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. Report on the grid used for the meridional overturning stream function.
-!----------------------------------
-! Additional variable information:
-!----------------------------------
-dimensions: longitude latitude
-out_name: basinv
-type: integer
-valid_min: 1.0
-valid_max: 10.0
-!----------------------------------
-!
-
diff --git a/Tables/md5s b/Tables/md5s
index 6099b0a..51e06c0 100644
--- a/Tables/md5s
+++ b/Tables/md5s
@@ -1 +1 @@
-{'CMIP5': {'cf3hr': {'12 March 2010': 'ae9a82f01824d9012aa0657cd7896a9a', '11 May 2010': 'a59ca1270ff3036d417a7f2217598266', '01 July 2010': 'c0fe9e92115d75292f5009e13761cb4b', '24 May 2010': '61693a46b06627dcd6ffe8ceff288ef0', '07 July 2010': '27949d438b4c04d481ff1d9790cff60f', '12 May 2010': '905f7ccdd5a31cb71e2a6e3b339cd0e1', '22 March 2010': '712cd14ab6a28116da828ff555e00c4d', '09 June 2010': '8aad2bf8bea26504a0e247c1737ea4a0', '29 April 2010': 'fdc4fb38dd4cfb7f066329ed43a9e805', '02 [...]
\ No newline at end of file
+{'CMIP5': {'cf3hr': {'12 March 2010': 'ae9a82f01824d9012aa0657cd7896a9a', '11 May 2010': 'a59ca1270ff3036d417a7f2217598266', '24 May 2010': '61693a46b06627dcd6ffe8ceff288ef0', '07 July 2010': '27949d438b4c04d481ff1d9790cff60f', '09 June 2010': '8aad2bf8bea26504a0e247c1737ea4a0', '22 March 2010': '712cd14ab6a28116da828ff555e00c4d', '12 May 2010': '905f7ccdd5a31cb71e2a6e3b339cd0e1', '10 June 2010': 'f70ed019bca338b2d73296e1924f3df4', '28 May 2010': 'f6e966842fed498f0921365983918119', '02 A [...]
\ No newline at end of file
diff --git a/Tables_csv/6hrLev.csv b/Tables_csv/6hrLev.csv
index b0bb74b..188fd58 100644
--- a/Tables_csv/6hrLev.csv
+++ b/Tables_csv/6hrLev.csv
@@ -14,8 +14,8 @@ CMOR Table 6hrLev: Fields (Sampled Every 6 Hours) for Driving Regional Models,,,
,,,,,,,,,,,,,,,,,,,,,,
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,Air Temperature,K,on all model levels,,ta,air_temperature,,K,,,,,,,real,longitude latitude alevel time1,ta,atmos,,area: areacella,,
-1.0,Eastward Wind,m s-1,on all model levels,,ua,eastward_wind,,m s-1,,,,,,,real,longitude latitude alevel time1,ua,atmos,,area: areacella,,
-1.0,Northward Wind,m s-1,on all model levels,,va,northward_wind,,m s-1,,,,,,,real,longitude latitude alevel time1,va,atmos,,area: areacella,,
+1.0,Eastward Wind,m s-1,on all model levels,,ua,eastward_wind,,m s-1,,,,,,,real,longitude latitude alevel time1,ua,atmos,,,,
+1.0,Northward Wind,m s-1,on all model levels,,va,northward_wind,,m s-1,,,,,,,real,longitude latitude alevel time1,va,atmos,,,,
1.0,Specific Humidity,1.0,on all model levels,,hus,specific_humidity,,1.0,,,,,,,real,longitude latitude alevel time1,hus,atmos,,area: areacella,,
1.0,Surface Air Pressure,Pa,"surface pressure, not mean sea level pressure",,ps,surface_air_pressure,,Pa,,,,,,,real,longitude latitude time1,ps,atmos,,area: areacella,,
diff --git a/Tables_csv/6hrPlev.csv b/Tables_csv/6hrPlev.csv
index 20a1ce0..1b12315 100644
--- a/Tables_csv/6hrPlev.csv
+++ b/Tables_csv/6hrPlev.csv
@@ -13,8 +13,8 @@ CMOR Table 6hrPlev: Fields (Sampled Every 6 Hours) for Storm-Track Analysis and
,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,
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,Eastward Wind,m s-1,"on the following pressure levels: 850, 500, 250 hPa",,ua,eastward_wind,,m s-1,,,,,,,real,longitude latitude plev3 time1,ua,atmos,,area: areacella,,
-1.0,Northward Wind,m s-1,"on the following pressure levels: 850, 500, 250 hPa",,va,northward_wind,,m s-1,,,,,,,real,longitude latitude plev3 time1,va,atmos,,area: areacella,,
+1.0,Eastward Wind,m s-1,"on the following pressure levels: 850, 500, 250 hPa",,ua,eastward_wind,,m s-1,,,,,,,real,longitude latitude plev3 time1,ua,atmos,,,,
+1.0,Northward Wind,m s-1,"on the following pressure levels: 850, 500, 250 hPa",,va,northward_wind,,m s-1,,,,,,,real,longitude latitude plev3 time1,va,atmos,,,,
1.0,Air Temperature,K,"on the following pressure levels: 850, 500, 250 hPa",,ta,air_temperature,,K,,,,,,,real,longitude latitude plev3 time1,ta,atmos,,area: areacella,,
1.0,Sea Level Pressure,Pa,,,psl,air_pressure_at_sea_level,,Pa,,,,,,,real,longitude latitude time1,psl,atmos,,area: areacella,,
diff --git a/Tables_csv/aero.csv b/Tables_csv/aero.csv
index d0abfac..729a8e4 100644
--- a/Tables_csv/aero.csv
+++ b/Tables_csv/aero.csv
@@ -79,7 +79,7 @@ priority,long name,units ,comment ,questions,output variable name ,standard name
1.0,Ice Crystal Number Concentration of Cloud Tops,m-3,"Report concentration ""as seen from space"" over liquid cloudy 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,,ice_crystal_number_concen [...]
1.0,Column Integrated Cloud Droplet Number,m-2,Droplets are liquid only. Weight by liquid cloud fraction in each layer when vertically integrating. Weight by total liquid cloud fraction (as seen from TOA) when reporting monthly mean,,cldnvi,atmosphere_number_content_of_cloud_droplets,,m-2,time: mean,,,,,,real,longitude latitude time,cldnvi,aerosol,,area: areacella,,
In CMOR Table aero: 3-D aerosol-related concentrations and properties on model levels,,,,,,,,,,,,,,,,,,,,,,
-"1-year samples: 1850 to 1950 every 20 years, 1960 to 2020 every 10 years, 2040 to 2100 every 20 years",,,,,,,,,,,,,,,,,,,,,,
+"For historical and RCP runs, report 1-year samples: 1850 to 1950 every 20 years (1850, 1870, ... 1950), 1960 to 2020 every 10 years (1960, 1970, ... 2020), 2040 to 2100 every 20 years. For AMIP runs, report 1-year samples every 10 years (1980, 1990, ... 2010). For 2030 time-slice run, report 1-year sample for year 2030.",,,,,,,,,,,,,,,,,,,,,,
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,Ambient Aerosol Extinction Optical Thickness at 550 nm,m-1,"atmosphere_extinction_due_to_ambient_aerosol: ""ambient"" means ""wetted"". This and other fields in this table are 3-D.",,ec550aer,,atmosphere_extinction_due_to_ambient_aerosol,m-1,time: mean,,,,,,,longitude latitude alevel time,ec550aer,aerosol,,area: areacella,,
1.0,Concentration of Dry Aerosol Organic Matter,kg m-3,"mass_concentration_of_organic_matter_dry_aerosol_in_air mass concentration of organic matter dry aerosol in air: This is the sum of concentrations of primary and secondary organic aerosols (see next two table entries), and therefore should only be reported if those two components cannot be separately reported. ",,concoa,mass_concentration_of_particulate_organic_matter_dry_aerosol_in_air,,kg m-3,time: mean,,,,,,,longitude latitude a [...]
diff --git a/Tables_csv/amon.csv b/Tables_csv/amon.csv
index 40bbe2e..1b28c04 100644
--- a/Tables_csv/amon.csv
+++ b/Tables_csv/amon.csv
@@ -72,8 +72,8 @@ priority,long name,units ,comment ,questions,output variable name ,standard name
1.0,Mass Fraction of Cloud Ice,1.0,Report on model layers (not standard pressures). Include both large-scale and convective cloud. Calculate 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. Include precipitating hydrometeors ONLY if the precipitating hydrometeor affects the calculation of radiative transfer in model. ,,cli,mass_fraction_of_cloud_ice_in_air,,1.0,time: mean,,,,,,real,longitude latitude alevel time [...]
1.0,Convective Mass Flux,kg m-2 s-1,"Report on model half-levels (i.e., model layer bounds and not standard pressures). The net mass flux should represent the difference between the updraft and downdraft components. The flux is computed as the mass divided by the area of the grid cell. ",,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,Air Temperature,K,,,ta,air_temperature,,K,time: mean,,,,,,real,longitude latitude plevs time,ta,atmos,,area: areacella,,
-1.0,Eastward Wind,m s-1,,,ua,eastward_wind,,m s-1,time: mean,,,,,,real,longitude latitude plevs time,ua,atmos,,area: areacella,,
-1.0,Northward Wind,m s-1,,,va,northward_wind,,m s-1,time: mean,,,,,,real,longitude latitude plevs time,va,atmos,,area: areacella,,
+1.0,Eastward Wind,m s-1,,,ua,eastward_wind,,m s-1,time: mean,,,,,,real,longitude latitude plevs time,ua,atmos,,,,
+1.0,Northward Wind,m s-1,,,va,northward_wind,,m s-1,time: mean,,,,,,real,longitude latitude plevs time,va,atmos,,,,
1.0,Specific Humidity,1.0,,,hus,specific_humidity,,1.0,time: mean,,,,,,real,longitude latitude plevs time,hus,atmos,,area: areacella,,
1.0,Relative Humidity,%,"This is the relative humidity with respect to liquid water for T> 0 C, and with respect to ice for T<0 C.",,hur,relative_humidity,,%,time: mean,,,,,,real,longitude latitude plevs time,hur,atmos,,area: areacella,,
1.0,omega (=dp/dt),Pa s-1,"commonly referred to as ""omega"", this represents the vertical component of velocity in pressure coordinates (positive down)",,wap,lagrangian_tendency_of_air_pressure,,Pa s-1,time: mean,,,,,,real,longitude latitude plevs time,wap,atmos,,area: areacella,,
diff --git a/Tables_csv/cfDay.csv b/Tables_csv/cfDay.csv
index 8475e21..a45a35f 100644
--- a/Tables_csv/cfDay.csv
+++ b/Tables_csv/cfDay.csv
@@ -46,8 +46,8 @@ priority,long name,units ,comment ,questions,output variable name ,standard name
1.0,CALIPSO High Level Cloud Fraction ,%,,,clhcalipso,cloud_area_fraction_in_atmosphere_layer,,%,time: mean,,,,,,real,longitude latitude time,clhcalipso,atmos,,area: areacella,,
"In CMOR Table cfDay: ""CFMIP daily 3D"" --daily mean 3-D fields on model levels plus CALIPSO and ISCCP cloud fractions",,,,,,,,,,,,,,,,,,,,,,
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,Eastward Wind,m s-1 ,,,ua,eastward_wind,,m s-1 ,time: mean,,,,,,real,longitude latitude alevel time,ua,atmos,,area: areacella,,
-1.0,Northward Wind,m s-1,,,va,northward_wind,,m s-1,time: mean,,,,,,real,longitude latitude alevel time,va,atmos,,area: areacella,,
+1.0,Eastward Wind,m s-1 ,,,ua,eastward_wind,,m s-1 ,time: mean,,,,,,real,longitude latitude alevel time,ua,atmos,,,,
+1.0,Northward Wind,m s-1,,,va,northward_wind,,m s-1,time: mean,,,,,,real,longitude latitude alevel time,va,atmos,,,,
1.0,Air Temperature,K,,,ta,air_temperature,,K,time: mean,,,,,,real,longitude latitude alevel time,ta,atmos,,area: areacella,,
1.0,Specific Humidity,1.0,,,hus,specific_humidity,,1.0,time: mean,,,,,,real,longitude latitude alevel time,hus,atmos,,area: areacella,,
1.0,omega (=dp/dt),Pa s-1,"commonly referred to as ""omega"", this represents the vertical component of velocity in pressure coordinates (positive down)",,wap,lagrangian_tendency_of_air_pressure,,Pa s-1,time: mean,,,,,,real,longitude latitude alevel time,wap,atmos,,area: areacella,,
diff --git a/Tables_csv/day.csv b/Tables_csv/day.csv
index 445a5da..e9d3648 100644
--- a/Tables_csv/day.csv
+++ b/Tables_csv/day.csv
@@ -64,8 +64,8 @@ priority,long name,units ,comment ,questions,output variable name ,standard name
1.0,Relative Humidity,%,"This is the relative humidity with respect to liquid water for T> 0 C, and with respect to ice for T<0 C.",,hur,relative_humidity,,%,time: mean,,,,,,real,longitude latitude plev8 time,hur,atmos,,area: areacella,,
1.0,Specific Humidity,1.0,,,hus,specific_humidity,,1.0,time: mean,,,,,,real,longitude latitude plev8 time,hus,atmos,,area: areacella,,
1.0,omega (=dp/dt),Pa s-1,"commonly referred to as ""omega"", this represents the vertical component of velocity in pressure coordinates (positive down)",,wap,lagrangian_tendency_of_air_pressure,,Pa s-1,time: mean,,,,,,real,longitude latitude plev8 time,wap,atmos,,area: areacella,,
-1.0,Northward Wind,m s-1 ,,,va,northward_wind,,m s-1 ,time: mean,,,,,,real,longitude latitude plev8 time,va,atmos,,area: areacella,,
-1.0,Eastward Wind,m s-1 ,,,ua,eastward_wind,,m s-1 ,time: mean,,,,,,real,longitude latitude plev8 time,ua,atmos,,area: areacella,,
+1.0,Northward Wind,m s-1 ,,,va,northward_wind,,m s-1 ,time: mean,,,,,,real,longitude latitude plev8 time,va,atmos,,,,
+1.0,Eastward Wind,m s-1 ,,,ua,eastward_wind,,m s-1 ,time: mean,,,,,,real,longitude latitude plev8 time,ua,atmos,,,,
2.0,Geopotential Height,m,,,zg,geopotential_height,,m,time: mean,,,,,,real,longitude latitude plev8 time,zg,atmos,,area: areacella,,
diff --git a/Tables_csv/fx.csv b/Tables_csv/fx.csv
index 5e0fb4a..a5ca9dd 100644
--- a/Tables_csv/fx.csv
+++ b/Tables_csv/fx.csv
@@ -27,6 +27,6 @@ priority,long name,units ,comment ,questions,output variable name ,standard name
1.0,Ocean Grid-Cell Area,m2,,,areacello,cell_area,,m2,,100000.0,1e+12,100000.0,1e+12,,real,longitude latitude,areacello,ocean,,,,
1.0,Sea Area Fraction,%,"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. This is the area fraction at the ocean surface.",Should this be recorded as a function of depth?,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. Report on the grid used for the temperature field.",,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 a [...]
-1.0,Region Selection Index,1.0,"Report on the same grid as the ocean 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. Report on the grid used for the meridional overturning stream function.",,basinv,region,,1.0,,1.0,10.0,,,,integer,longitude latitude,basinv,ocean,,,0 1 2 3 4 5 6 7 8 9 10,global_land southern_ocean atlant [...]
+,,,eliminated basinv because it can be estimated from basin; also some models would also need a basinu for completeness,,,,,,,,,,,,,,,,,,,
diff --git a/Tables_csv/omon.csv b/Tables_csv/omon.csv
index 7bb9b9a..d43c370 100644
--- a/Tables_csv/omon.csv
+++ b/Tables_csv/omon.csv
@@ -13,7 +13,7 @@ In CMOR Table Omon: Marine Biogeochemical 2-D Fields,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,
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
-2.0,Surface Concentration of (+name of tracer),"mol m-3 or kg m-3 or 1, consistent with first table in Oyr","surface concentrations of all 3D tracers. See first table in Oyr for a complete list of these tracers. ""Tracer"" concentations should be reported even if they are diagnosed rather than prognostically calculated.",,include Oyr 3D tracers,,,"mol m-3 or kg m-3 or 1, consistent with first table in Oyr",time: mean area: mean where sea,,,,,,real,longitude latitude time depth0m,,ocnBg [...]
+2.0,Surface Concentration of (+name of tracer),"mol m-3 or kg m-3 or 1, consistent with first table in Oyr"," Concentrations of all 3D tracers in the uppermost ocean layer. See first table in Oyr for a complete list of these tracers. ""Tracer"" concentations should be reported even if they are diagnosed rather than prognostically calculated.",,include Oyr 3D tracers,,,"mol m-3 or kg m-3 or 1, consistent with first table in Oyr",time: mean area: mean where sea,,,,,,real,longitude latitu [...]
1.0,Primary Organic Carbon Production by All Types of Phytoplankton,mol m-2 s-1,"Vertically integrated total primary (organic carbon) production by phytoplankton. This should equal the sum of intpdiat+intpphymisc, but those individual components may be unavailable in some models.",,intpp,net_primary_mole_productivity_of_carbon_by_phytoplankton,,mol m-2 s-1,time: mean area: mean where sea,,,,,,real,longitude latitude time,intpp,ocnBgchem,,area: areacello,,
2.0,Primary Organic Carbon Production by Phytoplankton Based on Nitrate Uptake Alone,mol m-2 s-1,Vertically integrated primary (organic carbon) production by phytoplankton based on nitrate uptake alone,,intpnitrate,net_primary_mole_productivity_of_carbon_due_to_nitrate_utilization,,mol m-2 s-1,time: mean area: where sea,,,,,,real,longitude latitude time,intpnitrate,ocnBgchem,,area: areacello,,
2.0,Primary Organic Carbon Production by Diatoms,mol m-2 s-1,Vertically integrated primary (organic carbon) production by the diatom phytoplankton component alone,,intpdiat,net_primary_mole_productivity_of_carbon_by_diatoms,,mol m-2 s-1,time: mean area: mean where sea,,,,,,real,longitude latitude time,intpdiat,ocnBgchem,,area: areacello,,
diff --git a/configure.ac b/configure.ac
index d48b007..810d5f7 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.0.1, doutriaux1 at llnl.gov)
+AC_INIT(cmip5-cmor-tables, 1.0.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