[cmor-tables] 44/83: 2010-09-17 : cfsite is back as longitude/latitude, site moved to CMIP5_grids 2010-09-15 : updated Omon longname for var coming from Oyr, also changed olevel to depth0m for these

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 4cf2abc13adf0e1ee93d76e961fe70b0b66b35f8
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date:   Fri Sep 17 15:19:01 2010 -0700

    2010-09-17 : cfsite is back as longitude/latitude, site moved to CMIP5_grids
    2010-09-15 : updated Omon longname for var coming from Oyr, also changed olevel to depth0m for these
---
 Lib/table_generator.py          |   9 +-
 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               |  86 ++++++++--------
 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            | 223 ++++++++++++++++++++++------------------
 Tables/CMIP5_day                |   2 +-
 Tables/CMIP5_fx                 |   2 +-
 Tables/CMIP5_grids              |  23 ++++-
 Tables/md5s                     |   2 +-
 Tables_csv/3hr.csv              |   2 +-
 Tables_csv/6hrLev.csv           |   2 +-
 Tables_csv/6hrPlev.csv          |   2 +-
 Tables_csv/CFMIP.csv            |   3 +-
 Tables_csv/aero.csv             |   2 +-
 Tables_csv/cfsites.csv          |  74 ++++++-------
 Tables_csv/day.csv              |   2 +-
 Tables_csv/dims.csv             |   6 +-
 Tables_csv/other.csv            |  20 ++--
 Tables_csv/standard_output.xlsx | Bin 285933 -> 0 bytes
 31 files changed, 268 insertions(+), 220 deletions(-)

diff --git a/Lib/table_generator.py b/Lib/table_generator.py
index 3f6d240..9b0fd76 100644
--- a/Lib/table_generator.py
+++ b/Lib/table_generator.py
@@ -429,8 +429,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
@@ -463,8 +463,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")
                         ## print 'Replaced to:',sp[16]
                     for i in range(len(sp)):
                         if sp[i].find(",")>-1:
@@ -482,6 +482,7 @@ def create_table(table_file, dims_file,minmax={}):
             f=open("Tables_csv/Oyr_tracer.csv")
             addedlines=[]
             for l in f.xreadlines():
+                l=l.replace("olevel time","time depth0m")
                 l=l.replace("olevel","depth0m")
                 l+='$$$$add at surface$$$'
                 addedlines.append(l)
diff --git a/Tables/CMIP5_3hr b/Tables/CMIP5_3hr
index c38a60d..bceb80b 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:   14 September 2010 ! date this table was constructed
+table_date:   17 September 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 f01e754..ae8dcba 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:   14 September 2010 ! date this table was constructed
+table_date:   17 September 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 c430e85..130d2f5 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:   14 September 2010 ! date this table was constructed
+table_date:   17 September 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 4e9a134..187c2f3 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:   14 September 2010 ! date this table was constructed
+table_date:   17 September 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 765470d..1b9049a 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:   14 September 2010 ! date this table was constructed
+table_date:   17 September 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 ee36116..d624962 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:   14 September 2010 ! date this table was constructed
+table_date:   17 September 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 95d0cb8..06e44f7 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:   14 September 2010 ! date this table was constructed
+table_date:   17 September 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 b316405..b6427c9 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:   14 September 2010 ! date this table was constructed
+table_date:   17 September 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 a6d4abb..fe589aa 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:   14 September 2010 ! date this table was constructed
+table_date:   17 September 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 
@@ -683,7 +683,7 @@ comment:           Dissolved inorganic carbon (CO3+HCO3+H2CO3) concentration
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          dissic
 type:              real
 !----------------------------------
@@ -705,7 +705,7 @@ comment:           Dissolved organic carbon concentration
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          dissoc
 type:              real
 !----------------------------------
@@ -727,7 +727,7 @@ comment:           sum of phytoplankton carbon component concentrations.  In mos
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          phyc
 type:              real
 !----------------------------------
@@ -749,7 +749,7 @@ comment:           sum of zooplankton carbon component concentrations
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          zooc
 type:              real
 !----------------------------------
@@ -771,7 +771,7 @@ comment:           sum of bacterial carbon component concentrations
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          bacc
 type:              real
 !----------------------------------
@@ -793,7 +793,7 @@ comment:           sum of detrital organic carbon component concentrations
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          detoc
 type:              real
 !----------------------------------
