[cmor-tables] 55/83: removed formula terms indices and added new experiemnt
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sun Aug 30 08:06:12 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 66276deb22defd3440b2d90c2e7f3b2866ebade1
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date: Mon Nov 29 16:01:48 2010 -0800
removed formula terms indices and added new experiemnt
---
Lib/table_generator.py | 1 +
Tables/CMIP5_Omon | 2 +-
Tables/md5s | 2 +-
Tables_csv/add_dims.txt | 18 +++++++++---------
Tables_csv/add_dims2.txt | 12 ++++++------
Tables_csv/add_dims2_notime.txt | 2 +-
6 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/Lib/table_generator.py b/Lib/table_generator.py
index 52daf9e..313f143 100644
--- a/Lib/table_generator.py
+++ b/Lib/table_generator.py
@@ -24,6 +24,7 @@ expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
expt_id_ok: 'pre-industrial control' 'piControl'
expt_id_ok: 'historical' 'historical'
+expt_id_ok: 'historical extension' 'historicalExt'
expt_id_ok: 'mid-Holocene' 'midHolocene'
expt_id_ok: 'last glacial maximum' 'lgm'
expt_id_ok: 'last millennium' 'past1000'
diff --git a/Tables/CMIP5_Omon b/Tables/CMIP5_Omon
index 17e3eb1..918828c 100644
--- a/Tables/CMIP5_Omon
+++ b/Tables/CMIP5_Omon
@@ -6,7 +6,7 @@ frequency: mon
cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
cf_version: 1.4 ! version of CF that output conforms to
project_id: CMIP5 ! project id
-table_date: 12 November 2010 ! date this table was constructed
+table_date: 17 November 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/md5s b/Tables/md5s
index c2bd564..44b6633 100644
--- a/Tables/md5s
+++ b/Tables/md5s
@@ -1 +1 @@
-{'CMIP5': {'cf3hr': {'11 May 2010': 'a59ca1270ff3036d417a7f2217598266', '19 October 2010': '8b5c2f197b70a103393838ebd4075c6c', '12 May 2010': '905f7ccdd5a31cb71e2a6e3b339cd0e1', '23 August 2010': '5ccea11a7c3d165c76df3d9eede395d0', '01 June 2010': '619aa3c816bc25a53335589698e64968', '01 July 2010': 'c0fe9e92115d75292f5009e13761cb4b', '29 April 2010': 'fdc4fb38dd4cfb7f066329ed43a9e805', '12 March 2010': 'ae9a82f01824d9012aa0657cd7896a9a', '22 March 2010': '712cd14ab6a28116da828ff555e00c4d [...]
\ No newline at end of file
+{'CMIP5': {'cfSites': {'11 May 2010': '80506c07ed63befd33f9f727b78bde55', '19 October 2010': '80264b0dd9e203ce916542fa15c6d272', '12 May 2010': '0ebecf85ba30b2223360a29ece880be4', '15 November 2010': '635f0e6676162c743b15d824033afb04', '23 August 2010': '4a2774cbbde4d5f69c9541e6b6248d00', '01 June 2010': '2eb2e9a6a1db0e18dac73e04e0dfbe47', '01 July 2010': '96628b3875e74a8a515d0a1e500710d8', '11 November 2010': '6be9b509f02f6118bfd2b0062f27df9a', '12 March 2010': '192f07ba869af3794494ea0d [...]
\ No newline at end of file
diff --git a/Tables_csv/add_dims.txt b/Tables_csv/add_dims.txt
index 5575e12..e8f92a1 100644
--- a/Tables_csv/add_dims.txt
+++ b/Tables_csv/add_dims.txt
@@ -25,7 +25,7 @@ must_have_bounds: yes
stored_direction: increasing
valid_min: -200.
valid_max: 800000.
-formula: z(n,k,j,i) = a(k)*ztop + b1(k)*zsurf1(n,j,i) + b2(k)*zsurf2(n,j,i)
+formula: z = a*ztop + b1*zsurf1 + b2*zsurf2
z_factors: a: a b1: b1 b2: b2 ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2
z_bounds_factors: a: a_bnds b1: b1_bnds b2: b2_bnds ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2
!----------------------------------
@@ -55,7 +55,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: -1.
valid_max: 20.
-formula: p(k) = p0 * exp(-lev(k))
+formula: p = p0 * exp(-lev)
z_factors: p0: p0 lev: lev
z_bounds_factors: p0: p0 lev: lev_bnds
!----------------------------------
@@ -85,7 +85,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = ptop + sigma(k)*(ps(n,j,i) - ptop)
+formula: p = ptop + sigma*(ps - ptop)
z_factors: ptop: ptop sigma: lev ps: ps
z_bounds_factors: ptop: ptop sigma: lev_bnds ps: ps
!----------------------------------
@@ -96,7 +96,7 @@ axis_entry: standard_hybrid_sigma
!============
!
! This coordinate is dimensionless and varies from a small value at the model top to 1.0 at the surface.
-! The values of a(k)+ b(k), which appear in the formula below, should be stored as standard_hybrid_sigma.
+! The values of a+ b, which appear in the formula below, should be stored as standard_hybrid_sigma.
! Note that in the netCDF file the variable will be named "lev", not standard_hybrid_sigma.
!
!---------------------------------
@@ -115,7 +115,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = a(k)*p0 + b(k)*ps(n,j,i)
+formula: p = a*p0 + b*ps
z_factors: p0: p0 a: a b: b ps: ps
z_bounds_factors: p0: p0 a: a_bnds b: b_bnds ps: ps
!----------------------------------
@@ -126,7 +126,7 @@ axis_entry: alternate_hybrid_sigma
!============
!
! This coordinate is dimensionless and varies from a small value at the model top to 1.0 at the surface.
-! The values of ap(k)/p0 + b(k), which appear in the formula below, should be stored as alternate_hybrid_sigma.
+! The values of ap/p0 + b, which appear in the formula below, should be stored as alternate_hybrid_sigma.
! Note that in the netCDF file the variable will be named "lev", not alternate_hybrid_sigma.
!
!------------
@@ -147,7 +147,7 @@ must_have_bounds: yes
stored_direction: decreasing
valid_min: 0.0
valid_max: 1.0
-formula: p(n,k,j,i) = ap(k) + b(k)*ps(n,j,i)
+formula: p = ap + b*ps
z_factors: ap: ap b: b ps: ps
z_bounds_factors: ap: ap_bnds b: b_bnds ps: ps
!----------------------------------
@@ -158,7 +158,7 @@ axis_entry: hybrid_height
!============
!
! This coordinate has dimension of meters (m) and increases upward.
-! The values of a(k) which appear in the formula below, should be stored as hybrid_height.
+! The values of a which appear in the formula below, should be stored as hybrid_height.
! Note that in the netCDF file the variable will be named "lev", not hybrid_height.
!
!------------
@@ -178,7 +178,7 @@ out_name: lev
must_have_bounds: yes
stored_direction: increasing
valid_min: 0.0
-formula: z(k,j,i) = a(k) + b(k)*orog(j,i)
+formula: z = a + b*orog
z_factors: a: lev b: b orog: orog
z_bounds_factors: a: lev_bnds b: b_bnds orog: orog
!----------------------------------
diff --git a/Tables_csv/add_dims2.txt b/Tables_csv/add_dims2.txt
index 8efead5..4e04598 100644
--- a/Tables_csv/add_dims2.txt
+++ b/Tables_csv/add_dims2.txt
@@ -44,7 +44,7 @@ long_name: ocean double sigma coordinate
!----------------------------------
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))
+formula: for k <= k_c:\n z= sigma*f \n for k > k_c:\n z= f + (sigma-1)*(depth-f) \n f= 0.5*(z1+ z2) + 0.5*(z1-z2)* tanh(2*a/(z1-z2)*(depth-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
!----------------------------------
@@ -66,7 +66,7 @@ long_name: ocean sigma over z coordinate
!----------------------------------
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)
+formula: for k <= nsigma: z = eta + sigma*(min(depth_c,depth)+eta) ; for k > nsigma: z = zlev
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
!----------------------------------
@@ -76,7 +76,7 @@ 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.
+! The values of s, 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.
!
!------------
@@ -96,7 +96,7 @@ 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)
+formula: z = eta*(1+s) + depth_c*s + (depth-depth_c)*C \n where \n C=(1-b)*sinh(a*s)/sinh(a) +\n b*(tanh(a*(s+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
!----------------------------------
@@ -106,7 +106,7 @@ 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.
+! The values of sigma, 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.
!
!------------
@@ -126,7 +126,7 @@ 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))
+formula: z = eta + sigma*(depth+eta)
z_factors: sigma: lev eta: eta depth: depth
z_bounds_factors: sigma: lev_bnds eta: eta depth: depth
!----------------------------------
diff --git a/Tables_csv/add_dims2_notime.txt b/Tables_csv/add_dims2_notime.txt
index e1efe31..b78694b 100644
--- a/Tables_csv/add_dims2_notime.txt
+++ b/Tables_csv/add_dims2_notime.txt
@@ -44,7 +44,7 @@ long_name: ocean double sigma coordinate
!----------------------------------
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))
+formula: for k <= k_c:\n z= sigma*f \n for k > k_c:\n z= f + (sigma-1)*(depth-f) \n f= 0.5*(z1+ z2) + 0.5*(z1-z2)* tanh(2*a/(z1-z2)*(depth-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
!----------------------------------
--
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