[cmor-tables] 51/83: reverted sites to lat/lon

Alastair McKinstry mckinstry at moszumanska.debian.org
Sun Aug 30 08:06:11 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 15f42921e8835091a9caeb10b8497647c157ab91
Author: Charles Doutriaux <doutriaux1 at al-dar-linux.(none)>
Date:   Fri Nov 5 15:52:38 2010 -0700

    reverted sites to lat/lon
---
 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                            |   2 +-
 Tables/CMIP5_cfDay                            |   2 +-
 Tables/CMIP5_cfMon                            |   2 +-
 Tables/CMIP5_cfOff                            |   2 +-
 Tables/CMIP5_cfSites                          | 163 +++++++++++++-------------
 Tables/CMIP5_day                              |   2 +-
 Tables/CMIP5_fx                               |   2 +-
 Tables_csv/{amon.csv => Amon.csv}             |   0
 Tables_csv/{amon_2D.csv => Amon_2D.csv}       |   0
 Tables_csv/{lmon.csv => Lmon.csv}             |   0
 Tables_csv/{oclim.csv => Oclim.csv}           |   0
 Tables_csv/{omon.csv => Omon.csv}             |   0
 Tables_csv/{oyr.csv => Oyr.csv}               |   0
 Tables_csv/{oyr_tracer.csv => Oyr_tracer.csv} |   0
 Tables_csv/{cfsites.csv => cfSites.csv}       |   0
 27 files changed, 109 insertions(+), 103 deletions(-)

diff --git a/Lib/table_generator.py b/Lib/table_generator.py
index aebccb2..a564ea2 100644
--- a/Lib/table_generator.py
+++ b/Lib/table_generator.py
@@ -315,7 +315,8 @@ def create_table_header(tbnm, table_file, dims_file, fqcy):
     fnm = "Tables/" + prefix + '_'+tbnm
     fo = open(fnm,'w')
     print >> fo, "table_id: Table %s" % tbnm
-
+    if tbnm.lower().find("cfsites")>-1:
+        print >> fo, "!\n! WARNING: Although this table define variables as function of longitude and latitude\n!          the user MUST use a 'grid' (using the 'site' index in CMIP5_grids)\n!          in order to define correctly the location of each site.\n!"
     realm = None
     if tbnm[0]=='O':
         realm = "ocean"
@@ -431,8 +432,8 @@ def create_table_header(tbnm, table_file, dims_file, fqcy):
         lns=lns.replace("zlevel",zlevel_name)
         if tbnm.find("Oclim")>-1:
             lns=lns.replace("dimensions:      longitude latitude time","dimensions:      longitude latitude time2")
-        if tbnm.find("cfSite")>-1:
-            lns=lns.replace("longitude latitude","site")
+ #       if tbnm.find("cfSite")>-1:
+ #           lns=lns.replace("longitude latitude","site")
         print >> fo, lns
 
     return fo
@@ -465,8 +466,8 @@ def create_table(table_file, dims_file,minmax={}):
                     ##     if sp[i2]=='tasmax' : print i2,sp[i2]
                     if len(sp)>15 and 'time' in sp[16]:
                         sp[16]=sp[16].replace('time','time1')
-                        if table_file[-11:-4]=='cfSites':
-                            sp[16]=sp[16].replace("longitude latitude","site")
+#                        if table_file[-11:-4]=='cfSites':
+#                            sp[16]=sp[16].replace("longitude latitude","site")
                     for i in range(len(sp)):
                         if sp[i].find(",")>-1:
                             sp[i]='"%s"' % sp[i]
@@ -493,8 +494,8 @@ def create_table(table_file, dims_file,minmax={}):
     dlines=dlines2
     for l in dlines:
         sp,iadd = process_a_line(l)
-        if len(sp)>15 and table_file[-11:-4]=='cfSites':
-                sp[16]=sp[16].replace("longitude latitude","site")
+#        if len(sp)>15 and table_file[-11:-4]=='cfSites':
+#                sp[16]=sp[16].replace("longitude latitude","site")
         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()=="":
