[cmor-tables] 40/83: updated frequency in tables
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 4b7a1943dc214824c59805aa58153dbbe4e33a6b
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date: Wed Aug 18 08:35:51 2010 -0700
updated frequency in tables
---
Lib/table_generator.py | 15 +++++++++++----
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_OImon | 2 +-
Tables/CMIP5_Oclim | 2 +-
Tables/CMIP5_Omon | 2 +-
Tables/CMIP5_Oyr | 2 +-
Tables/CMIP5_aero | 2 +-
Tables/CMIP5_cf3hr | 4 ++--
Tables/CMIP5_cfDay | 2 +-
Tables/CMIP5_cfMon | 4 ++--
Tables/CMIP5_cfOff | 4 ++--
Tables/CMIP5_cfSites | 4 ++--
Tables/CMIP5_day | 2 +-
Tables/CMIP5_fx | 2 +-
19 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/Lib/table_generator.py b/Lib/table_generator.py
index 90d2460..7ab8637 100644
--- a/Lib/table_generator.py
+++ b/Lib/table_generator.py
@@ -325,7 +325,8 @@ def create_table_header(tbnm, table_file, dims_file, fqcy):
print >> fo, general
# looking for approx interval, ASSUMING UNITS ARE IN DAYS SINCE
- if tbnm.find("mon")>-1:
+ print 'Table nm:',tbnm,'__________________________________________'
+ if tbnm.lower().find("mon")>-1:
interval = 30.
elif tbnm.lower().find('clim')>-1:
interval = 30.
@@ -335,12 +336,18 @@ def create_table_header(tbnm, table_file, dims_file, fqcy):
interval = 365.
elif tbnm.lower().find('da')>-1:
interval = 1.
- elif tbnm.find("hr")==1:
- interval = float(tbnm[0])/24.
- elif tbnm.find("min")>-1:
+ elif tbnm.lower().find("hr")>-1:
+ indx = tbnm.lower().find("hr")
+ interval = float(tbnm[indx-1])/24.
+ elif tbnm.lower().find("cfoff")>-1:
+ interval = 30.
+ elif tbnm.lower().find("cfsites")>-1:
+ interval = 25./(24.*60.)
+ elif tbnm.lower().find("min")>-1:
interval = float(tbnm[2:tbnm.find("min")])/1440.
else:
interval = 0.
+ print 'Interval:',interval,'________________________'
print >> fo, """approx_interval: %f ! approximate spacing between successive time
! samples (in units of the output time
! coordinate.""" % interval
diff --git a/Tables/CMIP5_3hr b/Tables/CMIP5_3hr
index d8d3c38..089fac2 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: 02 August 2010 ! date this table was constructed
+table_date: 17 August 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 4eabe55..738330f 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: 02 August 2010 ! date this table was constructed
+table_date: 17 August 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 1ccba09..340aab8 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: 02 August 2010 ! date this table was constructed
+table_date: 17 August 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 287b7db..9a52983 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: 02 August 2010 ! date this table was constructed
+table_date: 17 August 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 f32a4fc..debcbce 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: 02 August 2010 ! date this table was constructed
+table_date: 17 August 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 9787839..d99a2cd 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: 02 August 2010 ! date this table was constructed
+table_date: 17 August 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 3d1a6fc..c38b493 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: 02 August 2010 ! date this table was constructed
+table_date: 17 August 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 eba9d08..201526c 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: 02 August 2010 ! date this table was constructed
+table_date: 17 August 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 8248dac..93f8e28 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: 02 August 2010 ! date this table was constructed
+table_date: 17 August 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 42d76ef..3a58313 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: 02 August 2010 ! date this table was constructed
+table_date: 17 August 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 c7fcdad..9fd2615 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: 02 August 2010 ! date this table was constructed
+table_date: 17 August 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 bcb9556..40fcb63 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: 02 August 2010 ! date this table was constructed
+table_date: 17 August 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
@@ -72,7 +72,7 @@ expt_id_ok: 'aqua planet plus 4K anomaly' 'aqua4K'
expt_id_ok: 'AMIP plus 4K anomaly' 'amip4K'
-approx_interval: 0.000000 ! approximate spacing between successive time
+approx_interval: 0.125000 ! approximate spacing between successive time
! samples (in units of the output time
! coordinate.
diff --git a/Tables/CMIP5_cfDay b/Tables/CMIP5_cfDay
index 34b114c..f1bc0b5 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: 02 August 2010 ! date this table was constructed
+table_date: 17 August 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 7909210..292b222 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: 02 August 2010 ! date this table was constructed
+table_date: 17 August 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
@@ -72,7 +72,7 @@ expt_id_ok: 'aqua planet plus 4K anomaly' 'aqua4K'
expt_id_ok: 'AMIP plus 4K anomaly' 'amip4K'
-approx_interval: 0.000000 ! approximate spacing between successive time
+approx_interval: 30.000000 ! approximate spacing between successive time
! samples (in units of the output time
! coordinate.
diff --git a/Tables/CMIP5_cfOff b/Tables/CMIP5_cfOff
index 2a854d5..934346c 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: 02 August 2010 ! date this table was constructed
+table_date: 17 August 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
@@ -72,7 +72,7 @@ expt_id_ok: 'aqua planet plus 4K anomaly' 'aqua4K'
expt_id_ok: 'AMIP plus 4K anomaly' 'amip4K'
-approx_interval: 0.000000 ! approximate spacing between successive time
+approx_interval: 30.000000 ! approximate spacing between successive time
! samples (in units of the output time
! coordinate.
diff --git a/Tables/CMIP5_cfSites b/Tables/CMIP5_cfSites
index db62f04..07d7860 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: 02 August 2010 ! date this table was constructed
+table_date: 17 August 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
@@ -72,7 +72,7 @@ expt_id_ok: 'aqua planet plus 4K anomaly' 'aqua4K'
expt_id_ok: 'AMIP plus 4K anomaly' 'amip4K'
-approx_interval: 0.000000 ! approximate spacing between successive time
+approx_interval: 0.017361 ! approximate spacing between successive time
! samples (in units of the output time
! coordinate.
diff --git a/Tables/CMIP5_day b/Tables/CMIP5_day
index 90f1fa6..d332bf8 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: 02 August 2010 ! date this table was constructed
+table_date: 17 August 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 a8ec36c..8b7cafc 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: 02 August 2010 ! date this table was constructed
+table_date: 17 August 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
--
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