[cmor] 13/190: updated tables to reflect correct values of valid min/max for areacella
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 12:54:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cmor.
commit f2e2dfd221642f849a03e254341df0abc560d388
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date: Mon May 24 14:24:13 2010 -0700
updated tables to reflect correct values of valid min/max for areacella
---
Lib/table_generator.py | 3 +++
Tables/CMIP5_3hr | 2 +-
Tables/CMIP5_6hrLev | 2 +-
Tables/CMIP5_6hrPlev | 2 +-
Tables/CMIP5_Amon | 2 +-
Tables/CMIP5_Limon | 2 +-
Tables/CMIP5_Lmon | 2 +-
Tables/CMIP5_Oclim | 2 +-
Tables/CMIP5_Oimon | 2 +-
Tables/CMIP5_Omon | 2 +-
Tables/CMIP5_Oyr | 2 +-
Tables/CMIP5_aero | 2 +-
Tables/CMIP5_cf3hr | 2 +-
Tables/CMIP5_cfDay | 2 +-
Tables/CMIP5_cfMon | 2 +-
Tables/CMIP5_cfOff | 2 +-
Tables/CMIP5_cfSites | 2 +-
Tables/CMIP5_day | 2 +-
Tables/CMIP5_fx | 14 +++++++++-----
Tables/md5s | 2 +-
Tables_csv/fx.csv | 4 ++--
21 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/Lib/table_generator.py b/Lib/table_generator.py
index 7625a87..634ad32 100644
--- a/Lib/table_generator.py
+++ b/Lib/table_generator.py
@@ -197,6 +197,8 @@ def process_template(tmpl,cnames,cols,voids={},minmax={}):
setattr(F,"climatology","yes")
if "climatology" in keys: keys.remove("climatology")
if val.strip()!="":
+ ## if c=="valid max":
+ ## print 'ok we havew a val max predefined at:',cols
if c in ['units','unformatted units'] and val=='1.0':
val='1'
setattr(F,c,val)
@@ -236,6 +238,7 @@ def process_template(tmpl,cnames,cols,voids={},minmax={}):
std +=mn['std']
std/=len(mnmx.keys())
setattr(F,"valid max","%.2g" % (val+2*std))
+ ## print 'Setting valid max for %s to %.2g' % (ve,val)
keys.remove("valid max")
### Need to add lines for absolute mean min/max
diff --git a/Tables/CMIP5_3hr b/Tables/CMIP5_3hr
index 4d6bc14..68e65f0 100644
--- a/Tables/CMIP5_3hr
+++ b/Tables/CMIP5_3hr
@@ -6,7 +6,7 @@ frequency: 3hr
cmor_version: 2.0 ! version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 20 May 2010 ! date this table was constructed
+table_date: 24 May 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 1289632..712a0e4 100644
--- a/Tables/CMIP5_6hrLev
+++ b/Tables/CMIP5_6hrLev
@@ -6,7 +6,7 @@ frequency: 6hr
cmor_version: 2.0 ! version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 20 May 2010 ! date this table was constructed
+table_date: 24 May 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_6hrPlev b/Tables/CMIP5_6hrPlev
index c65f18f..0233b85 100644
--- a/Tables/CMIP5_6hrPlev
+++ b/Tables/CMIP5_6hrPlev
@@ -6,7 +6,7 @@ frequency: 6hr
cmor_version: 2.0 ! version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 20 May 2010 ! date this table was constructed
+table_date: 24 May 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_Amon b/Tables/CMIP5_Amon
index c101265..ecd7f7f 100644
--- a/Tables/CMIP5_Amon
+++ b/Tables/CMIP5_Amon
@@ -6,7 +6,7 @@ frequency: mon
cmor_version: 2.0 ! version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 20 May 2010 ! date this table was constructed
+table_date: 24 May 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_Limon b/Tables/CMIP5_Limon
index 9137ecb..7897335 100644
--- a/Tables/CMIP5_Limon
+++ b/Tables/CMIP5_Limon
@@ -6,7 +6,7 @@ frequency: mon
cmor_version: 2.0 ! version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 20 May 2010 ! date this table was constructed
+table_date: 24 May 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 9850b31..b0cc771 100644
--- a/Tables/CMIP5_Lmon
+++ b/Tables/CMIP5_Lmon
@@ -6,7 +6,7 @@ frequency: mon
cmor_version: 2.0 ! version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 20 May 2010 ! date this table was constructed
+table_date: 24 May 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 02e64a9..9739018 100644
--- a/Tables/CMIP5_Oclim
+++ b/Tables/CMIP5_Oclim
@@ -6,7 +6,7 @@ frequency: monClim
cmor_version: 2.0 ! version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 20 May 2010 ! date this table was constructed
+table_date: 24 May 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 ad997a7..1dd00db 100644
--- a/Tables/CMIP5_Oimon
+++ b/Tables/CMIP5_Oimon
@@ -6,7 +6,7 @@ frequency: mon
cmor_version: 2.0 ! version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 20 May 2010 ! date this table was constructed
+table_date: 24 May 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 8600c44..298092e 100644
--- a/Tables/CMIP5_Omon
+++ b/Tables/CMIP5_Omon
@@ -6,7 +6,7 @@ frequency: mon
cmor_version: 2.0 ! version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 20 May 2010 ! date this table was constructed
+table_date: 24 May 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_Oyr b/Tables/CMIP5_Oyr
index a60a0d9..d575960 100644
--- a/Tables/CMIP5_Oyr
+++ b/Tables/CMIP5_Oyr
@@ -6,7 +6,7 @@ frequency: yr
cmor_version: 2.0 ! version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 20 May 2010 ! date this table was constructed
+table_date: 24 May 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 d95de4f..05d2fa8 100644
--- a/Tables/CMIP5_aero
+++ b/Tables/CMIP5_aero
@@ -6,7 +6,7 @@ frequency: mon
cmor_version: 2.0 ! version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 20 May 2010 ! date this table was constructed
+table_date: 24 May 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 79c93d0..4769ec4 100644
--- a/Tables/CMIP5_cf3hr
+++ b/Tables/CMIP5_cf3hr
@@ -6,7 +6,7 @@ frequency: 3hr
cmor_version: 2.0 ! version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 20 May 2010 ! date this table was constructed
+table_date: 24 May 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 05c5e1d..06ba36f 100644
--- a/Tables/CMIP5_cfDay
+++ b/Tables/CMIP5_cfDay
@@ -6,7 +6,7 @@ frequency: day
cmor_version: 2.0 ! version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 20 May 2010 ! date this table was constructed
+table_date: 24 May 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_cfMon b/Tables/CMIP5_cfMon
index f62974c..f48dcf2 100644
--- a/Tables/CMIP5_cfMon
+++ b/Tables/CMIP5_cfMon
@@ -6,7 +6,7 @@ frequency: mon
cmor_version: 2.0 ! version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 20 May 2010 ! date this table was constructed
+table_date: 24 May 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 7413242..292bd78 100644
--- a/Tables/CMIP5_cfOff
+++ b/Tables/CMIP5_cfOff
@@ -6,7 +6,7 @@ frequency: mon
cmor_version: 2.0 ! version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 20 May 2010 ! date this table was constructed
+table_date: 24 May 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 ec1f69c..ad666cb 100644
--- a/Tables/CMIP5_cfSites
+++ b/Tables/CMIP5_cfSites
@@ -6,7 +6,7 @@ frequency: subhr
cmor_version: 2.0 ! version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 20 May 2010 ! date this table was constructed
+table_date: 24 May 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 a9d445d..a1b7bd8 100644
--- a/Tables/CMIP5_day
+++ b/Tables/CMIP5_day
@@ -6,7 +6,7 @@ frequency: day
cmor_version: 2.0 ! version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 20 May 2010 ! date this table was constructed
+table_date: 24 May 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_fx b/Tables/CMIP5_fx
index bc11944..bd4a248 100644
--- a/Tables/CMIP5_fx
+++ b/Tables/CMIP5_fx
@@ -6,7 +6,7 @@ frequency: fx
cmor_version: 2.0 ! version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 20 May 2010 ! date this table was constructed
+table_date: 24 May 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
@@ -425,8 +425,10 @@ long_name: Atmosphere Grid-Cell Area
dimensions: longitude latitude
out_name: areacella
type: real
-valid_min: 500.0
-valid_max: 250000.0
+valid_min: 100000.0
+valid_max: 1e+12
+ok_min_mean_abs: 100000.0
+ok_max_mean_abs: 1e+12
!----------------------------------
!
@@ -609,8 +611,10 @@ long_name: Ocean Grid-Cell Area
dimensions: longitude latitude
out_name: areacello
type: real
-valid_min: 10.0
-valid_max: 250000.0
+valid_min: 100000.0
+valid_max: 1e+12
+ok_min_mean_abs: 100000.0
+ok_max_mean_abs: 1e+12
!----------------------------------
!
diff --git a/Tables/md5s b/Tables/md5s
index 897ffe8..32262c7 100644
--- a/Tables/md5s
+++ b/Tables/md5s
@@ -1 +1 @@
-{'CMIP5': {'cf3hr': {'12 March 2010': 'ae9a82f01824d9012aa0657cd7896a9a', '11 May 2010': 'a59ca1270ff3036d417a7f2217598266', '22 March 2010': '712cd14ab6a28116da828ff555e00c4d', '12 May 2010': '905f7ccdd5a31cb71e2a6e3b339cd0e1', '02 April 2010': '3394448440a54597570cc877dcbaca7d', '26 April 2010': 'b0d0de6ac8d5ef997347610ea6a51d6d', '29 April 2010': 'fdc4fb38dd4cfb7f066329ed43a9e805'}, '3hr': {'12 March 2010': '8249007b0a473d19554b47efaff87a39', '11 May 2010': '9f293a2c84001fbaa5aef7357e [...]
\ No newline at end of file
+{'CMIP5': {'cf3hr': {'12 March 2010': 'ae9a82f01824d9012aa0657cd7896a9a', '11 May 2010': 'a59ca1270ff3036d417a7f2217598266', '22 March 2010': '712cd14ab6a28116da828ff555e00c4d', '12 May 2010': '905f7ccdd5a31cb71e2a6e3b339cd0e1', '02 April 2010': '3394448440a54597570cc877dcbaca7d', '26 April 2010': 'b0d0de6ac8d5ef997347610ea6a51d6d', '24 May 2010': '61693a46b06627dcd6ffe8ceff288ef0', '29 April 2010': 'fdc4fb38dd4cfb7f066329ed43a9e805'}, '3hr': {'12 March 2010': '8249007b0a473d19554b47efaf [...]
\ No newline at end of file
diff --git a/Tables_csv/fx.csv b/Tables_csv/fx.csv
index b40e0b6..5e2a0c0 100644
--- a/Tables_csv/fx.csv
+++ b/Tables_csv/fx.csv
@@ -13,7 +13,7 @@ on atmospheric grid,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,,,,,
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,Atmosphere Grid-Cell Area,m2,,,areacella,cell_area,,m2,,500.0,250000.0,,,,real,longitude latitude,areacella,atmos land,,,,
+1.0,Atmosphere Grid-Cell Area,m2,,,areacella,cell_area,,m2,,100000.0,1e+12,100000.0,1e+12,,real,longitude latitude,areacella,atmos land,,,,
1.0,Surface Altitude,m,"height above the geoid; as defined here, ""the geoid"" is a surface of constant geopotential that, if the ocean were at rest, would coincide with mean sea level. Under this definition, the geoid changes as the mean volume of the ocean changes (e.g., due to glacial melt, or global warming of the ocean). Report here the height above the present-day geoid. Over ocean, report as 0.0",,orog,surface_altitude,,m,,-700.0,10000.0,,,,real,longitude latitude,orog,atmos,,ar [...]
1.0,Land Area Fraction,%,,,sftlf,land_area_fraction,,%,,0.0,100.0,,,,real,longitude latitude,sftlf,atmos,,area: areacella,,
1.0,Fraction of Grid Cell Covered with Glacier,%,"fraction of grid cell occupied by ""permanent"" ice (i.e., glaciers). If time varying, report annual values for each year of simulation",,sftgif,land_ice_area_fraction,,%,,0.0,100.0,,,,real,longitude latitude,sftgif,land,,area: areacella,,
@@ -24,7 +24,7 @@ on ocean grid ,,,,,,,,,,,,,,,,,,,,,,
priority,long name,units ,comment ,questions,output variable name ,standard name,unconfirmed or proposed standard name,unformatted units,cell_methods,valid min,valid max,mean absolute min,mean absolute max,positive,type,CMOR dimensions,CMOR variable name,realm,frequency,cell_measures,flag_values,flag_meanings
1.0,Sea Floor Depth,m,Ocean bathymetry. Report here the sea floor depth for present day. Report as missing for land grid cells.,,deptho,sea_floor_depth_below_geoid,,m,,0.0,10000.0,2000.0,5000.0,,real,longitude latitude,deptho,ocean,,area: areacello,,
1.0,Ocean Grid-Cell Volume,m3,3-D field: grid-cell volume ca. 2000. ,,volcello,ocean_volume,,m3,,1000.0,1e+15,10000000000.0,1e+15,,real,longitude latitude olevel,volcello,ocean,,,,
-1.0,Ocean Grid-Cell Area,m2,,,areacello,cell_area,,m2,,10.0,250000.0,,,,real,longitude latitude,areacello,ocean,,,,
+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 [...]
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git
More information about the debian-science-commits
mailing list