diff --git a/Tables/CMIP5_3hr b/Tables/CMIP5_3hr
index 2780126..cedf7c3 100644
--- a/Tables/CMIP5_3hr
+++ b/Tables/CMIP5_3hr
@@ -6,7 +6,7 @@ frequency: 3hr
 cmor_version: 2.4.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:   25 October 2010 ! date this table was constructed
+table_date:   05 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/CMIP5_6hrLev b/Tables/CMIP5_6hrLev
index 00979d8..82fea22 100644
--- a/Tables/CMIP5_6hrLev
+++ b/Tables/CMIP5_6hrLev
@@ -6,7 +6,7 @@ frequency: 6hr
 cmor_version: 2.4.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:   25 October 2010 ! date this table was constructed
+table_date:   05 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/CMIP5_6hrPlev b/Tables/CMIP5_6hrPlev
index 6cc7252..e704ad6 100644
--- a/Tables/CMIP5_6hrPlev
+++ b/Tables/CMIP5_6hrPlev
@@ -6,7 +6,7 @@ frequency: 6hr
 cmor_version: 2.4.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:   25 October 2010 ! date this table was constructed
+table_date:   05 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/CMIP5_Amon b/Tables/CMIP5_Amon
index 92070dd..d2a8320 100644
--- a/Tables/CMIP5_Amon
+++ b/Tables/CMIP5_Amon
@@ -6,7 +6,7 @@ frequency: mon
 cmor_version: 2.4.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:   25 October 2010 ! date this table was constructed
+table_date:   05 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/CMIP5_LImon b/Tables/CMIP5_LImon
index 7cff338..04dae99 100644
--- a/Tables/CMIP5_LImon
+++ b/Tables/CMIP5_LImon
@@ -6,7 +6,7 @@ frequency: mon
 cmor_version: 2.4.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:   25 October 2010 ! date this table was constructed
+table_date:   05 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/CMIP5_Lmon b/Tables/CMIP5_Lmon
index 3ae1e6c..1cf1fef 100644
--- a/Tables/CMIP5_Lmon
+++ b/Tables/CMIP5_Lmon
@@ -6,7 +6,7 @@ frequency: mon
 cmor_version: 2.4.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:   25 October 2010 ! date this table was constructed
+table_date:   05 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/CMIP5_OImon b/Tables/CMIP5_OImon
index 2790793..327f94d 100644
--- a/Tables/CMIP5_OImon
+++ b/Tables/CMIP5_OImon
@@ -6,7 +6,7 @@ frequency: mon
 cmor_version: 2.4.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:   25 October 2010 ! date this table was constructed
+table_date:   05 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/CMIP5_Oclim b/Tables/CMIP5_Oclim
index 90b702a..569b65d 100644
--- a/Tables/CMIP5_Oclim
+++ b/Tables/CMIP5_Oclim
@@ -6,7 +6,7 @@ frequency: monClim
 cmor_version: 2.4.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:   25 October 2010 ! date this table was constructed
+table_date:   05 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/CMIP5_Omon b/Tables/CMIP5_Omon
index b7f2849..ffeedd0 100644
--- a/Tables/CMIP5_Omon
+++ b/Tables/CMIP5_Omon
@@ -6,7 +6,7 @@ frequency: mon
 cmor_version: 2.4.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:   25 October 2010 ! date this table was constructed
+table_date:   05 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/CMIP5_Oyr b/Tables/CMIP5_Oyr
index 2d73d05..6f329c4 100644
--- a/Tables/CMIP5_Oyr
+++ b/Tables/CMIP5_Oyr
@@ -6,7 +6,7 @@ frequency: yr
 cmor_version: 2.4.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:   25 October 2010 ! date this table was constructed
+table_date:   05 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/CMIP5_aero b/Tables/CMIP5_aero
index 9969764..3db2ba6 100644
--- a/Tables/CMIP5_aero
+++ b/Tables/CMIP5_aero
@@ -6,7 +6,7 @@ frequency: mon
 cmor_version: 2.4.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:   25 October 2010 ! date this table was constructed
+table_date:   05 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/CMIP5_cf3hr b/Tables/CMIP5_cf3hr
index d7b1a49..50a4e98 100644
--- a/Tables/CMIP5_cf3hr
+++ b/Tables/CMIP5_cf3hr
@@ -6,7 +6,7 @@ frequency: 3hr
 cmor_version: 2.4.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:   25 October 2010 ! date this table was constructed
