[cmor] 05/190: 2010-05-12 : CMIP5_fx add time dependency, fixed 2010-05-12 : user could pass any calendar name! Now has to match valid ones!
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 12:54:16 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 48364b0c1983224f1f586908cad905db0c853078
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date: Wed May 12 17:03:14 2010 -0700
2010-05-12 : CMIP5_fx add time dependency, fixed
2010-05-12 : user could pass any calendar name! Now has to match valid ones!
---
Lib/check_CMOR_compliant.py | 11 +-
Lib/table_generator.py | 3 +-
RELEASE-NOTES | 2 +
Src/cmor.c | 6 +-
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 | 99 +-------------
Tables/md5s | 2 +-
Tables_csv/add_dims2_notime.txt | 287 ++++++++++++++++++++++++++++++++++++++++
Test/ipcc_test_code.c | 2 +-
25 files changed, 322 insertions(+), 124 deletions(-)
diff --git a/Lib/check_CMOR_compliant.py b/Lib/check_CMOR_compliant.py
index 06bbcdd..eee8bec 100644
--- a/Lib/check_CMOR_compliant.py
+++ b/Lib/check_CMOR_compliant.py
@@ -10,7 +10,7 @@ VERBOSE=-999
class CMORError(Exception):
def __init__(self,value=None):
- self.value=value[0]
+ self.value=value
def __str__(self):
color=31
msg = "%c[%d;%d;%dm%s%c[%dm" % (0X1B,2,color,47,self.value,0X1B,0)
@@ -227,7 +227,7 @@ def checkCMOR(fout,file,table,noerror=cmor.CMOR_CRITICAL,variable=None,from_boun
spver = ver.split('.')
major = int(spver[0])
if major>1:
- req_glbl_att+=["contact",'experiment_id','physics_version','initialization_method','institute_id','institution','tracking_id','product','frequency','model_id','forcing','creation_date','frequency','modeling_realm']
+ req_glbl_att+=["contact",'experiment_id','physics_version','initialization_method','institute_id','institution','tracking_id','product','frequency','model_id','creation_date','frequency','modeling_realm']
else:
opt_glbl_att+=["contact",'experiment_id','physics_version','initialization_method','institute_id','institution','tracking_id','product','frequency','model_id','forcing','creation_date','frequency','modeling_realm']
if isinstance(file,str):
@@ -1176,10 +1176,10 @@ def checkCMOR(fout,file,table,noerror=cmor.CMOR_CRITICAL,variable=None,from_boun
## ???
manageLog(fout,VERBOSE, '\t\tChecking positive attribute')
p=getattr(ax,'positive',None)
- if not gnm in [ 'zlevel', 'alevel','olevel']:
+ if not nm in [ 'zlevel', 'alevel','olevel']:
ncheck+=1
if p is None:
- if gnm in ['zlevel','alevel','olevel']:
+ if nm in ['zlevel','alevel','olevel']:
nerr+=manageLog(fout, noerror, 'vertical dimensions must have positive attribute')
else:
nwarn+=1
@@ -1483,7 +1483,8 @@ def checkCMOR(fout,file,table,noerror=cmor.CMOR_CRITICAL,variable=None,from_boun
nerr+=nerr
manageLog(fout,cmor.CMOR_WARNING, '%d warnings issued out of %d checked for (%5.2f%%)' % (nwarn,ncheck,float(nwarn)/ncheck*100))
if nerr!=0:
- raise CMORError, str(nerr)+' CMOR errors were raise, please check output and correct your file !!!!'
+ print 'Nerr:',nerr
+ raise CMORError,'%i CMOR errors were raise, please check output and correct your file !!!!' % (nerr)
file.close()
return nwarn,ncheck,nerr
diff --git a/Lib/table_generator.py b/Lib/table_generator.py
index 9a71176..050fb75 100644
--- a/Lib/table_generator.py
+++ b/Lib/table_generator.py
@@ -199,7 +199,6 @@ def process_template(tmpl,cnames,cols,voids={}):
if val.strip()!="":
if c in ['units','unformatted units'] and val=='1.0':
val='1'
- print 'c:',c,'V:',val
setattr(F,c,val)
keys.remove(c)
## print
@@ -308,6 +307,8 @@ def create_table_header(tbnm, table_file, dims_file, fqcy):
addLines = True
zlevel_name = 'olevel'
file_add = 'Tables_csv/add_dims2.txt'
+ if tbnm=='fx':
+ file_add= "Tables_csv/add_dims2_notime.txt"
else:
print >> fo, process_template(axis_tmpl,cnms,sp)
if addLines is True:
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a204544..8090e0c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,5 @@
+2010-05-12 : CMIP5_fx add time dependency, fixed
+2010-05-12 : user could pass any calendar name! Now has to match valid ones!
2010-05-11 : updated tables
2010-05-11 : created a xls2csv script MUCH improved my life when Karl changes tables from now on.
2010-05-11 : sigma coord and irregular girds: implemented
diff --git a/Src/cmor.c b/Src/cmor.c
index 306da72..3568dcb 100644
--- a/Src/cmor.c
+++ b/Src/cmor.c
@@ -1144,7 +1144,7 @@ int cmor_dataset(char *outpath,
if (found == 1 ) {
snprintf(msg,CMOR_MAX_STRING,"CMOR_DATASET: you passed calendar: %s therefore we will ignore any user defined value you also set for month_lentgths and leap_months", calendar);
cmor_handle_error(msg,CMOR_WARNING);
- }
+ }
else {
if (strcmp(calendar,"non_standard")!=0) {
snprintf(msg,CMOR_MAX_STRING,"CMOR_DATASET: You defined a non_standard calendar, its name should be: 'non_standard', you passed: '%s'",calendar);
@@ -1189,6 +1189,10 @@ int cmor_dataset(char *outpath,
}
}
}
+ else if (found==0) {
+ snprintf(msg,CMOR_MAX_STRING,"Unknown calendar: %s (calendar are case sensitive)", calendar);
+ cmor_handle_error(msg,CMOR_CRITICAL);
+ }
cmor_set_cur_dataset_attribute("contact",contact,1);
cmor_set_cur_dataset_attribute("history",history,1);
cmor_set_cur_dataset_attribute("comment",comment,1);
diff --git a/Tables/CMIP5_3hr b/Tables/CMIP5_3hr
index ebb0d70..b66bfad 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: 11 May 2010 ! date this table was constructed
+table_date: 12 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 63f1d02..e812d31 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: 11 May 2010 ! date this table was constructed
+table_date: 12 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 1f6e8a7..1a1971c 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: 11 May 2010 ! date this table was constructed
+table_date: 12 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 874f809..46a78f8 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: 11 May 2010 ! date this table was constructed
+table_date: 12 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 df87f3f..012517a 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: 11 May 2010 ! date this table was constructed
+table_date: 12 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 d4d29d4..cbf16c8 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: 11 May 2010 ! date this table was constructed
+table_date: 12 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 2df3932..498f874 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: 11 May 2010 ! date this table was constructed
+table_date: 12 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 8c127f7..af73db2 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: 11 May 2010 ! date this table was constructed
+table_date: 12 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 f872075..e992aad 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: 11 May 2010 ! date this table was constructed
+table_date: 12 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 38c8f4a..f0e842c 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: 11 May 2010 ! date this table was constructed
+table_date: 12 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 41fdd05..6ac5bab 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: 11 May 2010 ! date this table was constructed
+table_date: 12 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 9ac762f..ff35a90 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: 11 May 2010 ! date this table was constructed
+table_date: 12 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 b755211..df48a7b 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: 11 May 2010 ! date this table was constructed
+table_date: 12 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 37ceff2..97a4d4d 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: 11 May 2010 ! date this table was constructed
+table_date: 12 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 8e8272e..353fb0d 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: 11 May 2010 ! date this table was constructed
+table_date: 12 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 9838c77..ba0fb7c 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: 11 May 2010 ! date this table was constructed
+table_date: 12 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 9bccaa4..d2ca38b 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: 11 May 2010 ! date this table was constructed
+table_date: 12 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 f4e1f2a..77bd223 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: 11 May 2010 ! date this table was constructed
+table_date: 12 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
@@ -172,86 +172,6 @@ z_factors: sigma: sigma depth: depth z1: z1 z2: z2 a: a_coeff href: href
z_bounds_factors: sigma: sigma_bnds depth: depth z1: z1 z2: z2 a: a href: href k_c: k_c
!----------------------------------
!
-!============
-axis_entry: ocean_sigma_z
-!============
-!
-!------------
-!
-! Axis attributes:
-!----------------------------------
-standard_name: ocean_sigma_z
-axis: Z
-long_name: ocean sigma over z coordinate
-!----------------------------------
-!
-! Additional axis information:
-!----------------------------------
-out_name: lev
-must_have_bounds: yes
-formula: for k <= nsigma: z(n,k,j,i) = eta(n,j,i) + sigma(k)*(min(depth_c,depth(j,i))+eta(n,j,i)) ; for k > nsigma: z(n,k,j,i) = zlev(k)
-z_factors: sigma: sigma eta: eta depth: depth depth_c: depth_c nsigma: nsigma zlev: zlev
-z_bounds_factors: sigma: sigma_bnds eta: eta depth: depth depth_c: depth_c nsigma: nsigma zlev: zlev_bnds
-!----------------------------------
-!
-!============
-axis_entry: ocean_s
-!============
-!
-! This coordinate is dimensionless and varies from 0 at the surface to -1. at the ocean floor.
-! The values of s(k), which appears in the formula below, should be stored as ocean_s.
-! Note that in the netCDF file the variable will be named "lev", not ocean_s.
-!
-!------------
-!
-! Axis attributes:
-!----------------------------------
-standard_name: ocean_s_coordinate
-axis: Z
-positive: up
-long_name: ocean s-coordinate
-!----------------------------------
-!
-! Additional axis information:
-!----------------------------------
-out_name: lev
-must_have_bounds: yes
-stored_direction: decreasing
-valid_min: -1.
-valid_max: 0.
-formula: z(n,k,j,i) = eta(n,j,i)*(1+s(k)) + depth_c*s(k) + (depth(j,i)-depth_c)*C(k) \n where \n C(k)=(1-b)*sinh(a*s(k))/sinh(a) +\n b*(tanh(a*(s(k)+0.5))/(2*tanh(0.5*a)) - 0.5)
-z_factors: s: lev eta: eta depth: depth a: a_coeff b: b_coeff depth_c: depth_c
-z_bounds_factors: s: lev_bnds eta: eta depth: depth a: a b: b depth_c: depth_c
-!----------------------------------
-!
-!============
-axis_entry: ocean_sigma
-!============
-!
-! This coordinate is dimensionless and varies from 0 at the surface to -1. at the ocean floor.
-! The values of sigma(k), which appears in the formula below, should be stored as ocean_sigma.
-! Note that in the netCDF file the variable will be named "lev", not ocean_sigma.
-!
-!------------
-!
-! Axis attributes:
-!----------------------------------
-standard_name: ocean_sigma_coordinate
-axis: Z
-positive: up
-long_name: ocean sigma coordinate
-!----------------------------------
-!
-! Additional axis information:
-!----------------------------------
-out_name: lev
-must_have_bounds: yes
-stored_direction: decreasing
-valid_min: -1.
-valid_max: 0.
-formula: z(n,k,j,i) = eta(n,j,i) + sigma(k)*(depth(j,i)+eta(n,j,i))
-z_factors: sigma: lev eta: eta depth: depth
-z_bounds_factors: sigma: lev_bnds eta: eta depth: depth
!----------------------------------
!
!
@@ -262,23 +182,6 @@ z_bounds_factors: sigma: lev_bnds eta: eta depth: depth
! ***************************************************************
!
!============
-variable_entry: eta
-!============
-!----------------------------------
-! Variable attributes:
-!----------------------------------
-units: m
-cell_methods: time: mean
-long_name: Sea Surface Height
-!----------------------------------
-! Additional variable information:
-!----------------------------------
-dimensions: longitude latitude time
-type: real
-!----------------------------------
-!
-!
-!============
variable_entry: depth
!============
!----------------------------------
diff --git a/Tables/md5s b/Tables/md5s
index d5bde69..897ffe8 100644
--- a/Tables/md5s
+++ b/Tables/md5s
@@ -1 +1 @@
-{'CMIP5': {'cfSites': {'12 March 2010': '192f07ba869af3794494ea0dc3a72a54', '11 May 2010': '80506c07ed63befd33f9f727b78bde55', '22 March 2010': 'fe60fd7cfbaccc08c75a91dc67a68b99', '02 April 2010': '650c6032a9cbeedb142a41b923e85f22', '26 April 2010': '6fe91d86689e2fa1faa2fe7164876ace', '29 April 2010': '27c4a93f80a4282ef69f23391c699f01'}, 'cf3hr': {'12 March 2010': 'ae9a82f01824d9012aa0657cd7896a9a', '11 May 2010': 'a59ca1270ff3036d417a7f2217598266', '22 March 2010': '712cd14ab6a28116da82 [...]
\ 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', '29 April 2010': 'fdc4fb38dd4cfb7f066329ed43a9e805'}, '3hr': {'12 March 2010': '8249007b0a473d19554b47efaff87a39', '11 May 2010': '9f293a2c84001fbaa5aef7357e [...]
\ No newline at end of file
diff --git a/Tables_csv/add_dims2_notime.txt b/Tables_csv/add_dims2_notime.txt
new file mode 100644
index 0000000..d2a018e
--- /dev/null
+++ b/Tables_csv/add_dims2_notime.txt
@@ -0,0 +1,287 @@
+!============
+axis_entry: depth_coord
+!============
+!
+! This vertical coordinate is used in z-coordinate models
+! The units are meters (m), and it has a value of 0. at the surface
+! and becomes more and more negative with depth.
+!
+!------------
+!
+! Axis attributes:
+!----------------------------------
+standard_name: depth
+units: m
+axis: Z
+positive: up
+long_name: ocean depth coordinate
+!----------------------------------
+!
+! Additional axis information:
+!----------------------------------
+out_name: lev
+must_have_bounds: yes
+stored_direction: decreasing
+valid_min: -12000.
+valid_max: 0.
+!----------------------------------
+!
+!============
+axis_entry: ocean_double_sigma
+!============
+!
+!------------
+!
+! Axis attributes:
+!----------------------------------
+standard_name: ocean_double_sigma
+axis: Z
+positive: up
+long_name: ocean double sigma coordinate
+!----------------------------------
+!
+! Additional axis information:
+!----------------------------------
+out_name: lev
+must_have_bounds: yes
+formula: for k <= k_c:\n z(k,j,i)= sigma(k)*f(j,i) \n for k > k_c:\n z(k,j,i)= f(j,i) + (sigma(k)-1)*(depth(j,i)-f(j,i)) \n f(j,i)= 0.5*(z1+ z2) + 0.5*(z1-z2)* tanh(2*a/(z1-z2)*(depth(j,i)-href))
+z_factors: sigma: sigma depth: depth z1: z1 z2: z2 a: a_coeff href: href k_c: k_c
+z_bounds_factors: sigma: sigma_bnds depth: depth z1: z1 z2: z2 a: a href: href k_c: k_c
+!----------------------------------
+!
+!----------------------------------
+!
+!
+! ***************************************************************
+!
+! Vertical coordinate formula_terms:
+!
+! ***************************************************************
+!
+!============
+variable_entry: depth
+!============
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+units: m
+long_name: Sea Floor Depth
+comment: Ocean bathymetry.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions: longitude latitude
+out_name: depth
+type: real
+valid_min: 0
+valid_max: 10000
+ok_min_mean_abs: 2000
+ok_max_mean_abs: 5000
+!----------------------------------
+!
+!
+!============
+variable_entry: sigma
+!============
+!------------
+!
+! Variable attributes:
+!----------------------------------
+long_name: vertical coordinate formula term: sigma(k)
+!----------------------------------
+!
+! Additional variable information:
+!----------------------------------
+dimensions: olevel
+type: double
+!----------------------------------
+!
+!
+!============
+variable_entry: sigma_bnds
+!============
+!------------
+!
+! Variable attributes:
+!----------------------------------
+long_name: vertical coordinate formula term: sigma(k+1/2)
+!----------------------------------
+!
+! Additional variable information:
+!----------------------------------
+dimensions: olevel
+type: double
+!----------------------------------
+!
+!
+!============
+variable_entry: zlev
+!============
+!------------
+!
+! Variable attributes:
+!----------------------------------
+long_name: vertical coordinate formula term: zlev(k)
+!----------------------------------
+!
+! Additional variable information:
+!----------------------------------
+dimensions: olevel
+type: double
+!----------------------------------
+!
+!
+!============
+variable_entry: zlev_bnds
+!============
+!------------
+!
+! Variable attributes:
+!----------------------------------
+long_name: vertical coordinate formula term: zlev(k+1/2)
+!----------------------------------
+!
+! Additional variable information:
+!----------------------------------
+dimensions: olevel
+type: double
+!----------------------------------
+!
+!
+!
+!============
+variable_entry: depth_c
+!============
+!
+!------------
+!
+! Variable attributes:
+!----------------------------------
+long_name: vertical coordinate formula term: depth_c
+!----------------------------------
+!
+! Additional variable information:
+!----------------------------------
+type: double
+!----------------------------------
+!
+!
+!============
+variable_entry: a
+!============
+!
+!------------
+!
+! Variable attributes:
+!----------------------------------
+long_name: vertical coordinate formula term: coefficient a
+!----------------------------------
+!
+! Additional variable information:
+!----------------------------------
+type: double
+!----------------------------------
+!
+!
+!============
+variable_entry: b
+!============
+!
+!------------
+!
+! Variable attributes:
+!----------------------------------
+long_name: vertical coordinate formula term: coefficient b
+!----------------------------------
+!
+! Additional variable information:
+!----------------------------------
+type: double
+!----------------------------------
+!
+!
+!============
+variable_entry: nsigma
+!============
+!
+!------------
+!
+! Variable attributes:
+!----------------------------------
+long_name: vertical coordinate formula term: nsigma
+!----------------------------------
+!
+! Additional variable information:
+!----------------------------------
+type: integer
+!----------------------------------
+!
+!
+!============
+variable_entry: z1
+!============
+!
+!------------
+!
+! Variable attributes:
+!----------------------------------
+long_name: vertical coordinate formula term: z1
+!----------------------------------
+!
+! Additional variable information:
+!----------------------------------
+type: double
+!----------------------------------
+!
+!
+!============
+variable_entry: z2
+!============
+!
+!------------
+!
+! Variable attributes:
+!----------------------------------
+long_name: vertical coordinate formula term: z2
+!----------------------------------
+!
+! Additional variable information:
+!----------------------------------
+type: double
+!----------------------------------
+!
+!
+!============
+variable_entry: href
+!============
+!
+!------------
+!
+! Variable attributes:
+!----------------------------------
+long_name: vertical coordinate formula term: href
+!----------------------------------
+!
+! Additional variable information:
+!----------------------------------
+type: double
+!----------------------------------
+!
+!
+!============
+variable_entry: k_c
+!============
+!
+!------------
+!
+! Variable attributes:
+!----------------------------------
+long_name: vertical coordinate formula term: k_c
+!----------------------------------
+!
+! Additional variable information:
+!----------------------------------
+type: integer
+!----------------------------------
+!
+!
diff --git a/Test/ipcc_test_code.c b/Test/ipcc_test_code.c
index df65c5b..c33ef96 100644
--- a/Test/ipcc_test_code.c
+++ b/Test/ipcc_test_code.c
@@ -294,7 +294,7 @@ int main()
"abrupt 4XCO2",
"GICC (Generic International Climate Center, Geneva, Switzerland)",
"GICCM1(2002): atmosphere: GICAM3 (gicam_0_brnchT_itea_2, T63L32); ocean: MOM (mom3_ver_3.5.2, 2x3L15); sea ice: GISIM4; land: GILSM2.5",
- "standard",
+ "360_day",
1,
"Rusty Koder (koder at middle_earth.net)",
"Output from archive/giccm_03_std_2xCO2_2256.",
--
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