@@ -815,7 +815,7 @@ comment:           sum of particulate calcite component concentrations (e.g. Phy
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          calc
 type:              real
 !----------------------------------
@@ -837,7 +837,7 @@ comment:           sum of particulate aragonite components (e.g. Phytoplankton,
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          arag
 type:              real
 !----------------------------------
@@ -859,7 +859,7 @@ comment:           carbon from the diatom phytoplankton component concentration
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          phydiat
 type:              real
 !----------------------------------
@@ -881,7 +881,7 @@ comment:           carbon concentration from the diazotrophic phytoplankton comp
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          phydiaz
 type:              real
 !----------------------------------
@@ -903,7 +903,7 @@ comment:           carbon concentration from calcareous (calcite-producing) phyt
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          phycalc
 type:              real
 !----------------------------------
@@ -925,7 +925,7 @@ comment:           carbon concentration from the picophytoplankton (<2 um) compo
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          phypico
 type:              real
 !----------------------------------
@@ -947,7 +947,7 @@ comment:           carbon concentration from additional phytoplankton component
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          phymisc
 type:              real
 !----------------------------------
@@ -969,7 +969,7 @@ comment:           carbon  concentration from the microzooplankton (<20 um) comp
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          zmicro
 type:              real
 !----------------------------------
@@ -991,7 +991,7 @@ comment:           carbon  concentration from mesozooplankton (20-200 um) compon
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          zmeso
 type:              real
 !----------------------------------
@@ -1013,7 +1013,7 @@ comment:           carbon from additional zooplankton component concentrations a
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          zoocmisc
 type:              real
 !----------------------------------
@@ -1035,7 +1035,7 @@ comment:           total alkalinity equivalent concentration (including carbonat
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          talk
 type:              real
 !----------------------------------
@@ -1057,7 +1057,7 @@ comment:           negative log of hydrogen ion concentration with the concentra
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          ph
 type:              real
 !----------------------------------
@@ -1079,7 +1079,7 @@ comment:           dissolved oxygen gas concentration in sea water
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          o2
 type:              real
 !----------------------------------
@@ -1101,7 +1101,7 @@ comment:           dissolved nitrate concentration in sea water
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          no3
 type:              real
 !----------------------------------
@@ -1123,7 +1123,7 @@ comment:           dissolved ammonium concentration in sea water
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          nh4
 type:              real
 !----------------------------------
@@ -1145,7 +1145,7 @@ comment:           dissolved Phosphate concentration in sea water
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          po4
 type:              real
 !----------------------------------
@@ -1167,7 +1167,7 @@ comment:           dissolved iron concentration in sea water
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          dfe
 type:              real
 !----------------------------------
@@ -1189,7 +1189,7 @@ comment:           dissolved silicate concentration in sea water
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          si
 type:              real
 !----------------------------------
@@ -1211,7 +1211,7 @@ comment:           sum of chlorophyll from all phytoplankton group concentration
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          chl
 type:              real
 !----------------------------------
@@ -1233,7 +1233,7 @@ comment:           chlorophyll from diatom phytoplankton component concentration
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          chldiat
 type:              real
 !----------------------------------
@@ -1255,7 +1255,7 @@ comment:           chlorophyll concentration from the diazotrophic phytoplankton
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          chldiaz
 type:              real
 !----------------------------------
@@ -1277,7 +1277,7 @@ comment:           chlorophyll concentration from the calcite-producing phytopla
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          chlcalc
 type:              real
 !----------------------------------
@@ -1299,7 +1299,7 @@ comment:           chlorophyll concentration from the picophytoplankton (<2 um)
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          chlpico
 type:              real
 !----------------------------------
@@ -1321,7 +1321,7 @@ comment:           chlorophyll from additional phytoplankton component concentra
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          chlmisc
 type:              real
 !----------------------------------
@@ -1343,7 +1343,7 @@ comment:           sum of particulate organic nitrogen component concentrations
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          pon
 type:              real
 !----------------------------------
@@ -1365,7 +1365,7 @@ comment:           sum of particulate organic phosphorus component concentration
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          pop
 type:              real
 !----------------------------------
@@ -1387,7 +1387,7 @@ comment:           sum of particulate organic iron component concentrations
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          bfe
 type:              real
 !----------------------------------
@@ -1409,7 +1409,7 @@ comment:           sum of particulate silica component concentrations
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          bsi
 type:              real
 !----------------------------------
@@ -1431,7 +1431,7 @@ comment:           sum of phytoplankton nitrogen component concentrations
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          phyn
 type:              real
 !----------------------------------
@@ -1453,7 +1453,7 @@ comment:           sum of phytoplankton phosphorus components
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          phyp
 type:              real
 !----------------------------------
@@ -1475,7 +1475,7 @@ comment:           sum of phytoplankton iron component concentrations
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          phyfe
 type:              real
 !----------------------------------
@@ -1497,7 +1497,7 @@ comment:           sum of phytoplankton silica component concentrations
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          physi
 type:              real
 !----------------------------------
@@ -1519,7 +1519,7 @@ comment:           dimethyl sulphide concentration
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          dms
 type:              real
 !----------------------------------
@@ -1541,7 +1541,7 @@ comment:           carbonate ion concentration
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          co3
 type:              real
 !----------------------------------
@@ -1563,7 +1563,7 @@ comment:           carbonate ion concentration at calcite solution saturation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          co3satcalc
 type:              real
 !----------------------------------
@@ -1585,7 +1585,7 @@ comment:           carbonate ion concentration at aragonite solution saturation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude depth0m time
+dimensions:        longitude latitude time depth0m
 out_name:          co3satarag
 type:              real
 !----------------------------------
diff --git a/Tables/CMIP5_Oyr b/Tables/CMIP5_Oyr
index 3a9c7c3..19c064f 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:   14 September 2010 ! date this table was constructed
+table_date:   17 September 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 43d9ef8..321d405 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:   14 September 2010 ! date this table was constructed
+table_date:   17 September 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 7980fa6..87a6e41 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:   14 September 2010 ! date this table was constructed
+table_date:   17 September 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 a795fc2..81f6218 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:   14 September 2010 ! date this table was constructed
+table_date:   17 September 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 75089e2..7f50432 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:   14 September 2010 ! date this table was constructed
+table_date:   17 September 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 6b31871..9c78e04 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:   14 September 2010 ! date this table was constructed
+table_date:   17 September 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 3ab3476..210834d 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:   14 September 2010 ! date this table was constructed
+table_date:   17 September 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 
@@ -79,6 +79,52 @@ approx_interval:  0.017361     ! approximate spacing between successive time
 generic_levels:   alevel alevhalf
 
 !============
+axis_entry: longitude
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    longitude
+units:            degrees_east
+axis:             X             ! X, Y, Z, T (default: undeclared)
+long_name:        longitude
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         lon
+valid_min:        0.0         
+valid_max:        360.0 
+stored_direction: increasing
+type:             double
+must_have_bounds: yes
+!----------------------------------
+!
+
+
+!============
+axis_entry: latitude
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    latitude
+units:            degrees_north
+axis:             Y             ! X, Y, Z, T (default: undeclared)
+long_name:        latitude
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         lat
+valid_min:        -90.0         
+valid_max:        90.0 
+stored_direction: increasing
+type:             double
+must_have_bounds: yes
+!----------------------------------
+!
+
+
+!============
 axis_entry: time1
 !============
 !----------------------------------
@@ -148,25 +194,6 @@ must_have_bounds: no
 !----------------------------------
 !
 
-
-!============
-axis_entry: site
-!============
-!----------------------------------
-! Axis attributes:
-!----------------------------------
-units:            1
-long_name:        site index
-!----------------------------------
-! Additional axis information:
-!----------------------------------
-out_name:         site
-type:             integer
-must_have_bounds: no
-index_only:       ok
-!----------------------------------
-!
-
 !============
 axis_entry: smooth_level
 !============
@@ -373,7 +400,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
@@ -542,7 +569,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
@@ -568,7 +595,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
@@ -594,7 +621,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
@@ -620,7 +647,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
@@ -646,7 +673,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
@@ -672,7 +699,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
@@ -698,7 +725,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
 !----------------------------------
@@ -720,7 +747,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
 !----------------------------------
@@ -742,7 +769,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
@@ -768,7 +795,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
@@ -794,7 +821,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
@@ -820,7 +847,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
@@ -846,7 +873,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
 !----------------------------------
@@ -868,7 +895,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
@@ -893,7 +920,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
@@ -919,7 +946,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
@@ -946,7 +973,7 @@ comment:           includes both evaporation and sublimation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          hfls
 type:              real
 positive:          up
@@ -972,7 +999,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
@@ -998,7 +1025,7 @@ long_name:         Surface Downwelling Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          rlds
 type:              real
 positive:          down
@@ -1024,7 +1051,7 @@ long_name:         Surface Upwelling Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          rlus
 type:              real
 positive:          up
@@ -1050,7 +1077,7 @@ long_name:         Surface Downwelling Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          rsds
 type:              real
 positive:          down
@@ -1076,7 +1103,7 @@ long_name:         Surface Upwelling Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          rsus
 type:              real
 positive:          up
@@ -1102,7 +1129,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
@@ -1128,7 +1155,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
@@ -1154,7 +1181,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
@@ -1181,7 +1208,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
@@ -1208,7 +1235,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
@@ -1235,7 +1262,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
@@ -1261,7 +1288,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
@@ -1287,7 +1314,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
@@ -1314,7 +1341,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
@@ -1340,7 +1367,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
@@ -1366,7 +1393,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
@@ -1392,7 +1419,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
@@ -1418,7 +1445,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
@@ -1444,7 +1471,7 @@ long_name:         Air Pressure at Convective Cloud Base
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          ccb
 type:              real
 !----------------------------------
@@ -1465,7 +1492,7 @@ long_name:         Air Pressure at Convective Cloud Top
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        site time1
+dimensions:        longitude latitude time1
 out_name:          cct
 type:              real
 !----------------------------------
@@ -1486,7 +1513,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
 !----------------------------------
@@ -1507,7 +1534,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
 !----------------------------------
@@ -1528,7 +1555,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
@@ -1550,7 +1577,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
@@ -1572,7 +1599,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
@@ -1594,7 +1621,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
@@ -1619,7 +1646,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
 !----------------------------------
@@ -1640,7 +1667,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
 !----------------------------------
@@ -1661,7 +1688,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
@@ -1682,7 +1709,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
@@ -1706,7 +1733,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
@@ -1730,7 +1757,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
@@ -1754,7 +1781,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
@@ -1779,7 +1806,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
@@ -1804,7 +1831,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
@@ -1828,7 +1855,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
@@ -1852,7 +1879,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
@@ -1873,7 +1900,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
@@ -1894,7 +1921,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
@@ -1915,7 +1942,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
@@ -1936,7 +1963,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
@@ -1957,7 +1984,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
@@ -1978,7 +2005,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
@@ -1999,7 +2026,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
@@ -2020,7 +2047,7 @@ long_name:         Tendency of Air Temperature
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          tnt 
 type:              real
 !----------------------------------
@@ -2040,7 +2067,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
 !----------------------------------
@@ -2060,7 +2087,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
 !----------------------------------
@@ -2080,7 +2107,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
 !----------------------------------
@@ -2100,7 +2127,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
 !----------------------------------
@@ -2120,7 +2147,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
 !----------------------------------
@@ -2140,7 +2167,7 @@ long_name:         Tendency of Specific Humidity
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        alevel site time1
+dimensions:        alevel longitude latitude time1
 out_name:          tnhus
 type:              real
 !----------------------------------
@@ -2160,7 +2187,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
 !----------------------------------
@@ -2180,7 +2207,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
 !----------------------------------
@@ -2200,7 +2227,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
 !----------------------------------
@@ -2220,7 +2247,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
 !----------------------------------
@@ -2240,7 +2267,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
 !----------------------------------
@@ -2260,7 +2287,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
 !----------------------------------
@@ -2280,7 +2307,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
 !----------------------------------
@@ -2301,7 +2328,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
 !----------------------------------
@@ -2322,7 +2349,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 c15de34..3b92bf4 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:   14 September 2010 ! date this table was constructed
+table_date:   17 September 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 372c9cf..5995eb3 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:   14 September 2010 ! date this table was constructed
+table_date:   17 September 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_grids b/Tables/CMIP5_grids
index c14f046..473ecfb 100644
--- a/Tables/CMIP5_grids
+++ b/Tables/CMIP5_grids
@@ -4,7 +4,7 @@ table_id: Table grids
 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 August 2010 ! date this table was constructed
+table_date:   19 September 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 
@@ -78,6 +78,22 @@ parameter: false_northing
 coordinates: rlon rlat
 !
 !============
+axis_entry: site
+!============
+!
+!------------
+!
+! Axis attributes:
+!----------------------------------
+out_name:         site
+units:            1
+long_name:        site index
+type: 		  integer
+index_only:       ok
+!----------------------------------	
+!
+!
+!============
 axis_entry: i_index
 !============
 !
@@ -88,6 +104,7 @@ axis_entry: i_index
 out_name:         i
 units:            1
 long_name:        cell index along first dimension
+type: 		  integer
 !----------------------------------	
 !
 !
@@ -102,6 +119,7 @@ axis_entry: j_index
 out_name:         j
 units:            1
 long_name:        cell index along second dimension
+type: 		  integer
 !----------------------------------	
 !
 !
@@ -116,6 +134,7 @@ axis_entry: k_index
 out_name:         k
 units:            1
 long_name:        cell index along third dimension
+type: 		  integer
 !----------------------------------	
 !
 !============
@@ -129,6 +148,7 @@ axis_entry: l_index
 out_name:         l
 units:            1
 long_name:        cell index along fourth dimension
+type: 		  integer
 !----------------------------------	
 !
 !============
@@ -142,6 +162,7 @@ axis_entry: m_index
 out_name:         m
 units:            1
 long_name:        cell index along fifth dimension
+type: 		  integer
 !----------------------------------	
 !
 !============
diff --git a/Tables/md5s b/Tables/md5s
index 51e06c0..542fcbc 100644
--- a/Tables/md5s
+++ b/Tables/md5s
@@ -1 +1 @@
-{'CMIP5': {'cf3hr': {'12 March 2010': 'ae9a82f01824d9012aa0657cd7896a9a', '11 May 2010': 'a59ca1270ff3036d417a7f2217598266', '24 May 2010': '61693a46b06627dcd6ffe8ceff288ef0', '07 July 2010': '27949d438b4c04d481ff1d9790cff60f', '09 June 2010': '8aad2bf8bea26504a0e247c1737ea4a0', '22 March 2010': '712cd14ab6a28116da828ff555e00c4d', '12 May 2010': '905f7ccdd5a31cb71e2a6e3b339cd0e1', '10 June 2010': 'f70ed019bca338b2d73296e1924f3df4', '28 May 2010': 'f6e966842fed498f0921365983918119', '02 A [...]
\ No newline at end of file
+{'CMIP5': {'cf3hr': {'12 March 2010': 'ae9a82f01824d9012aa0657cd7896a9a', '11 May 2010': 'a59ca1270ff3036d417a7f2217598266', '01 July 2010': 'c0fe9e92115d75292f5009e13761cb4b', '17 September 2010': 'b71b239f5fac1e0588d0b15bc4d34ed8', '24 May 2010': '61693a46b06627dcd6ffe8ceff288ef0', '07 July 2010': '27949d438b4c04d481ff1d9790cff60f', '12 May 2010': '905f7ccdd5a31cb71e2a6e3b339cd0e1', '22 March 2010': '712cd14ab6a28116da828ff555e00c4d', '09 June 2010': '8aad2bf8bea26504a0e247c1737ea4a0', [...]
\ No newline at end of file
diff --git a/Tables_csv/3hr.csv b/Tables_csv/3hr.csv
index deeff04..ac71985 100644
--- a/Tables_csv/3hr.csv
+++ b/Tables_csv/3hr.csv
@@ -4,7 +4,7 @@ The 3-hourly data should be collected only for the following experiments and yea
 ,,,experiment,time-period requested,,,,,,,,,,,,,,,,,,
 ,,,decadal hindcasts/forecasts,all years,,,,,,,,,,,,,,,,,,
 ,,,historical,Jan 1960 - Dec 2005,,,,,,,,,,,,,,,,,,
-,,,AMIP,all years,,,,,,,,,,,,,,,,,,
+,,,AMIP & future 2030 time-slice,all years,,,,,,,,,,,,,,,,,,
 ,,,future simulations driven by RCP concentrations or emissions,"Jan 2026 - Dec 2045, Jan 2081-Dec 2100, 2181-2200, and 2281-2300",,,,,,,,,,,,,,,,,,
 ,,,pre-industrial control,30 years (ideally the years corresponding to the last 30 years of abrupt 4xCO2 run),,,,,,,,,,,,,,,,,,
 ,,,1 percent per year CO2,last 30 years,,,,,,,,,,,,,,,,,,
diff --git a/Tables_csv/6hrLev.csv b/Tables_csv/6hrLev.csv
index 188fd58..fefeb86 100644
--- a/Tables_csv/6hrLev.csv
+++ b/Tables_csv/6hrLev.csv
@@ -4,7 +4,7 @@ CMOR Table 6hrLev: Fields (Sampled Every 6 Hours) for Driving Regional Models,,,
 ,,,historical,Jan 1950 - Dec 2005,1.0,highest,,,,,,,,,,,,,,,,
 ,,,AMIP,all years,1.0,highest,,,,,,,,,,,,,,,,
 ,,,RCP4.5 and RCP8.5,Jan 2006 - Dec 2100,1 for each expt.,highest,,,,,,,,,,,,,,,,
-,,,decadal hindcasts/forecasts runs inititalized in late 2005 and late 1980,late 2005 - Dec 2035 and       late 1980 - Dec 2010,3 for each period,lower,,,,,,,,,,,,,,,,
+,,,decadal hindcasts/forecasts runs inititalized in late 2005 and late 1980,late 2016 - Dec 2035 and       late 1991 - Dec 2010,3 for each period,lower,,,,,,,,,,,,,,,,
 ,,,decadal hindcasts/forecasts runs inititalized in late 1990,late 1990 - Dec 2000,3.0,lower,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,,,
diff --git a/Tables_csv/6hrPlev.csv b/Tables_csv/6hrPlev.csv
index 1b12315..a8020b0 100644
--- a/Tables_csv/6hrPlev.csv
+++ b/Tables_csv/6hrPlev.csv
@@ -3,7 +3,7 @@ CMOR Table 6hrPlev: Fields (Sampled Every 6 Hours) for Storm-Track Analysis and
 ,,,experiment,time-period requested,,,,,,,,,,,,,,,,,,
 ,,,decadal hindcasts/forecasts,all years,,,,,,,,,,,,,,,,,,
 ,,,historical,Jan 1950 - Dec 2005,,,,,,,,,,,,,,,,,,
-,,,AMIP,all years,,,,,,,,,,,,,,,,,,
+,,,AMIP & 2030 time-slice,all years,,,,,,,,,,,,,,,,,,
 ,,,RCP4.5 and RCP8.5,Jan 2006 - Dec 2100,,,,,,,,,,,,,,,,,,
 ,,,preindustrial control ,30 years -- preferably corresponding to years 1979-2008 of the historical run,,,,,,,,,,,,,,,,,,
 ,,,Last glacial maximum paleo-run,last 30 years,,,,,,,,,,,,,,,,,,
diff --git a/Tables_csv/CFMIP.csv b/Tables_csv/CFMIP.csv
index 9f76755..5ec259f 100644
--- a/Tables_csv/CFMIP.csv
+++ b/Tables_csv/CFMIP.csv
@@ -9,9 +9,7 @@ pre-industrial control,coupled atmosphere/ocean control run,3.1,,,,, , ,121*,140
 historical,simulation of recent past (1850-2005),3.2,,,,,,,1979.0,2005.0,,,1979.0,2005.0,,,,,,,,
 AMIP,AMIP (1979-at least 2008),3.3,1979.0,2008.0,1979.0,2008.0,1979.0,2008.0,1979.0,2008.0,2008.0,2008.0,1979.0,2008.0,1979.0,2008.0,2008.0,2008.0,2008.0,2008.0,1979.0,2008.0
 ESM fixed climate 1,"radiation code ""sees"" control CO2, but carbon cycle sees 1%/yr rise",5.4-1,,,,,,,121.0,140.0,,,121.0,140.0,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,,,
 ESM feedback 1,"carbon cycle ""sees"" control CO2, but radiatation sees 1%/yr rise",5.5-1,,,,,,,121.0,140.0,,,121.0,140.0,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,,,
 1 percent per year CO2,impose a 1%/yr increase in CO2 to quadrupling,6.1,,,,,,,121.0,140.0,,,121.0,140.0,121.0,140.0,,,,,,
 control SST climatology,control run climatological SSTs & sea ice imposed.,6.2a,,,1.0,30.0, , ,1.0,30.0,,,1.0,30.0,,,,,,,,
 CO2 forcing,"as in expt. 6.2a, but with 4XCO2 imposed",6.2b,,,,,,,1.0,30.0,,,1.0,30.0,,,,,,,,
@@ -20,6 +18,7 @@ abrupt 4XCO2,"impose an instantaneous quadrupling of CO2, then hold fixed",6.3,,
 abrupt 4XCO2,"generate an ensemble of runs like expt. 6.3, initialized in different months, and terminated after 5 years",6.3-E,,,,,,,1.0,5.0,,,1.0,5.0,,,,,,,,
 all aerosol forcing,"as in expt. 6.2a, but with aerosols from year 2000 of expt. 3.2",6.4a,,,,,,,1.0,30.0,,,1.0,30.0,,,,,,,,
 sulfate aerosol forcing,"as in expt. 6.2a, but with sulfate aerosols from year 2000 of expt. 3.2",6.4b,,,,,,,1.0,30.0,,,1.0,30.0,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,
 4xCO2 AMIP,AMIP (1979-2008) conditions (expt. 3.3) but with 4xCO2,6.5,1979.0,2008.0, , , , ,1979.0,2008.0,2008.0,2008.0,1979.0,2008.0,1979.0,2008.0,2008.0,2008.0,,,1979.0,2008.0
 AMIP plus patterned anomaly,"consistent with CFMIP, patterned SST anomalies added to AMIP conditions (expt. 3.3)",6.6,1979.0,2008.0, , , , ,1979.0,2008.0,2008.0,2008.0,1979.0,2008.0,1979.0,2008.0,2008.0,2008.0,,,1979.0,2008.0
 aqua planet control,"consistent with CFMIP, zonally uniform SSTs for ocean-covered earth",6.7a,1.0,5.0,1.0,5.0,1.0,5.0,1.0,5.0,,,1.0,5.0,1.0,5.0,,,,,1.0,5.0
diff --git a/Tables_csv/aero.csv b/Tables_csv/aero.csv
index 729a8e4..cf9ac77 100644
--- a/Tables_csv/aero.csv
+++ b/Tables_csv/aero.csv
@@ -79,7 +79,7 @@ priority,long name,units ,comment ,questions,output variable name ,standard name
 1.0,Ice Crystal Number Concentration of Cloud Tops,m-3,"Report concentration ""as seen from space"" over liquid cloudy portion of grid cell.  This is the value from uppermost model layer with ice cloud or, if available, it is better to sum over all ice cloud tops, no matter where they occur, as long as they are seen from the top of the atmosphere. Weight by total ice cloud top fraction (as seen from TOA) of each time sample when computing monthly mean.",,cldnci,,ice_crystal_number_concen [...]
 1.0,Column Integrated Cloud Droplet Number,m-2,Droplets are liquid only.  Weight by liquid cloud fraction in each layer when vertically integrating.  Weight by total liquid cloud fraction (as seen from TOA) when reporting monthly mean,,cldnvi,atmosphere_number_content_of_cloud_droplets,,m-2,time: mean,,,,,,real,longitude latitude time,cldnvi,aerosol,,area: areacella,,
 In CMOR Table aero: 3-D aerosol-related concentrations and properties on model levels,,,,,,,,,,,,,,,,,,,,,,
-"For historical and RCP runs, report 1-year samples: 1850 to 1950 every 20 years (1850, 1870,  ... 1950), 1960 to 2020 every 10 years (1960, 1970, ... 2020), 2040 to 2100 every 20 years.  For AMIP runs, report 1-year samples every 10 years (1980, 1990, ... 2010).  For 2030 time-slice run, report 1-year sample for year 2030.",,,,,,,,,,,,,,,,,,,,,,
+"Report 1-year samples for years: 1850, 1870, 1890, ..., 1950, 1960, 1970, ... 2000 of the historical run, and 2010, 2020, 2040, 2060, 2080, 2100 of the RCP runs.  For AMIP runs, report 1-year samples every 10 years (1980, 1990, ..., 2010).  For 2030 time-slice run, report 1-year sample for year 2035.  For decadal runs, report 10th year only for 10-year predictions or hindcasts, and report year 10, 20, and 30 for 30-year predictions and hindcasts.  For the preindustrial control, report t [...]
 priority,long name,units ,comment ,questions,output variable name ,standard name,unconfirmed or proposed standard name,unformatted units,cell_methods,valid min,valid max,mean absolute min,mean absolute max,positive,type,CMOR dimensions,CMOR variable name,realm,frequency,cell_measures,flag_values,flag_meanings
 1.0,Ambient Aerosol Extinction Optical Thickness at 550 nm,m-1,"atmosphere_extinction_due_to_ambient_aerosol: ""ambient"" means ""wetted"".  This and other fields in this table are 3-D.",,ec550aer,,atmosphere_extinction_due_to_ambient_aerosol,m-1,time: mean,,,,,,,longitude latitude alevel time,ec550aer,aerosol,,area: areacella,,
 1.0,Concentration of Dry Aerosol Organic Matter,kg m-3,"mass_concentration_of_organic_matter_dry_aerosol_in_air mass concentration of organic matter dry aerosol in air:  This is the sum of concentrations of primary and secondary organic aerosols (see next two table entries), and therefore should only be reported if those two components cannot be separately reported. ",,concoa,mass_concentration_of_particulate_organic_matter_dry_aerosol_in_air,,kg m-3,time: mean,,,,,,,longitude latitude a [...]
diff --git a/Tables_csv/cfsites.csv b/Tables_csv/cfsites.csv
index 23c01cb..42998f7 100644
--- a/Tables_csv/cfsites.csv
+++ b/Tables_csv/cfsites.csv
@@ -7,47 +7,47 @@ CMOR Table cfSites: CFMIP high frequency Cloud Diagnostic Fields,,,,,cfSites,sub
 ,,,,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,,,
 "The spread sheet ""CFMIP output"" specifies the simulations and time-periods for which the cloud diagnostic fields listed on this spread sheet should be saved.",,,,,,,,,,,,,,,,,,,,,,
-"CMOR Table cfSites: ""CFMIP Timestep Station Data"" -- 2-D fields from the Amon table and 3-D fields on model levels sampled at 20 to 30 minute intervals at 73 specified locations for aquaplanet experiments and 119 specified locations for other experiments (see http://cfmip.metoffice.com/cfmip2/pointlocations.txt.",,,,,,,,,,,,,,,,,,,,,,
+"CMOR Table cfSites: ""CFMIP Timestep Station Data"" -- 2-D fields from the Amon table and 3-D fields on model levels sampled at 20 to 30 minute intervals at 73 specified locations for aquaplanet experiments and 119 specified locations for other experiments (see http://cfmip.metoffice.com/cfmip2/pointlocations.txt).  Note that the column labeled ""CMOR dimensions"" indicates that these variables are a function of longitude and latitude.  When writing the data to the netCDF file, however, [...]
 "The sampling interval should be the integer multiple of the model time-step that is nearest to 30 minutes and divides into 60 minutes with no remainder. e.g. (30->30,20->20,15->30,10->30).   Outputs should be instantaneous (not time mean) and from nearest gridbox (no spatial interpolation.) Note that except for the quantities appearing in the Amon spreadsheet (first line of table below), all other fields are 3-D.",,,,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,,,
 priority,long name,units ,comment ,questions,output variable name ,standard name,unconfirmed or proposed standard name,unformatted units,cell_methods,valid min,valid max,mean absolute min,mean absolute max,positive,type,CMOR dimensions,CMOR variable name,realm,frequency,cell_measures,flag_values,flag_meanings
-1.0,(use names from Amon 2D table),,"This table includes the 2-D variables listed in the ""Amon"" spreadsheet, omitting, however, the daily maximum and minimum temperatures.  All variables should be reported as synoptic fields, not daily means.  ",,include Amon 2D,,,,time: point,,,,,,real,site time1,,atmos,,,,
-1.0,Cloud Area Fraction,%,Include both large-scale and convective cloud.,,cl,cloud_area_fraction_in_atmosphere_layer,,%,time: point,,,,,,real,alevel site time1,cl,atmos,,,,
-1.0,Mass Fraction of Cloud Liquid Water,1.0,Include both large-scale and convective cloud.  Calculate as the mass of  cloud liquid water in the grid cell divided by the mass of air (including the water in all phases) in the grid cell.  Include precipitating hydrometeors ONLY if the precipitating hydrometeor affects the calculation of radiative transfer in model.  ,,clw,mass_fraction_of_cloud_liquid_water_in_air,,1.0,time: point,,,,,,real,alevel site time1,clw,atmos,,,,
-1.0,Mass Fraction of Cloud Ice,1.0,Include both large-scale and convective cloud. Calculate as the mass of  cloud ice  in the grid cell divided by the mass of air (including the water in all phases) in the grid cell.  Include precipitating hydrometeors ONLY if the precipitating hydrometeor affects the calculation of radiative transfer in model.  ,,cli,mass_fraction_of_cloud_ice_in_air,,1.0,time: point,,,,,,real,alevel site time1,cli,atmos,,,,
-1.0,Convective Mass Flux,kg m-2 s-1,"Report on model half-levels (i.e., model layer bounds and not standard pressures).  The net mass flux should represent the difference between the updraft and downdraft components.  Calculate as the convective mass flux divided by the area of the whole grid cell (not just the area of the updrafts).",,mc,atmosphere_net_upward_convective_mass_flux,,kg m-2 s-1,time: point,,,,,up,real,alevhalf site time1,mc,atmos,,,,
-1.0,Air Temperature,K,,,ta,air_temperature,,K,time: point,,,,,,real,alevel site time1,ta,atmos,,,,
-1.0,Eastward Wind,m s-1,,,ua,eastward_wind,,m s-1,time: point,,,,,,real,alevel site time1,ua,atmos,,,,
-1.0,Northward Wind,m s-1,,,va,northward_wind,,m s-1,time: point,,,,,,real,alevel site time1,va,atmos,,,,
-1.0,Specific Humidity,1.0,,,hus,specific_humidity,,1.0,time: point,,,,,,real,alevel site time1,hus,atmos,,,,
-1.0,Relative Humidity,%,"This is the relative humidity with respect to liquid water for T> 0 C, and with respect to ice for T<0 C.",,hur,relative_humidity,,%,time: point,,,,,,real,alevel site time1,hur,atmos,,,,
-1.0,omega (=dp/dt),Pa s-1,"commonly referred to as ""omega"", this represents the vertical component of velocity in pressure coordinates (positive down)",,wap,lagrangian_tendency_of_air_pressure,,Pa s-1,time: point,,,,,,real,alevel site time1,wap,atmos,,,,
-1.0,Geopotential Height,m,,,zg,geopotential_height,,m,time: point,,,,,,real,alevel site time1,zg,atmos,,,,
-1.0,Upwelling Longwave Radiation,W m-2,,,rlu,upwelling_longwave_flux_in_air,,W m-2,time: point,,,,,up,real,alevel site time1,rlu,atmos,,,,
-1.0,Upwelling Shortwave Radiation,W m-2,,,rsu,upwelling_shortwave_flux_in_air,,W m-2,time: point,,,,,up,real,alevel site time1,rsu,atmos,,,,
-1.0,Downwelling Longwave Radiation,W m-2,,,rld,downwelling_longwave_flux_in_air,,W m-2,time: point,,,,,down,real,alevel site time1,rld,atmos,,,,
-1.0,Downwelling Shortwave Radiation,W m-2,,,rsd,downwelling_shortwave_flux_in_air,,W m-2,time: point,,,,,down,real,alevel site time1,rsd,atmos,,,,
-1.0,Upwelling Clear-Sky Longwave Radiation,W m-2,,,rlucs,upwelling_longwave_flux_in_air_assuming_clear_sky,,W m-2,time: point,,,,,up,real,alevel site time1,rlucs,atmos,,,,
-1.0,Upwelling Clear-Sky Shortwave Radiation,W m-2,,,rsucs,upwelling_shortwave_flux_in_air_assuming_clear_sky,,W m-2,time: point,,,,,up,real,alevel site time1,rsucs,atmos,,,,
-1.0,Downwelling Clear-Sky Longwave Radiation,W m-2,,,rldcs,downwelling_longwave_flux_in_air_assuming_clear_sky,,W m-2,time: point,,,,,down,real,alevel site time1,rldcs,atmos,,,,
-1.0,Downwelling Clear-Sky Shortwave Radiation,W m-2,,,rsdcs,downwelling_shortwave_flux_in_air_assuming_clear_sky,,W m-2,time: point,,,,,down,real,alevel site time1,rsdcs,atmos,,,,
-1.0,Tendency of Air Temperature,K s-1,,,tnt ,tendency_of_air_temperature,,K s-1,time: point,,,,,,real,alevel site time1,tnt ,atmos,,,,
-1.0,Tendency of Air Temperature due to Advection,K s-1,,,tnta ,tendency_of_air_temperature_due_to_advection,,K s-1,time: point,,,,,,real,alevel site time1,tnta ,atmos,,,,
-1.0,Tendency of Air Temperature due to Diabatic Processes,K s-1,,,tntmp,tendency_of_air_temperature_due_to_model_physics,,K s-1,time: point,,,,,,real,alevel site time1,tntmp,atmos,,,,
-1.0,Tendency of Air Temperature due to Stratiform Cloud Condensation and Evaporation,K s-1,,,tntscpbl ,tendency_of_air_temperature_due_to_stratiform_cloud_and_precipitation_and_boundary_layer_mixing,,K s-1,time: point,,,,,,real,alevel site time1,tntscpbl ,atmos,,,,
-1.0,Tendency of Air Temperature due to Radiative Heating,K s-1,,,tntr ,tendency_of_air_temperature_due_to_radiative_heating,,K s-1,time: point,,,,,,real,alevel site time1,tntr ,atmos,,,,
-1.0,Tendency of Air Temperature due to Moist Convection,K s-1,,,tntc,tendency_of_air_temperature_due_to_convection,,K s-1,time: point,,,,,,real,alevel site time1,tntc,atmos,,,,
-1.0,Tendency of Specific Humidity,s-1,,,tnhus,tendency_of_specific_humidity,,s-1,time: point,,,,,,real,alevel site time1,tnhus,atmos,,,,
-1.0,Tendency of Specific Humidity due to Advection,s-1,,,tnhusa ,tendency_of_specific_humidity_due_to_advection,,s-1,time: point,,,,,,real,alevel site time1,tnhusa ,atmos,,,,
-1.0,Tendency of Specific Humidity due to Convection,s-1,,,tnhusc ,tendency_of_specific_humidity_due_to_convection,,s-1,time: point,,,,,,real,alevel site time1,tnhusc ,atmos,,,,
-1.0,Tendency of Specific Humidity due to Diffusion,s-1,,,tnhusd ,tendency_of_specific_humidity_due_to_diffusion,,s-1,time: point,,,,,,real,alevel site time1,tnhusd ,atmos,,,,
-1.0,Tendency of Specific Humidity due to Stratiform Cloud Condensation and Evaporation,s-1,,,tnhusscpbl ,tendency_of_specific_humidity_due_to_stratiform_cloud_and_precipitation_and_boundary_layer_mixing,,s-1,time: point,,,,,,real,alevel site time1,tnhusscpbl ,atmos,,,,
-1.0,Tendency of Specific Humidity due to Model Physics,s-1,,,tnhusmp ,tendency_of_specific_humidity_due_to_model_physics,,s-1,time: point,,,,,,real,alevel site time1,tnhusmp ,atmos,,,,
-1.0,Eddy Viscosity Coefficient for Momentum Variables,m2 s-1,,,evu,atmosphere_momentum_diffusivity,,m2 s-1,time: point,,,,,,real,alevel site time1,evu,atmos,,,,
-1.0,Eddy Diffusivity Coefficient for Temperature Variable,m2 s-1,,,edt,atmosphere_heat_diffusivity,,m2 s-1,time: point,,,,,,real,alevel site time1,edt,atmos,,,,
-1.0,Pressure on Model Levels,Pa,"This field is needed only for models in which the pressure can't be calculated from the vertical coordinate information stored already for each variable.  Thus, the pressures are needed for height or theta-coordinate models, for example, but not sigma- or eta-coordinate models.",,pfull,air_pressure,,Pa,time: point,,,,,,real,alevel site time1,pfull,atmos,,,,
-1.0,Pressure on Model Half-Levels,Pa,"This field is needed only for models in which the pressure can't be calculated from the vertical coordinate information stored already for each variable.  Thus, the pressures are needed for height or theta-coordinate models, for example, but not sigma- or eta-coordinate models.",,phalf,air_pressure,,Pa,time: point,,,,,,real,alevel site time1,phalf,atmos,,,,
+1.0,(use names from Amon 2D table),,"This table includes the 2-D variables listed in the ""Amon"" spreadsheet, omitting, however, the daily maximum and minimum temperatures.  All variables should be reported as synoptic fields, not daily means.  ",,include Amon 2D,,,,time: point,,,,,,real,longitude latitude time1,,atmos,,,,
+1.0,Cloud Area Fraction,%,Include both large-scale and convective cloud.,,cl,cloud_area_fraction_in_atmosphere_layer,,%,time: point,,,,,,real,alevel longitude latitude time1,cl,atmos,,,,
+1.0,Mass Fraction of Cloud Liquid Water,1.0,Include both large-scale and convective cloud.  Calculate as the mass of  cloud liquid water in the grid cell divided by the mass of air (including the water in all phases) in the grid cell.  Include precipitating hydrometeors ONLY if the precipitating hydrometeor affects the calculation of radiative transfer in model.  ,,clw,mass_fraction_of_cloud_liquid_water_in_air,,1.0,time: point,,,,,,real,alevel longitude latitude time1,clw,atmos,,,,
+1.0,Mass Fraction of Cloud Ice,1.0,Include both large-scale and convective cloud. Calculate as the mass of  cloud ice  in the grid cell divided by the mass of air (including the water in all phases) in the grid cell.  Include precipitating hydrometeors ONLY if the precipitating hydrometeor affects the calculation of radiative transfer in model.  ,,cli,mass_fraction_of_cloud_ice_in_air,,1.0,time: point,,,,,,real,alevel longitude latitude time1,cli,atmos,,,,
+1.0,Convective Mass Flux,kg m-2 s-1,"Report on model half-levels (i.e., model layer bounds and not standard pressures).  The net mass flux should represent the difference between the updraft and downdraft components.  Calculate as the convective mass flux divided by the area of the whole grid cell (not just the area of the updrafts).",,mc,atmosphere_net_upward_convective_mass_flux,,kg m-2 s-1,time: point,,,,,up,real,alevhalf longitude latitude time1,mc,atmos,,,,
+1.0,Air Temperature,K,,,ta,air_temperature,,K,time: point,,,,,,real,alevel longitude latitude time1,ta,atmos,,,,
+1.0,Eastward Wind,m s-1,,,ua,eastward_wind,,m s-1,time: point,,,,,,real,alevel longitude latitude time1,ua,atmos,,,,
+1.0,Northward Wind,m s-1,,,va,northward_wind,,m s-1,time: point,,,,,,real,alevel longitude latitude time1,va,atmos,,,,
+1.0,Specific Humidity,1.0,,,hus,specific_humidity,,1.0,time: point,,,,,,real,alevel longitude latitude time1,hus,atmos,,,,
+1.0,Relative Humidity,%,"This is the relative humidity with respect to liquid water for T> 0 C, and with respect to ice for T<0 C.",,hur,relative_humidity,,%,time: point,,,,,,real,alevel longitude latitude time1,hur,atmos,,,,
+1.0,omega (=dp/dt),Pa s-1,"commonly referred to as ""omega"", this represents the vertical component of velocity in pressure coordinates (positive down)",,wap,lagrangian_tendency_of_air_pressure,,Pa s-1,time: point,,,,,,real,alevel longitude latitude time1,wap,atmos,,,,
+1.0,Geopotential Height,m,,,zg,geopotential_height,,m,time: point,,,,,,real,alevel longitude latitude time1,zg,atmos,,,,
+1.0,Upwelling Longwave Radiation,W m-2,,,rlu,upwelling_longwave_flux_in_air,,W m-2,time: point,,,,,up,real,alevel longitude latitude time1,rlu,atmos,,,,
+1.0,Upwelling Shortwave Radiation,W m-2,,,rsu,upwelling_shortwave_flux_in_air,,W m-2,time: point,,,,,up,real,alevel longitude latitude time1,rsu,atmos,,,,
+1.0,Downwelling Longwave Radiation,W m-2,,,rld,downwelling_longwave_flux_in_air,,W m-2,time: point,,,,,down,real,alevel longitude latitude time1,rld,atmos,,,,
+1.0,Downwelling Shortwave Radiation,W m-2,,,rsd,downwelling_shortwave_flux_in_air,,W m-2,time: point,,,,,down,real,alevel longitude latitude time1,rsd,atmos,,,,
+1.0,Upwelling Clear-Sky Longwave Radiation,W m-2,,,rlucs,upwelling_longwave_flux_in_air_assuming_clear_sky,,W m-2,time: point,,,,,up,real,alevel longitude latitude time1,rlucs,atmos,,,,
+1.0,Upwelling Clear-Sky Shortwave Radiation,W m-2,,,rsucs,upwelling_shortwave_flux_in_air_assuming_clear_sky,,W m-2,time: point,,,,,up,real,alevel longitude latitude time1,rsucs,atmos,,,,
+1.0,Downwelling Clear-Sky Longwave Radiation,W m-2,,,rldcs,downwelling_longwave_flux_in_air_assuming_clear_sky,,W m-2,time: point,,,,,down,real,alevel longitude latitude time1,rldcs,atmos,,,,
+1.0,Downwelling Clear-Sky Shortwave Radiation,W m-2,,,rsdcs,downwelling_shortwave_flux_in_air_assuming_clear_sky,,W m-2,time: point,,,,,down,real,alevel longitude latitude time1,rsdcs,atmos,,,,
+1.0,Tendency of Air Temperature,K s-1,,,tnt ,tendency_of_air_temperature,,K s-1,time: point,,,,,,real,alevel longitude latitude time1,tnt ,atmos,,,,
+1.0,Tendency of Air Temperature due to Advection,K s-1,,,tnta ,tendency_of_air_temperature_due_to_advection,,K s-1,time: point,,,,,,real,alevel longitude latitude time1,tnta ,atmos,,,,
+1.0,Tendency of Air Temperature due to Diabatic Processes,K s-1,,,tntmp,tendency_of_air_temperature_due_to_model_physics,,K s-1,time: point,,,,,,real,alevel longitude latitude time1,tntmp,atmos,,,,
+1.0,Tendency of Air Temperature due to Stratiform Cloud Condensation and Evaporation,K s-1,,,tntscpbl ,tendency_of_air_temperature_due_to_stratiform_cloud_and_precipitation_and_boundary_layer_mixing,,K s-1,time: point,,,,,,real,alevel longitude latitude time1,tntscpbl ,atmos,,,,
+1.0,Tendency of Air Temperature due to Radiative Heating,K s-1,,,tntr ,tendency_of_air_temperature_due_to_radiative_heating,,K s-1,time: point,,,,,,real,alevel longitude latitude time1,tntr ,atmos,,,,
+1.0,Tendency of Air Temperature due to Moist Convection,K s-1,,,tntc,tendency_of_air_temperature_due_to_convection,,K s-1,time: point,,,,,,real,alevel longitude latitude time1,tntc,atmos,,,,
+1.0,Tendency of Specific Humidity,s-1,,,tnhus,tendency_of_specific_humidity,,s-1,time: point,,,,,,real,alevel longitude latitude time1,tnhus,atmos,,,,
+1.0,Tendency of Specific Humidity due to Advection,s-1,,,tnhusa ,tendency_of_specific_humidity_due_to_advection,,s-1,time: point,,,,,,real,alevel longitude latitude time1,tnhusa ,atmos,,,,
+1.0,Tendency of Specific Humidity due to Convection,s-1,,,tnhusc ,tendency_of_specific_humidity_due_to_convection,,s-1,time: point,,,,,,real,alevel longitude latitude time1,tnhusc ,atmos,,,,
+1.0,Tendency of Specific Humidity due to Diffusion,s-1,,,tnhusd ,tendency_of_specific_humidity_due_to_diffusion,,s-1,time: point,,,,,,real,alevel longitude latitude time1,tnhusd ,atmos,,,,
+1.0,Tendency of Specific Humidity due to Stratiform Cloud Condensation and Evaporation,s-1,,,tnhusscpbl ,tendency_of_specific_humidity_due_to_stratiform_cloud_and_precipitation_and_boundary_layer_mixing,,s-1,time: point,,,,,,real,alevel longitude latitude time1,tnhusscpbl ,atmos,,,,
+1.0,Tendency of Specific Humidity due to Model Physics,s-1,,,tnhusmp ,tendency_of_specific_humidity_due_to_model_physics,,s-1,time: point,,,,,,real,alevel longitude latitude time1,tnhusmp ,atmos,,,,
+1.0,Eddy Viscosity Coefficient for Momentum Variables,m2 s-1,,,evu,atmosphere_momentum_diffusivity,,m2 s-1,time: point,,,,,,real,alevel longitude latitude time1,evu,atmos,,,,
+1.0,Eddy Diffusivity Coefficient for Temperature Variable,m2 s-1,,,edt,atmosphere_heat_diffusivity,,m2 s-1,time: point,,,,,,real,alevel longitude latitude time1,edt,atmos,,,,
+1.0,Pressure on Model Levels,Pa,"This field is needed only for models in which the pressure can't be calculated from the vertical coordinate information stored already for each variable.  Thus, the pressures are needed for height or theta-coordinate models, for example, but not sigma- or eta-coordinate models.",,pfull,air_pressure,,Pa,time: point,,,,,,real,alevel longitude latitude time1,pfull,atmos,,,,
+1.0,Pressure on Model Half-Levels,Pa,"This field is needed only for models in which the pressure can't be calculated from the vertical coordinate information stored already for each variable.  Thus, the pressures are needed for height or theta-coordinate models, for example, but not sigma- or eta-coordinate models.",,phalf,air_pressure,,Pa,time: point,,,,,,real,alevel longitude latitude time1,phalf,atmos,,,,
 
 
diff --git a/Tables_csv/day.csv b/Tables_csv/day.csv
index e9d3648..b58f220 100644
--- a/Tables_csv/day.csv
+++ b/Tables_csv/day.csv
@@ -28,7 +28,7 @@ The rest of the daily mean fields on this spreadsheet should be collected only f
 ,,,pre-industrial controls,"20 years, preferably corresponding to years 1986-2005 of the historical run",,,,,,,,,,,,,,,,,,
 ,,,historical,Jan 1950 -- Dec 2005,,,,,,,,,,,,,,,,,,
 ,,,future simulations driven by RCP concentrations or emissions,"only years 2006-2100, 2181-2200, and 2281-2300",,,,,,,,,,,,,,,,,,
-,,,AMIP,all years,,,,,,,,,,,,,,,,,,
+,,,AMIP & 2030 time-slice run,all years,,,,,,,,,,,,,,,,,,
 "CMOR Table day: 2-D daily-mean atmospheric and surface fields (All fields should be reported on the atmospheric grid except (as noted below) the sea ice fields, which should be reported on the ocean grid.)",,,,,,,,,,,,,,,,,,,,,,
 priority,long name,units ,comment ,questions,output variable name ,standard name,unconfirmed or proposed standard name,unformatted units,cell_methods,valid min,valid max,mean absolute min,mean absolute max,positive,type,CMOR dimensions,CMOR variable name,realm,frequency,cell_measures,flag_values,flag_meanings
 1.0,Moisture in Upper 0.1 m of Soil Column,kg m-2,Compute the mass of water in all phases in the upper 0.1 meters of soil.,,mrsos,moisture_content_of_soil_layer,,kg m-2,time: mean area: mean where land ,,,,,,real,longitude latitude time sdepth1,mrsos,land,,area: areacella,,
diff --git a/Tables_csv/dims.csv b/Tables_csv/dims.csv
index da22f08..aabf34e 100644
--- a/Tables_csv/dims.csv
+++ b/Tables_csv/dims.csv
@@ -1,8 +1,8 @@
 CMOR Dimensions,,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,
 CMOR table(s),CMOR dimension,output dimension name,description,standard name,long name,axis,units,index axis?,coords_attrib,bounds?,stored direction,valid_min,valid_max,type,positive,value,bounds _values,requested,bounds_ requested,tol_on_requests: variance from requested values that is tolerated
-"fx, Amon, Lmon, LImon, OImon, aero, day, 6hrLev, 6hrPlev, 3hr,  Oclim, Oyr, Omon, cfMon, cfOff, cfDay, cf3hr",longitude,lon,,longitude,longitude,X,degrees_east,,,yes,increasing,0.0,360.0,double,,,,,,
-"fx, Amon, Lmon, LImon, OImon, aero, day, 6hrLev, 6hrPlev, 3hr,  Oclim, Oyr, Omon, cfMon, cfOff, cfDay, cf3hr",latitude,lat,,latitude,latitude,Y,degrees_north,,,yes,increasing,-90.0,90.0,double,,,,,,
+"fx, Amon, Lmon, LImon, OImon, aero, day, 6hrLev, 6hrPlev, 3hr,  Oclim, Oyr, Omon, cfMon, cfOff, cfDay, cf3hr, cfSites",longitude,lon,,longitude,longitude,X,degrees_east,,,yes,increasing,0.0,360.0,double,,,,,,
+"fx, Amon, Lmon, LImon, OImon, aero, day, 6hrLev, 6hrPlev, 3hr,  Oclim, Oyr, Omon, cfMon, cfOff, cfDay, cf3hr, cfSites",latitude,lat,,latitude,latitude,Y,degrees_north,,,yes,increasing,-90.0,90.0,double,,,,,,
 Amon,plevs,plev,There are 17 mandatory levels and up to 6 additional levels requested of models with sufficient resolution in the stratosphere.,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down,,,100000. 92500. 85000. 70000. 60000. 50000. 40000. 30000. 25000. 20000. 15000. 10000. 7000. 5000. 3000. 2000. 1000.,,0.001
 day,plev8,plev,,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down,,,100000. 85000. 70000. 50000. 25000. 10000. 5000. 1000.,,0.001
 6hrPlev,plev3,plev,,air_pressure,pressure,Z,Pa,,,no,decreasing,,,double,down,,,85000. 50000. 25000. ,,0.001
@@ -27,7 +27,7 @@ aero,alev1,lev,atmospheric model's lowest level,,lowest atmospheric model level,
 "cfOff, cf3hr",scatratio,scatratio,15 bins of scattering ratio for the CALIPSO simulator CFAD,backscattering_ratio,lidar backscattering ratio,,1.0,,,yes,increasing,,,double,,,,0.0605 2.1 4. 6. 8.5 12.5 17.5 22.5 27.5 35. 45. 55. 70. 539.5 1004.,0.01 1.2 1.2 3. 3. 5. 5. 7. 7. 10. 10. 15. 15. 20. 20. 25. 25. 30. 30. 40. 40. 50. 50. 60. 60. 80. 80. 999. 999. 1009.,0.001
 "cfOff, cf3hr",dbze,dbze,15 bins of radar reflectivity for CloudSat simulator CFAD,equivalent_reflectivity_factor,CloudSat simulator equivalent radar reflectivity factor,,dBZ,,,yes,increasing,,,double,,,,-47.5 -42.5 -37.5 -32.5 -27.5 -22.5 -17.5 -12.5 -7.5 -2.5 2.5 7.5 12.5 17.5 22.5,-50. -45. -45. -40. -40. -35. -35. -30. -30. -25. -25. -20. -20. -15. -15. -10. -10. -5. -5. 0. 0. 5. 5. 10. 10. 15. 15. 20. 20. 25.,0.001
 "cfMon, cfOff, cfDay, cf3hr",sza5,sza,5 solar zenith angles for PARASOL reflectances,solar_zenith_angle,solar zenith angle,,degree,,,no,increasing,,,double,,,,0. 20. 40. 60. 80.,,0.001
-cfSites,site,site,an integer assigned to each of 119 stations (standard) and 73 stations (aquaplanet),,site index,,1.0,ok,,no,,,,integer,,,,,,
+,site,site,an integer assigned to each of 119 stations (standard) and 73 stations (aquaplanet),,site index,,1.0,ok,,no,,,,integer,,,,,,
 Omon,basin,basin,,region,ocean basin,,1.0,,region,no,,,,character,,,,atlantic_arctic_ocean indian_pacific_ocean global_ocean,,
 Omon,rho,rho,density?  Potential density++++? Check units,,density++++?,Z,kg m-3,,,yes,decreasing,,,double,down,,, ,,
 "fx, Oclim, Oyr, Omon",olevel,lev,generic ocean model vertical coordinate (nondimensional or dimensional),,ocean model level,Z,,ok,,yes,,,,double,down,,,,,
diff --git a/Tables_csv/other.csv b/Tables_csv/other.csv
index 921b793..5afc471 100644
--- a/Tables_csv/other.csv
+++ b/Tables_csv/other.csv
@@ -43,8 +43,8 @@ Experiment, Description,Expt. #,,,,lon x lat x olev,other,,,,lon x lat,lon x  la
 30-year predictions,increased ensemble size of 1.2,1.2-E,,all*,all,all**,all,all,all,all,all,"years 10, 20, & 30",,all,,all,all
 10-year predictions,additional start dates for expts. 1.1,1.1-I,,all*,all,all**,all,all,all,all,all,year 10,,all,,all,all
 AMIP,AMIP (1979-2008),3.3,,,all,,,all,all,all,all,"years 1980, 1990, 2000, & possibly 2010",all,all,all,all,all
-pre-industrial control,"control run, but possibly as short as 100 years",3.1-S,,all*,all,all**,all,all,all,all,all,"years 20, 40, 60, 80, & 100",,all,,,30.0
-1 percent per year CO2,1% per year CO2 rise imposed,6.1-S,,all*,all,all**,all,all,all,all,,,,all,,,30.0
+pre-industrial control,"control run, but possibly as short as 100 years",3.1-S,,all*,all,all**,all,all,all,all,all,,,all,,,30.0
+1 percent per year CO2,1% per year CO2 rise imposed,6.1-S,,all*,all,all**,all,all,all,all,,,,all,,,last 30
 volcano-free hindcasts,hindcasts but without volcanoes,1.3,,all*,all,all**,all,all,all,all,all,"year 2010, 2011, and 2012",,all,,all,all
 prediction with 2010 volcano,Pinatubo-like eruption imposed,1.4,,all*,all,all**,all,all,all,all,all,year 10,,all,,all,all
 initialization alternatives,experiments to explore impact of different initialization procedures,1.5,,all*,all,all**,all,all,all,all,all,year 10,,all,,all,all
@@ -52,7 +52,7 @@ chemistry-focused runs,near-term runs with enhanced chemistry/aerosol models,1.6
 ,,,,,,,,,,,,,,,,,
 "experiments focusing on the ""longer-term""",,,Oclim,Oyr,Amon,Omon,,Lmon,Limon,Oimon,aero,,day,,6hrLev,6hrPlev,3hr
 Experiment, Description,Expt. #,,,,lon x lat x olev,other,,,,lon x lat,lon x  lat x alev,subset of fields saved for selected expts. ,other,,,
-pre-industrial control,coupled atmosphere/ocean control run,3.1,,all*,all,all**,all,all,all,all,all,"years corresponding to years 1850, 1870, 1890, . . . , 1950, 1960, 1970, . . . , 2000 of the historical run and years 2010, 2020, 2040, 2060, 2080, & 2100 of the RCP run",20 years corresponding to years 1986-2005 of historical run,all,,30.0,30.0
+pre-industrial control,coupled atmosphere/ocean control run,3.1,,all*,all,all**,all,all,all,all,all,"years corresponding to years 1850, 1870, 1890, . . . , 1950, 1960, 1970, . . . , 2000 of the historical run and years 2010, 2020, 2040, 2060, 2080, & 2100 of the RCP run",20 years corresponding to years 1986-2005 of historical run,all,,30 years corresponding to 1979-2008 of historical run,30 years corresponding to last 30 years of abrupt 4xCO2
 historical,simulation of recent past (1850-2005),3.2,1986-2005 monthly climatology,all*,all,all**,all,all,all,all,all,"years 1850, 1870, 1890, . . . , 1950, 1960, 1970, . . . , 2000",1950-2005,all,1950-2005,1950-2005,1960-2005
 AMIP,AMIP (1979-2008),3.3,,,all,,,all,all,all,all,"1980, 1990, 2000, & possibly 2010",all,all,all,all,all
 historical,increase ensemble size of expt. 3.2,3.2-E,,all*,all,all**,all,all,all,all,all,"years 1850, 1870, 1890,  . . .  , 1950, 1960, 1970,  . . . , 2000",,all,,1950-2005,1960-2005
@@ -74,7 +74,7 @@ ESM fixed climate 1,"radiation code ""sees"" control CO2, but carbon cycle sees
 ESM fixed climate 2,"radiation code ""sees"" control CO2, but carbon cycle sees historical followed by RCP4.5 rise in CO2",5.4-2,,all*,all,all**,all,all,all,all,all,,,all,,,
 ESM feedback 1,"carbon cycle ""sees"" control CO2, but radiatation sees 1%/yr rise",5.5-1,,all*,all,all**,all,all,all,all,all,,,all,,,
 ESM feedback 2,"carbon cycle ""sees"" control CO2, but radiatation sees historical followed by RCP4.5 rise in CO2",5.5-2,,all*,all,all**,all,all,all,all,all,,,all,,,
-1 percent per year CO2,imposed 1%/yr increase in CO2 to quadrupling,6.1,,all*,all,all**,all,all,all,all,,,,all,,,30.0
+1 percent per year CO2,imposed 1%/yr increase in CO2 to quadrupling,6.1,,all*,all,all**,all,all,all,all,,,,all,,,last 30
 control SST climatology,An atmosphere-only run driven by prescribed climatological SST and sea ice.,6.2a,,,all,,,all,all,all,all,,,all,,,all
 CO2 forcing,"as in expt. 6.2a, but with 4XCO2 imposed",6.2b,,,all,,,all,all,all,,,,all,,,all
 abrupt 4XCO2,"impose an instantaneous quadrupling of CO2, then hold fixed",6.3,,,all,all**,all,all,all,all,,,,all,,,first 5 and last 30
@@ -97,14 +97,14 @@ other-only,increase ensemble size of expt. 7.3,7.3-E,,all*,all,all**,all,all,all
 atmosphere-only experiments,,,Oclim,Oyr,Amon,Omon,,Lmon,Limon,Oimon,aero,,day,,6hrLev,6hrPlev,3hr
 Experiment, Description,Expt. #,,,,lon x lat x olev,other,,,,lon x lat,lon x  lat x alev,subset of fields saved for selected expts. ,other,,,
 AMIP,AMIP (1979-2008),3.3,,,all,,,all,all,all,all,"years 1980, 1990, 2000, & possibly 2010",all,all,all,all,all
-2030 time-slice,conditions for 2026-2035 imposed,2.1,,,all,,,all,all,all,all,,,all,,,
-AMIP,increase ensemble size of expt. 3.3,3.3-E,,,all,,,all,all,all,all,"years 1980, 1990, 2000, & possibly 2010",,all,,,
-2030 time-slice,increase ensemble size of expt. 2.1,2.1-E,,,all,,,all,all,all,all,,,all,,,
+2030 time-slice,conditions for 2026-2035 imposed,2.1,,,all,,,all,all,all,all,year 2035,all,all,,all,all
+AMIP,increase ensemble size of expt. 3.3,3.3-E,,,all,,,all,all,all,all,"years 1980, 1990, 2000, & possibly 2010",,all,,all,all
+2030 time-slice,increase ensemble size of expt. 2.1,2.1-E,,,all,,,all,all,all,all,year 2035,,all,,,
 Cloud response to imposed 4xCO2,"consistent with CFMIP, impose AMIP (1979-2008) conditions (expt. 3.3) but with 4xCO2",6.5,,,all,,,all,all,all,,,,all,,,
 Cloud response to an imposed change in SST pattern,"consistent with CFMIP, add a patterned SST perturbation to AMIP SSTs of expt. 3.3.",6.6,,,all,,,all,all,all,,,,all,,,
-aqua planet: control run,"consistent with CFMIP, impose zonally uniform SSTs on a planet without continents",6.7a,,,all,,,all,all,all,,,,all,,,
-aqua planet: cloud response to imposed 4xCO2,"Consistent with CFMIP requirements, impose 4xCO2 on the zonally uniform SSTs of expt. 6.7a ",6.7b,,,all,,,all,all,all,,,,all,,,
-Aqua-planet: cloud response to an imposed uniform change in SST.,"Consistent with CFMIP requirements, add a uniform +4K to the zonally uniform SSTs of expt. 6.7a (which is the control for this run).",6.7c,,,all,,,all,all,all,,,,all,,,
+aqua planet: control run,"consistent with CFMIP, impose zonally uniform SSTs on a planet without continents",6.7a,,,all,,,,,,,,,all,,,
+aqua planet: cloud response to imposed 4xCO2,"Consistent with CFMIP requirements, impose 4xCO2 on the zonally uniform SSTs of expt. 6.7a ",6.7b,,,all,,,,,,,,,all,,,
+Aqua-planet: cloud response to an imposed uniform change in SST.,"Consistent with CFMIP requirements, add a uniform +4K to the zonally uniform SSTs of expt. 6.7a (which is the control for this run).",6.7c,,,all,,,,,,,,,all,,,
 Cloud response to an imposed uniform change in SST,"Consistent with CFMIP requirements, add a uniform +4 K SST to the AMIP SSTs of expt. 3.3 (which is the ""control"" for this run).",6.8,,,all,,,all,all,all,,,,all,,,
 
 
diff --git a/Tables_csv/standard_output.xlsx b/Tables_csv/standard_output.xlsx
deleted file mode 100644
index c731090..0000000
Binary files a/Tables_csv/standard_output.xlsx and /dev/null differ

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