+table_date:   05 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/CMIP5_cfDay b/Tables/CMIP5_cfDay
index 0d09930..f5458be 100644
--- a/Tables/CMIP5_cfDay
+++ b/Tables/CMIP5_cfDay
@@ -6,7 +6,7 @@ frequency: day
 cmor_version: 2.4.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:   25 October 2010 ! date this table was constructed
+table_date:   05 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/CMIP5_cfMon b/Tables/CMIP5_cfMon
index 798336c..5b0d0f7 100644
--- a/Tables/CMIP5_cfMon
+++ b/Tables/CMIP5_cfMon
@@ -6,7 +6,7 @@ frequency: mon
 cmor_version: 2.4.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:   25 October 2010 ! date this table was constructed
+table_date:   05 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/CMIP5_cfOff b/Tables/CMIP5_cfOff
index 25326ea..5cad698 100644
--- a/Tables/CMIP5_cfOff
+++ b/Tables/CMIP5_cfOff
@@ -6,7 +6,7 @@ frequency: mon
 cmor_version: 2.4.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:   25 October 2010 ! date this table was constructed
+table_date:   05 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/CMIP5_cfSites b/Tables/CMIP5_cfSites
index b053c8f..7f76749 100644
--- a/Tables/CMIP5_cfSites
+++ b/Tables/CMIP5_cfSites
@@ -1,4 +1,9 @@
 table_id: Table cfSites
+!
+! WARNING: Although this table define variables as function of longitude and latitude
+!          the user MUST use a 'grid' (using the 'site' index in CMIP5_grids)
+!          in order to define correctly the location of each site.
+!
 modeling_realm: atmos
 
 frequency: subhr
@@ -6,7 +11,7 @@ frequency: subhr
 cmor_version: 2.4.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:   25 October 2010 ! date this table was constructed
+table_date:   05 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 
@@ -384,7 +389,7 @@ comment:           height above the geoid; as defined here, ""the geoid"" is a s
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site
+dimensions:        longitude latitude
 out_name:          orog
 type:              real
 valid_min:         -700
@@ -553,7 +558,7 @@ comment:           near-surface (usually, 2 meter) air temperature.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1 height2m
+dimensions:        longitude latitude time1 height2m
 out_name:          tas
 type:              real
 valid_min:         180.6
@@ -579,7 +584,7 @@ comment:           ""skin"" temperature (i.e., SST for open ocean)
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          ts
 type:              real
 valid_min:         176.8
@@ -605,7 +610,7 @@ comment:           not, in general, the same as surface pressure
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          psl
 type:              real
 valid_min:         9.477e+04
@@ -631,7 +636,7 @@ comment:           not, in general, the same as mean sea-level pressure
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          ps
 type:              real
 valid_min:         4.792e+04
@@ -656,7 +661,7 @@ comment:           near-surface (usually, 10 meters) eastward component of wind.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1 height10m
+dimensions:        longitude latitude time1 height10m
 out_name:          uas
 type:              real
 valid_min:         -19.01
@@ -681,7 +686,7 @@ comment:           near-surface (usually, 10 meters) northward component of wind
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1 height10m
+dimensions:        longitude latitude time1 height10m
 out_name:          vas
 type:              real
 valid_min:         -18.04
@@ -706,7 +711,7 @@ comment:           near-surface (usually, 10 meters) wind speed.  This is the me
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1 height10m
+dimensions:        longitude latitude time1 height10m
 out_name:          sfcWind
 type:              real
 !----------------------------------
@@ -728,7 +733,7 @@ comment:           near-surface (usually, 2meters) relative humidity expressed a
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1 height2m
+dimensions:        longitude latitude time1 height2m
 out_name:          hurs
 type:              real
 !----------------------------------
@@ -750,7 +755,7 @@ comment:           near-surface (usually, 2 meters) specific humidity.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1 height2m
+dimensions:        longitude latitude time1 height2m
 out_name:          huss
 type:              real
 valid_min:         -7.21e-06
@@ -776,7 +781,7 @@ comment:           at surface; includes both liquid and solid phases from all ty
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          pr
 type:              real
 valid_min:         0
@@ -802,7 +807,7 @@ comment:           at surface; includes precipitation of all forms of water in t
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          prsn
 type:              real
 valid_min:         0
@@ -828,7 +833,7 @@ comment:           at surface; includes both liquid and solid phases.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          prc
 type:              real
 valid_min:         0
@@ -854,7 +859,7 @@ comment:           at surface; flux of water into the atmosphere due to conversi
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          evspsbl
 type:              real
 !----------------------------------
@@ -876,7 +881,7 @@ comment:           The snow and ice sublimation flux is the loss of snow and ice
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          sbl
 type:              real
 valid_min:         -0.004959
@@ -900,7 +905,7 @@ long_name:         Surface Downward Eastward Wind Stress
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          tauu
 type:              real
 positive:          down
@@ -925,7 +930,7 @@ long_name:         Surface Downward Northward Wind Stress
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          tauv
 type:              real
 positive:          down
@@ -952,7 +957,7 @@ comment:           includes both evaporation and sublimation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          hfls
 type:              real
 positive:          up
@@ -978,7 +983,7 @@ long_name:         Surface Upward Sensible Heat Flux
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          hfss
 type:              real
 positive:          up
@@ -1004,7 +1009,7 @@ long_name:         Surface Downwelling Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          rlds
 type:              real
 positive:          down
@@ -1030,7 +1035,7 @@ long_name:         Surface Upwelling Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          rlus
 type:              real
 positive:          up
@@ -1056,7 +1061,7 @@ long_name:         Surface Downwelling Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          rsds
 type:              real
 positive:          down
@@ -1082,7 +1087,7 @@ long_name:         Surface Upwelling Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          rsus
 type:              real
 positive:          up
@@ -1108,7 +1113,7 @@ long_name:         Surface Downwelling Clear-Sky Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          rsdscs
 type:              real
 positive:          down
@@ -1134,7 +1139,7 @@ long_name:         Surface Upwelling Clear-Sky Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          rsuscs
 type:              real
 positive:          up
@@ -1160,7 +1165,7 @@ long_name:         Surface Downwelling Clear-Sky Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          rldscs
 type:              real
 positive:          down
@@ -1187,7 +1192,7 @@ comment:           incident shortwave at the top of the atmosphere
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          rsdt
 type:              real
 positive:          down
@@ -1214,7 +1219,7 @@ comment:           at the top of the atmosphere
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          rsut
 type:              real
 positive:          up
@@ -1241,7 +1246,7 @@ comment:           at the top of the atmosphere (to be compared with satellite m
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          rlut
 type:              real
 positive:          up
@@ -1267,7 +1272,7 @@ long_name:         TOA Outgoing Clear-Sky Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          rlutcs
 type:              real
 positive:          up
@@ -1293,7 +1298,7 @@ long_name:         TOA Outgoing Clear-Sky Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          rsutcs
 type:              real
 positive:          up
@@ -1320,7 +1325,7 @@ comment:           vertically integrated through the atmospheric column
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          prw
 type:              real
 valid_min:         -0.0006775
@@ -1346,7 +1351,7 @@ comment:           for the whole atmospheric column, as seen from the surface or
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          clt
 type:              real
 valid_min:         -0.0001822
@@ -1372,7 +1377,7 @@ comment:           calculate mass of condensed (liquid + ice) water in the colum
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          clwvi
 type:              real
 valid_min:         -3.827e-06
@@ -1398,7 +1403,7 @@ comment:           calculate mass of ice water in the column divided by the area
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          clivi
 type:              real
 valid_min:         -1.872e-06
@@ -1424,7 +1429,7 @@ comment:           i.e., at the top of that portion of the atmosphere where dyna
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          rtmt
 type:              real
 positive:          down
@@ -1450,7 +1455,7 @@ long_name:         Air Pressure at Convective Cloud Base
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          ccb
 type:              real
 !----------------------------------
@@ -1471,7 +1476,7 @@ long_name:         Air Pressure at Convective Cloud Top
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          cct
 type:              real
 !----------------------------------
@@ -1492,7 +1497,7 @@ comment:           Fraction of time that convection occurs in the grid cell .
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          ci 
 type:              real
 !----------------------------------
@@ -1513,7 +1518,7 @@ comment:           Fraction of time that shallow convection occurs in the grid c
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          sci
 type:              real
 !----------------------------------
@@ -1534,7 +1539,7 @@ comment:           This is requested only for the emission-driven coupled carbon
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          fco2antt
 type:              real
 positive:          up
@@ -1556,7 +1561,7 @@ comment:           This is requested only for the emission-driven coupled carbon
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          fco2fos
 type:              real
 positive:          up
@@ -1578,7 +1583,7 @@ comment:           Report from all simulations (both emission-driven and concent
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          fco2nat
 type:              real
 positive:          up
@@ -1600,7 +1605,7 @@ comment:           Include both large-scale and convective cloud.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          cl
 type:              real
 valid_min:         0
@@ -1625,7 +1630,7 @@ comment:           Include both large-scale and convective cloud.  Calculate as
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          clw
 type:              real
 !----------------------------------
@@ -1646,7 +1651,7 @@ comment:           Include both large-scale and convective cloud. Calculate as t
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          cli
 type:              real
 !----------------------------------
@@ -1667,7 +1672,7 @@ comment:           Report on model half-levels (i.e., model layer bounds and not
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevhalf site time1
+dimensions:        alevhalf longitude latitude time1
 out_name:          mc
 type:              real
 positive:          up
@@ -1688,7 +1693,7 @@ long_name:         Air Temperature
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          ta
 type:              real
 valid_min:         157.1
@@ -1712,7 +1717,7 @@ long_name:         Eastward Wind
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          ua
 type:              real
 valid_min:         -68.65
@@ -1736,7 +1741,7 @@ long_name:         Northward Wind
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          va
 type:              real
 valid_min:         -71.1
@@ -1760,7 +1765,7 @@ long_name:         Specific Humidity
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          hus
 type:              real
 valid_min:         -0.000299
@@ -1785,7 +1790,7 @@ comment:           This is the relative humidity with respect to liquid water fo
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          hur
 type:              real
 valid_min:         -2.642
@@ -1810,7 +1815,7 @@ comment:           commonly referred to as ""omega"", this represents the vertic
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          wap
 type:              real
 valid_min:         -1.126
@@ -1834,7 +1839,7 @@ long_name:         Geopotential Height
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          zg
 type:              real
 valid_min:         -719.7
@@ -1858,7 +1863,7 @@ long_name:         Upwelling Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          rlu
 type:              real
 positive:          up
@@ -1879,7 +1884,7 @@ long_name:         Upwelling Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          rsu
 type:              real
 positive:          up
@@ -1900,7 +1905,7 @@ long_name:         Downwelling Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          rld
 type:              real
 positive:          down
@@ -1921,7 +1926,7 @@ long_name:         Downwelling Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          rsd
 type:              real
 positive:          down
@@ -1942,7 +1947,7 @@ long_name:         Upwelling Clear-Sky Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          rlucs
 type:              real
 positive:          up
@@ -1963,7 +1968,7 @@ long_name:         Upwelling Clear-Sky Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          rsucs
 type:              real
 positive:          up
@@ -1984,7 +1989,7 @@ long_name:         Downwelling Clear-Sky Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          rldcs
 type:              real
 positive:          down
@@ -2005,7 +2010,7 @@ long_name:         Downwelling Clear-Sky Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          rsdcs
 type:              real
 positive:          down
@@ -2026,7 +2031,7 @@ long_name:         Tendency of Air Temperature
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          tnt 
 type:              real
 !----------------------------------
@@ -2046,7 +2051,7 @@ long_name:         Tendency of Air Temperature due to Advection
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          tnta 
 type:              real
 !----------------------------------
@@ -2066,7 +2071,7 @@ long_name:         Tendency of Air Temperature due to Diabatic Processes
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          tntmp
 type:              real
 !----------------------------------
@@ -2086,7 +2091,7 @@ long_name:         Tendency of Air Temperature due to Stratiform Cloud Condensat
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          tntscpbl 
 type:              real
 !----------------------------------
@@ -2106,7 +2111,7 @@ long_name:         Tendency of Air Temperature due to Radiative Heating
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          tntr 
 type:              real
 !----------------------------------
@@ -2126,7 +2131,7 @@ long_name:         Tendency of Air Temperature due to Moist Convection
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          tntc
 type:              real
 !----------------------------------
@@ -2146,7 +2151,7 @@ long_name:         Tendency of Specific Humidity
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          tnhus
 type:              real
 !----------------------------------
@@ -2166,7 +2171,7 @@ long_name:         Tendency of Specific Humidity due to Advection
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          tnhusa 
 type:              real
 !----------------------------------
@@ -2186,7 +2191,7 @@ long_name:         Tendency of Specific Humidity due to Convection
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          tnhusc 
 type:              real
 !----------------------------------
@@ -2206,7 +2211,7 @@ long_name:         Tendency of Specific Humidity due to Diffusion
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          tnhusd 
 type:              real
 !----------------------------------
@@ -2226,7 +2231,7 @@ long_name:         Tendency of Specific Humidity due to Stratiform Cloud Condens
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          tnhusscpbl 
 type:              real
 !----------------------------------
@@ -2246,7 +2251,7 @@ long_name:         Tendency of Specific Humidity due to Model Physics
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          tnhusmp 
 type:              real
 !----------------------------------
@@ -2266,7 +2271,7 @@ long_name:         Eddy Viscosity Coefficient for Momentum Variables
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          evu
 type:              real
 !----------------------------------
@@ -2286,7 +2291,7 @@ long_name:         Eddy Diffusivity Coefficient for Temperature Variable
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          edt
 type:              real
 !----------------------------------
@@ -2307,7 +2312,7 @@ comment:           This field is needed only for models in which the pressure ca
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          pfull
 type:              real
 !----------------------------------
@@ -2328,7 +2333,7 @@ comment:           This field is needed only for models in which the pressure ca
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          phalf
 type:              real
 !----------------------------------
diff --git a/Tables/CMIP5_day b/Tables/CMIP5_day
index 14d4b64..386cc99 100644
--- a/Tables/CMIP5_day
+++ b/Tables/CMIP5_day
@@ -6,7 +6,7 @@ frequency: day
 cmor_version: 2.4.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:   25 October 2010 ! date this table was constructed
+table_date:   05 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/CMIP5_fx b/Tables/CMIP5_fx
index ea2077c..a3b51be 100644
--- a/Tables/CMIP5_fx
+++ b/Tables/CMIP5_fx
@@ -6,7 +6,7 @@ frequency: fx
 cmor_version: 2.4.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:   25 October 2010 ! date this table was constructed
+table_date:   05 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_csv/amon.csv b/Tables_csv/Amon.csv
similarity index 100%
rename from Tables_csv/amon.csv
rename to Tables_csv/Amon.csv
diff --git a/Tables_csv/amon_2D.csv b/Tables_csv/Amon_2D.csv
similarity index 100%
rename from Tables_csv/amon_2D.csv
rename to Tables_csv/Amon_2D.csv
diff --git a/Tables_csv/lmon.csv b/Tables_csv/Lmon.csv
similarity index 100%
rename from Tables_csv/lmon.csv
rename to Tables_csv/Lmon.csv
diff --git a/Tables_csv/oclim.csv b/Tables_csv/Oclim.csv
similarity index 100%
rename from Tables_csv/oclim.csv
rename to Tables_csv/Oclim.csv
diff --git a/Tables_csv/omon.csv b/Tables_csv/Omon.csv
similarity index 100%
rename from Tables_csv/omon.csv
rename to Tables_csv/Omon.csv
diff --git a/Tables_csv/oyr.csv b/Tables_csv/Oyr.csv
similarity index 100%
rename from Tables_csv/oyr.csv
rename to Tables_csv/Oyr.csv
diff --git a/Tables_csv/oyr_tracer.csv b/Tables_csv/Oyr_tracer.csv
similarity index 100%
rename from Tables_csv/oyr_tracer.csv
rename to Tables_csv/Oyr_tracer.csv
diff --git a/Tables_csv/cfsites.csv b/Tables_csv/cfSites.csv
similarity index 100%
rename from Tables_csv/cfsites.csv
rename to Tables_csv/cfSites.csv

-- 
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