[cmor] 77/190: Updated Tests to be completely self-contained by distrib

Alastair McKinstry mckinstry at moszumanska.debian.org
Tue Jul 21 12:54:40 UTC 2015


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository cmor.

commit e80f6931e1db868113b9da69ffb9842d0136479d
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date:   Fri Nov 12 16:21:28 2010 -0800

    Updated Tests to be completely self-contained by distrib
---
 Test/climatology_test_code.f90                     |    2 +-
 Test/ipcc_test_code.f90                            |    2 +-
 Test/karls_test.f90                                |    2 +-
 Test/main_prog.f90                                 |    2 +-
 Test/mytest_4d_d_big_array_2.f90                   |    2 +-
 Test/mytest_4d_d_big_array_3.f90                   |    2 +-
 Test/mytest_4d_d_big_array_4.f90                   |    2 +-
 Test/mytest_4d_d_big_array_5.f90                   |    2 +-
 Test/mytest_4d_r.f90                               |    2 +-
 Test/mytest_4d_r_big_array.f90                     |    2 +-
 Test/omonxyztst.f90                                |    2 +-
 Test/rewrite_harvardf_data.f90                     |    2 +-
 Test/test1.f90                                     |    2 +-
 Test/test2.f90                                     |    2 +-
 Test/test3.f90                                     |    2 +-
 Test/test4.f90                                     |    2 +-
 Test/test_3h.f90                                   |    2 +-
 Test/test_any_from_asc.f90                         |    2 +-
 Test/test_any_from_asc_d.f90                       |    2 +-
 Test/test_any_from_asc_i.f90                       |    2 +-
 Test/test_cmor_grid_time_varying.f90               |    6 +-
 Test/test_dimensionless.f90                        |    2 +-
 Test/test_fortran_example_00.f90                   |    2 +-
 Test/test_fortran_example_01.f90                   |    2 +-
 Test/test_joerg_broken.f90                         |    2 +-
 Test/test_lots_of_variables.f90                    |    2 +-
 .../{test_python_joerg_7.py => test_python_3hr.py} |   56 +-
 Test/test_python_cfmip_site_axis_test.py           |    2 +-
 Test/test_python_jamie_8.py                        |    2 +-
 Test/test_python_jamie_site_surface.py             |    2 +-
 ...t_python_joerg_8.py => test_python_joerg_10.py} |   29 +-
 Test/test_python_joerg_6.py                        |    2 +-
 Test/test_python_joerg_7.py                        |    2 +-
 Test/test_python_joerg_8.py                        |    4 +-
 Test/test_python_joerg_9.py                        |    4 +-
 Test/test_region.f90                               |    2 +-
 Test/test_shrt_exp_nm_set_att_initi.f90            |    2 +-
 Test/test_sigma.f90                                |    2 +-
 Test/test_singleton.f90                            |    2 +-
 Test/test_sophie.f90                               |    2 +-
 Test/test_station_data.f90                         |    2 +-
 TestTables/CMIP5_3hr                               |  569 +++++-
 TestTables/CMIP5_6hrLev                            |    4 +-
 TestTables/CMIP5_Amon                              |    4 +-
 TestTables/CMIP5_Lmon                              | 1471 ++++++++++++++-
 TestTables/CMIP5_Omon                              |    4 +-
 TestTables/{CMIP5_Amon => CMIP5_cf3hr}             | 1199 ++++++++-----
 TestTables/{CMIP5_Amon => CMIP5_cfMon}             | 1877 ++++++++++++--------
 TestTables/{CMIP5_Amon => CMIP5_cfSites}           |  864 +++++----
 TestTables/CMIP5_day                               |  143 +-
 TestTables/CMIP5_fx                                |    4 +-
 TestTables/CMIP5_grids                             |   61 +-
 TestTables/md5s                                    |    2 +-
 53 files changed, 4524 insertions(+), 1849 deletions(-)

diff --git a/Test/climatology_test_code.f90 b/Test/climatology_test_code.f90
index ae1a15a..0f830ae 100644
--- a/Test/climatology_test_code.f90
+++ b/Test/climatology_test_code.f90
@@ -242,7 +242,7 @@ PROGRAM ipcc_test_code
        '(Clim. Dyn., 2003, 323-357.)', &
        model_id = 'GICCM1', &
        forcing='TO',contact="Barry Bonds",institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
 
   !  Define all axes that will be needed
 
diff --git a/Test/ipcc_test_code.f90 b/Test/ipcc_test_code.f90
index a8a0d00..46598d8 100644
--- a/Test/ipcc_test_code.f90
+++ b/Test/ipcc_test_code.f90
@@ -240,7 +240,7 @@ PROGRAM ipcc_test_code
        ' 2XCO2 simulation described in Dorkey et al. '    //   &
        '(Clim. Dyn., 2003, 323-357.)',&
        model_id='GICCM1',forcing='TO',contact="Barry Bonds",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
   
   
   !  Define all axes that will be needed
diff --git a/Test/karls_test.f90 b/Test/karls_test.f90
index 6208bf2..a56e584 100644
--- a/Test/karls_test.f90
+++ b/Test/karls_test.f90
@@ -248,7 +248,7 @@ PROGRAM karls_test
        ' 2XCO2 simulation described in Dorkey et al. '    //   &
        '(Clim. Dyn., 2003, 323-357.)',&
        model_id='GICCM1',forcing='TO',contact="Barry Bonds",&
-       parent_experiment_id="N/A",branch_time=bt,institute_id="PCMDI")
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt,institute_id="PCMDI")
   
   !  Define all axes that will be needed
 
diff --git a/Test/main_prog.f90 b/Test/main_prog.f90
index f2e1618..513aca9 100644
--- a/Test/main_prog.f90
+++ b/Test/main_prog.f90
@@ -230,7 +230,7 @@ PROGRAM mip_contribution
        ' 2XCO2 simulation described in Dorkey et al. '//       &
        '(Clim. Dyn., 2003, 323-357.)', model_id="GICCM1", &
        forcing='TO',contact="Barry Bonds",institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
   
   print*, 'returned from cmor_dataset'
 
diff --git a/Test/mytest_4d_d_big_array_2.f90 b/Test/mytest_4d_d_big_array_2.f90
index 8b5e2bd..424e945 100644
--- a/Test/mytest_4d_d_big_array_2.f90
+++ b/Test/mytest_4d_d_big_array_2.f90
@@ -88,7 +88,7 @@ program main
        ' 2XCO2 simulation described in Dorkey et al. '//       &
        '(Clim. Dyn., 2003, 323-357.)', model_id="GICCM1", &
        forcing='TO',contact="Barry Bonds",institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
 
   current=>mydims
   do i = 0,ndim-1
diff --git a/Test/mytest_4d_d_big_array_3.f90 b/Test/mytest_4d_d_big_array_3.f90
index 460bce3..7050766 100644
--- a/Test/mytest_4d_d_big_array_3.f90
+++ b/Test/mytest_4d_d_big_array_3.f90
@@ -88,7 +88,7 @@ program main
        ' 2XCO2 simulation described in Dorkey et al. '//       &
        '(Clim. Dyn., 2003, 323-357.)', model_id="GICCM1", &
        forcing='TO',contact="Barry Bonds",institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
   
   current=>mydims
   do i = 0,ndim-1
diff --git a/Test/mytest_4d_d_big_array_4.f90 b/Test/mytest_4d_d_big_array_4.f90
index cf6d4a0..d06caf4 100644
--- a/Test/mytest_4d_d_big_array_4.f90
+++ b/Test/mytest_4d_d_big_array_4.f90
@@ -76,7 +76,7 @@ program main
        ' 2XCO2 simulation described in Dorkey et al. '//       &
        '(Clim. Dyn., 2003, 323-357.)',model_id="GICCM1", &
        forcing='TO',contact="Barry Bonds",institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
 
   current=>mydims
   do i = 0,ndim-1
diff --git a/Test/mytest_4d_d_big_array_5.f90 b/Test/mytest_4d_d_big_array_5.f90
index 26bff82..6dd55b9 100644
--- a/Test/mytest_4d_d_big_array_5.f90
+++ b/Test/mytest_4d_d_big_array_5.f90
@@ -88,7 +88,7 @@ program main
        ' 2XCO2 simulation described in Dorkey et al. '//       &
        '(Clim. Dyn., 2003, 323-357.)',model_id='GICCM1', &
        forcing='TO',contact="Barry Bonds",institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
   
   current=>mydims
   do i = 0,ndim-1
diff --git a/Test/mytest_4d_r.f90 b/Test/mytest_4d_r.f90
index 89ae6d2..96b4434 100644
--- a/Test/mytest_4d_r.f90
+++ b/Test/mytest_4d_r.f90
@@ -71,7 +71,7 @@ program main
        '(Clim. Dyn., 2003, 323-357.)', &
        model_id="GICCM1",&
        forcing='TO',contact="Barry Bonds",institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
   
   current=>mydims
   do i = 0,ndim-1
diff --git a/Test/mytest_4d_r_big_array.f90 b/Test/mytest_4d_r_big_array.f90
index d08d690..093906c 100644
--- a/Test/mytest_4d_r_big_array.f90
+++ b/Test/mytest_4d_r_big_array.f90
@@ -86,7 +86,7 @@ program main
        ' 2XCO2 simulation described in Dorkey et al. '//       &
        '(Clim. Dyn., 2003, 323-357.)', model_id="GICCM1", &
        forcing='TO',contact="Barry Bonds",institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
   current=>mydims
   do i = 0,ndim-1
      print*,'Test Code: CMOR AXIS',i,'AAAAAAA*************************************************************************'
diff --git a/Test/omonxyztst.f90 b/Test/omonxyztst.f90
index 74d7da8..64fa3f5 100644
--- a/Test/omonxyztst.f90
+++ b/Test/omonxyztst.f90
@@ -253,7 +253,7 @@ PROGRAM mip_contribution
        'oceanic physics, V.46, N4, in print.',          &
        model_id="inmcm4", &
        !modeling_realm="ocean",  &
-       parent_experiment_id="N/A",   &
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",   &
        physics_version=1,      &
        branch_time=bt, &
       ! frequency='mon',                           &
diff --git a/Test/rewrite_harvardf_data.f90 b/Test/rewrite_harvardf_data.f90
index ddb8148..9954ffb 100644
--- a/Test/rewrite_harvardf_data.f90
+++ b/Test/rewrite_harvardf_data.f90
@@ -75,7 +75,7 @@ USE cmor_users_functions
                       contact       =                          &
       'Jasmin John, Berkeley CAS <jjohn at berkeley.edu>', &
                       model_id = "GICCM1" ,institute_id="PCMDI",&
-                      parent_experiment_id='N/A',forcing='SO',branch_time=bt)
+                      parent_experiment_rip="N/A",parent_experiment_id='N/A',forcing='SO',branch_time=bt)
 
 !     print *, ' ** Time coordinate vector:', t
 !     print *, ' ** Time bounds vector:',     tbounds
diff --git a/Test/test1.f90 b/Test/test1.f90
index d5c5068..a8483c7 100644
--- a/Test/test1.f90
+++ b/Test/test1.f90
@@ -228,7 +228,7 @@ PROGRAM mip_contribution
        ' 2XCO2 simulation described in Dorkey et al. '//       &
        '(Clim. Dyn., 2003, 323-357.)',model_id="GICCM1", &
        forcing="Nat",contact="Barry Bonds",institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
   
   print*, 'returned from cmor_dataset'
 
diff --git a/Test/test2.f90 b/Test/test2.f90
index be80c40..9ca8642 100644
--- a/Test/test2.f90
+++ b/Test/test2.f90
@@ -230,7 +230,7 @@ PROGRAM mip_contribution
        ' 2XCO2 simulation described in Dorkey et al. '//       &
        '(Clim. Dyn., 2003, 323-357.)' ,                        &
        model_id="GICCM1",forcing="SO",contact="Barry Bonds",&
-       parent_experiment_id="N/A",branch_time=bt,institute_id="PCMDI")
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt,institute_id="PCMDI")
   
   print*, 'returned from cmor_dataset'
 
diff --git a/Test/test3.f90 b/Test/test3.f90
index 59b8791..da575cf 100644
--- a/Test/test3.f90
+++ b/Test/test3.f90
@@ -232,7 +232,7 @@ PROGRAM mip_contribution
        ' 2XCO2 simulation described in Dorkey et al. '//       &
        '(Clim. Dyn., 2003, 323-357.)' , &
        model_id="GICCM1",forcing='TO',contact="Barry Bonds",&
-       parent_experiment_id="N/A",branch_time=bt,institute_id="PCMDI");
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt,institute_id="PCMDI");
   
   print*, 'returned from cmor_dataset'
 
diff --git a/Test/test4.f90 b/Test/test4.f90
index be61379..70aedb4 100644
--- a/Test/test4.f90
+++ b/Test/test4.f90
@@ -236,7 +236,7 @@ PROGRAM mip_contribution
        ' 2XCO2 simulation described in Dorkey et al. '//       &
        '(Clim. Dyn., 2003, 323-357.)' , model_id="GICCM1", &
        forcing = 'TO',contact="Barry Bonds",&
-       parent_experiment_id="N/A",branch_time=bt,institute_id="PCMDI")
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt,institute_id="PCMDI")
   
   print*, 'returned from cmor_dataset'
 
diff --git a/Test/test_3h.f90 b/Test/test_3h.f90
index 477abc9..732883b 100644
--- a/Test/test_3h.f90
+++ b/Test/test_3h.f90
@@ -235,7 +235,7 @@ PROGRAM ipcc_test_code
        ' 2XCO2 simulation described in Dorkey et al. '    //   &
        '(Clim. Dyn., 2003, 323-357.)', model_id="GICCM1", &
        forcing='TO',contact="Barry Bonds",institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
   
   !  Define all axes that will be needed
 
diff --git a/Test/test_any_from_asc.f90 b/Test/test_any_from_asc.f90
index c649158..32ae8ef 100644
--- a/Test/test_any_from_asc.f90
+++ b/Test/test_any_from_asc.f90
@@ -91,7 +91,7 @@ program main
        ' 2XCO2 simulation described in Dorkey et al. '//       &
        '(Clim. Dyn., 2003, 323-357.)', &
        model_id='GICCM1',forcing='Nat', &
-       parent_experiment_id="N/A",branch_time=bt,&
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt,&
        contact="Freddy Krueger",institute_id="PCMDI" )
   
   current=>mydims
diff --git a/Test/test_any_from_asc_d.f90 b/Test/test_any_from_asc_d.f90
index 7609260..c5ff055 100644
--- a/Test/test_any_from_asc_d.f90
+++ b/Test/test_any_from_asc_d.f90
@@ -92,7 +92,7 @@ mymissing=1.e20;
        ' 2XCO2 simulation described in Dorkey et al. '//       &
        '(Clim. Dyn., 2003, 323-357.)' ,   &
        model_id = "GICCM1",forcing='TO',contact="Barry Bonds",&
-       parent_experiment_id="N/A",branch_time=bt,institute_id="PCMDI")
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt,institute_id="PCMDI")
   
   current=>mydims
   do i = 0,ndim-1
diff --git a/Test/test_any_from_asc_i.f90 b/Test/test_any_from_asc_i.f90
index c5a406b..1539c1b 100644
--- a/Test/test_any_from_asc_i.f90
+++ b/Test/test_any_from_asc_i.f90
@@ -90,7 +90,7 @@ program main
        ' 2XCO2 simulation described in Dorkey et al. '//       &
        '(Clim. Dyn., 2003, 323-357.)', &
        model_id = "GICCM1", forcing='TO',contact="Barry Bonds",&
-       parent_experiment_id="N/A",branch_time=bt,institute_id="PCMDI")
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt,institute_id="PCMDI")
   
   current=>mydims
   do i = 0,ndim-1
diff --git a/Test/test_cmor_grid_time_varying.f90 b/Test/test_cmor_grid_time_varying.f90
index de12dd2..c65ccd1 100644
--- a/Test/test_cmor_grid_time_varying.f90
+++ b/Test/test_cmor_grid_time_varying.f90
@@ -89,7 +89,7 @@ PROGRAM test_cmor_grid
    !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
    ! Specify path for tables and set up other CMOR options
    !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-   error_flag = cmor_setup(inpath='/git/cmip5-cmor-tables/Tables/', &
+   error_flag = cmor_setup(inpath='Tables/', &
                            netcdf_file_action="replace",create_subdirectories=0)
 
    print *, '---------------Define dataset'
@@ -125,9 +125,9 @@ PROGRAM test_cmor_grid
    grid_id = cmor_grid((/profile_axid, section_axid/))
 !    lat,lon,lat_bounds,lon_bounds,
    print *, ' -- grid_id: ', grid_id
-   latvar_id = cmor_time_varying_grid_coordinate(grid_id,'lat','degrees_north',R_UNDEF)
+   latvar_id = cmor_time_varying_grid_coordinate(grid_id,'latitude','degrees_north',missing=R_UNDEF)
    print*, ' -- latvar_id :',latvar_id
-   lonvar_id = cmor_time_varying_grid_coordinate(grid_id,'lon','degrees_east',R_UNDEF)
+   lonvar_id = cmor_time_varying_grid_coordinate(grid_id,'longitude','degrees_east',missing=R_UNDEF)
    print*, ' -- lonvar_id:',lonvar_id
    if (grid_id > 0) then
         print *,  '*********** Error, grid_id: ', grid_id
diff --git a/Test/test_dimensionless.f90 b/Test/test_dimensionless.f90
index 276b4f1..472bcc6 100644
--- a/Test/test_dimensionless.f90
+++ b/Test/test_dimensionless.f90
@@ -236,7 +236,7 @@ PROGRAM ipcc_test_code
        ' 2XCO2 simulation described in Dorkey et al. '    //   &
        '(Clim. Dyn., 2003, 323-357.)', model_id="GICCM1", &
        forcing='TO',contact="Barry Bonds",institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
   
   !  Define all axes that will be needed
   
diff --git a/Test/test_fortran_example_00.f90 b/Test/test_fortran_example_00.f90
index 35301ad..59f4675 100644
--- a/Test/test_fortran_example_00.f90
+++ b/Test/test_fortran_example_00.f90
@@ -159,7 +159,7 @@ program testing
        ' 2XCO2 simulation described in Dorkey et al. '    //   &
        '(Clim. Dyn., 2003, 323-357.)', model_id="GICCM1", &
        forcing='TO',contact="Barry Bonds",institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
   print*, 'Test code: done 2 lalala'
   
   call read_coords(alats, alons, plevs, bnds_lat, bnds_lon)
diff --git a/Test/test_fortran_example_01.f90 b/Test/test_fortran_example_01.f90
index d3672cf..af10e67 100644
--- a/Test/test_fortran_example_01.f90
+++ b/Test/test_fortran_example_01.f90
@@ -202,7 +202,7 @@ program testing
        ' 2XCO2 simulation described in Dorkey et al. '    //   &
        '(Clim. Dyn., 2003, 323-357.)',model_id="GICCM1", &
        forcing='TO',contact="Barry Bonds",institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
 
     tables(1) = cmor_load_table('Tables/CMIP5_Amon')
     tables(2) = cmor_load_table('Tables/CMIP5_grids')
diff --git a/Test/test_joerg_broken.f90 b/Test/test_joerg_broken.f90
index 2c777d7..52c6906 100644
--- a/Test/test_joerg_broken.f90
+++ b/Test/test_joerg_broken.f90
@@ -66,7 +66,7 @@ program joerg
        ' 2XCO2 simulation described in Dorkey et al. '    //    &
        '(Clim. Dyn., 2003, 323-357.)',                          &
        model_id='GICCM1',forcing='TO',contact="Barry Bonds",    &
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
 
   ntables(1) =  cmor_load_table('/git/cmip5-cmor-tables/Tables/CMIP5_OImon')
   ntables(2) =  cmor_load_table('/git/cmip5-cmor-tables/Tables/CMIP5_grids')
diff --git a/Test/test_lots_of_variables.f90 b/Test/test_lots_of_variables.f90
index 7458278..c39bdbf 100644
--- a/Test/test_lots_of_variables.f90
+++ b/Test/test_lots_of_variables.f90
@@ -207,7 +207,7 @@ PROGRAM mip_contribution
        ' 2XCO2 simulation described in Dorkey et al. '//       &
        '(Clim. Dyn., 2003, 323-357.)',model_id="GICCM1", &
        forcing='TO',contact="Barry Bonds",institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
 
   error_flag  = cmor_set_cur_dataset_attribute("initialization_method","4")
   error_flag  = cmor_set_cur_dataset_attribute("physics_version","6")
diff --git a/Test/test_python_joerg_7.py b/Test/test_python_3hr.py
similarity index 50%
copy from Test/test_python_joerg_7.py
copy to Test/test_python_3hr.py
index 4d46512..9b94570 100644
--- a/Test/test_python_joerg_7.py
+++ b/Test/test_python_3hr.py
@@ -21,32 +21,34 @@ error_flag = cmor.dataset(
        branch_time=3.14159)
   
 
-cmor.load_table("/git/cmip5-cmor-tables/Tables/CMIP5_Omon")
-itime = cmor.axis(table_entry="time",units='months since 2010',coord_vals=numpy.array([0,1,2,3,4.]),cell_bounds=numpy.array([0,1,2,3,4,5.]))
+n_lev = 40
+zlevs = 480.*numpy.arange(0,n_lev)+240.
+zbnds = numpy.zeros((n_lev,2))
+
+zbnds[:,0]=zlevs-240.
+zbnds[:,1]=zlevs+240.
+
 # creates 1 degree grid
-nlat=18
-nlon=36
-alats = numpy.arange(180)-89.5
-bnds_lat = numpy.arange(181)-90
-alons=numpy.arange(360)+.5
-bnds_lon=numpy.arange(361)
-ilat = cmor.axis(  
-    table_entry='latitude',       
-    units='degrees_north',          
-    length=nlat,                   
-    coord_vals=alats,              
-    cell_bounds=bnds_lat)        
-
-ilon = cmor.axis(  
-    table_entry='longitude',      
-    length=nlon,                   
-    units='degrees_east',         
-    coord_vals=alons,             
-    cell_bounds=bnds_lon)      
-ivar = cmor.variable(table_entry="epc100",axis_ids=[itime,ilat,ilon],units='mol m-2 s-1',positive="up")
-
-data=numpy.random.random((5,nlat,nlon))
-for i in range(0,5):
-    cmor.write(ivar,data[i:i])#,time_vals=numpy.array([i,]),time_bnds=numpy.array([i,i+1]))
-error_flag = cmor.close()  
+cmor.load_table("Tables/CMIP5_cf3hr")
+
+
+ialt40 = cmor.axis("alt40",units="m",coord_vals=zlevs,cell_bounds=zbnds)
+
+itm = cmor.axis("time1",units="months since 2000")
+iloc = cmor.axis("location",units="1",coord_vals=numpy.arange(2))
+
+igrid = cmor.grid(axis_ids=[iloc,itm])
+
+print igrid
+
+ilat = cmor.time_varying_grid_coordinate(igrid,table_entry='latitude',units='degrees_north')
+ilon = cmor.time_varying_grid_coordinate(igrid,table_entry='longitude',units='degrees_east')
+
+cmor.load_table("Tables/CMIP5_cf3hr")
+ivar = cmor.variable("clcalipso",axis_ids=[igrid,ialt40],units="%")
+
+ierr =cmor.write(ivar,numpy.ones((2,3,n_lev)),time_vals=numpy.arange(3))
+ierr =cmor.write(ilat,-90.*numpy.ones((2,3,n_lev)),time_vals=numpy.arange(3),store_with=ivar)
+ierr =cmor.write(ilon,180.*numpy.ones((2,3,n_lev)),time_vals=numpy.arange(3),store_with=ivar)
+error_flag = cmor.close()
 
diff --git a/Test/test_python_cfmip_site_axis_test.py b/Test/test_python_cfmip_site_axis_test.py
index bec66d8..dd0089e 100644
--- a/Test/test_python_cfmip_site_axis_test.py
+++ b/Test/test_python_cfmip_site_axis_test.py
@@ -31,7 +31,7 @@ variables:
 import cmor
 import numpy
 
-MIP_TABLE_DIR = '/git/cmip5-cmor-tables/Tables'   # set according to your MIP table location
+MIP_TABLE_DIR = 'Tables'   # set according to your MIP table location
 
 #---------------------------------------------------------------------------------------------------
 def setup_cmor() :
diff --git a/Test/test_python_jamie_8.py b/Test/test_python_jamie_8.py
index 1cacffb..80a2863 100644
--- a/Test/test_python_jamie_8.py
+++ b/Test/test_python_jamie_8.py
@@ -27,7 +27,7 @@ def define_write_var(axis_ids, entry, unit, values):
 
 
 def cmor_ini():
-    cmor.setup(inpath='/git/cmip5-cmor-tables/Tables',
+    cmor.setup(inpath='Tables',
                netcdf_file_action = cmor.CMOR_REPLACE)
     cmor.dataset('pre-industrial control', 'mohc', 'HadGEM2: source',
                  '360_day',
diff --git a/Test/test_python_jamie_site_surface.py b/Test/test_python_jamie_site_surface.py
index e35e02e..f9a325f 100644
--- a/Test/test_python_jamie_site_surface.py
+++ b/Test/test_python_jamie_site_surface.py
@@ -2,7 +2,7 @@ import cmor
 import numpy
 
 def cmor_initialisation():
-    cmor.setup(inpath='/git/cmip5-cmor-tables/Tables',
+    cmor.setup(inpath='Tables',
                netcdf_file_action = cmor.CMOR_REPLACE_3,
                create_subdirectories = 0)
     cmor.dataset('pre-industrial control', 'ukmo', 'HadCM3', '360_day',
diff --git a/Test/test_python_joerg_8.py b/Test/test_python_joerg_10.py
similarity index 81%
copy from Test/test_python_joerg_8.py
copy to Test/test_python_joerg_10.py
index f674ab8..5bfb066 100644
--- a/Test/test_python_joerg_8.py
+++ b/Test/test_python_joerg_10.py
@@ -33,14 +33,14 @@ cmor.dataset(
     model_id="GICCM1",
     forcing="Ant, Nat",
     institute_id="pcmdi",
-    parent_experiment_id="piControl",
-    parent_experiment_rip="r1i1p1",
-    branch_time=18336.33)
+    parent_experiment_id="piControl",branch_time=18336.33)
+
+cmor.set_cur_dataset_attribute("parent_experiment_rip","r1i1p1")
 
 tables=[]
-a = cmor.load_table("/git/cmip5-cmor-tables/Tables/CMIP5_grids")
+a = cmor.load_table("Tables/CMIP5_grids")
 tables.append(a)
-tables.append(cmor.load_table("/git/cmip5-cmor-tables/Tables/CMIP5_Omon"))
+tables.append(cmor.load_table("Tables/CMIP5_Omon"))
 print 'Tables ids:',tables
 
 cmor.set_table(tables[0])
@@ -83,17 +83,20 @@ myaxes[3] = cmor.axis(table_entry = 'time',
 pass_axes = [myaxes[3],myaxes[2]]
 
 print 'ok going to cmorvar'
-myvars[0] = cmor.variable( table_entry = 'epc100',
-                           units = 'mol m-2 s-1',
+myvars[0] = cmor.variable( table_entry = 'calc',
+                           units = 'mol m-3',
                            axis_ids = pass_axes,
-                           positive = 'down',
-                           original_name = 'HFLS',
+                           original_name = 'yep',
                            history = 'no history',
                            comment = 'no future'
                            )
-for i in range(ntimes):
-    data2d = read_2d_input_files(i, varin2d[0], lat,lon)
+
+ntimes=2
+for i in range(0,ntimes,2):
+    data2d_1 = read_2d_input_files(i,   varin2d[0], lat,lon)
+    data2d_2 = read_2d_input_files(i+1, varin2d[0], lat,lon)
+    data2d=numpy.array((data2d_1,data2d_2))
     print 'writing time: ',i,data2d.shape,data2d
-    print Time[i],bnds_time[2*i:2*i+2]    
-    cmor.write(myvars[0],data2d,1,time_vals=Time[i],time_bnds=bnds_time[2*i:2*i+2])
+    print Time[i:i+2],bnds_time[2*i:2*i+4]    
+    cmor.write(myvars[0],data2d,2,time_vals=numpy.arange(i,i+2),time_bnds=numpy.arange(i,i+3))
 cmor.close()
diff --git a/Test/test_python_joerg_6.py b/Test/test_python_joerg_6.py
index 4999caa..2258c5d 100644
--- a/Test/test_python_joerg_6.py
+++ b/Test/test_python_joerg_6.py
@@ -21,7 +21,7 @@ error_flag = cmor.dataset(
        branch_time=3.14159)
   
 
-cmor.load_table("/git/cmip5-cmor-tables/Tables/CMIP5_Omon")
+cmor.load_table("Tables/CMIP5_Omon")
 itime = cmor.axis(table_entry="time",units='months since 2010',coord_vals=numpy.array([0,1,2,3,4.]),cell_bounds=numpy.array([0,1,2,3,4,5.]))
 ivar = cmor.variable(table_entry="masso",axis_ids=[itime],units='kg')
 
diff --git a/Test/test_python_joerg_7.py b/Test/test_python_joerg_7.py
index 4d46512..6d3df16 100644
--- a/Test/test_python_joerg_7.py
+++ b/Test/test_python_joerg_7.py
@@ -21,7 +21,7 @@ error_flag = cmor.dataset(
        branch_time=3.14159)
   
 
-cmor.load_table("/git/cmip5-cmor-tables/Tables/CMIP5_Omon")
+cmor.load_table("Tables/CMIP5_Omon")
 itime = cmor.axis(table_entry="time",units='months since 2010',coord_vals=numpy.array([0,1,2,3,4.]),cell_bounds=numpy.array([0,1,2,3,4,5.]))
 # creates 1 degree grid
 nlat=18
diff --git a/Test/test_python_joerg_8.py b/Test/test_python_joerg_8.py
index f674ab8..80b667b 100644
--- a/Test/test_python_joerg_8.py
+++ b/Test/test_python_joerg_8.py
@@ -38,9 +38,9 @@ cmor.dataset(
     branch_time=18336.33)
 
 tables=[]
-a = cmor.load_table("/git/cmip5-cmor-tables/Tables/CMIP5_grids")
+a = cmor.load_table("Tables/CMIP5_grids")
 tables.append(a)
-tables.append(cmor.load_table("/git/cmip5-cmor-tables/Tables/CMIP5_Omon"))
+tables.append(cmor.load_table("Tables/CMIP5_Omon"))
 print 'Tables ids:',tables
 
 cmor.set_table(tables[0])
diff --git a/Test/test_python_joerg_9.py b/Test/test_python_joerg_9.py
index 031c346..6f5dfaf 100644
--- a/Test/test_python_joerg_9.py
+++ b/Test/test_python_joerg_9.py
@@ -24,8 +24,8 @@ error_flag = cmor.dataset(
        forcing="Ant",
        parent_experiment_id="lgm",branch_time=0)
 
-ntables=[cmor.load_table("/git/cmip5-cmor-tables/Tables/CMIP5_grids")]
-ntables.append(cmor.load_table("/git/cmip5-cmor-tables/Tables/CMIP5_OImon"))
+ntables=[cmor.load_table("Tables/CMIP5_grids")]
+ntables.append(cmor.load_table("Tables/CMIP5_OImon"))
 
 
 cmor.set_table(ntables[0])
diff --git a/Test/test_region.f90 b/Test/test_region.f90
index 0a8edbe..4402984 100644
--- a/Test/test_region.f90
+++ b/Test/test_region.f90
@@ -189,7 +189,7 @@ PROGRAM test_region
        ' 2XCO2 simulation described in Dorkey et al. '    //   &
        '(Clim. Dyn., 2003, 323-357.)' , model_id="GICCM1", &
        forcing='TO',contact="Barry Bonds",institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
     
   !  Define all axes that will be needed
   
diff --git a/Test/test_shrt_exp_nm_set_att_initi.f90 b/Test/test_shrt_exp_nm_set_att_initi.f90
index c5a2a3a..ff5f9bc 100644
--- a/Test/test_shrt_exp_nm_set_att_initi.f90
+++ b/Test/test_shrt_exp_nm_set_att_initi.f90
@@ -179,7 +179,7 @@ PROGRAM mip_contribution
        ' 2XCO2 simulation described in Dorkey et al. '//       &
        '(Clim. Dyn., 2003, 323-357.)',model_id="GICCM1", &
        forcing='TO',contact="Barry Bonds",institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
   
   
   print*, 'returned from cmor_dataset'
diff --git a/Test/test_sigma.f90 b/Test/test_sigma.f90
index 933c159..d30d6a0 100644
--- a/Test/test_sigma.f90
+++ b/Test/test_sigma.f90
@@ -236,7 +236,7 @@ PROGRAM ipcc_test_code
        ' 2XCO2 simulation described in Dorkey et al. '    //   &
        '(Clim. Dyn., 2003, 323-357.)',model_id="GICCM1", &
        forcing='TO',contact="Barry Bonds",institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
 
   !  Define all axes that will be needed
   
diff --git a/Test/test_singleton.f90 b/Test/test_singleton.f90
index d677ce6..f678b03 100755
--- a/Test/test_singleton.f90
+++ b/Test/test_singleton.f90
@@ -238,7 +238,7 @@ PROGRAM ipcc_test_code
        ' 2XCO2 simulation described in Dorkey et al. '    //   &
        '(Clim. Dyn., 2003, 323-357.)', model_id="GICCM1", &
        forcing='TO',institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
   !  Define all axes that will be needed
 
   ilat = cmor_axis(  &
diff --git a/Test/test_sophie.f90 b/Test/test_sophie.f90
index 2356aa2..4e52af2 100644
--- a/Test/test_sophie.f90
+++ b/Test/test_sophie.f90
@@ -168,7 +168,7 @@ program testing
       ' 2XCO2 simulation described in Dorkey et al. '    //   &
       '(Clim. Dyn., 2003, 323-357.)', model_id="GICCM1", &
       forcing='TO',contact="Barry Bonds",institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
   
  print*, 'Test code: done 2 lalala'
 
diff --git a/Test/test_station_data.f90 b/Test/test_station_data.f90
index b967d59..23748e0 100644
--- a/Test/test_station_data.f90
+++ b/Test/test_station_data.f90
@@ -179,7 +179,7 @@ program testing
        ' 2XCO2 simulation described in Dorkey et al. '    //   &
        '(Clim. Dyn., 2003, 323-357.)', model_id="GICCM1", &
        forcing='TO',contact="Barry Bonds",institute_id="PCMDI",&
-       parent_experiment_id="N/A",branch_time=bt)
+       parent_experiment_rip="N/A",parent_experiment_id="N/A",branch_time=bt)
   print*, 'Test code: done 2 lalala'
   
   call read_coords(alats, alons, plevs, bnds_lat, bnds_lon, station, st_lons, st_lats)
diff --git a/TestTables/CMIP5_3hr b/TestTables/CMIP5_3hr
index 7b222a9..31e2871 100644
--- a/TestTables/CMIP5_3hr
+++ b/TestTables/CMIP5_3hr
@@ -3,10 +3,10 @@ modeling_realm: atmos
 
 frequency: 3hr
 
-cmor_version: 2.0         ! version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
 cf_version:   1.4         ! version of CF that output conforms to
 project_id:   CMIP5  ! project id
-table_date:   10 June 2010 ! date this table was constructed
+table_date:   12 November 2010 ! date this table was constructed
 
 missing_value: 1.e20      ! value used to indicate a missing value
                           !   in arrays output by netCDF as 32-bit IEEE 
@@ -15,15 +15,15 @@ missing_value: 1.e20      ! value used to indicate a missing value
 baseURL: http://cmip-pcmdi.llnl.gov/CMIP5/dataLocation 
 product: output
 
-required_global_attributes: creation_date tracking_id forcing model_id parent_experiment_id branch_time contact institute_id ! space separated required global attribute 
+required_global_attributes: creation_date tracking_id forcing model_id parent_experiment_id parent_experiment_rip branch_time contact institute_id ! space separated required global attribute 
 
 forcings:   N/A Nat Ant GHG SD SI SA TO SO Oz LU Sl Vl SS Ds BC MD OC AA
 
 expt_id_ok: '10- or 30-year run initialized in year XXXX' 'decadalXXXX'
-expt_id_ok: 'volcano-free hindcasts XXXX' 'noVolcXXXX'
+expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
 expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
 expt_id_ok: 'pre-industrial control' 'piControl'
-expt_id_ok: 'Historical' 'historical'
+expt_id_ok: 'historical' 'historical'
 expt_id_ok: 'mid-Holocene' 'midHolocene'
 expt_id_ok: 'last glacial maximum' 'lgm'
 expt_id_ok: 'last millennium' 'past1000'
@@ -42,22 +42,6 @@ expt_id_ok: '1 percent per year CO2' '1pctCO2'
 expt_id_ok: 'abrupt 4XCO2' 'abrupt4xCO2'
 expt_id_ok: 'natural-only' 'historicalNat'
 expt_id_ok: 'GHG-only' 'historicalGHG'
-expt_id_ok: 'anthropogenic-only' 'historicalAnt'
-expt_id_ok: 'anthropogenic sulfate aerosol direct effect only' 'historicalSD'
-expt_id_ok: 'anthropogenic sulfate aerosol indirect effect only' 'historicalSI'
-expt_id_ok: 'anthropogenic sulfate aerosol only' 'historicalSA'
-expt_id_ok: 'tropospheric ozone only' 'historicalTO'
-expt_id_ok: 'stratospheric ozone' 'historicalSO'
-expt_id_ok: 'ozone only' 'historicalOz'
-expt_id_ok: 'land-use change only' 'historicalLU'
-expt_id_ok: 'solar irradiance only' 'historicalSl'
-expt_id_ok: 'volcanic aerosol only' 'historicalVl'
-expt_id_ok: 'sea salt only' 'historicalSS'
-expt_id_ok: 'dust' 'historicalDs'
-expt_id_ok: 'black carbon only' 'historicalBC'
-expt_id_ok: 'mineral dust only' 'historicalMD'
-expt_id_ok: 'organic carbon only' 'historicalOC'
-expt_id_ok: 'anthropogenic aerosols only' 'historicalAA'
 expt_id_ok: 'AMIP' 'amip'
 expt_id_ok: '2030 time-slice' 'sst2030'
 expt_id_ok: 'control SST climatology' 'sstClim'
@@ -213,6 +197,32 @@ must_have_bounds: no
 !----------------------------------
 !
 
+
+!============
+axis_entry: sdepth1 
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    depth
+units:            m
+axis:             Z             ! X, Y, Z, T (default: undeclared)
+positive:         down         ! up or down (default: undeclared)
+long_name:        depth
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         depth
+valid_min:        0.0         
+valid_max:        0.2 
+stored_direction: increasing
+type:             double
+value:            0.05            ! of scalar (singleton) dimension 
+bounds_values:    0.0 0.1    ! of scalar (singleton) dimension bounds
+must_have_bounds: yes
+!----------------------------------
+!
+
 !============
 variable_entry:    pr
 !============
@@ -223,7 +233,7 @@ modeling_realm:    atmos
 standard_name:     precipitation_flux
 units:             kg m-2 s-1
 cell_methods:      time:mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Precipitation
 comment:           at surface; includes both liquid and solid phases.  This is the 3-hour mean precipitation flux.
 !----------------------------------
@@ -249,7 +259,7 @@ modeling_realm:    atmos
 standard_name:     air_temperature
 units:             K
 cell_methods:      time: point
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Air Temperature
 comment:           near-surface (usually, 2 meter) air temperature, sampled synoptically.
 !----------------------------------
@@ -275,7 +285,7 @@ modeling_realm:    atmos
 standard_name:     surface_upward_latent_heat_flux
 units:             W m-2
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Surface Upward Latent Heat Flux
 comment:           This is the 3-hour mean flux.
 !----------------------------------
@@ -291,3 +301,514 @@ ok_min_mean_abs:   50.39
 ok_max_mean_abs:   73.2
 !----------------------------------
 !
+
+!============
+variable_entry:    hfss
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_upward_sensible_heat_flux
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Surface Upward Sensible Heat Flux
+comment:           This is the 3-hour mean flux.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          hfss
+type:              real
+positive:          up
+valid_min:         -264.5
+valid_max:         844.8
+ok_min_mean_abs:   10.7
+ok_max_mean_abs:   34.84
+!----------------------------------
+!
+
+!============
+variable_entry:    rlds
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_downwelling_longwave_flux_in_air
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Surface Downwelling Longwave Radiation
+comment:           This is the 3-hour mean flux.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          rlds
+type:              real
+positive:          down
+valid_min:         30.71
+valid_max:         520.5
+ok_min_mean_abs:   271.2
+ok_max_mean_abs:   323.6
+!----------------------------------
+!
+
+!============
+variable_entry:    rlus
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_upwelling_longwave_flux_in_air
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Surface Upwelling Longwave Radiation
+comment:           This is the 3-hour mean flux.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          rlus
+type:              real
+positive:          up
+valid_min:         43.75
+valid_max:         658
+ok_min_mean_abs:   331.1
+ok_max_mean_abs:   369.9
+!----------------------------------
+!
+
+!============
+variable_entry:    rsds
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_downwelling_shortwave_flux_in_air
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Surface Downwelling Shortwave Radiation
+comment:           This is the 3-hour mean flux.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          rsds
+type:              real
+positive:          down
+valid_min:         -0.002946
+valid_max:         524.4
+ok_min_mean_abs:   143.9
+ok_max_mean_abs:   181.6
+!----------------------------------
+!
+
+!============
+variable_entry:    rsus
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_upwelling_shortwave_flux_in_air
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Surface Upwelling Shortwave Radiation
+comment:           This is the 3-hour mean flux.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          rsus
+type:              real
+positive:          up
+valid_min:         -0.006589
+valid_max:         422.2
+ok_min_mean_abs:   26.22
+ok_max_mean_abs:   43.77
+!----------------------------------
+!
+
+!============
+variable_entry:    uas
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     eastward_wind
+units:             m s-1
+cell_methods:      time: point
+long_name:         Eastward Near-Surface Wind Speed
+comment:           sampled synoptically.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time1 height2m
+out_name:          uas
+type:              real
+valid_min:         -19.01
+valid_max:         18.68
+ok_min_mean_abs:   1.668
+ok_max_mean_abs:   4.106
+!----------------------------------
+!
+
+!============
+variable_entry:    vas
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     northward_wind
+units:             m s-1
+cell_methods:      time: point
+long_name:         Northward Near-Surface Wind Speed
+comment:           sampled synoptically.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time1 height2m
+out_name:          vas
+type:              real
+valid_min:         -18.04
+valid_max:         22.84
+ok_min_mean_abs:   1.065
+ok_max_mean_abs:   2.678
+!----------------------------------
+!
+
+!============
+variable_entry:    huss
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     specific_humidity
+units:             1
+cell_methods:      time: point
+cell_measures:     area: areacella
+long_name:         Near-Surface Specific Humidity
+comment:           near-surface (usually 2 m) specific humidity, sampled synoptically.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time1 height2m
+out_name:          huss
+type:              real
+valid_min:         -7.21e-06
+valid_max:         0.02992
+ok_min_mean_abs:   0.006391
+ok_max_mean_abs:   0.008749
+!----------------------------------
+!
+
+!============
+variable_entry:    mrsos
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     moisture_content_of_soil_layer
+units:             kg m-2
+cell_methods:      time: point area: mean where land
+cell_measures:     area: areacella
+long_name:         Moisture in Upper 0.1 m of Soil Column
+comment:           Compute the mass of water in all phases in the upper 0.1 meters of soil.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time1 sdepth1
+out_name:          mrsos
+type:              real
+valid_min:         -2.008
+valid_max:         146.5
+ok_min_mean_abs:   -35.89
+ok_max_mean_abs:   123.3
+!----------------------------------
+!
+
+!============
+variable_entry:    tslsi
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_temperature
+units:             K
+cell_methods:      time: point
+cell_measures:     area: areacella
+long_name:          Surface Temperature Where Land or Sea Ice
+comment:           ""skin"" temperature of all surfaces except open ocean, sampled synoptically.  
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time1
+out_name:          tslsi
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    tso
+!============
+modeling_realm:    ocean
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     sea_surface_temperature
+units:             K
+cell_methods:      time: point area: mean where sea
+cell_measures:     area: areacella
+long_name:         Sea Surface Temperature
+comment:           temperature of surface of open ocean, sampled synoptically.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time1
+out_name:          tso
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    prc
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     convective_precipitation_flux
+units:             kg m-2 s-1
+cell_methods:      time:mean
+cell_measures:     area: areacella
+long_name:         Convective Precipitation
+comment:           at surface.  This is a 3-hour mean convective precipitation flux.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          prc
+type:              real
+valid_min:         0
+valid_max:         0.0006323
+ok_min_mean_abs:   -2.528e-06
+ok_max_mean_abs:   3.209e-05
+!----------------------------------
+!
+
+!============
+variable_entry:    prsn
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     snowfall_flux
+units:             kg m-2 s-1
+cell_methods:      time:mean
+cell_measures:     area: areacella
+long_name:         Snowfall Flux
+comment:           at surface.  Includes all forms of precipitating solid phase of water.  This is the 3-hour mean snowfall flux.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          prsn
+type:              real
+valid_min:         0
+valid_max:         0.0002987
+ok_min_mean_abs:   1.449e-06
+ok_max_mean_abs:   6.11e-06
+!----------------------------------
+!
+
+!============
+variable_entry:    mrro
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     runoff_flux
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Total Runoff
+comment:           compute the total runoff (including ""drainage"" through the base of the soil model) leaving the land portion of the grid cell divided by the land area in the grid cell, averaged over the 3-hour interval.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          mrro
+type:              real
+valid_min:         -0.0002019
+valid_max:         0.001065
+ok_min_mean_abs:   -6.668e-06
+ok_max_mean_abs:   1.874e-05
+!----------------------------------
+!
+
+!============
+variable_entry:    rldscs
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     downwelling_longwave_flux_in_air_assuming_clear_sky
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Surface Downwelling Clear-Sky Longwave Radiation
+comment:           This is a 3-hour mean flux.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          rldscs
+type:              real
+positive:          down
+valid_min:         33.55
+valid_max:         543.6
+ok_min_mean_abs:   238.6
+ok_max_mean_abs:   293.8
+!----------------------------------
+!
+
+!============
+variable_entry:    rsdscs
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_downwelling_shortwave_flux_in_air_assuming_clear_sky
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Surface Downwelling Clear-Sky Shortwave Radiation
+comment:           This is a 3-hour mean flux.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          rsdscs
+type:              real
+positive:          down
+valid_min:         -1.748e+30
+valid_max:         518
+ok_min_mean_abs:   206.9
+ok_max_mean_abs:   238.6
+!----------------------------------
+!
+
+!============
+variable_entry:    rluscs
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_upwelling_shortwave_flux_in_air_assuming_clear_sky
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Surface Upwelling Clear-Sky Shortwave Radiation
+comment:           This is a 3-hour mean flux.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          rluscs
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    ps
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_air_pressure
+units:             Pa
+cell_methods:      time: point
+cell_measures:     area: areacella
+long_name:         Surface Pressure
+comment:           sampled synoptically to diagnose atmospheric tides, this is better than mean sea level pressure.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time1
+out_name:          ps
+type:              real
+valid_min:         4.792e+04
+valid_max:         1.093e+05
+ok_min_mean_abs:   9.606e+04
+ok_max_mean_abs:   9.743e+04
+!----------------------------------
+!
+
+!============
+variable_entry:    clt
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     cloud_area_fraction
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Total Cloud Fraction
+comment:           for the whole atmospheric column, as seen from the surface or the top of the atmosphere. Include both large-scale and convective cloud.  This is a 3-hour mean.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          clt
+type:              real
+valid_min:         -0.0001822
+valid_max:         100.2
+ok_min_mean_abs:   39.37
+ok_max_mean_abs:   84.98
+!----------------------------------
+!
+
+!============
+variable_entry:    rsdsdiff
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_diffuse_downwelling_shortwave_flux_in_air
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Surface Downward Diffuse Shortwave Radiation
+comment:           This is a 3-hour mean flux.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          rsdsdiff
+type:              real
+!----------------------------------
+!
+
diff --git a/TestTables/CMIP5_6hrLev b/TestTables/CMIP5_6hrLev
index 2e5d0c2..2c2e1aa 100644
--- a/TestTables/CMIP5_6hrLev
+++ b/TestTables/CMIP5_6hrLev
@@ -3,10 +3,10 @@ modeling_realm: atmos
 
 frequency: 6hr
 
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
 cf_version:   1.4         ! version of CF that output conforms to
 project_id:   CMIP5  ! project id
-table_date:   09 November 2010 ! date this table was constructed
+table_date:   12 November 2010 ! date this table was constructed
 
 missing_value: 1.e20      ! value used to indicate a missing value
                           !   in arrays output by netCDF as 32-bit IEEE 
diff --git a/TestTables/CMIP5_Amon b/TestTables/CMIP5_Amon
index 2071412..281583c 100644
--- a/TestTables/CMIP5_Amon
+++ b/TestTables/CMIP5_Amon
@@ -3,10 +3,10 @@ modeling_realm: atmos
 
 frequency: mon
 
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
 cf_version:   1.4         ! version of CF that output conforms to
 project_id:   CMIP5  ! project id
-table_date:   09 November 2010 ! date this table was constructed
+table_date:   12 November 2010 ! date this table was constructed
 
 missing_value: 1.e20      ! value used to indicate a missing value
                           !   in arrays output by netCDF as 32-bit IEEE 
diff --git a/TestTables/CMIP5_Lmon b/TestTables/CMIP5_Lmon
index 216ed80..1d70cbe 100644
--- a/TestTables/CMIP5_Lmon
+++ b/TestTables/CMIP5_Lmon
@@ -3,10 +3,10 @@ modeling_realm: land
 
 frequency: mon
 
-cmor_version: 2.0         ! version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
 cf_version:   1.4         ! version of CF that output conforms to
 project_id:   CMIP5  ! project id
-table_date:   10 June 2010 ! date this table was constructed
+table_date:   12 November 2010 ! date this table was constructed
 
 missing_value: 1.e20      ! value used to indicate a missing value
                           !   in arrays output by netCDF as 32-bit IEEE 
@@ -15,15 +15,15 @@ missing_value: 1.e20      ! value used to indicate a missing value
 baseURL: http://cmip-pcmdi.llnl.gov/CMIP5/dataLocation 
 product: output
 
-required_global_attributes: creation_date tracking_id forcing model_id parent_experiment_id branch_time contact institute_id ! space separated required global attribute 
+required_global_attributes: creation_date tracking_id forcing model_id parent_experiment_id parent_experiment_rip branch_time contact institute_id ! space separated required global attribute 
 
 forcings:   N/A Nat Ant GHG SD SI SA TO SO Oz LU Sl Vl SS Ds BC MD OC AA
 
 expt_id_ok: '10- or 30-year run initialized in year XXXX' 'decadalXXXX'
-expt_id_ok: 'volcano-free hindcasts XXXX' 'noVolcXXXX'
+expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
 expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
 expt_id_ok: 'pre-industrial control' 'piControl'
-expt_id_ok: 'Historical' 'historical'
+expt_id_ok: 'historical' 'historical'
 expt_id_ok: 'mid-Holocene' 'midHolocene'
 expt_id_ok: 'last glacial maximum' 'lgm'
 expt_id_ok: 'last millennium' 'past1000'
@@ -42,22 +42,6 @@ expt_id_ok: '1 percent per year CO2' '1pctCO2'
 expt_id_ok: 'abrupt 4XCO2' 'abrupt4xCO2'
 expt_id_ok: 'natural-only' 'historicalNat'
 expt_id_ok: 'GHG-only' 'historicalGHG'
-expt_id_ok: 'anthropogenic-only' 'historicalAnt'
-expt_id_ok: 'anthropogenic sulfate aerosol direct effect only' 'historicalSD'
-expt_id_ok: 'anthropogenic sulfate aerosol indirect effect only' 'historicalSI'
-expt_id_ok: 'anthropogenic sulfate aerosol only' 'historicalSA'
-expt_id_ok: 'tropospheric ozone only' 'historicalTO'
-expt_id_ok: 'stratospheric ozone' 'historicalSO'
-expt_id_ok: 'ozone only' 'historicalOz'
-expt_id_ok: 'land-use change only' 'historicalLU'
-expt_id_ok: 'solar irradiance only' 'historicalSl'
-expt_id_ok: 'volcanic aerosol only' 'historicalVl'
-expt_id_ok: 'sea salt only' 'historicalSS'
-expt_id_ok: 'dust' 'historicalDs'
-expt_id_ok: 'black carbon only' 'historicalBC'
-expt_id_ok: 'mineral dust only' 'historicalMD'
-expt_id_ok: 'organic carbon only' 'historicalOC'
-expt_id_ok: 'anthropogenic aerosols only' 'historicalAA'
 expt_id_ok: 'AMIP' 'amip'
 expt_id_ok: '2030 time-slice' 'sst2030'
 expt_id_ok: 'control SST climatology' 'sstClim'
@@ -199,6 +183,7 @@ axis_entry: vegtype
 !----------------------------------
 ! Axis attributes:
 !----------------------------------
+standard_name:    area_type
 units:            1
 long_name:        plant functional type
 !----------------------------------
@@ -211,6 +196,153 @@ coords_attrib:    type_description
 !----------------------------------
 !
 
+
+!============
+axis_entry: typebare
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    area_type
+units:            1
+long_name:        surface type
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         type
+type:             character
+value:            bare_ground            ! of scalar (singleton) dimension 
+must_have_bounds: no
+coords_attrib:    type_description
+!----------------------------------
+!
+
+
+!============
+axis_entry: typepdec
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    area_type
+units:            1
+long_name:        surface type
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         type
+type:             character
+value:            primary_deciduous_trees            ! of scalar (singleton) dimension 
+must_have_bounds: no
+coords_attrib:    type_description
+!----------------------------------
+!
+
+
+!============
+axis_entry: typepever
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    area_type
+units:            1
+long_name:        surface type
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         type
+type:             character
+value:            primary_evergreen_trees            ! of scalar (singleton) dimension 
+must_have_bounds: no
+coords_attrib:    type_description
+!----------------------------------
+!
+
+
+!============
+axis_entry: typesdec
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    area_type
+units:            1
+long_name:        surface type
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         type
+type:             character
+value:            secondary_decidous_trees            ! of scalar (singleton) dimension 
+must_have_bounds: no
+coords_attrib:    type_description
+!----------------------------------
+!
+
+
+!============
+axis_entry: typesever 
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    area_type
+units:            1
+long_name:        surface type
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         type
+type:             character
+value:            secondary_evergreen_trees            ! of scalar (singleton) dimension 
+must_have_bounds: no
+coords_attrib:    type_description
+!----------------------------------
+!
+
+
+!============
+axis_entry: typec3pft
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    area_type
+units:            1
+long_name:        surface type
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         type
+type:             character
+value:            c3_plant_functional_types            ! of scalar (singleton) dimension 
+must_have_bounds: no
+coords_attrib:    type_description
+!----------------------------------
+!
+
+
+!============
+axis_entry: typec4pft
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    area_type
+units:            1
+long_name:        surface type
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         type
+type:             character
+value:            c4_plant_functional_types            ! of scalar (singleton) dimension 
+must_have_bounds: no
+coords_attrib:    type_description
+!----------------------------------
+!
+
 !============
 variable_entry:    mrsos
 !============
@@ -221,7 +353,7 @@ modeling_realm:    land
 standard_name:     moisture_content_of_soil_layer
 units:             kg m-2
 cell_methods:      time: mean area: mean where land
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Moisture in Upper 0.1 m of Soil Column
 comment:           Compute the mass of water in all phases in the upper 0.1 meters of soil.
 !----------------------------------
@@ -236,3 +368,1298 @@ ok_min_mean_abs:   -35.89
 ok_max_mean_abs:   123.3
 !----------------------------------
 !
+
+!============
+variable_entry:    mrso
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     soil_moisture_content
+units:             kg m-2
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Total Soil Moisture Content
+comment:           Compute the mass per unit area  (summed over all soil layers) of water in all phases.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          mrso
+type:              real
+valid_min:         -64.17
+valid_max:         5717
+ok_min_mean_abs:   -1424
+ok_max_mean_abs:   3038
+!----------------------------------
+!
+
+!============
+variable_entry:    mrfso
+!============
+modeling_realm:    land landIce
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     soil_frozen_water_content
+units:             kg m-2
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Soil Frozen Water Content 
+comment:           Compute the mass (summed over all all layers) of frozen water.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          mrfso
+type:              real
+valid_min:         0
+valid_max:         5763
+ok_min_mean_abs:   -419
+ok_max_mean_abs:   940.3
+!----------------------------------
+!
+
+!============
+variable_entry:    mrros
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_runoff_flux
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Surface Runoff
+comment:           Compute the total surface runoff leaving the land portion of the grid cell.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          mrros
+type:              real
+valid_min:         -6.802e-06
+valid_max:         0.0009825
+ok_min_mean_abs:   -5.867e-06
+ok_max_mean_abs:   1.302e-05
+!----------------------------------
+!
+
+!============
+variable_entry:    mrro
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     runoff_flux
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Total Runoff
+comment:           "compute the total runoff (including ""drainage"" through the base of the soil model) leaving the land portion of the grid cell."
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          mrro
+type:              real
+valid_min:         -0.0002019
+valid_max:         0.001065
+ok_min_mean_abs:   -6.668e-06
+ok_max_mean_abs:   1.874e-05
+!----------------------------------
+!
+
+!============
+variable_entry:    prveg
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     precipitation_flux_onto_canopy
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Precipitation onto Canopy
+comment:           Report the precipitation flux that is intercepted by the vegetation canopy (if present in model) before reaching the ground.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          prveg
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    evspsblveg
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     water_evaporation_flux_from_canopy
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Evaporation from Canopy
+comment:           Report the canopy evaporation+sublimation (if present in model).
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          evspsblveg
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    evspsblsoi
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     water_evaporation_flux_from_soil
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Water Evaporation from Soil
+comment:           includes sublimation.  
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          evspsblsoi
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    tran
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     transpiration_flux
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Transpiration
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          tran
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    mrlsl
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     moisture_content_of_soil_layer
+units:             kg m-2
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:          Water Content of Soil Layer
+comment:           in each soil layer, the mass of water in all phases, including ice.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude sdepth time
+out_name:          mrlsl
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    tsl
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     soil_temperature
+units:             K
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Temperature of Soil
+comment:           "Temperature of each soil layer.  Report as ""missing"" for grid cells occupied entirely by ""sea""."
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude sdepth time
+out_name:          tsl
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    treeFrac
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     area_fraction
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Tree Cover Fraction
+comment:           fraction of entire grid cell  that is covered by trees.  
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          treeFrac
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    grassFrac
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     area_fraction
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Natural Grass Fraction
+comment:           fraction of entire grid cell that is covered by natural grass.  
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          grassFrac
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    shrubFrac
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     area_fraction
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Shrub Fraction
+comment:           fraction of entire grid cell  that is covered by shrub.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          shrubFrac
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    cropFrac
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     area_fraction
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Crop Fraction
+comment:           fraction of entire grid cell  that is covered by crop. 
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          cropFrac
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    pastureFrac
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     area_fraction
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Anthropogenic Pasture Fraction
+comment:           fraction of entire grid cell  that is covered by anthropogenic pasture. 
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          pastureFrac
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    baresoilFrac
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     area_fraction
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Bare Soil Fraction
+comment:           fraction of entire grid cell  that is covered by bare soil.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time typebare
+out_name:          baresoilFrac
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    residualFrac
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     area_fraction
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Fraction of Grid Cell that is Land but Neither Vegetation-Covered nor Bare Soil
+comment:           fraction of entire grid cell  that is land and is covered by ""non-vegetation"" and ""non-bare-soil"" (e.g., urban, ice, lakes, etc.) 
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          residualFrac
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    burntArea
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     area_fraction
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Burnt Area Fraction
+comment:           fraction of entire grid cell  that is covered by burnt vegetation.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          burntArea
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    cVeg
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     vegetation_carbon_content
+units:             kg m-2
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass in Vegetation
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          cVeg
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    cLitter
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     litter_carbon_content
+units:             kg m-2
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass in Litter Pool
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          cLitter
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    cSoil
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     soil_carbon_content
+units:             kg m-2
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass in Soil Pool
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          cSoil
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    cProduct
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     carbon_content_of_products_of_anthropogenic_land_use_change
+units:             kg m-2
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass in Products of Land Use Change
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          cProduct
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    lai
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     leaf_area_index
+units:             1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Leaf Area Index
+comment:           projected leaf area per unit of ground area (i.e., only the land portion of the grid cell), expressed as a proper fraction (not a percentage)
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          lai
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    gpp
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     gross_primary_productivity_of_carbon
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass Flux out of Atmosphere due to Gross Primary Production on Land
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          gpp
+type:              real
+positive:          down
+!----------------------------------
+!
+
+!============
+variable_entry:    ra
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     plant_respiration_carbon_flux
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass Flux into Atmosphere due to Autotrophic (Plant) Respiration on Land
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          ra
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    npp
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     net_primary_productivity_of_carbon
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass Flux out of Atmosphere due to Net Primary Production on Land
+comment:           needed for models that do not compute GPP (if any)
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          npp
+type:              real
+positive:          down
+!----------------------------------
+!
+
+!============
+variable_entry:    rh
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     heterotrophic_respiration_carbon_flux
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass Flux into Atmosphere due to Heterotrophic Respiration on Land
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          rh
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    fFire
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_upward_mass_flux_of_carbon_dioxide_expressed_as_carbon_due_to_emission_from_fires_excluding_anthropogenic_land_use_change
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass Flux into Atmosphere due to CO2 Emission from Fire
+comment:           CO2 emissions (expressed as a carbon mass flux) from natural fires + human ignition fires as calculated by the fire module of the DGVM, but excluding any CO2 flux from fire included in fLuc, defined below (CO2 Flux to Atmosphere from Land Use Change).
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          fFire
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    fGrazing
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_upward_mass_flux_of_carbon_dioxide_expressed_as_carbon_due_to_emission_from_grazing
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass Flux into Atmosphere due to Grazing on Land
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          fGrazing
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    fHarvest
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_upward_mass_flux_of_carbon_dioxide_expressed_as_carbon_due_to_emission_from_crop_harvesting
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass Flux into Atmosphere due to Crop Harvesting
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          fHarvest
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    fLuc
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_net_upward_mass_flux_of_carbon_dioxide_expressed_as_carbon_due_to_emission_from_anthropogenic_land_use_change
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Net Carbon Mass Flux into Atmosphere due to Land Use Change
+comment:           human changes to land (excluding forest regrowth) accounting possibly for different time-scales related to fate of the wood, for example.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          fLuc
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    nbp
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_net_downward_mass_flux_of_carbon_dioxide_expressed_as_carbon_due_to_all_land_processes
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass Flux out of Atmosphere due to Net Biospheric Production on Land
+comment:           This is the net mass flux of carbon between land and atmosphere calculated as photosynthesis MINUS the sum of  plant and soil respiration, carbonfluxes  from fire, harvest, grazing  and land use change. Positive flux  is into the land.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          nbp
+type:              real
+positive:          down
+!----------------------------------
+!
+
+!============
+variable_entry:    fVegLitter
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     litter_carbon_flux
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Total Carbon Mass Flux from Vegetation to Litter
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          fVegLitter
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    fLitterSoil
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     carbon_mass_flux_into_soil_from_litter
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Total Carbon Mass Flux from Litter to Soil
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          fLitterSoil
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    fVegSoil
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     carbon_mass_flux_into_soil_from_vegetation_excluding_litter
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Total Carbon Mass Flux from Vegetation Directly to Soil
+comment:           In some models part of carbon (e.g., root exudate) can go directly into the soil pool without entering litter.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          fVegSoil
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    cLeaf
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     leaf_carbon_content
+units:             kg m-2
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass in Leaves
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          cLeaf
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    cWood
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     wood_carbon_content
+units:             kg m-2
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass in Wood
+comment:           including sapwood and hardwood.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          cWood
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    cRoot
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     root_carbon_content
+units:             kg m-2
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass in Roots
+comment:           including fine and coarse roots.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          cRoot
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    cMisc
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     miscellaneous_living_matter_carbon_content
+units:             kg m-2
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass in Other Living Compartments on Land
+comment:           e.g., labile, fruits, reserves, etc.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          cMisc
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    cCwd
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     wood_debris_carbon_content
+units:             kg m-2
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass in Coarse Woody Debris
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          cCwd
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    cLitterAbove
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_litter_carbon_content
+units:             kg m-2
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass in Above-Ground Litter
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          cLitterAbove
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    cLitterBelow
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     subsurface_litter_carbon_content
+units:             kg m-2
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass in Below-Ground Litter
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          cLitterBelow
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    cSoilFast
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     fast_soil_pool_carbon_content
+units:             kg m-2
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass in Fast Soil Pool
+comment:           fast is meant as lifetime of less than 10 years for  reference climate conditions (20 C, no water limitations).
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          cSoilFast
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    cSoilMedium
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     medium_soil_pool_carbon_content
+units:             kg m-2
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass in Medium Soil Pool
+comment:           medium is meant as lifetime of more than than 10 years and less than 100 years for  reference climate conditions (20 C, no water limitations)
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          cSoilMedium
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    cSoilSlow
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     slow_soil_pool_carbon_content
+units:             kg m-2
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass in Slow Soil Pool
+comment:           fast is meant as lifetime of more than 100 years for  reference climate conditions (20 C, no water limitations)
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          cSoilSlow
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    landCoverFrac
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     area_fraction
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Plant Functional Type Grid Fraction
+comment:           using each individual ESM PFT definition.   This includes natural PFTs, anthropogenic PFTs, bare soil, lakes, urban areas, etc.   Sum of all should equal the fraction of the grid-cell that is land.  Note that the ""types"" will be model dependent and for each type there should be a full description of the PFT (plant functional type).   To facilitate model comparison, it is also requested that the aggregated land cover types called for in lines 28 to 35 be archived (but [...]
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude vegtype time
+out_name:          landCoverFrac
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    treeFracPrimDec
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     area_fraction
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Total Primary Deciduous Tree Fraction
+comment:           "Agregation of model PFTs as defined in 1st priority to aid model intercomparison.  This is the fraction of the entire grid cell  that is covered by ""total primary deciduous trees.""    "
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time typepdec
+out_name:          treeFracPrimDec
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    treeFracPrimEver
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     area_fraction
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Total Primary Evergreen Tree Cover Fraction
+comment:           fraction of entire grid cell  that is covered by primary evergreen trees. 
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time typepever
+out_name:          treeFracPrimEver
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    treeFracSecDec
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     area_fraction
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Total Secondary Deciduous Tree Cover Fraction
+comment:           fraction of entire grid cell  that is covered by secondary deciduous trees.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time typesdec
+out_name:          treeFracSecDec
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    treeFracSecEver
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     area_fraction
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Total Secondary Evergreen Tree Cover Fraction
+comment:           fraction of entire grid cell  that is covered by secondary evergreen trees.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time typesever 
+out_name:          treeFracSecEver
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    c3PftFrac
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     area_fraction
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Total C3 PFT Cover Fraction
+comment:           fraction of entire grid cell  that is covered by C3 PFTs (including grass, crops, and trees).
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time typec3pft
+out_name:          c3PftFrac
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    c4PftFrac
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     area_fraction
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Total C4 PFT Cover Fraction
+comment:           fraction of entire grid cell  that is covered by C4 PFTs (including grass and crops).
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time typec4pft
+out_name:          c4PftFrac
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    rGrowth
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_upward_carbon_mass_flux_due_to_plant_respiration_for_biomass_growth
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass Flux into Atmosphere due to Growth Autotrophic Respiration on Land
+comment:           "This flux and the one in the following row provide a breakdown of the higher priority ""Autotrophic (Plant) Respiration"" in an earlier row of this table; thus the sum should be identical to that."
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          rGrowth
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    rMaint
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_upward_carbon_mass_flux_due_to_plant_respiration_for_biomass_maintenance
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass Flux into Atmosphere due to Maintenance Autotrophic Respiration on Land
+comment:           "This flux and the one in the previous row provide a breakdown of the higher priority ""Autotrophic (Plant) Respiration"" in an earlier row of this table; thus the sum should be identical to that."
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          rMaint
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    nppLeaf
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     net_primary_productivity_of_carbon_accumulated_in_leaves
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass Flux due to NPP Allocation to Leaf
+comment:           This is the rate of carbon uptake by leaves due to NPP
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          nppLeaf
+type:              real
+positive:          down
+!----------------------------------
+!
+
+!============
+variable_entry:    nppWood
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     net_primary_productivity_of_carbon_accumulated_in_wood
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass Flux due to NPP Allocation to Wood
+comment:           This is the rate of carbon uptake by wood due to NPP
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          nppWood
+type:              real
+positive:          down
+!----------------------------------
+!
+
+!============
+variable_entry:    nppRoot
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     net_primary_productivity_of_carbon_accumulated_in_roots
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Carbon Mass Flux due to NPP Allocation to Roots
+comment:           This is the rate of carbon uptake by roots due to NPP
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          nppRoot
+type:              real
+positive:          down
+!----------------------------------
+!
+
+!============
+variable_entry:    nep
+!============
+modeling_realm:    land
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     surface_net_downward_mass_flux_of_carbon_dioxide_expressed_as_carbon_due_to_all_land_processes_excluding_anthropogenic_land_use_change
+units:             kg m-2 s-1
+cell_methods:      time: mean area: mean where land
+cell_measures:     area: areacella
+long_name:         Net Carbon Mass Flux out of Atmophere due to Net Ecosystem Productivity on Land.
+comment:           Natural flux of CO2 (expressed as a mass flux of carbon) from the atmosphere to the land calculated as the difference between uptake associated will photosynthesis and the release of CO2 from the sum of plant and soil respiration and fire.  Positive flux is into the land.  emissions from natural fires + human ignition fires as calculated by the fire module of the DGVM, but excluding any CO2 flux from fire included in fLuc, defined below (CO2 Flux to Atmosphere from Lan [...]
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          nep
+type:              real
+positive:          down
+!----------------------------------
+!
+
diff --git a/TestTables/CMIP5_Omon b/TestTables/CMIP5_Omon
index 18e9495..17e3eb1 100644
--- a/TestTables/CMIP5_Omon
+++ b/TestTables/CMIP5_Omon
@@ -3,10 +3,10 @@ modeling_realm: ocean
 
 frequency: mon
 
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
 cf_version:   1.4         ! version of CF that output conforms to
 project_id:   CMIP5  ! project id
-table_date:   09 November 2010 ! date this table was constructed
+table_date:   12 November 2010 ! date this table was constructed
 
 missing_value: 1.e20      ! value used to indicate a missing value
                           !   in arrays output by netCDF as 32-bit IEEE 
diff --git a/TestTables/CMIP5_Amon b/TestTables/CMIP5_cf3hr
similarity index 65%
copy from TestTables/CMIP5_Amon
copy to TestTables/CMIP5_cf3hr
index 2071412..d6eeb0b 100644
--- a/TestTables/CMIP5_Amon
+++ b/TestTables/CMIP5_cf3hr
@@ -1,12 +1,12 @@
-table_id: Table Amon
+table_id: Table cf3hr
 modeling_realm: atmos
 
-frequency: mon
+frequency: 3hr
 
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
 cf_version:   1.4         ! version of CF that output conforms to
 project_id:   CMIP5  ! project id
-table_date:   09 November 2010 ! date this table was constructed
+table_date:   12 November 2010 ! date this table was constructed
 
 missing_value: 1.e20      ! value used to indicate a missing value
                           !   in arrays output by netCDF as 32-bit IEEE 
@@ -56,7 +56,7 @@ expt_id_ok: 'aqua planet plus 4K anomaly' 'aqua4K'
 expt_id_ok: 'AMIP plus 4K anomaly' 'amip4K'
 
 
-approx_interval:  30.000000     ! approximate spacing between successive time
+approx_interval:  0.125000     ! approximate spacing between successive time
                           !   samples (in units of the output time 
                           !   coordinate.
 
@@ -109,7 +109,55 @@ must_have_bounds: yes
 
 
 !============
-axis_entry: plevs
+axis_entry: p220
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    air_pressure
+units:            Pa
+axis:             Z             ! X, Y, Z, T (default: undeclared)
+positive:         down         ! up or down (default: undeclared)
+long_name:        pressure
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         plev
+stored_direction: decreasing
+type:             double
+value:            22000.            ! of scalar (singleton) dimension 
+bounds_values:    44000. 0.0    ! of scalar (singleton) dimension bounds
+must_have_bounds: no
+!----------------------------------
+!
+
+
+!============
+axis_entry: p560
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    air_pressure
+units:            Pa
+axis:             Z             ! X, Y, Z, T (default: undeclared)
+positive:         down         ! up or down (default: undeclared)
+long_name:        pressure
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         plev
+stored_direction: decreasing
+type:             double
+value:            56000.            ! of scalar (singleton) dimension 
+bounds_values:    68000. 44000.    ! of scalar (singleton) dimension bounds
+must_have_bounds: no
+!----------------------------------
+!
+
+
+!============
+axis_entry: p840
 !============
 !----------------------------------
 ! Axis attributes:
@@ -124,15 +172,40 @@ long_name:        pressure
 !----------------------------------
 out_name:         plev
 stored_direction: decreasing
-tolerance:        0.001
 type:             double
-requested:        100000. 92500. 85000. 70000. 60000. 50000. 40000. 30000. 25000. 20000. 15000. 10000. 7000. 5000. 3000. 2000. 1000.        ! space-separated list of requested coordinates 
+value:            84000.            ! of scalar (singleton) dimension 
+bounds_values:    100000. 68000.    ! of scalar (singleton) dimension bounds
 must_have_bounds: no
 !----------------------------------
 !
 
 
 !============
+axis_entry: alt40
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    altitude
+units:            m
+axis:             Z             ! X, Y, Z, T (default: undeclared)
+positive:         up         ! up or down (default: undeclared)
+long_name:        altitude
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         alt40
+stored_direction: increasing
+tolerance:        0.001
+type:             double
+requested:        240. 720. 1200. 1680. 2160. 2640. 3120. 3600. 4080. 4560. 5040. 5520. 6000. 6480. 6960. 7440. 7920. 8400. 8880. 9360. 9840. 10320. 10800. 11280. 11760. 12240. 12720. 13200. 13680. 14160. 14640. 15120. 15600. 16080. 16560. 17040. 17520. 18000. 18480. 18960.        ! space-separated list of requested coordinates 
+requested_bounds: 0. 480. 480. 960. 960. 1440. 1440. 1920. 1920. 2400. 2400. 2880. 2880. 3360. 3360. 3840. 3840. 4320. 4320. 4800. 4800. 5280. 5280. 5760. 5760. 6240. 6240. 6720. 6720. 7200. 7200. 7680. 7680. 8160. 8160. 8640. 8640. 9120. 9120. 9600. 9600. 10080. 10080. 10560. 10560. 11040. 11040. 11520. 11520. 12000. 12000. 12480. 12480. 12960. 12960. 13440. 13440. 13920. 13920. 14400. 14400. 14880. 14880. 15360. 15360. 15840. 15840. 16320. 16320. 16800. 16800. 17280. 17280. 17760. 1776 [...]
+must_have_bounds: yes
+!----------------------------------
+!
+
+
+!============
 axis_entry: time
 !============
 !----------------------------------
@@ -154,7 +227,7 @@ must_have_bounds: yes
 
 
 !============
-axis_entry: time2
+axis_entry: time1
 !============
 !----------------------------------
 ! Axis attributes:
@@ -169,8 +242,7 @@ long_name:        time
 out_name:         time
 stored_direction: increasing
 type:             double
-must_have_bounds: yes
-climatology:      yes
+must_have_bounds: no
 !----------------------------------
 !
 
@@ -224,6 +296,96 @@ must_have_bounds: no
 !----------------------------------
 !
 
+
+!============
+axis_entry: scatratio
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    backscattering_ratio
+units:            1
+long_name:        lidar backscattering ratio
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         scatratio
+stored_direction: increasing
+tolerance:        0.001
+type:             double
+requested:        0.0605 2.1 4. 6. 8.5 12.5 17.5 22.5 27.5 35. 45. 55. 70. 539.5 1004.        ! space-separated list of requested coordinates 
+requested_bounds: 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. ! space-separated list of requested coordinate bounds
+must_have_bounds: yes
+!----------------------------------
+!
+
+
+!============
+axis_entry: dbze
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    equivalent_reflectivity_factor
+units:            dBZ
+long_name:        CloudSat simulator equivalent radar reflectivity factor
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         dbze
+stored_direction: increasing
+tolerance:        0.001
+type:             double
+requested:        -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        ! space-separated list of requested coordinates 
+requested_bounds: -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. ! space-separated list of requested coordinate bounds
+must_have_bounds: yes
+!----------------------------------
+!
+
+
+!============
+axis_entry: sza5
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    solar_zenith_angle
+units:            degree
+long_name:        solar zenith angle
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         sza
+stored_direction: increasing
+tolerance:        0.001
+type:             double
+requested:        0. 20. 40. 60. 80.        ! space-separated list of requested coordinates 
+must_have_bounds: no
+!----------------------------------
+!
+
+
+!============
+axis_entry: location
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+units:            1
+long_name:        location index
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         loc
+stored_direction: increasing
+type:             integer
+must_have_bounds: no
+index_only:       ok
+must_call_cmor_grid: yes
+
+!----------------------------------
+!
+
 !============
 axis_entry: smooth_level
 !============
@@ -584,59 +746,258 @@ units:           m
 !
 
 !============
-variable_entry:    tas
+variable_entry:      clcalipso 
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     air_temperature
-units:             K
-cell_methods:      time: mean
-cell_measures:     area: areacella
-long_name:         Near-Surface Air Temperature
-comment:           near-surface (usually, 2 meter) air temperature.
+standard_name:     cloud_area_fraction_in_atmosphere_layer
+units:             %
+cell_methods:      time: point
+long_name:         CALIPSO Cloud Area Fraction
+comment:           (40 height levels)
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height2m
-out_name:          tas
+dimensions:        location alt40 time1
+out_name:            clcalipso 
 type:              real
-valid_min:         180.6
-valid_max:         325.7
-ok_min_mean_abs:   273.5
-ok_max_mean_abs:   281.7
 !----------------------------------
 !
 
 !============
-variable_entry:    ts
+variable_entry:    clcalipso2  
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     surface_temperature
-units:             K
-cell_methods:      time: mean
-cell_measures:     area: areacella
-long_name:         Surface Temperature
-comment:           ""skin"" temperature (i.e., SST for open ocean)
+standard_name:     cloud_area_fraction_in_atmosphere_layer
+units:             %
+cell_methods:      time: point
+long_name:         CALIPSO Cloud Fraction Undetected by CloudSat
+comment:           (40 height levels)  Clouds detected by CALIPSO but below the detectability threshold of CloudSat
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          ts
+dimensions:        location alt40 time1
+out_name:          clcalipso2  
 type:              real
-valid_min:         176.8
-valid_max:         331.8
-ok_min_mean_abs:   274.2
-ok_max_mean_abs:   281.8
 !----------------------------------
 !
 
 !============
-variable_entry:    tasmin
+variable_entry:    cfadDbze94
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     histogram_of_equivalent_reflectivity_factor_over_height_above_reference_ellipsoid
+units:             1
+cell_methods:      time: point
+long_name:         CloudSat Radar Reflectivity CFAD
+comment:           CFADs (Cloud Frequency Altitude Diagrams) are joint height - radar reflectivity (or lidar scattering ratio) distributions  (40 levelsx15 bins) .
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        location alt40 dbze time1
+out_name:          cfadDbze94
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    cfadLidarsr532
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     histogram_of_backscattering_ratio_over_height_above_reference_ellipsoid
+units:             1
+cell_methods:      time: point
+long_name:         CALIPSO Scattering Ratio CFAD
+comment:           CFADs (Cloud Frequency Altitude Diagrams) are joint height - radar reflectivity (or lidar scattering ratio) distributions  (40 levelsx15 bins) .
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        location alt40 scatratio time1
+out_name:          cfadLidarsr532
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    parasolRefl
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     toa_bidirectional_reflectance
+units:             1
+cell_methods:      time: point
+long_name:         PARASOL Reflectance
+comment:           Simulated reflectance from PARASOL as seen at the top of the atmosphere for 5 solar zenith angles. Valid only over ocean and for one viewing direction (viewing zenith angle of 30 degrees and relative azimuth angle 320 degrees).
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        location sza5 time1
+out_name:          parasolRefl
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    cltcalipso
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     cloud_area_fraction
+units:             %
+cell_methods:      time: point
+long_name:         CALIPSO Total Cloud Fraction 
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        location time1
+out_name:          cltcalipso
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    cllcalipso
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     cloud_area_fraction_in_atmosphere_layer
+units:             %
+cell_methods:      time: point
+long_name:         CALIPSO Low Level Cloud Fraction 
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        location time1 p840
+out_name:          cllcalipso
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    clmcalipso
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     cloud_area_fraction_in_atmosphere_layer
+units:             %
+cell_methods:      time: point
+long_name:         CALIPSO Mid Level Cloud Fraction 
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        location time1 p560
+out_name:          clmcalipso
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    clhcalipso
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     cloud_area_fraction_in_atmosphere_layer
+units:             %
+cell_methods:      time: point
+long_name:         CALIPSO High Level Cloud Fraction 
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        location time1 p220
+out_name:          clhcalipso
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    longitude
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     longitude
+units:             degrees_east
+cell_methods:      time: point
+long_name:         Longitude
+comment:           is a function of time.  Note that the CF convention and CMOR2 require that this field will be included in each file that contains a variable that is a function of the ""location"" dimension, so there is no need to save this field by itself.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        location time1
+out_name:          lon
+type:              real
+valid_min:         0.0
+valid_max:         360.0
+!----------------------------------
+!
+
+!============
+variable_entry:    latitude
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     latitude
+units:             degrees_north
+cell_methods:      time: point
+long_name:         Latitude
+comment:           the above comment also applies to latitude.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        location time1
+out_name:          lat
+type:              real
+valid_min:         -90.0
+valid_max:         90.0
+!----------------------------------
+!
+
+!============
+variable_entry:    toffset
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     time
+units:             day
+long_name:         Offset Time
+comment:           "this ""offset time"" should be added to the value stored in the ""time dimension"" to get the actual time.  This actual time is the time (UTC) of the corresponding point in the satellite orbit used to extract the model data."
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        location time1
+out_name:          toffset
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    tas
 !============
 modeling_realm:    atmos
 !----------------------------------
@@ -644,46 +1005,46 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     air_temperature
 units:             K
-cell_methods:      time: minimum within days time: mean over days
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Daily Minimum Near-Surface Air Temperature
-comment:           monthly mean of the daily-minimum near-surface (usually, 2 meter) air temperature.
+long_name:         Near-Surface Air Temperature
+comment:           near-surface (usually, 2 meter) air temperature.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height2m
-out_name:          tasmin
+dimensions:        longitude latitude time1 height2m
+out_name:          tas
 type:              real
-valid_min:         183.6
-valid_max:         309.8
-ok_min_mean_abs:   271.8
-ok_max_mean_abs:   279.6
+valid_min:         180.6
+valid_max:         325.7
+ok_min_mean_abs:   273.5
+ok_max_mean_abs:   281.7
 !----------------------------------
 !
 
 !============
-variable_entry:    tasmax
+variable_entry:    ts
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     air_temperature
+standard_name:     surface_temperature
 units:             K
-cell_methods:      time: maximum within days time: mean over days
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Daily Maximum Near-Surface Air Temperature
-comment:           monthly mean of the daily-maximum near-surface (usually, 2 meter) air temperature.
+long_name:         Surface Temperature
+comment:           ""skin"" temperature (i.e., SST for open ocean)
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height2m
-out_name:          tasmax
+dimensions:        longitude latitude time1
+out_name:          ts
 type:              real
-valid_min:         181.9
-valid_max:         330.6
-ok_min_mean_abs:   277.3
-ok_max_mean_abs:   281.4
+valid_min:         176.8
+valid_max:         331.8
+ok_min_mean_abs:   274.2
+ok_max_mean_abs:   281.8
 !----------------------------------
 !
 
@@ -696,14 +1057,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     air_pressure_at_sea_level
 units:             Pa
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Sea Level Pressure
 comment:           not, in general, the same as surface pressure
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          psl
 type:              real
 valid_min:         9.477e+04
@@ -722,14 +1083,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_air_pressure
 units:             Pa
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Air Pressure
 comment:           not, in general, the same as mean sea-level pressure
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          ps
 type:              real
 valid_min:         4.792e+04
@@ -748,13 +1109,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     eastward_wind
 units:             m s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 long_name:         Eastward Near-Surface Wind
 comment:           near-surface (usually, 10 meters) eastward component of wind.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height10m
+dimensions:        longitude latitude time1 height10m
 out_name:          uas
 type:              real
 valid_min:         -19.01
@@ -773,13 +1134,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     northward_wind
 units:             m s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 long_name:         Northward Near-Surface Wind
 comment:           near-surface (usually, 10 meters) northward component of wind.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height10m
+dimensions:        longitude latitude time1 height10m
 out_name:          vas
 type:              real
 valid_min:         -18.04
@@ -798,13 +1159,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     wind_speed
 units:             m s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 long_name:         Near-Surface Wind Speed
 comment:           near-surface (usually, 10 meters) wind speed.  This is the mean of the speed, not the speed computed from the mean u and v components of wind
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height10m
+dimensions:        longitude latitude time1 height10m
 out_name:          sfcWind
 type:              real
 !----------------------------------
@@ -819,14 +1180,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     relative_humidity
 units:             %
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Near-Surface Relative Humidity
 comment:           near-surface (usually, 2meters) relative humidity expressed as a percentage.  This is the relative humidity with respect to liquid water for T> 0 C, and with respect to ice for T<0 C.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height2m
+dimensions:        longitude latitude time1 height2m
 out_name:          hurs
 type:              real
 !----------------------------------
@@ -841,14 +1202,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     specific_humidity
 units:             1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Near-Surface Specific Humidity
 comment:           near-surface (usually, 2 meters) specific humidity.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height2m
+dimensions:        longitude latitude time1 height2m
 out_name:          huss
 type:              real
 valid_min:         -7.21e-06
@@ -867,14 +1228,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     precipitation_flux
 units:             kg m-2 s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Precipitation
 comment:           at surface; includes both liquid and solid phases from all types of clouds (both large-scale and convective)
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          pr
 type:              real
 valid_min:         0
@@ -893,14 +1254,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     snowfall_flux
 units:             kg m-2 s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Snowfall Flux
 comment:           at surface; includes precipitation of all forms of water in the solid phase
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          prsn
 type:              real
 valid_min:         0
@@ -919,14 +1280,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     convective_precipitation_flux
 units:             kg m-2 s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Convective Precipitation
 comment:           at surface; includes both liquid and solid phases.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          prc
 type:              real
 valid_min:         0
@@ -945,14 +1306,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     water_evaporation_flux
 units:             kg m-2 s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Evaporation
 comment:           at surface; flux of water into the atmosphere due to conversion of both liquid and solid phases to vapor (from underlying surface and vegetation)
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          evspsbl
 type:              real
 !----------------------------------
@@ -967,14 +1328,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     water_sublimation_flux
 units:             kg m-2 s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Snow and Ice Sublimation Flux
 comment:           The snow and ice sublimation flux is the loss of snow and ice mass from the surface resulting from their conversion to water vapor that enters the atmosphere. This differs from sbl appearing in table Limon in that the flux is averaged over the entire grid cell, not just the land portion.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          sbl
 type:              real
 valid_min:         -0.004959
@@ -993,12 +1354,12 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_downward_eastward_stress
 units:             Pa
-cell_methods:      time: mean
+cell_methods:      time: point
 long_name:         Surface Downward Eastward Wind Stress
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          tauu
 type:              real
 positive:          down
@@ -1018,12 +1379,12 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_downward_northward_stress
 units:             Pa
-cell_methods:      time: mean
+cell_methods:      time: point
 long_name:         Surface Downward Northward Wind Stress
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          tauv
 type:              real
 positive:          down
@@ -1043,14 +1404,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_upward_latent_heat_flux
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Upward Latent Heat Flux
 comment:           includes both evaporation and sublimation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          hfls
 type:              real
 positive:          up
@@ -1070,13 +1431,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_upward_sensible_heat_flux
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Upward Sensible Heat Flux
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          hfss
 type:              real
 positive:          up
@@ -1096,13 +1457,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_downwelling_longwave_flux_in_air
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Downwelling Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          rlds
 type:              real
 positive:          down
@@ -1122,13 +1483,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_upwelling_longwave_flux_in_air
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Upwelling Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          rlus
 type:              real
 positive:          up
@@ -1148,13 +1509,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_downwelling_shortwave_flux_in_air
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Downwelling Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          rsds
 type:              real
 positive:          down
@@ -1174,13 +1535,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_upwelling_shortwave_flux_in_air
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Upwelling Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          rsus
 type:              real
 positive:          up
@@ -1200,13 +1561,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_downwelling_shortwave_flux_in_air_assuming_clear_sky
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Downwelling Clear-Sky Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          rsdscs
 type:              real
 positive:          down
@@ -1226,13 +1587,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_upwelling_shortwave_flux_in_air_assuming_clear_sky
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Upwelling Clear-Sky Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          rsuscs
 type:              real
 positive:          up
@@ -1252,13 +1613,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_downwelling_longwave_flux_in_air_assuming_clear_sky
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Downwelling Clear-Sky Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          rldscs
 type:              real
 positive:          down
@@ -1278,14 +1639,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     toa_incoming_shortwave_flux
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         TOA Incident Shortwave Radiation
 comment:           incident shortwave at the top of the atmosphere
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          rsdt
 type:              real
 positive:          down
@@ -1305,14 +1666,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     toa_outgoing_shortwave_flux
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         TOA Outgoing Shortwave Radiation
 comment:           at the top of the atmosphere
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          rsut
 type:              real
 positive:          up
@@ -1332,14 +1693,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     toa_outgoing_longwave_flux
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         TOA Outgoing Longwave Radiation
 comment:           at the top of the atmosphere (to be compared with satellite measurements)
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          rlut
 type:              real
 positive:          up
@@ -1359,13 +1720,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     toa_outgoing_longwave_flux_assuming_clear_sky
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         TOA Outgoing Clear-Sky Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          rlutcs
 type:              real
 positive:          up
@@ -1385,13 +1746,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     toa_outgoing_shortwave_flux_assuming_clear_sky
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         TOA Outgoing Clear-Sky Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          rsutcs
 type:              real
 positive:          up
@@ -1411,14 +1772,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     atmosphere_water_vapor_content
 units:             kg m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Water Vapor Path
 comment:           vertically integrated through the atmospheric column
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          prw
 type:              real
 valid_min:         -0.0006775
@@ -1437,14 +1798,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     cloud_area_fraction
 units:             %
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Total Cloud Fraction
 comment:           for the whole atmospheric column, as seen from the surface or the top of the atmosphere. Include both large-scale and convective cloud.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          clt
 type:              real
 valid_min:         -0.0001822
@@ -1463,14 +1824,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     atmosphere_cloud_condensed_water_content
 units:             kg m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Condensed Water Path
 comment:           calculate mass of condensed (liquid + ice) water in the column divided by the area of the column (not just the area of the cloudy portion of the column). Include precipitating hydrometeors ONLY if the precipitating hydrometeor affects the calculation of radiative transfer in model.  
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          clwvi
 type:              real
 valid_min:         -3.827e-06
@@ -1489,14 +1850,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     atmosphere_cloud_ice_content
 units:             kg m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Ice Water Path
 comment:           calculate mass of ice water in the column divided by the area of the column (not just the area of the cloudy portion of the column). Include precipitating frozen hydrometeors ONLY if the precipitating hydrometeor affects the calculation of radiative transfer in model.  
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          clivi
 type:              real
 valid_min:         -1.872e-06
@@ -1515,14 +1876,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     net_downward_radiative_flux_at_top_of_atmosphere_model
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Net Downward Flux at Top of Model
 comment:           i.e., at the top of that portion of the atmosphere where dynamics are explicitly treated by the model. Report only if this differs from the net downward radiative flux at the top of the atmosphere.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          rtmt
 type:              real
 positive:          down
@@ -1542,13 +1903,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     air_pressure_at_convective_cloud_base
 units:             Pa
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Air Pressure at Convective Cloud Base
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          ccb
 type:              real
 !----------------------------------
@@ -1563,13 +1924,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     air_pressure_at_convective_cloud_top
 units:             Pa
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Air Pressure at Convective Cloud Top
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          cct
 type:              real
 !----------------------------------
@@ -1584,14 +1945,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     convection_time_fraction
 units:             1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Fraction of Time Convection Occurs
 comment:           Fraction of time that convection occurs in the grid cell .
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          ci 
 type:              real
 !----------------------------------
@@ -1606,14 +1967,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     shallow_convection_time_fraction
 units:             1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Fraction of Time Shallow Convection Occurs
 comment:           Fraction of time that shallow convection occurs in the grid cell. ( For models with a distinct shallow convection scheme only)
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          sci
 type:              real
 !----------------------------------
@@ -1628,14 +1989,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     tendency_of_atmosphere_mass_content_of_carbon_dioxide_expressed_as_carbon_due_to_anthropogenic_emission
 units:             kg  m-2 s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Carbon Mass Flux into Atmosphere Due to All Anthropogenic Emissions of CO2
 comment:           This is requested only for the emission-driven coupled carbon climate model runs.  Do not include natural fire sources, but include all anthropogenic sources, including fossil fuel use, cement production, agricultural burning, and sources associated with anthropogenic land use change excluding forest regrowth.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          fco2antt
 type:              real
 positive:          up
@@ -1651,14 +2012,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     tendency_of_atmosphere_mass_content_of_carbon_dioxide_expressed_as_carbon_due_to_emission_from_fossil_fuel_combustion
 units:             kg m-2 s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Carbon Mass Flux into Atmosphere Due to Fossil Fuel Emissions of CO2
 comment:           This is requested only for the emission-driven coupled carbon climate model runs.  Report the prescribed anthropogenic CO2 flux from fossil fuel use, including cement production, and flaring (but not from land-use changes, agricultural burning, forest regrowth, etc.)
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          fco2fos
 type:              real
 positive:          up
@@ -1674,14 +2035,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_upward_mass_flux_of_carbon_dioxide_expressed_as_carbon_due_to_emission_from_natural_sources
 units:             kg m-2 s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Carbon Mass Flux into the Atmosphere Due to Natural Sources
 comment:           Report from all simulations (both emission-driven and concentration-driven) performed by models with fully interactive and responsive carbon cycles.  This is what the atmosphere sees (on its own grid).  This field should be equivalent to the combined natural fluxes of carbon (requested in the L_mon and O_mon tables) that account for natural exchanges between the atmosphere and land or ocean reservoirs (i.e., ""net ecosystem biospheric productivity"", for land, and ""ai [...]
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time1
 out_name:          fco2nat
 type:              real
 positive:          up
@@ -1689,698 +2050,686 @@ positive:          up
 !
 
 !============
-variable_entry:    cl
+variable_entry:    cltc
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     cloud_area_fraction_in_atmosphere_layer
+standard_name:     convective_cloud_area_fraction
 units:             %
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Cloud Area Fraction
-comment:           Report on model layers (not standard pressures).  Include both large-scale and convective cloud.
+long_name:         Convective Cloud Fraction
+comment:           for the whole atmospheric column, as seen from the surface or the top of the atmosphere. Include only convective cloud.  Besides the quantities from the Amon table, this is the only other 2-D field in this table.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude alevel time
-out_name:          cl
+dimensions:        longitude latitude time1
+out_name:          cltc
 type:              real
-valid_min:         0
-valid_max:         100.2
-ok_min_mean_abs:   -0.04479
-ok_max_mean_abs:   24.87
+valid_min:         0.0
+valid_max:         100.0
 !----------------------------------
 !
 
 !============
-variable_entry:    clw
+variable_entry:    zfull
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mass_fraction_of_cloud_liquid_water_in_air
-units:             1
-cell_methods:      time: mean
+standard_name:     height_above_reference_ellipsoid
+units:             m
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Mass Fraction of Cloud Liquid Water
-comment:           Report on model layers (not standard pressures).  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 cells. Include precipitating hydrometeors ONLY if the precipitating hydrometeor affects the calculation of radiative transfer in model.  
+long_name:         Altitude of Model Full-Levels
+comment:           This is actual height above mean sea level, not geopotential height
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude alevel time
-out_name:          clw
+dimensions:        longitude latitude alevel time1
+out_name:          zfull
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    cli
+variable_entry:    zhalf
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mass_fraction_of_cloud_ice_in_air
-units:             1
-cell_methods:      time: mean
+standard_name:     height_above_reference_ellipsoid
+units:             m
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Mass Fraction of Cloud Ice
-comment:           Report on model layers (not standard pressures).  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.  
+long_name:         Altitude of Model Half-Levels
+comment:           This is actual height above mean sea level, not geopotential height.  This is actual height above mean sea level, not geopotential height.  Include both the top of the model atmosphere and surface levels.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude alevel time
-out_name:          cli
+dimensions:        longitude latitude alevhalf time1
+out_name:          zhalf
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    mc
+variable_entry:    pfull
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     atmosphere_net_upward_convective_mass_flux
-units:             kg m-2 s-1
-cell_methods:      time: mean
+standard_name:     air_pressure
+units:             Pa
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Convective Mass Flux
-comment:           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.  The flux is computed as the mass divided by the area of the grid cell.  
+long_name:         Pressure at Model Full-Levels
+comment:           provide this field 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.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude alevhalf time
-out_name:          mc
+dimensions:        longitude latitude alevel time1
+out_name:          pfull
 type:              real
-positive:          up
 !----------------------------------
 !
 
 !============
-variable_entry:    ta
+variable_entry:    phalf
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     air_temperature
-units:             K
-cell_methods:      time: mean
+standard_name:     air_pressure
+units:             Pa
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Air Temperature
+long_name:         Pressure at Model Half-Levels
+comment:           provide this field 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.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          ta
+dimensions:        longitude latitude alevhalf time1
+out_name:          phalf
 type:              real
-valid_min:         157.1
-valid_max:         326.4
-ok_min_mean_abs:   200.2
-ok_max_mean_abs:   289.9
 !----------------------------------
 !
 
 !============
-variable_entry:    ua
+variable_entry:    ta
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     eastward_wind
-units:             m s-1
-cell_methods:      time: mean
-long_name:         Eastward Wind
+standard_name:     air_temperature
+units:             K
+cell_methods:      time: point
+cell_measures:     area: areacella
+long_name:         Air Temperature
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          ua
+dimensions:        longitude latitude alevel time1
+out_name:          ta
 type:              real
-valid_min:         -68.65
-valid_max:         136.6
-ok_min_mean_abs:   1.101
-ok_max_mean_abs:   22.42
+valid_min:         157.1
+valid_max:         326.4
+ok_min_mean_abs:   200.2
+ok_max_mean_abs:   289.9
 !----------------------------------
 !
 
 !============
-variable_entry:    va
+variable_entry:    h2o
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     northward_wind
-units:             m s-1
-cell_methods:      time: mean
-long_name:         Northward Wind
+standard_name:     mass_fraction_of_water_in_air
+units:             1
+cell_methods:      time: point
+cell_measures:     area: areacella
+long_name:         Mass Fraction of Water
+comment:           include all phases of water
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          va
+dimensions:        longitude latitude alevel time1
+out_name:          h2o
 type:              real
-valid_min:         -71.1
-valid_max:         69.93
-ok_min_mean_abs:   0.9886
-ok_max_mean_abs:   4.679
 !----------------------------------
 !
 
 !============
-variable_entry:    hus
+variable_entry:    clws
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     specific_humidity
+standard_name:     mass_fraction_of_stratiform_cloud_liquid_water_in_air
 units:             1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Specific Humidity
+long_name:         Mass Fraction of Stratiform Cloud Liquid Water
+comment:           Calculate as the mass of stratiform 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.  
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          hus
+dimensions:        longitude latitude alevel time1
+out_name:          clws
 type:              real
-valid_min:         -0.000299
-valid_max:         0.02812
-ok_min_mean_abs:   -0.0003539
-ok_max_mean_abs:   0.01027
 !----------------------------------
 !
 
 !============
-variable_entry:    hur
+variable_entry:    clis
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     relative_humidity
-units:             %
-cell_methods:      time: mean
+standard_name:     mass_fraction_of_stratiform_cloud_ice_in_air
+units:             1
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Relative Humidity
-comment:           This is the relative humidity with respect to liquid water for T> 0 C, and with respect to ice for T<0 C.
+long_name:         Mass Fraction of Stratiform Cloud Ice
+comment:           Calculate as the mass of stratiform 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.  
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          hur
+dimensions:        longitude latitude alevel time1
+out_name:          clis
 type:              real
-valid_min:         -2.642
-valid_max:         135.7
-ok_min_mean_abs:   -10.31
-ok_max_mean_abs:   97
 !----------------------------------
 !
 
 !============
-variable_entry:    wap
+variable_entry:    clwc
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     lagrangian_tendency_of_air_pressure
-units:             Pa s-1
-cell_methods:      time: mean
+standard_name:     mass_fraction_of_convective_cloud_liquid_water_in_air
+units:             1
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         omega (=dp/dt)
-comment:           commonly referred to as ""omega"", this represents the vertical component of velocity in pressure coordinates (positive down)
+long_name:         Mass Fraction of Convective Cloud Liquid Water
+comment:           Calculate as the mass of convective 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.  
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          wap
+dimensions:        longitude latitude alevel time1
+out_name:          clwc
 type:              real
-valid_min:         -1.126
-valid_max:         2.319
-ok_min_mean_abs:   -0.005083
-ok_max_mean_abs:   0.04256
 !----------------------------------
 !
 
 !============
-variable_entry:    zg
+variable_entry:    clic
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     geopotential_height
-units:             m
-cell_methods:      time: mean
+standard_name:     mass_fraction_of_convective_cloud_ice_in_air
+units:             1
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Geopotential Height
+long_name:         Mass Fraction of Convective Cloud Ice
+comment:           Calculate as the mass of convective 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.  
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          zg
+dimensions:        longitude latitude alevel time1
+out_name:          clic
 type:              real
-valid_min:         -719.7
-valid_max:         3.306e+04
-ok_min_mean_abs:   -113.4
-ok_max_mean_abs:   3.164e+04
 !----------------------------------
 !
 
 !============
-variable_entry:    tro3
+variable_entry:    reffclws
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_ozone_in_air
-units:             1e-9
-cell_methods:      time: mean
+standard_name:     effective_radius_of_stratiform_cloud_liquid_water_particle
+units:             m
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Mole Fraction of O3
-comment:           If this does not change over time (except possibly to vary identically over each annual cycle), report instead the variable described in the next table entry. 
+long_name:         Hydrometeor Effective Radius of Stratiform Cloud Liquid Water 
+comment:           This is defined as the in-cloud ratio of the third moment over the second moment of the particle size distribution (obtained by considering only the cloudy portion of the grid cell). 
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          tro3
+dimensions:        longitude latitude alevel time1
+out_name:          reffclws
 type:              real
-valid_min:         -419.2
-valid_max:         1.162e+04
-ok_min_mean_abs:   -149.1
-ok_max_mean_abs:   7363
 !----------------------------------
 !
 
 !============
-variable_entry:    tro3Clim
+variable_entry:    reffclis
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_ozone_in_air
-units:             1e-9
-cell_methods:      time: mean within years time: mean over years
+standard_name:     effective_radius_of_stratiform_cloud_ice_particle
+units:             m
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Mole Fraction of O3
-comment:           If O3 does not vary from one year to the next, report 12 months, starting with January.   (Note: include all 12 months even if the values don't vary seasonally.)  When calling CMOR, identify this variable as tro3Clim, not tro3. If the O3 varies from one year to the next,  then report instead the field described in the previous table entry.  
+long_name:         Hydrometeor Effective Radius of Stratiform Cloud Ice
+comment:           This is defined as the in-cloud ratio of the third moment over the second moment of the particle size distribution (obtained by considering only the cloudy portion of the grid cell). 
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time2
-out_name:          tro3
+dimensions:        longitude latitude alevel time1
+out_name:          reffclis
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    co2
+variable_entry:    reffclwc
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_carbon_dioxide_in_air
-units:             1e-6
-cell_methods:      time: mean
+standard_name:     effective_radius_of_convective_cloud_liquid_water_particle
+units:             m
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Mole Fraction of CO2
-comment:           For some simulations (e.g., prescribed concentration pi-control run), this will not vary from one year to the next, and so report instead the variable described in the next table entry.  If spatially uniform, omit this field, but report Total Atmospheric Mass of CO2 (see the table entry after the next one). 
+long_name:         Hydrometeor Effective Radius of Convective Cloud Liquid Water
+comment:           This is defined as the in-cloud ratio of the third moment over the second moment of the particle size distribution (obtained by considering only the cloudy portion of the grid cell). 
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          co2
+dimensions:        longitude latitude alevel time1
+out_name:          reffclwc
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    co2Clim
+variable_entry:    reffclic
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_carbon_dioxide_in_air
-units:             1e-6
-cell_methods:      time: mean within years time: mean over years
+standard_name:     effective_radius_of_convective_cloud_ice_particle
+units:             m
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Mole Fraction of CO2
-comment:           Report only for simulations (e.g., prescribed concentration pi-control run), in which the CO2 does not vary from one year to the next. Report 12 monthly values, starting with January, even if the values don't vary seasonally.  When calling CMOR, identify this variable as co2Clim, not co2.   If  CO2 is spatially uniform, omit this field, but report Total Atmospheric Mass of CO2 (see the table entry after the next).
+long_name:         Hydrometeor Effective Radius of Convective Cloud Ice
+comment:           This is defined as the in-cloud ratio of the third moment over the second moment of the particle size distribution (obtained by considering only the cloudy portion of the grid cell). 
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time2
-out_name:          co2
+dimensions:        longitude latitude alevel time1
+out_name:          reffclic
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    co2mass
+variable_entry:    grpllsprof
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     atmosphere_mass_of_carbon_dioxide
-units:             kg
-cell_methods:      time: mean
-long_name:         Total Atmospheric Mass of CO2
-comment:           For some simulations (e.g., prescribed concentration pi-control run), this will not vary from one year to the next, and so report instead the variable described in the next table entry.  If CO2 is spatially nonuniform, omit this field, but report Mole Fraction of CO2 (see the table entry before the previous one). 
+standard_name:     large_scale_graupel_flux
+units:             kg m-2 s-1 
+cell_methods:      time: point
+cell_measures:     area: areacella
+long_name:         Stratiform Graupel Flux
+comment:           report on model half-levels
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          co2mass
+dimensions:        longitude latitude alevel time1
+out_name:          grpllsprof
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    co2massClim
+variable_entry:    prcprof
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     atmosphere_mass_of_carbon_dioxide
-units:             kg
-cell_methods:      time: mean within years time: mean over years
-long_name:         Total Atmospheric Mass of CO2
-comment:           Report only for simulations (e.g., prescribed concentration pi-control run), in which the CO2 does not vary from one year to the next. Report 12 monthly values, starting with January, even if the values don't vary seasonally.  When calling CMOR, identify this variable as co2massClim, not co2mass.  If CO2 is spatially nonuniform, omit this field, but report Mole Fraction of CO2 (see the table entry before the previous one). 
+standard_name:     convective_rainfall_flux
+units:             kg m-2 s-1 
+cell_methods:      time: point
+cell_measures:     area: areacella
+long_name:         Convective Rainfall Flux
+comment:           report on model half-levels
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time2
-out_name:          co2mass
+dimensions:        longitude latitude alevel time1
+out_name:          prcprof
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    ch4
+variable_entry:    prlsprof
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_methane_in_air
-units:             1e-9
-cell_methods:      time: mean
+standard_name:     large_scale_rainfall_flux
+units:             kg m-2 s-1 
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Mole Fraction of CH4
-comment:           For some simulations (e.g., prescribed concentration pi-control run), this will not vary from one year to the next, and so report instead the variable described in the next table entry.  If CH4 is spatially uniform, omit this field, but report Global Mean Mole Fraction of CH4 (see the table entry after the next one). 
+long_name:         Stratiform Rainfall Flux
+comment:           report on model half-levels
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          ch4
+dimensions:        longitude latitude alevel time1
+out_name:          prlsprof
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    ch4Clim
+variable_entry:    prsnc
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_methane_in_air
-units:             1e-9
-cell_methods:      time: mean within years time: mean over years
+standard_name:     convective_snowfall_flux
+units:             kg m-2 s-1 
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Mole Fraction of CH4
-comment:           Report only for simulations (e.g., prescribed concentration pi-control run), in which the CH4 does not vary from one year to the next. Report 12 monthly values, starting with January, even if the values don't vary seasonally.  When calling CMOR, identify this variable as ch4global, not ch4.   If  CH4 is spatially uniform, omit this field, but report Global Mean Mole Fraction of CH4 (see the table entry after the next).
+long_name:         Convective Snowfall Flux
+comment:           report on model half-levels
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time2
-out_name:          ch4
+dimensions:        longitude latitude alevel time1
+out_name:          prsnc
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    ch4global
+variable_entry:    prlsns
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_methane_in_air
-units:             1e-9
-cell_methods:      time: mean
-long_name:         Global Mean Mole Fraction of CH4
-comment:           For some simulations (e.g., prescribed concentration pi-control run), this will not vary from one year to the next, and so report instead the variable described in the next table entry.  If CH4 is spatially nonuniform, omit this field, but report Mole Fraction of CH4 (see the table entry before the previous one). 
+standard_name:     large_scale_snowfall_flux
+units:             kg m-2 s-1 
+cell_methods:      time: point
+cell_measures:     area: areacella
+long_name:         Stratiform Snowfall Flux
+comment:           report on model half-levels
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          ch4global
+dimensions:        longitude latitude alevel time1
+out_name:          prlsns
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    ch4globalClim
+variable_entry:    reffgrpls
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_methane_in_air
-units:             1e-9
-cell_methods:      time: mean within years time: mean over years
-long_name:         Global Mean Mole Fraction of CH4
-comment:           Report only for simulations (e.g., prescribed concentration pi-control run), in which the CH4 does not vary from one year to the next. Report 12 monthly values, starting with January, even if the values don't vary seasonally.  When calling CMOR, identify this variable as ch4globalClim, not ch4global.  If CH4 is spatially nonuniform, omit this field, but report Global Mean Mole Fraction of CH4 (see the table entry before the previous one). 
+standard_name:     effective_radius_of_stratiform_cloud_graupel_particle
+units:             m
+cell_methods:      time: point
+cell_measures:     area: areacella
+long_name:         Hydrometeor Effective Radius of Stratiform Graupel
+comment:           This is defined as the in-cloud ratio of the third moment over the second moment of the particle size distribution (obtained by considering only the cloudy portion of the grid cell). 
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time2
-out_name:          ch4global
+dimensions:        longitude latitude alevel time1
+out_name:          reffgrpls
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    n2o
+variable_entry:    reffrainc
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_nitrous_oxide_in_air
-units:             1e-9
-cell_methods:      time: mean
+standard_name:     effective_radius_of_convective_cloud_rain_particle
+units:             m
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Mole Fraction of N2O
-comment:           For some simulations (e.g., prescribed concentration pi-control run), this will not vary from one year to the next, and so report instead the variable described in the next table entry.  If N2O is spatially uniform, omit this field, but report Global Mean Mole Fraction of N2O (see the table entry after the next one). 
+long_name:         Hydrometeor Effective Radius of Convective Rainfall
+comment:           This is defined as the in-cloud ratio of the third moment over the second moment of the particle size distribution (obtained by considering only the cloudy portion of the grid cell). 
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          n2o
+dimensions:        longitude latitude alevel time1
+out_name:          reffrainc
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    n2oClim
+variable_entry:    reffrains
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_nitrous_oxide_in_air
-units:             1e-9
-cell_methods:      time: mean within years time: mean over years
+standard_name:     effective_radius_of_stratiform_cloud_rain_particle
+units:             m
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Mole Fraction of N2O
-comment:           Report only for simulations (e.g., prescribed concentration pi-control run), in which the N2O does not vary from one year to the next. Report 12 monthly values, starting with January, even if the values don't vary seasonally.  When calling CMOR, identify this variable as n2oglobal, not n2o.   If  N2O is spatially uniform, omit this field, but report Global Mean Mole Fraction of N2O (see the table entry after the next).
+long_name:         Hydrometeor Effective Radius of Stratiform Rainfall
+comment:           This is defined as the in-cloud ratio of the third moment over the second moment of the particle size distribution (obtained by considering only the cloudy portion of the grid cell). 
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time2
-out_name:          n2o
+dimensions:        longitude latitude alevel time1
+out_name:          reffrains
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    n2oglobal
+variable_entry:    reffsnowc
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_nitrous_oxide_in_air
-units:             1e-9
-cell_methods:      time: mean
-long_name:         Global Mean Mole Fraction of N2O
-comment:           For some simulations (e.g., prescribed concentration pi-control run), this will not vary from one year to the next, and so report instead the variable described in the next table entry.  If N2O is spatially nonuniform, omit this field, but report Mole Fraction of N2O (see the table entry before the previous one). 
+standard_name:     effective_radius_of_convective_cloud_snow_particle
+units:             m
+cell_methods:      time: point
+cell_measures:     area: areacella
+long_name:         Hydrometeor Effective Radius of Convective Snowfall
+comment:           This is defined as the in-cloud ratio of the third moment over the second moment of the particle size distribution (obtained by considering only the cloudy portion of the grid cell). 
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          n2oglobal
+dimensions:        longitude latitude alevel time1
+out_name:          reffsnowc
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    n2oglobalClim
+variable_entry:    reffsnows
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_nitrous_oxide_in_air
-units:             1e-9
-cell_methods:      time: mean within years time: mean over years
-long_name:         Global Mean Mole Fraction of N2O
-comment:           Report only for simulations (e.g., prescribed concentration pi-control run), in which the N2O does not vary from one year to the next. Report 12 monthly values, starting with January, even if the values don't vary seasonally.  When calling CMOR, identify this variable as ch4globalClim, not ch4global.  If N2O is spatially nonuniform, omit this field, but report Global Mean Mole Fraction of N2O (see the table entry before the previous one). 
+standard_name:     effective_radius_of_stratiform_cloud_snow_particle
+units:             m
+cell_methods:      time: point
+cell_measures:     area: areacella
+long_name:         Hydrometeor Effective Radius of Stratiform Snowfall
+comment:           This is defined as the in-cloud ratio of the third moment over the second moment of the particle size distribution (obtained by considering only the cloudy portion of the grid cell). 
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time2
-out_name:          n2oglobal
+dimensions:        longitude latitude alevel time1
+out_name:          reffsnows
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    cfc11global
+variable_entry:    dtaus
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_cfc11_in_air
-units:             1e-12
-cell_methods:      time: mean
-long_name:         Global Mean Mole Fraction of CFC11
+standard_name:     atmosphere_optical_thickness_due_to_stratiform_cloud
+units:             1
+cell_methods:      time: point
+cell_measures:     area: areacella
+long_name:         Stratiform Cloud Optical Depth
+comment:           This is the in-cloud optical depth obtained by considering only the cloudy portion of the grid cell.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          cfc11global
+dimensions:        longitude latitude alevel time1
+out_name:          dtaus
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    cfc12global
+variable_entry:    dtauc
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_cfc12_in_air
-units:             1e-12
-cell_methods:      time: mean
-long_name:         Global Mean Mole Fraction of CFC12
+standard_name:     atmosphere_optical_thickness_due_to_convective_cloud
+units:             1
+cell_methods:      time: point
+cell_measures:     area: areacella
+long_name:         Convective Cloud Optical Depth
+comment:           This is the in-cloud optical depth obtained by considering only the cloudy portion of the grid cell
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          cfc12global
+dimensions:        longitude latitude alevel time1
+out_name:          dtauc
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    hcfc22global
+variable_entry:    dems
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_hcfc22_in_air
-units:             1e-12
-cell_methods:      time: mean
-long_name:         Global Mean Mole Fraction of HCFC22
+standard_name:     stratiform_cloud_longwave_emissivity
+units:             1
+cell_methods:      time: point
+cell_measures:     area: areacella
+long_name:         Stratiform Cloud Emissivity
+comment:           This is the in-cloud emissivity obtained by considering only the cloudy portion of the grid cell.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          hcfc22global
+dimensions:        longitude latitude alevel time1
+out_name:          dems
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    cfc113global
+variable_entry:    demc
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_cfc113_in_air
-units:             1e-12
-cell_methods:      time: mean
-long_name:         Global Mean Mole Fraction of CFC113
+standard_name:     convective_cloud_longwave_emissivity
+units:             1
+cell_methods:      time: point
+cell_measures:     area: areacella
+long_name:         Convective Cloud Emissivity
+comment:           This is the in-cloud emissivity obtained by considering only the cloudy portion of the grid cell.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          cfc113global
+dimensions:        longitude latitude alevel time1
+out_name:          demc
 type:              real
 !----------------------------------
 !
 
-
 !============
-variable_entry:    pfull
+variable_entry:    clc
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     air_pressure
-units:             Pa
-cell_methods:      time: mean within years time: mean over years
+standard_name:     convective_cloud_area_fraction_in_atmosphere_layer
+units:             %
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Pressure on Model Levels
+long_name:         Convective Cloud Area Fraction
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude alevel time2
-out_name:          pfull
+dimensions:        longitude latitude alevel time1
+out_name:          clc
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    phalf
+variable_entry:    cls
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     air_pressure
-units:             Pa
-cell_methods:      time: mean within years time: mean over years
+standard_name:     stratiform_cloud_area_fraction_in_atmosphere_layer
+units:             %
+cell_methods:      time: point
 cell_measures:     area: areacella
-long_name:         Pressure on Model Half-Levels
+long_name:         Stratiform Cloud Area Fraction
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude alevhalf time2
-out_name:          phalf
+dimensions:        longitude latitude alevel time1
+out_name:          cls
 type:              real
 !----------------------------------
 !
diff --git a/TestTables/CMIP5_Amon b/TestTables/CMIP5_cfMon
similarity index 51%
copy from TestTables/CMIP5_Amon
copy to TestTables/CMIP5_cfMon
index 2071412..83d2186 100644
--- a/TestTables/CMIP5_Amon
+++ b/TestTables/CMIP5_cfMon
@@ -1,12 +1,12 @@
-table_id: Table Amon
+table_id: Table cfMon
 modeling_realm: atmos
 
 frequency: mon
 
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
 cf_version:   1.4         ! version of CF that output conforms to
 project_id:   CMIP5  ! project id
-table_date:   09 November 2010 ! date this table was constructed
+table_date:   12 November 2010 ! date this table was constructed
 
 missing_value: 1.e20      ! value used to indicate a missing value
                           !   in arrays output by netCDF as 32-bit IEEE 
@@ -109,7 +109,7 @@ must_have_bounds: yes
 
 
 !============
-axis_entry: plevs
+axis_entry: plev7
 !============
 !----------------------------------
 ! Axis attributes:
@@ -126,35 +126,112 @@ out_name:         plev
 stored_direction: decreasing
 tolerance:        0.001
 type:             double
-requested:        100000. 92500. 85000. 70000. 60000. 50000. 40000. 30000. 25000. 20000. 15000. 10000. 7000. 5000. 3000. 2000. 1000.        ! space-separated list of requested coordinates 
+requested:        90000. 74000. 62000. 50000. 37500. 24500. 9000.        ! space-separated list of requested coordinates 
+requested_bounds: 100000. 80000. 80000. 68000. 68000. 56000. 56000. 44000. 44000. 31000. 31000. 18000. 18000.  0. ! space-separated list of requested coordinate bounds
+must_have_bounds: yes
+!----------------------------------
+!
+
+
+!============
+axis_entry: p220
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    air_pressure
+units:            Pa
+axis:             Z             ! X, Y, Z, T (default: undeclared)
+positive:         down         ! up or down (default: undeclared)
+long_name:        pressure
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         plev
+stored_direction: decreasing
+type:             double
+value:            22000.            ! of scalar (singleton) dimension 
+bounds_values:    44000. 0.0    ! of scalar (singleton) dimension bounds
 must_have_bounds: no
 !----------------------------------
 !
 
 
 !============
-axis_entry: time
+axis_entry: p560
 !============
 !----------------------------------
 ! Axis attributes:
 !----------------------------------
-standard_name:    time
-units:            days since ?
-axis:             T             ! X, Y, Z, T (default: undeclared)
-long_name:        time
+standard_name:    air_pressure
+units:            Pa
+axis:             Z             ! X, Y, Z, T (default: undeclared)
+positive:         down         ! up or down (default: undeclared)
+long_name:        pressure
 !----------------------------------
 ! Additional axis information:
 !----------------------------------
-out_name:         time
+out_name:         plev
+stored_direction: decreasing
+type:             double
+value:            56000.            ! of scalar (singleton) dimension 
+bounds_values:    68000. 44000.    ! of scalar (singleton) dimension bounds
+must_have_bounds: no
+!----------------------------------
+!
+
+
+!============
+axis_entry: p840
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    air_pressure
+units:            Pa
+axis:             Z             ! X, Y, Z, T (default: undeclared)
+positive:         down         ! up or down (default: undeclared)
+long_name:        pressure
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         plev
+stored_direction: decreasing
+type:             double
+value:            84000.            ! of scalar (singleton) dimension 
+bounds_values:    100000. 68000.    ! of scalar (singleton) dimension bounds
+must_have_bounds: no
+!----------------------------------
+!
+
+
+!============
+axis_entry: alt40
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    altitude
+units:            m
+axis:             Z             ! X, Y, Z, T (default: undeclared)
+positive:         up         ! up or down (default: undeclared)
+long_name:        altitude
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         alt40
 stored_direction: increasing
+tolerance:        0.001
 type:             double
+requested:        240. 720. 1200. 1680. 2160. 2640. 3120. 3600. 4080. 4560. 5040. 5520. 6000. 6480. 6960. 7440. 7920. 8400. 8880. 9360. 9840. 10320. 10800. 11280. 11760. 12240. 12720. 13200. 13680. 14160. 14640. 15120. 15600. 16080. 16560. 17040. 17520. 18000. 18480. 18960.        ! space-separated list of requested coordinates 
+requested_bounds: 0. 480. 480. 960. 960. 1440. 1440. 1920. 1920. 2400. 2400. 2880. 2880. 3360. 3360. 3840. 3840. 4320. 4320. 4800. 4800. 5280. 5280. 5760. 5760. 6240. 6240. 6720. 6720. 7200. 7200. 7680. 7680. 8160. 8160. 8640. 8640. 9120. 9120. 9600. 9600. 10080. 10080. 10560. 10560. 11040. 11040. 11520. 11520. 12000. 12000. 12480. 12480. 12960. 12960. 13440. 13440. 13920. 13920. 14400. 14400. 14880. 14880. 15360. 15360. 15840. 15840. 16320. 16320. 16800. 16800. 17280. 17280. 17760. 1776 [...]
 must_have_bounds: yes
 !----------------------------------
 !
 
 
 !============
-axis_entry: time2
+axis_entry: time
 !============
 !----------------------------------
 ! Axis attributes:
@@ -170,56 +247,50 @@ out_name:         time
 stored_direction: increasing
 type:             double
 must_have_bounds: yes
-climatology:      yes
 !----------------------------------
 !
 
 
 !============
-axis_entry: height2m
+axis_entry: tau
 !============
 !----------------------------------
 ! Axis attributes:
 !----------------------------------
-standard_name:    height
-units:            m
-axis:             Z             ! X, Y, Z, T (default: undeclared)
-positive:         up         ! up or down (default: undeclared)
-long_name:        height
+standard_name:    atmosphere_optical_thickness_due_to_cloud
+units:            1
+long_name:        cloud optical thickness
 !----------------------------------
 ! Additional axis information:
 !----------------------------------
-out_name:         height
-valid_min:        1.0         
-valid_max:        10.0 
+out_name:         tau
 stored_direction: increasing
+tolerance:        0.001
 type:             double
-value:            2.            ! of scalar (singleton) dimension 
-must_have_bounds: no
+requested:        0.15 0.8 2.45 6.5 16.2 41.5 100.        ! space-separated list of requested coordinates 
+requested_bounds: 0.0  0.3  0.3  1.3  1.3  3.6  3.6  9.4 9.4 23.0 23.0 60.0 60.0 100000. ! space-separated list of requested coordinate bounds
+must_have_bounds: yes
 !----------------------------------
 !
 
 
 !============
-axis_entry: height10m
+axis_entry: sza5
 !============
 !----------------------------------
 ! Axis attributes:
 !----------------------------------
-standard_name:    height
-units:            m
-axis:             Z             ! X, Y, Z, T (default: undeclared)
-positive:         up         ! up or down (default: undeclared)
-long_name:        height
+standard_name:    solar_zenith_angle
+units:            degree
+long_name:        solar zenith angle
 !----------------------------------
 ! Additional axis information:
 !----------------------------------
-out_name:         height
-valid_min:        1.0         
-valid_max:        30.0 
+out_name:         sza
 stored_direction: increasing
+tolerance:        0.001
 type:             double
-value:            10.            ! of scalar (singleton) dimension 
+requested:        0. 20. 40. 60. 80.        ! space-separated list of requested coordinates 
 must_have_bounds: no
 !----------------------------------
 !
@@ -582,1805 +653,2103 @@ units:           m
 !
 !
 !
-
+!
 !============
-variable_entry:    tas
+variable_entry: ps
 !============
-modeling_realm:    atmos
+modeling_realm:  atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     air_temperature
-units:             K
-cell_methods:      time: mean
-cell_measures:     area: areacella
-long_name:         Near-Surface Air Temperature
-comment:           near-surface (usually, 2 meter) air temperature.
+standard_name:  surface_air_pressure
+units:         Pa
+cell_methods:     time: mean
+long_name:          Surface Air Pressure
+comment:      not, in general, the same as mean sea-level pressure
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height2m
-out_name:          tas
-type:              real
-valid_min:         180.6
-valid_max:         325.7
-ok_min_mean_abs:   273.5
-ok_max_mean_abs:   281.7
-!----------------------------------
+dimensions:      longitude latitude time
+out_name:  ps
+type:      real
 !
 
 !============
-variable_entry:    ts
+variable_entry:    rlu
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     surface_temperature
-units:             K
+standard_name:     upwelling_longwave_flux_in_air
+units:             W m-2
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Surface Temperature
-comment:           ""skin"" temperature (i.e., SST for open ocean)
+long_name:         Upwelling Longwave Radiation
+comment:           Include also the fluxes at the surface and TOA.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          ts
+dimensions:        longitude latitude alevhalf time
+out_name:          rlu
 type:              real
-valid_min:         176.8
-valid_max:         331.8
-ok_min_mean_abs:   274.2
-ok_max_mean_abs:   281.8
+positive:          up
 !----------------------------------
 !
 
 !============
-variable_entry:    tasmin
+variable_entry:    rsu
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     air_temperature
-units:             K
-cell_methods:      time: minimum within days time: mean over days
+standard_name:     upwelling_shortwave_flux_in_air
+units:             W m-2
+cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Daily Minimum Near-Surface Air Temperature
-comment:           monthly mean of the daily-minimum near-surface (usually, 2 meter) air temperature.
+long_name:         Upwelling Shortwave Radiation
+comment:           Include also the fluxes at the surface and TOA.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height2m
-out_name:          tasmin
+dimensions:        longitude latitude alevhalf time
+out_name:          rsu
 type:              real
-valid_min:         183.6
-valid_max:         309.8
-ok_min_mean_abs:   271.8
-ok_max_mean_abs:   279.6
+positive:          up
 !----------------------------------
 !
 
 !============
-variable_entry:    tasmax
+variable_entry:    rld
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     air_temperature
-units:             K
-cell_methods:      time: maximum within days time: mean over days
+standard_name:     downwelling_longwave_flux_in_air
+units:             W m-2
+cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Daily Maximum Near-Surface Air Temperature
-comment:           monthly mean of the daily-maximum near-surface (usually, 2 meter) air temperature.
+long_name:         Downwelling Longwave Radiation
+comment:           Include also the fluxes at the surface and TOA.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height2m
-out_name:          tasmax
+dimensions:        longitude latitude alevhalf time
+out_name:          rld
 type:              real
-valid_min:         181.9
-valid_max:         330.6
-ok_min_mean_abs:   277.3
-ok_max_mean_abs:   281.4
+positive:          down
 !----------------------------------
 !
 
 !============
-variable_entry:    psl
+variable_entry:    rsd
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     air_pressure_at_sea_level
-units:             Pa
+standard_name:     downwelling_shortwave_flux_in_air
+units:             W m-2
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Sea Level Pressure
-comment:           not, in general, the same as surface pressure
+long_name:         Downwelling Shortwave Radiation
+comment:           Include also the fluxes at the surface and TOA.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          psl
+dimensions:        longitude latitude alevhalf time
+out_name:          rsd
 type:              real
-valid_min:         9.477e+04
-valid_max:         1.124e+05
-ok_min_mean_abs:   1.003e+05
-ok_max_mean_abs:   1.017e+05
+positive:          down
 !----------------------------------
 !
 
 !============
-variable_entry:    ps
+variable_entry:    rlucs
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     surface_air_pressure
-units:             Pa
+standard_name:     upwelling_longwave_flux_in_air_assuming_clear_sky
+units:             W m-2
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Surface Air Pressure
-comment:           not, in general, the same as mean sea-level pressure
+long_name:         Upwelling Clear-Sky Longwave Radiation
+comment:           Include also the fluxes at the surface and TOA.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          ps
+dimensions:        longitude latitude alevhalf time
+out_name:          rlucs
 type:              real
-valid_min:         4.792e+04
-valid_max:         1.093e+05
-ok_min_mean_abs:   9.606e+04
-ok_max_mean_abs:   9.743e+04
+positive:          up
 !----------------------------------
 !
 
 !============
-variable_entry:    uas
+variable_entry:    rsucs
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     eastward_wind
-units:             m s-1
+standard_name:     upwelling_shortwave_flux_in_air_assuming_clear_sky
+units:             W m-2
 cell_methods:      time: mean
-long_name:         Eastward Near-Surface Wind
-comment:           near-surface (usually, 10 meters) eastward component of wind.
+cell_measures:     area: areacella
+long_name:         Upwelling Clear-Sky Shortwave Radiation
+comment:           Include also the fluxes at the surface and TOA.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height10m
-out_name:          uas
+dimensions:        longitude latitude alevhalf time
+out_name:          rsucs
 type:              real
-valid_min:         -19.01
-valid_max:         18.68
-ok_min_mean_abs:   1.668
-ok_max_mean_abs:   4.106
+positive:          up
 !----------------------------------
 !
 
 !============
-variable_entry:    vas
+variable_entry:    rldcs
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     northward_wind
-units:             m s-1
+standard_name:     downwelling_longwave_flux_in_air_assuming_clear_sky
+units:             W m-2
 cell_methods:      time: mean
-long_name:         Northward Near-Surface Wind
-comment:           near-surface (usually, 10 meters) northward component of wind.
+cell_measures:     area: areacella
+long_name:         Downwelling Clear-Sky Longwave Radiation
+comment:           Include also the fluxes at the surface and TOA.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height10m
-out_name:          vas
+dimensions:        longitude latitude alevhalf time
+out_name:          rldcs
 type:              real
-valid_min:         -18.04
-valid_max:         22.84
-ok_min_mean_abs:   1.065
-ok_max_mean_abs:   2.678
+positive:          down
 !----------------------------------
 !
 
 !============
-variable_entry:    sfcWind
+variable_entry:    rsdcs
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     wind_speed
-units:             m s-1
+standard_name:     downwelling_shortwave_flux_in_air_assuming_clear_sky
+units:             W m-2
 cell_methods:      time: mean
-long_name:         Near-Surface Wind Speed
-comment:           near-surface (usually, 10 meters) wind speed.  This is the mean of the speed, not the speed computed from the mean u and v components of wind
+cell_measures:     area: areacella
+long_name:         Downwelling Clear-Sky Shortwave Radiation
+comment:           Include also the fluxes at the surface and TOA.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height10m
-out_name:          sfcWind
+dimensions:        longitude latitude alevhalf time
+out_name:          rsdcs
 type:              real
+positive:          down
 !----------------------------------
 !
 
 !============
-variable_entry:    hurs
+variable_entry:    ta
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     relative_humidity
-units:             %
+standard_name:     air_temperature
+units:             K
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Near-Surface Relative Humidity
-comment:           near-surface (usually, 2meters) relative humidity expressed as a percentage.  This is the relative humidity with respect to liquid water for T> 0 C, and with respect to ice for T<0 C.
+long_name:         Air Temperature
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height2m
-out_name:          hurs
+dimensions:        longitude latitude alevel time
+out_name:          ta
 type:              real
+valid_min:         157.1
+valid_max:         326.4
+ok_min_mean_abs:   200.2
+ok_max_mean_abs:   289.9
 !----------------------------------
 !
 
 !============
-variable_entry:    huss
+variable_entry:    tnt
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     specific_humidity
-units:             1
+standard_name:     tendency_of_air_temperature
+units:             K s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Near-Surface Specific Humidity
-comment:           near-surface (usually, 2 meters) specific humidity.
+long_name:         Tendency of Air Temperature
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height2m
-out_name:          huss
+dimensions:        longitude latitude alevel time
+out_name:          tnt
 type:              real
-valid_min:         -7.21e-06
-valid_max:         0.02992
-ok_min_mean_abs:   0.006391
-ok_max_mean_abs:   0.008749
 !----------------------------------
 !
 
 !============
-variable_entry:    pr
+variable_entry:    tnta 
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     precipitation_flux
-units:             kg m-2 s-1
+standard_name:     tendency_of_air_temperature_due_to_advection
+units:             K s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Precipitation
-comment:           at surface; includes both liquid and solid phases from all types of clouds (both large-scale and convective)
+long_name:         Tendency of Air Temperature due to Advection
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          pr
+dimensions:        longitude latitude alevel time
+out_name:          tnta 
 type:              real
-valid_min:         0
-valid_max:         0.001254
-ok_min_mean_abs:   2.156e-05
-ok_max_mean_abs:   3.215e-05
 !----------------------------------
 !
 
 !============
-variable_entry:    prsn
+variable_entry:    tntmp
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     snowfall_flux
-units:             kg m-2 s-1
+standard_name:     tendency_of_air_temperature_due_to_model_physics
+units:             K s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Snowfall Flux
-comment:           at surface; includes precipitation of all forms of water in the solid phase
+long_name:         Tendency of Air Temperature due to Diabatic Processes
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          prsn
+dimensions:        longitude latitude alevel time
+out_name:          tntmp
 type:              real
-valid_min:         0
-valid_max:         0.0002987
-ok_min_mean_abs:   1.449e-06
-ok_max_mean_abs:   6.11e-06
 !----------------------------------
 !
 
 !============
-variable_entry:    prc
+variable_entry:    tntscpbl
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     convective_precipitation_flux
-units:             kg m-2 s-1
+standard_name:     tendency_of_air_temperature_due_to_stratiform_cloud_and_precipitation_and_boundary_layer_mixing
+units:             K s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Convective Precipitation
-comment:           at surface; includes both liquid and solid phases.
+long_name:         Tendency of Air Temperature Due to Stratiform Cloud and Precipitation and Boundary Layer Mixing
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          prc
+dimensions:        longitude latitude alevel time
+out_name:          tntscpbl
 type:              real
-valid_min:         0
-valid_max:         0.0006323
-ok_min_mean_abs:   -2.528e-06
-ok_max_mean_abs:   3.209e-05
 !----------------------------------
 !
 
 !============
-variable_entry:    evspsbl
+variable_entry:    tntr 
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     water_evaporation_flux
-units:             kg m-2 s-1
+standard_name:     tendency_of_air_temperature_due_to_radiative_heating
+units:             K s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Evaporation
-comment:           at surface; flux of water into the atmosphere due to conversion of both liquid and solid phases to vapor (from underlying surface and vegetation)
+long_name:         Tendency of Air Temperature due to Radiative Heating
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          evspsbl
+dimensions:        longitude latitude alevel time
+out_name:          tntr 
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    sbl
+variable_entry:    tntc
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     water_sublimation_flux
-units:             kg m-2 s-1
+standard_name:     tendency_of_air_temperature_due_to_convection
+units:             K s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Surface Snow and Ice Sublimation Flux
-comment:           The snow and ice sublimation flux is the loss of snow and ice mass from the surface resulting from their conversion to water vapor that enters the atmosphere. This differs from sbl appearing in table Limon in that the flux is averaged over the entire grid cell, not just the land portion.
+long_name:         Tendency of Air Temperature due to Moist Convection
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          sbl
+dimensions:        longitude latitude alevel time
+out_name:          tntc
 type:              real
-valid_min:         -0.004959
-valid_max:         0.0009936
-ok_min_mean_abs:   -5.521e-05
-ok_max_mean_abs:   9.61e-05
 !----------------------------------
 !
 
 !============
-variable_entry:    tauu
+variable_entry:    hus
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     surface_downward_eastward_stress
-units:             Pa
+standard_name:     specific_humidity
+units:             1
 cell_methods:      time: mean
-long_name:         Surface Downward Eastward Wind Stress
+cell_measures:     area: areacella
+long_name:         Specific Humidity
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          tauu
+dimensions:        longitude latitude alevel time
+out_name:          hus
 type:              real
-positive:          down
-valid_min:         -2.729
-valid_max:         2.934
-ok_min_mean_abs:   0.03979
-ok_max_mean_abs:   0.1065
+valid_min:         -0.000299
+valid_max:         0.02812
+ok_min_mean_abs:   -0.0003539
+ok_max_mean_abs:   0.01027
 !----------------------------------
 !
 
 !============
-variable_entry:    tauv
+variable_entry:    tnhus
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     surface_downward_northward_stress
-units:             Pa
+standard_name:     tendency_of_specific_humidity
+units:             s-1
 cell_methods:      time: mean
-long_name:         Surface Downward Northward Wind Stress
+cell_measures:     area: areacella
+long_name:         Tendency of Specific Humidity
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          tauv
+dimensions:        longitude latitude alevel time
+out_name:          tnhus
 type:              real
-positive:          down
-valid_min:         -2.472
-valid_max:         2.527
-ok_min_mean_abs:   0.01447
-ok_max_mean_abs:   0.08134
 !----------------------------------
 !
 
 !============
-variable_entry:    hfls
+variable_entry:    tnhusa
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     surface_upward_latent_heat_flux
-units:             W m-2
+standard_name:     tendency_of_specific_humidity_due_to_advection
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Surface Upward Latent Heat Flux
-comment:           includes both evaporation and sublimation
+long_name:         Tendency of Specific Humidity due to Advection
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          hfls
+dimensions:        longitude latitude alevel time
+out_name:          tnhusa
 type:              real
-positive:          up
-valid_min:         -76.77
-valid_max:         790.7
-ok_min_mean_abs:   50.39
-ok_max_mean_abs:   73.2
 !----------------------------------
 !
 
 !============
-variable_entry:    hfss
+variable_entry:    tnhusc
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     surface_upward_sensible_heat_flux
-units:             W m-2
+standard_name:     tendency_of_specific_humidity_due_to_convection
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Surface Upward Sensible Heat Flux
+long_name:         Tendency of Specific Humidity due to Convection
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          hfss
+dimensions:        longitude latitude alevel time
+out_name:          tnhusc
 type:              real
-positive:          up
-valid_min:         -264.5
-valid_max:         844.8
-ok_min_mean_abs:   10.7
-ok_max_mean_abs:   34.84
 !----------------------------------
 !
 
 !============
-variable_entry:    rlds
+variable_entry:    tnhusd
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     surface_downwelling_longwave_flux_in_air
-units:             W m-2
+standard_name:     tendency_of_specific_humidity_due_to_diffusion
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Surface Downwelling Longwave Radiation
+long_name:         Tendency of Specific Humidity due to Diffusion
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          rlds
+dimensions:        longitude latitude alevel time
+out_name:          tnhusd
 type:              real
-positive:          down
-valid_min:         30.71
-valid_max:         520.5
-ok_min_mean_abs:   271.2
-ok_max_mean_abs:   323.6
 !----------------------------------
 !
 
 !============
-variable_entry:    rlus
+variable_entry:    tnhusscpbl
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     surface_upwelling_longwave_flux_in_air
-units:             W m-2
+standard_name:     tendency_of_specific_humidity_due_to_stratiform_cloud_and_precipitation_and_boundary_layer_mixing
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Surface Upwelling Longwave Radiation
+long_name:         Tendency of Specific Humidity due to Stratiform Cloud Condensation and Evaporation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          rlus
+dimensions:        longitude latitude alevel time
+out_name:          tnhusscpbl
 type:              real
-positive:          up
-valid_min:         43.75
-valid_max:         658
-ok_min_mean_abs:   331.1
-ok_max_mean_abs:   369.9
 !----------------------------------
 !
 
 !============
-variable_entry:    rsds
+variable_entry:    tnhusmp
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     surface_downwelling_shortwave_flux_in_air
-units:             W m-2
+standard_name:     tendency_of_specific_humidity_due_to_model_physics
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Surface Downwelling Shortwave Radiation
+long_name:         Tendency of Specific Humidity due to Model Physics
+comment:           This should include sources and sinks from parametrized physics (e.g. convection, stratiform condensation/evaporation, etc.) and should exclude sources and sinks from resolved dynamics and diffusion.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          rsds
+dimensions:        longitude latitude alevel time
+out_name:          tnhusmp
 type:              real
-positive:          down
-valid_min:         -0.002946
-valid_max:         524.4
-ok_min_mean_abs:   143.9
-ok_max_mean_abs:   181.6
 !----------------------------------
 !
 
 !============
-variable_entry:    rsus
+variable_entry:    eviscu
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     surface_upwelling_shortwave_flux_in_air
-units:             W m-2
+standard_name:     atmosphere_momentum_diffusivity
+units:             m2 s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Surface Upwelling Shortwave Radiation
+long_name:         Eddy Viscosity Coefficients for Momentum
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          rsus
+dimensions:        longitude latitude alevel time
+out_name:          eviscu
 type:              real
-positive:          up
-valid_min:         -0.006589
-valid_max:         422.2
-ok_min_mean_abs:   26.22
-ok_max_mean_abs:   43.77
 !----------------------------------
 !
 
 !============
-variable_entry:    rsdscs
+variable_entry:    evisct
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     surface_downwelling_shortwave_flux_in_air_assuming_clear_sky
-units:             W m-2
+standard_name:     atmosphere_heat_diffusivity
+units:             m2 s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Surface Downwelling Clear-Sky Shortwave Radiation
+long_name:         Eddy Diffusivity Coefficients for Temperature
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          rsdscs
+dimensions:        longitude latitude alevel time
+out_name:          evisct
 type:              real
-positive:          down
-valid_min:         -1.748e+30
-valid_max:         518
-ok_min_mean_abs:   206.9
-ok_max_mean_abs:   238.6
 !----------------------------------
 !
 
 !============
-variable_entry:    rsuscs
+variable_entry:    clc
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     surface_upwelling_shortwave_flux_in_air_assuming_clear_sky
-units:             W m-2
+standard_name:     convective_cloud_area_fraction_in_atmosphere_layer
+units:             %
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Surface Upwelling Clear-Sky Shortwave Radiation
+long_name:         Convective Cloud Area Fraction
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          rsuscs
+dimensions:        longitude latitude alevel time
+out_name:          clc
 type:              real
-positive:          up
-valid_min:         -0.01446
-valid_max:         462.2
-ok_min_mean_abs:   31.65
-ok_max_mean_abs:   61.59
 !----------------------------------
 !
 
 !============
-variable_entry:    rldscs
+variable_entry:     clwc
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     surface_downwelling_longwave_flux_in_air_assuming_clear_sky
-units:             W m-2
+standard_name:     mass_fraction_of_convective_cloud_liquid_water_in_air
+units:             1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Surface Downwelling Clear-Sky Longwave Radiation
+long_name:         Mass Fraction of Convective Cloud Liquid Water 
+comment:           Calculate as the mass of convective 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.  
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          rldscs
+dimensions:        longitude latitude alevel time
+out_name:           clwc
 type:              real
-positive:          down
-valid_min:         33.55
-valid_max:         543.6
-ok_min_mean_abs:   238.6
-ok_max_mean_abs:   293.8
 !----------------------------------
 !
 
 !============
-variable_entry:    rsdt
+variable_entry:    clic
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     toa_incoming_shortwave_flux
-units:             W m-2
+standard_name:     mass_fraction_of_convective_cloud_ice_in_air
+units:             1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         TOA Incident Shortwave Radiation
-comment:           incident shortwave at the top of the atmosphere
+long_name:         Mass Fraction of Convective Cloud Ice
+comment:           Calculate as the mass of convective 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.  
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          rsdt
+dimensions:        longitude latitude alevel time
+out_name:          clic
 type:              real
-positive:          down
-valid_min:         0
-valid_max:         555.5
-ok_min_mean_abs:   294.4
-ok_max_mean_abs:   303.8
 !----------------------------------
 !
 
 !============
-variable_entry:    rsut
+variable_entry:    cls
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     toa_outgoing_shortwave_flux
-units:             W m-2
+standard_name:     stratiform_cloud_area_fraction_in_atmosphere_layer
+units:             %
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         TOA Outgoing Shortwave Radiation
-comment:           at the top of the atmosphere
+long_name:         Stratiform Cloud Area Fraction
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          rsut
+dimensions:        longitude latitude alevel time
+out_name:          cls
 type:              real
-positive:          up
-valid_min:         -0.02689
-valid_max:         416.9
-ok_min_mean_abs:   96.72
-ok_max_mean_abs:   114.1
 !----------------------------------
 !
 
 !============
-variable_entry:    rlut
+variable_entry:    clws
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     toa_outgoing_longwave_flux
-units:             W m-2
+standard_name:     mass_fraction_of_stratiform_cloud_liquid_water_in_air
+units:             1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         TOA Outgoing Longwave Radiation
-comment:           at the top of the atmosphere (to be compared with satellite measurements)
+long_name:         Mass Fraction of Stratiform Cloud Liquid Water
+comment:           Calculate as the mass of stratiform 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.  
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          rlut
+dimensions:        longitude latitude alevel time
+out_name:          clws
 type:              real
-positive:          up
-valid_min:         67.48
-valid_max:         383.2
-ok_min_mean_abs:   214.1
-ok_max_mean_abs:   227.5
 !----------------------------------
 !
 
 !============
-variable_entry:    rlutcs
+variable_entry:    clis
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     toa_outgoing_longwave_flux_assuming_clear_sky
-units:             W m-2
+standard_name:     mass_fraction_of_stratiform_cloud_ice_in_air
+units:             1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         TOA Outgoing Clear-Sky Longwave Radiation
+long_name:         Mass Fraction of Stratiform Cloud Ice
+comment:           Calculate as the mass of stratiform 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.  
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          rlutcs
+dimensions:        longitude latitude alevel time
+out_name:          clis
 type:              real
-positive:          up
-valid_min:         70.59
-valid_max:         372.3
-ok_min_mean_abs:   235.1
-ok_max_mean_abs:   253.8
 !----------------------------------
 !
 
 !============
-variable_entry:    rsutcs
+variable_entry:    mcu
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     toa_outgoing_shortwave_flux_assuming_clear_sky
-units:             W m-2
+standard_name:     atmosphere_updraft_convective_mass_flux
+units:             kg m-2 s-1 
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         TOA Outgoing Clear-Sky Shortwave Radiation
+long_name:         Updraft Convective Mass Flux
+comment:           Report on model half-levels (i.e., model layer bounds and not standard pressures).   Calculate as the convective mass flux divided by the area of the whole grid cell (not just the area of the cloud).
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          rsutcs
+dimensions:        longitude latitude alevhalf time
+out_name:          mcu
 type:              real
 positive:          up
-valid_min:         0
-valid_max:         444
-ok_min_mean_abs:   54.7
-ok_max_mean_abs:   73.36
 !----------------------------------
 !
 
 !============
-variable_entry:    prw
+variable_entry:    mcd
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     atmosphere_water_vapor_content
-units:             kg m-2
+standard_name:     atmosphere_downdraft_convective_mass_flux
+units:             kg m-2 s-1 
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Water Vapor Path
-comment:           vertically integrated through the atmospheric column
+long_name:         Downdraft Convective Mass Flux
+comment:           Report on model half-levels (i.e., model layer bounds and not standard pressures).  Calculate as the convective mass flux divided by the area of the whole grid cell (not just the area of the cloud).
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          prw
+dimensions:        longitude latitude alevhalf time
+out_name:          mcd
 type:              real
-valid_min:         -0.0006775
-valid_max:         78.04
-ok_min_mean_abs:   12.75
-ok_max_mean_abs:   23.09
+positive:          down
 !----------------------------------
 !
 
 !============
-variable_entry:    clt
+variable_entry:    smc
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     cloud_area_fraction
-units:             %
+standard_name:     atmosphere_net_upward_shallow_convective_mass_flux
+units:             kg m-2 s-1 
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Total Cloud Fraction
-comment:           for the whole atmospheric column, as seen from the surface or the top of the atmosphere. Include both large-scale and convective cloud.
+long_name:         Shallow Convective Mass Flux
+comment:           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.  For models with a distinct shallow convection scheme, calculate as the convective mass flux divided by the area of the whole grid cell (not just the area of the cloud).
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          clt
+dimensions:        longitude latitude alevhalf time
+out_name:          smc
 type:              real
-valid_min:         -0.0001822
-valid_max:         100.2
-ok_min_mean_abs:   39.37
-ok_max_mean_abs:   84.98
+positive:          up
 !----------------------------------
 !
 
 !============
-variable_entry:    clwvi
+variable_entry:    dmc
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     atmosphere_cloud_condensed_water_content
-units:             kg m-2
+standard_name:     atmosphere_net_upward_deep_convective_mass_flux
+units:             kg m-2 s-1 
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Condensed Water Path
-comment:           calculate mass of condensed (liquid + ice) water in the column divided by the area of the column (not just the area of the cloudy portion of the column). Include precipitating hydrometeors ONLY if the precipitating hydrometeor affects the calculation of radiative transfer in model.  
+long_name:         Deep Convective Mass Flux
+comment:           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 cloud).
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          clwvi
+dimensions:        longitude latitude alevhalf time
+out_name:          dmc
 type:              real
-valid_min:         -3.827e-06
-valid_max:         3.364
-ok_min_mean_abs:   -0.03549
-ok_max_mean_abs:   0.2846
+positive:          up
 !----------------------------------
 !
 
 !============
-variable_entry:    clivi
+variable_entry:    tnsclw
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     atmosphere_cloud_ice_content
-units:             kg m-2
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_liquid_water_in_air
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Ice Water Path
-comment:           calculate mass of ice water in the column divided by the area of the column (not just the area of the cloudy portion of the column). Include precipitating frozen hydrometeors ONLY if the precipitating hydrometeor affects the calculation of radiative transfer in model.  
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Liquid Water In Air
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          clivi
+dimensions:        longitude latitude alevel time
+out_name:          tnsclw
 type:              real
-valid_min:         -1.872e-06
-valid_max:         1.535
-ok_min_mean_abs:   -0.0348
-ok_max_mean_abs:   0.1187
 !----------------------------------
 !
 
 !============
-variable_entry:    rtmt
+variable_entry:    tnsclwcm
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     net_downward_radiative_flux_at_top_of_atmosphere_model
-units:             W m-2
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_liquid_water_in_air_due_to_cloud_microphysics
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Net Downward Flux at Top of Model
-comment:           i.e., at the top of that portion of the atmosphere where dynamics are explicitly treated by the model. Report only if this differs from the net downward radiative flux at the top of the atmosphere.
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Liquid Water In Air Due To Cloud Microphysics
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          rtmt
+dimensions:        longitude latitude alevel time
+out_name:          tnsclwcm
 type:              real
-positive:          down
-valid_min:         -232.8
-valid_max:         218.7
-ok_min_mean_abs:   77.62
-ok_max_mean_abs:   88.34
 !----------------------------------
 !
 
 !============
-variable_entry:    ccb
+variable_entry:    tnsclwbl
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     air_pressure_at_convective_cloud_base
-units:             Pa
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_liquid_water_in_air_due_to_boundary_layer_mixing
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Air Pressure at Convective Cloud Base
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Liquid Water In Air Due To Boundary Layer Mixing
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          ccb
+dimensions:        longitude latitude alevel time
+out_name:          tnsclwbl
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    cct
+variable_entry:    tnsclwbfpcli
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     air_pressure_at_convective_cloud_top
-units:             Pa
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_liquid_water_in_air_due_to_bergeron_findeisen_process_to_cloud_ice
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Air Pressure at Convective Cloud Top
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Liquid Water In Air Due To Bergeron Findeisen Process To Cloud Ice
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          cct
+dimensions:        longitude latitude alevel time
+out_name:          tnsclwbfpcli
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    ci 
+variable_entry:    tnsclwce 
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     convection_time_fraction
-units:             1
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_liquid_water_in_air_due_to_condensation_and_evaporation
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Fraction of Time Convection Occurs
-comment:           Fraction of time that convection occurs in the grid cell .
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Liquid Water due to Condensation and Evaporation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          ci 
+dimensions:        longitude latitude alevel time
+out_name:          tnsclwce 
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    sci
+variable_entry:    tnsclwcd 
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     shallow_convection_time_fraction
-units:             1
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_liquid_water_in_air_due_to_convective_detrainment
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Fraction of Time Shallow Convection Occurs
-comment:           Fraction of time that shallow convection occurs in the grid cell. ( For models with a distinct shallow convection scheme only)
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Liquid Water Due to Convective Detrainment
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          sci
+dimensions:        longitude latitude alevel time
+out_name:          tnsclwcd 
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    fco2antt
+variable_entry:    tnsclwhon 
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     tendency_of_atmosphere_mass_content_of_carbon_dioxide_expressed_as_carbon_due_to_anthropogenic_emission
-units:             kg  m-2 s-1
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_liquid_water_in_air_due_to_homogeneous_nucleation
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Carbon Mass Flux into Atmosphere Due to All Anthropogenic Emissions of CO2
-comment:           This is requested only for the emission-driven coupled carbon climate model runs.  Do not include natural fire sources, but include all anthropogenic sources, including fossil fuel use, cement production, agricultural burning, and sources associated with anthropogenic land use change excluding forest regrowth.
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Liquid Water due to Homogeneous Nucleation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          fco2antt
+dimensions:        longitude latitude alevel time
+out_name:          tnsclwhon 
 type:              real
-positive:          up
 !----------------------------------
 !
 
 !============
-variable_entry:    fco2fos
+variable_entry:    tnsclwhen 
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     tendency_of_atmosphere_mass_content_of_carbon_dioxide_expressed_as_carbon_due_to_emission_from_fossil_fuel_combustion
-units:             kg m-2 s-1
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_liquid_water_in_air_due_to_heterogeneous_nucleation
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Carbon Mass Flux into Atmosphere Due to Fossil Fuel Emissions of CO2
-comment:           This is requested only for the emission-driven coupled carbon climate model runs.  Report the prescribed anthropogenic CO2 flux from fossil fuel use, including cement production, and flaring (but not from land-use changes, agricultural burning, forest regrowth, etc.)
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Liquid Water due to Heterogeneous Nucleation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          fco2fos
+dimensions:        longitude latitude alevel time
+out_name:          tnsclwhen 
 type:              real
-positive:          up
 !----------------------------------
 !
 
 !============
-variable_entry:    fco2nat
+variable_entry:    tnsclwri 
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     surface_upward_mass_flux_of_carbon_dioxide_expressed_as_carbon_due_to_emission_from_natural_sources
-units:             kg m-2 s-1
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_liquid_water_in_air_due_to_riming
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Surface Carbon Mass Flux into the Atmosphere Due to Natural Sources
-comment:           Report from all simulations (both emission-driven and concentration-driven) performed by models with fully interactive and responsive carbon cycles.  This is what the atmosphere sees (on its own grid).  This field should be equivalent to the combined natural fluxes of carbon (requested in the L_mon and O_mon tables) that account for natural exchanges between the atmosphere and land or ocean reservoirs (i.e., ""net ecosystem biospheric productivity"", for land, and ""ai [...]
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Liquid Water due to Riming
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
-out_name:          fco2nat
+dimensions:        longitude latitude alevel time
+out_name:          tnsclwri 
 type:              real
-positive:          up
 !----------------------------------
 !
 
 !============
-variable_entry:    cl
+variable_entry:    tnsclwar 
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     cloud_area_fraction_in_atmosphere_layer
-units:             %
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_liquid_water_in_air_due_to_accretion_to_rain
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Cloud Area Fraction
-comment:           Report on model layers (not standard pressures).  Include both large-scale and convective cloud.
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Liquid Water due to Accretion to Rain
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
 dimensions:        longitude latitude alevel time
-out_name:          cl
+out_name:          tnsclwar 
 type:              real
-valid_min:         0
-valid_max:         100.2
-ok_min_mean_abs:   -0.04479
-ok_max_mean_abs:   24.87
 !----------------------------------
 !
 
 !============
-variable_entry:    clw
+variable_entry:    tnsclwas 
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mass_fraction_of_cloud_liquid_water_in_air
-units:             1
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_liquid_water_in_air_due_to_accretion_to_snow
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Mass Fraction of Cloud Liquid Water
-comment:           Report on model layers (not standard pressures).  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 cells. Include precipitating hydrometeors ONLY if the precipitating hydrometeor affects the calculation of radiative transfer in model.  
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Liquid Water due to Accretion to Snow
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
 dimensions:        longitude latitude alevel time
-out_name:          clw
+out_name:          tnsclwas 
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    cli
+variable_entry:    tnsclwmi 
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mass_fraction_of_cloud_ice_in_air
-units:             1
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_liquid_water_in_air_due_to_melting_from_cloud_ice
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Mass Fraction of Cloud Ice
-comment:           Report on model layers (not standard pressures).  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.  
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Liquid Water due to Melting From Cloud Ice
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
 dimensions:        longitude latitude alevel time
-out_name:          cli
+out_name:          tnsclwmi 
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    mc
+variable_entry:    tnsclwac 
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     atmosphere_net_upward_convective_mass_flux
-units:             kg m-2 s-1
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_liquid_water_in_air_due_to_autoconversion
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Convective Mass Flux
-comment:           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.  The flux is computed as the mass divided by the area of the grid cell.  
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Liquid Water due to Autoconversion
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude alevhalf time
-out_name:          mc
+dimensions:        longitude latitude alevel time
+out_name:          tnsclwac 
 type:              real
-positive:          up
 !----------------------------------
 !
 
 !============
-variable_entry:    ta
+variable_entry:    tnsclwa 
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     air_temperature
-units:             K
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_liquid_water_in_air_due_to_advection
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Air Temperature
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Liquid Water due to Advection
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          ta
+dimensions:        longitude latitude alevel time
+out_name:          tnsclwa 
 type:              real
-valid_min:         157.1
-valid_max:         326.4
-ok_min_mean_abs:   200.2
-ok_max_mean_abs:   289.9
 !----------------------------------
 !
 
 !============
-variable_entry:    ua
+variable_entry:    tnscli
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     eastward_wind
-units:             m s-1
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_ice_in_air
+units:             s-1
 cell_methods:      time: mean
-long_name:         Eastward Wind
+cell_measures:     area: areacella
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Ice In Air
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          ua
+dimensions:        longitude latitude alevel time
+out_name:          tnscli
 type:              real
-valid_min:         -68.65
-valid_max:         136.6
-ok_min_mean_abs:   1.101
-ok_max_mean_abs:   22.42
 !----------------------------------
 !
 
 !============
-variable_entry:    va
+variable_entry:    tnsclicm
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     northward_wind
-units:             m s-1
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_ice_in_air_due_to_cloud_microphysics
+units:             s-1
 cell_methods:      time: mean
-long_name:         Northward Wind
+cell_measures:     area: areacella
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Ice In Air Due To Cloud Microphysics
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          va
+dimensions:        longitude latitude alevel time
+out_name:          tnsclicm
 type:              real
-valid_min:         -71.1
-valid_max:         69.93
-ok_min_mean_abs:   0.9886
-ok_max_mean_abs:   4.679
 !----------------------------------
 !
 
 !============
-variable_entry:    hus
+variable_entry:    tnsclibl
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     specific_humidity
-units:             1
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_ice_in_air_due_to_boundary_layer_mixing
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Specific Humidity
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Ice In Air Due To Boundary Layer Mixing
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          hus
+dimensions:        longitude latitude alevel time
+out_name:          tnsclibl
 type:              real
-valid_min:         -0.000299
-valid_max:         0.02812
-ok_min_mean_abs:   -0.0003539
-ok_max_mean_abs:   0.01027
 !----------------------------------
 !
 
 !============
-variable_entry:    hur
+variable_entry:    tnsclibfpcl
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     relative_humidity
-units:             %
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_ice_in_air_due_to_bergeron_findeisen_process_from_cloud_liquid
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Relative Humidity
-comment:           This is the relative humidity with respect to liquid water for T> 0 C, and with respect to ice for T<0 C.
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Ice In Air Due To Bergeron Findeisen Process from Cloud Liquid
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          hur
+dimensions:        longitude latitude alevel time
+out_name:          tnsclibfpcl
 type:              real
-valid_min:         -2.642
-valid_max:         135.7
-ok_min_mean_abs:   -10.31
-ok_max_mean_abs:   97
 !----------------------------------
 !
 
 !============
-variable_entry:    wap
+variable_entry:    tnsclicd
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     lagrangian_tendency_of_air_pressure
-units:             Pa s-1
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_ice_in_air_due_to_convective_detrainment
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         omega (=dp/dt)
-comment:           commonly referred to as ""omega"", this represents the vertical component of velocity in pressure coordinates (positive down)
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Ice Due Convective Detrainment
+comment:           Tendency of Mass Fraction of Stratiform Cloud Ice Due to Convective Detrainment
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          wap
+dimensions:        longitude latitude alevel time
+out_name:          tnsclicd
 type:              real
-valid_min:         -1.126
-valid_max:         2.319
-ok_min_mean_abs:   -0.005083
-ok_max_mean_abs:   0.04256
 !----------------------------------
 !
 
 !============
-variable_entry:    zg
+variable_entry:    tnsclihon
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     geopotential_height
-units:             m
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_ice_in_air_due_to_homogeneous_nucleation
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Geopotential Height
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Ice due to Homogeneous Nucleation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          zg
+dimensions:        longitude latitude alevel time
+out_name:          tnsclihon
 type:              real
-valid_min:         -719.7
-valid_max:         3.306e+04
-ok_min_mean_abs:   -113.4
-ok_max_mean_abs:   3.164e+04
 !----------------------------------
 !
 
 !============
-variable_entry:    tro3
+variable_entry:    tnsclihencl
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_ozone_in_air
-units:             1e-9
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_ice_in_air_due_to_heterogeneous_nucleation_from_cloud_liquid_water
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Mole Fraction of O3
-comment:           If this does not change over time (except possibly to vary identically over each annual cycle), report instead the variable described in the next table entry. 
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Ice due to Heterogeneous Nucleation From Cloud Liquid
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          tro3
+dimensions:        longitude latitude alevel time
+out_name:          tnsclihencl
 type:              real
-valid_min:         -419.2
-valid_max:         1.162e+04
-ok_min_mean_abs:   -149.1
-ok_max_mean_abs:   7363
 !----------------------------------
 !
 
 !============
-variable_entry:    tro3Clim
+variable_entry:    tnsclihenv
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_ozone_in_air
-units:             1e-9
-cell_methods:      time: mean within years time: mean over years
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_ice_in_air_due_to_heterogeneous_nucleation_from_water_vapor
+units:             s-1
+cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Mole Fraction of O3
-comment:           If O3 does not vary from one year to the next, report 12 months, starting with January.   (Note: include all 12 months even if the values don't vary seasonally.)  When calling CMOR, identify this variable as tro3Clim, not tro3. If the O3 varies from one year to the next,  then report instead the field described in the previous table entry.  
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Ice due to Heterogeneous Nucleation From Water Vapor
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time2
-out_name:          tro3
+dimensions:        longitude latitude alevel time
+out_name:          tnsclihenv
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    co2
+variable_entry:    tnscliricl
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_carbon_dioxide_in_air
-units:             1e-6
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_ice_in_air_due_to_riming_from_cloud_liquid_water
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Mole Fraction of CO2
-comment:           For some simulations (e.g., prescribed concentration pi-control run), this will not vary from one year to the next, and so report instead the variable described in the next table entry.  If spatially uniform, omit this field, but report Total Atmospheric Mass of CO2 (see the table entry after the next one). 
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Ice due to Riming From Cloud Liquid
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          co2
+dimensions:        longitude latitude alevel time
+out_name:          tnscliricl
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    co2Clim
+variable_entry:    tnsclirir
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_carbon_dioxide_in_air
-units:             1e-6
-cell_methods:      time: mean within years time: mean over years
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_ice_in_air_due_to_riming_from_rain
+units:             s-1
+cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Mole Fraction of CO2
-comment:           Report only for simulations (e.g., prescribed concentration pi-control run), in which the CO2 does not vary from one year to the next. Report 12 monthly values, starting with January, even if the values don't vary seasonally.  When calling CMOR, identify this variable as co2Clim, not co2.   If  CO2 is spatially uniform, omit this field, but report Total Atmospheric Mass of CO2 (see the table entry after the next).
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Ice due to Riming From Rain
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time2
-out_name:          co2
+dimensions:        longitude latitude alevel time
+out_name:          tnsclirir
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    co2mass
+variable_entry:    tnsclids
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     atmosphere_mass_of_carbon_dioxide
-units:             kg
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_ice_in_air_due_to_deposition_and_sublimation
+units:             s-1
 cell_methods:      time: mean
-long_name:         Total Atmospheric Mass of CO2
-comment:           For some simulations (e.g., prescribed concentration pi-control run), this will not vary from one year to the next, and so report instead the variable described in the next table entry.  If CO2 is spatially nonuniform, omit this field, but report Mole Fraction of CO2 (see the table entry before the previous one). 
+cell_measures:     area: areacella
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Ice due to Deposition and Sublimation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          co2mass
+dimensions:        longitude latitude alevel time
+out_name:          tnsclids
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    co2massClim
+variable_entry:    tnscliag
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     atmosphere_mass_of_carbon_dioxide
-units:             kg
-cell_methods:      time: mean within years time: mean over years
-long_name:         Total Atmospheric Mass of CO2
-comment:           Report only for simulations (e.g., prescribed concentration pi-control run), in which the CO2 does not vary from one year to the next. Report 12 monthly values, starting with January, even if the values don't vary seasonally.  When calling CMOR, identify this variable as co2massClim, not co2mass.  If CO2 is spatially nonuniform, omit this field, but report Mole Fraction of CO2 (see the table entry before the previous one). 
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_ice_in_air_due_to_aggregation
+units:             s-1
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Ice due to Aggregation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time2
-out_name:          co2mass
+dimensions:        longitude latitude alevel time
+out_name:          tnscliag
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    ch4
+variable_entry:    tnsclias
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_methane_in_air
-units:             1e-9
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_ice_in_air_due_to_accretion_to_snow
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Mole Fraction of CH4
-comment:           For some simulations (e.g., prescribed concentration pi-control run), this will not vary from one year to the next, and so report instead the variable described in the next table entry.  If CH4 is spatially uniform, omit this field, but report Global Mean Mole Fraction of CH4 (see the table entry after the next one). 
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Ice due to Accretion to Snow
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          ch4
+dimensions:        longitude latitude alevel time
+out_name:          tnsclias
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    ch4Clim
+variable_entry:    tnscliemi
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_methane_in_air
-units:             1e-9
-cell_methods:      time: mean within years time: mean over years
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_ice_in_air_due_to_evaporation_of_melting_ice
+units:             s-1
+cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Mole Fraction of CH4
-comment:           Report only for simulations (e.g., prescribed concentration pi-control run), in which the CH4 does not vary from one year to the next. Report 12 monthly values, starting with January, even if the values don't vary seasonally.  When calling CMOR, identify this variable as ch4global, not ch4.   If  CH4 is spatially uniform, omit this field, but report Global Mean Mole Fraction of CH4 (see the table entry after the next).
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Ice due to Evaporation of Melting Ice
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time2
-out_name:          ch4
+dimensions:        longitude latitude alevel time
+out_name:          tnscliemi
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    ch4global
+variable_entry:    tnsclimr
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_methane_in_air
-units:             1e-9
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_ice_in_air_due_to_melting_to_rain
+units:             s-1
 cell_methods:      time: mean
-long_name:         Global Mean Mole Fraction of CH4
-comment:           For some simulations (e.g., prescribed concentration pi-control run), this will not vary from one year to the next, and so report instead the variable described in the next table entry.  If CH4 is spatially nonuniform, omit this field, but report Mole Fraction of CH4 (see the table entry before the previous one). 
+cell_measures:     area: areacella
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Ice due to Melting to Rain
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          ch4global
+dimensions:        longitude latitude alevel time
+out_name:          tnsclimr
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    ch4globalClim
+variable_entry:    tnsclimcl
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_methane_in_air
-units:             1e-9
-cell_methods:      time: mean within years time: mean over years
-long_name:         Global Mean Mole Fraction of CH4
-comment:           Report only for simulations (e.g., prescribed concentration pi-control run), in which the CH4 does not vary from one year to the next. Report 12 monthly values, starting with January, even if the values don't vary seasonally.  When calling CMOR, identify this variable as ch4globalClim, not ch4global.  If CH4 is spatially nonuniform, omit this field, but report Global Mean Mole Fraction of CH4 (see the table entry before the previous one). 
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_ice_in_air_due_to_melting_to_cloud_liquid_water
+units:             s-1
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Ice due to Melting to Cloud Liquid
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time2
-out_name:          ch4global
+dimensions:        longitude latitude alevel time
+out_name:          tnsclimcl
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    n2o
+variable_entry:    tnscliif
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_nitrous_oxide_in_air
-units:             1e-9
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_ice_in_air_due_to_icefall
+units:             s-1
 cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Mole Fraction of N2O
-comment:           For some simulations (e.g., prescribed concentration pi-control run), this will not vary from one year to the next, and so report instead the variable described in the next table entry.  If N2O is spatially uniform, omit this field, but report Global Mean Mole Fraction of N2O (see the table entry after the next one). 
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Ice due to Icefall
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          n2o
+dimensions:        longitude latitude alevel time
+out_name:          tnscliif
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    n2oClim
+variable_entry:    tnsclia
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_nitrous_oxide_in_air
-units:             1e-9
-cell_methods:      time: mean within years time: mean over years
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_ice_in_air_due_to_advection
+units:             s-1
+cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Mole Fraction of N2O
-comment:           Report only for simulations (e.g., prescribed concentration pi-control run), in which the N2O does not vary from one year to the next. Report 12 monthly values, starting with January, even if the values don't vary seasonally.  When calling CMOR, identify this variable as n2oglobal, not n2o.   If  N2O is spatially uniform, omit this field, but report Global Mean Mole Fraction of N2O (see the table entry after the next).
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Ice due to Advection
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time2
-out_name:          n2o
+dimensions:        longitude latitude alevel time
+out_name:          tnsclia
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    n2oglobal
+variable_entry:    tnsccw
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_nitrous_oxide_in_air
-units:             1e-9
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_condensed_water_in_air
+units:             s-1
 cell_methods:      time: mean
-long_name:         Global Mean Mole Fraction of N2O
-comment:           For some simulations (e.g., prescribed concentration pi-control run), this will not vary from one year to the next, and so report instead the variable described in the next table entry.  If N2O is spatially nonuniform, omit this field, but report Mole Fraction of N2O (see the table entry before the previous one). 
+cell_measures:     area: areacella
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Condensed Water In Air
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          n2oglobal
+dimensions:        longitude latitude alevel time
+out_name:          tnsccw
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    n2oglobalClim
+variable_entry:    tnsccwcm
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_nitrous_oxide_in_air
-units:             1e-9
-cell_methods:      time: mean within years time: mean over years
-long_name:         Global Mean Mole Fraction of N2O
-comment:           Report only for simulations (e.g., prescribed concentration pi-control run), in which the N2O does not vary from one year to the next. Report 12 monthly values, starting with January, even if the values don't vary seasonally.  When calling CMOR, identify this variable as ch4globalClim, not ch4global.  If N2O is spatially nonuniform, omit this field, but report Global Mean Mole Fraction of N2O (see the table entry before the previous one). 
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_condensed_water_in_air_due_to_cloud_microphysics
+units:             s-1
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Condensed Water In Air Due To Cloud Microphysics
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time2
-out_name:          n2oglobal
+dimensions:        longitude latitude alevel time
+out_name:          tnsccwcm
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    cfc11global
+variable_entry:    tnsccwbl
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_cfc11_in_air
-units:             1e-12
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_condensed_water_in_air_due_to_boundary_layer_mixing
+units:             s-1
 cell_methods:      time: mean
-long_name:         Global Mean Mole Fraction of CFC11
+cell_measures:     area: areacella
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Condensed Water In Air Due To Boundary Layer Mixing
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          cfc11global
+dimensions:        longitude latitude alevel time
+out_name:          tnsccwbl
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    cfc12global
+variable_entry:    tnsccwce
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_cfc12_in_air
-units:             1e-12
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_condensed_water_in_air_due_to_condensation_and_evaporation
+units:             s-1
 cell_methods:      time: mean
-long_name:         Global Mean Mole Fraction of CFC12
+cell_measures:     area: areacella
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Condensed Water due to Condensation and Evaporation
+comment:           condensed water includes both liquid and ice.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          cfc12global
+dimensions:        longitude latitude alevel time
+out_name:          tnsccwce
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    hcfc22global
+variable_entry:    tnsccwacr
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_hcfc22_in_air
-units:             1e-12
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_condensed_water_in_air_due_to_autoconversion_to_rain
+units:             s-1
 cell_methods:      time: mean
-long_name:         Global Mean Mole Fraction of HCFC22
+cell_measures:     area: areacella
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Condensed Water due to Autoconversion to Rain
+comment:           condensed water includes both liquid and ice.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          hcfc22global
+dimensions:        longitude latitude alevel time
+out_name:          tnsccwacr
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    cfc113global
+variable_entry:    tnsccwacs
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_cfc113_in_air
-units:             1e-12
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_condensed_water_in_air_due_to_autoconversion_to_snow
+units:             s-1
 cell_methods:      time: mean
-long_name:         Global Mean Mole Fraction of CFC113
+cell_measures:     area: areacella
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Condensed Water due to Autoconversion to Snow
+comment:           condensed water includes both liquid and ice.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          cfc113global
+dimensions:        longitude latitude alevel time
+out_name:          tnsccwacs
 type:              real
 !----------------------------------
 !
 
+!============
+variable_entry:    tnsccwif
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_condensed_water_in_air_due_to_icefall
+units:             s-1
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Condensed Water due to Icefall
+comment:           condensed water includes both liquid and ice.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude alevel time
+out_name:          tnsccwif
+type:              real
+!----------------------------------
+!
 
 !============
-variable_entry:    pfull
+variable_entry:    tnsccwa
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     air_pressure
-units:             Pa
-cell_methods:      time: mean within years time: mean over years
+standard_name:     tendency_of_mass_fraction_of_stratiform_cloud_condensed_water_in_air_due_to_advection
+units:             s-1
+cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Pressure on Model Levels
+long_name:         Tendency of Mass Fraction of Stratiform Cloud Condensed Water due to Advection
+comment:           condensed water includes both liquid and ice.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude alevel time2
-out_name:          pfull
+dimensions:        longitude latitude alevel time
+out_name:          tnsccwa
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    phalf
+variable_entry:    rsut4co2
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     air_pressure
-units:             Pa
-cell_methods:      time: mean within years time: mean over years
+standard_name:     toa_outgoing_shortwave_flux
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         TOA Outgoing Shortwave Radiation in 4XCO2 Atmosphere
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          rsut4co2
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    rlut4co2
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     toa_outgoing_longwave_flux
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         TOA Outgoing Longwave Radiation 4XCO2 Atmosphere
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          rlut4co2
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    rsutcs4co2
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     toa_outgoing_shortwave_flux_assuming_clear_sky
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         TOA Outgoing Clear-Sky Shortwave Radiation 4XCO2 Atmosphere
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          rsutcs4co2
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    rlutcs4co2
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     toa_outgoing_longwave_flux_assuming_clear_sky
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         TOA Outgoing Clear-Sky Longwave Radiation 4XCO2 Atmosphere
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          rlutcs4co2
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    rlu4co2
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     upwelling_longwave_flux_in_air
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Upwelling Longwave Radiation 4XCO2 Atmosphere
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude alevhalf time
+out_name:          rlu4co2
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    rsu4co2
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     upwelling_shortwave_flux_in_air
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Upwelling Shortwave Radiation 4XCO2 Atmosphere
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude alevhalf time
+out_name:          rsu4co2
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    rld4co2
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     downwelling_longwave_flux_in_air
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Downwelling Longwave Radiation 4XCO2 Atmosphere
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude alevhalf time
+out_name:          rld4co2
+type:              real
+positive:          down
+!----------------------------------
+!
+
+!============
+variable_entry:    rsd4co2
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     downwelling_shortwave_flux_in_air
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Downwelling Shortwave Radiation 4XCO2 Atmosphere
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude alevhalf time
+out_name:          rsd4co2
+type:              real
+positive:          down
+!----------------------------------
+!
+
+!============
+variable_entry:    rlucs4co2
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     upwelling_longwave_flux_in_air_assuming_clear_sky
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Upwelling Clear-Sky Longwave Radiation 4XCO2 Atmosphere
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude alevhalf time
+out_name:          rlucs4co2
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    rsucs4co2
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     upwelling_shortwave_flux_in_air_assuming_clear_sky
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Upwelling Clear-Sky Shortwave Radiation 4XCO2 Atmosphere
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude alevhalf time
+out_name:          rsucs4co2
+type:              real
+positive:          up
+!----------------------------------
+!
+
+!============
+variable_entry:    rldcs4co2
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     downwelling_longwave_flux_in_air_assuming_clear_sky
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Downwelling Clear-Sky Longwave Radiation 4XCO2 Atmosphere
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude alevhalf time
+out_name:          rldcs4co2
+type:              real
+positive:          down
+!----------------------------------
+!
+
+!============
+variable_entry:    rsdcs4co2
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     downwelling_shortwave_flux_in_air_assuming_clear_sky
+units:             W m-2
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         Downwelling Clear-Sky Shortwave Radiation 4XCO2 Atmosphere
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude alevhalf time
+out_name:          rsdcs4co2
+type:              real
+positive:          down
+!----------------------------------
+!
+
+!============
+variable_entry:    cltisccp
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     cloud_area_fraction
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         ISCCP Total Cloud Fraction
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          cltisccp
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    albisccp
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     cloud_albedo
+units:             1
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         ISCCP Mean Cloud Albedo
+comment:           When computing time-means, weight by the ISCCP Total Cloud Fraction - see  http://www.cfmip.net/README
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          albisccp
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    ctpisccp
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     air_pressure_at_cloud_top
+units:             Pa 
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         ISCCP Mean Cloud Top Pressure
+comment:           When computing time-means, weight by the ISCCP Total Cloud Fraction - see  http://www.cfmip.net/README
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          ctpisccp
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    clisccp
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     isccp_cloud_area_fraction
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         ISCCP Cloud Area Fraction
+comment:            7 levels x 7 tau
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude plev7 tau time
+out_name:          clisccp
+type:              real
+valid_min:         0
+valid_max:         1.399
+ok_min_mean_abs:   0.0004413
+ok_max_mean_abs:   0.04866
+!----------------------------------
+!
+
+!============
+variable_entry:    cltcalipso
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     cloud_area_fraction
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         CALIPSO Total Cloud Fraction
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time
+out_name:          cltcalipso
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    cllcalipso
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     cloud_area_fraction_in_atmosphere_layer
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         CALIPSO Low Level Cloud Fraction 
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time p840
+out_name:          cllcalipso
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    clmcalipso
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     cloud_area_fraction_in_atmosphere_layer
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         CALIPSO Mid Level Cloud Fraction 
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time p560
+out_name:          clmcalipso
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    clhcalipso
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     cloud_area_fraction_in_atmosphere_layer
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         CALIPSO High Level Cloud Fraction 
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude time p220
+out_name:          clhcalipso
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    clcalipso
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     cloud_area_fraction_in_atmosphere_layer
+units:             %
+cell_methods:      time: mean
+cell_measures:     area: areacella
+long_name:         CALIPSO Cloud Fraction 
+comment:            40 height levels
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        longitude latitude alt40 time
+out_name:          clcalipso
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    parasolRefl
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     toa_bidirectional_reflectance
+units:             1
+cell_methods:      time: mean
 cell_measures:     area: areacella
-long_name:         Pressure on Model Half-Levels
+long_name:         PARASOL Reflectance 
+comment:            5 bins of solar zenith angle.  This is reflectance as seen at the top of the atmosphere.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude alevhalf time2
-out_name:          phalf
+dimensions:        longitude latitude sza5 time
+out_name:          parasolRefl
 type:              real
 !----------------------------------
 !
diff --git a/TestTables/CMIP5_Amon b/TestTables/CMIP5_cfSites
similarity index 75%
copy from TestTables/CMIP5_Amon
copy to TestTables/CMIP5_cfSites
index 2071412..c40d57c 100644
--- a/TestTables/CMIP5_Amon
+++ b/TestTables/CMIP5_cfSites
@@ -1,12 +1,17 @@
-table_id: Table Amon
+table_id: Table cfSites
+!
+! WARNING: Although this table define variables as function of longitude and latitude
+!          the user MUST use a 'grid' (using the 'site' index in CMIP5_grids)
+!          in order to define correctly the location of each site.
+!
 modeling_realm: atmos
 
-frequency: mon
+frequency: subhr
 
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
 cf_version:   1.4         ! version of CF that output conforms to
 project_id:   CMIP5  ! project id
-table_date:   09 November 2010 ! date this table was constructed
+table_date:   12 November 2010 ! date this table was constructed
 
 missing_value: 1.e20      ! value used to indicate a missing value
                           !   in arrays output by netCDF as 32-bit IEEE 
@@ -56,105 +61,14 @@ expt_id_ok: 'aqua planet plus 4K anomaly' 'aqua4K'
 expt_id_ok: 'AMIP plus 4K anomaly' 'amip4K'
 
 
-approx_interval:  30.000000     ! approximate spacing between successive time
+approx_interval:  0.017361     ! approximate spacing between successive time
                           !   samples (in units of the output time 
                           !   coordinate.
 
 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: plevs
-!============
-!----------------------------------
-! Axis attributes:
-!----------------------------------
-standard_name:    air_pressure
-units:            Pa
-axis:             Z             ! X, Y, Z, T (default: undeclared)
-positive:         down         ! up or down (default: undeclared)
-long_name:        pressure
-!----------------------------------
-! Additional axis information:
-!----------------------------------
-out_name:         plev
-stored_direction: decreasing
-tolerance:        0.001
-type:             double
-requested:        100000. 92500. 85000. 70000. 60000. 50000. 40000. 30000. 25000. 20000. 15000. 10000. 7000. 5000. 3000. 2000. 1000.        ! space-separated list of requested coordinates 
-must_have_bounds: no
-!----------------------------------
-!
-
-
-!============
-axis_entry: time
-!============
-!----------------------------------
-! Axis attributes:
-!----------------------------------
-standard_name:    time
-units:            days since ?
-axis:             T             ! X, Y, Z, T (default: undeclared)
-long_name:        time
-!----------------------------------
-! Additional axis information:
-!----------------------------------
-out_name:         time
-stored_direction: increasing
-type:             double
-must_have_bounds: yes
-!----------------------------------
-!
-
-
-!============
-axis_entry: time2
+axis_entry: time1
 !============
 !----------------------------------
 ! Axis attributes:
@@ -169,8 +83,7 @@ long_name:        time
 out_name:         time
 stored_direction: increasing
 type:             double
-must_have_bounds: yes
-climatology:      yes
+must_have_bounds: no
 !----------------------------------
 !
 
@@ -224,6 +137,27 @@ 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
+must_call_cmor_grid: yes
+
+!----------------------------------
+!
+
 !============
 axis_entry: smooth_level
 !============
@@ -430,7 +364,7 @@ comment:           height above the geoid; as defined here, ""the geoid"" is a s
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude
+dimensions:        site
 out_name:          orog
 type:              real
 valid_min:         -700
@@ -592,14 +526,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     air_temperature
 units:             K
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Near-Surface Air Temperature
 comment:           near-surface (usually, 2 meter) air temperature.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height2m
+dimensions:        site time1 height2m
 out_name:          tas
 type:              real
 valid_min:         180.6
@@ -618,14 +552,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_temperature
 units:             K
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Temperature
 comment:           ""skin"" temperature (i.e., SST for open ocean)
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          ts
 type:              real
 valid_min:         176.8
@@ -636,58 +570,6 @@ ok_max_mean_abs:   281.8
 !
 
 !============
-variable_entry:    tasmin
-!============
-modeling_realm:    atmos
-!----------------------------------
-! Variable attributes:
-!----------------------------------
-standard_name:     air_temperature
-units:             K
-cell_methods:      time: minimum within days time: mean over days
-cell_measures:     area: areacella
-long_name:         Daily Minimum Near-Surface Air Temperature
-comment:           monthly mean of the daily-minimum near-surface (usually, 2 meter) air temperature.
-!----------------------------------
-! Additional variable information:
-!----------------------------------
-dimensions:        longitude latitude time height2m
-out_name:          tasmin
-type:              real
-valid_min:         183.6
-valid_max:         309.8
-ok_min_mean_abs:   271.8
-ok_max_mean_abs:   279.6
-!----------------------------------
-!
-
-!============
-variable_entry:    tasmax
-!============
-modeling_realm:    atmos
-!----------------------------------
-! Variable attributes:
-!----------------------------------
-standard_name:     air_temperature
-units:             K
-cell_methods:      time: maximum within days time: mean over days
-cell_measures:     area: areacella
-long_name:         Daily Maximum Near-Surface Air Temperature
-comment:           monthly mean of the daily-maximum near-surface (usually, 2 meter) air temperature.
-!----------------------------------
-! Additional variable information:
-!----------------------------------
-dimensions:        longitude latitude time height2m
-out_name:          tasmax
-type:              real
-valid_min:         181.9
-valid_max:         330.6
-ok_min_mean_abs:   277.3
-ok_max_mean_abs:   281.4
-!----------------------------------
-!
-
-!============
 variable_entry:    psl
 !============
 modeling_realm:    atmos
@@ -696,14 +578,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     air_pressure_at_sea_level
 units:             Pa
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Sea Level Pressure
 comment:           not, in general, the same as surface pressure
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          psl
 type:              real
 valid_min:         9.477e+04
@@ -722,14 +604,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_air_pressure
 units:             Pa
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Air Pressure
 comment:           not, in general, the same as mean sea-level pressure
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          ps
 type:              real
 valid_min:         4.792e+04
@@ -748,13 +630,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     eastward_wind
 units:             m s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 long_name:         Eastward Near-Surface Wind
 comment:           near-surface (usually, 10 meters) eastward component of wind.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height10m
+dimensions:        site time1 height10m
 out_name:          uas
 type:              real
 valid_min:         -19.01
@@ -773,13 +655,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     northward_wind
 units:             m s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 long_name:         Northward Near-Surface Wind
 comment:           near-surface (usually, 10 meters) northward component of wind.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height10m
+dimensions:        site time1 height10m
 out_name:          vas
 type:              real
 valid_min:         -18.04
@@ -798,13 +680,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     wind_speed
 units:             m s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 long_name:         Near-Surface Wind Speed
 comment:           near-surface (usually, 10 meters) wind speed.  This is the mean of the speed, not the speed computed from the mean u and v components of wind
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height10m
+dimensions:        site time1 height10m
 out_name:          sfcWind
 type:              real
 !----------------------------------
@@ -819,14 +701,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     relative_humidity
 units:             %
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Near-Surface Relative Humidity
 comment:           near-surface (usually, 2meters) relative humidity expressed as a percentage.  This is the relative humidity with respect to liquid water for T> 0 C, and with respect to ice for T<0 C.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height2m
+dimensions:        site time1 height2m
 out_name:          hurs
 type:              real
 !----------------------------------
@@ -841,14 +723,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     specific_humidity
 units:             1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Near-Surface Specific Humidity
 comment:           near-surface (usually, 2 meters) specific humidity.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time height2m
+dimensions:        site time1 height2m
 out_name:          huss
 type:              real
 valid_min:         -7.21e-06
@@ -867,14 +749,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     precipitation_flux
 units:             kg m-2 s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Precipitation
 comment:           at surface; includes both liquid and solid phases from all types of clouds (both large-scale and convective)
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          pr
 type:              real
 valid_min:         0
@@ -893,14 +775,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     snowfall_flux
 units:             kg m-2 s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Snowfall Flux
 comment:           at surface; includes precipitation of all forms of water in the solid phase
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          prsn
 type:              real
 valid_min:         0
@@ -919,14 +801,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     convective_precipitation_flux
 units:             kg m-2 s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Convective Precipitation
 comment:           at surface; includes both liquid and solid phases.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          prc
 type:              real
 valid_min:         0
@@ -945,14 +827,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     water_evaporation_flux
 units:             kg m-2 s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Evaporation
 comment:           at surface; flux of water into the atmosphere due to conversion of both liquid and solid phases to vapor (from underlying surface and vegetation)
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          evspsbl
 type:              real
 !----------------------------------
@@ -967,14 +849,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     water_sublimation_flux
 units:             kg m-2 s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Snow and Ice Sublimation Flux
 comment:           The snow and ice sublimation flux is the loss of snow and ice mass from the surface resulting from their conversion to water vapor that enters the atmosphere. This differs from sbl appearing in table Limon in that the flux is averaged over the entire grid cell, not just the land portion.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          sbl
 type:              real
 valid_min:         -0.004959
@@ -993,12 +875,12 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_downward_eastward_stress
 units:             Pa
-cell_methods:      time: mean
+cell_methods:      time: point
 long_name:         Surface Downward Eastward Wind Stress
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          tauu
 type:              real
 positive:          down
@@ -1018,12 +900,12 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_downward_northward_stress
 units:             Pa
-cell_methods:      time: mean
+cell_methods:      time: point
 long_name:         Surface Downward Northward Wind Stress
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          tauv
 type:              real
 positive:          down
@@ -1043,14 +925,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_upward_latent_heat_flux
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Upward Latent Heat Flux
 comment:           includes both evaporation and sublimation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          hfls
 type:              real
 positive:          up
@@ -1070,13 +952,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_upward_sensible_heat_flux
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Upward Sensible Heat Flux
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          hfss
 type:              real
 positive:          up
@@ -1096,13 +978,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_downwelling_longwave_flux_in_air
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Downwelling Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          rlds
 type:              real
 positive:          down
@@ -1122,13 +1004,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_upwelling_longwave_flux_in_air
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Upwelling Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          rlus
 type:              real
 positive:          up
@@ -1148,13 +1030,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_downwelling_shortwave_flux_in_air
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Downwelling Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          rsds
 type:              real
 positive:          down
@@ -1174,13 +1056,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_upwelling_shortwave_flux_in_air
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Upwelling Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          rsus
 type:              real
 positive:          up
@@ -1200,13 +1082,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_downwelling_shortwave_flux_in_air_assuming_clear_sky
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Downwelling Clear-Sky Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          rsdscs
 type:              real
 positive:          down
@@ -1226,13 +1108,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_upwelling_shortwave_flux_in_air_assuming_clear_sky
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Upwelling Clear-Sky Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          rsuscs
 type:              real
 positive:          up
@@ -1252,13 +1134,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_downwelling_longwave_flux_in_air_assuming_clear_sky
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Downwelling Clear-Sky Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          rldscs
 type:              real
 positive:          down
@@ -1278,14 +1160,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     toa_incoming_shortwave_flux
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         TOA Incident Shortwave Radiation
 comment:           incident shortwave at the top of the atmosphere
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          rsdt
 type:              real
 positive:          down
@@ -1305,14 +1187,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     toa_outgoing_shortwave_flux
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         TOA Outgoing Shortwave Radiation
 comment:           at the top of the atmosphere
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          rsut
 type:              real
 positive:          up
@@ -1332,14 +1214,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     toa_outgoing_longwave_flux
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         TOA Outgoing Longwave Radiation
 comment:           at the top of the atmosphere (to be compared with satellite measurements)
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          rlut
 type:              real
 positive:          up
@@ -1359,13 +1241,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     toa_outgoing_longwave_flux_assuming_clear_sky
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         TOA Outgoing Clear-Sky Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          rlutcs
 type:              real
 positive:          up
@@ -1385,13 +1267,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     toa_outgoing_shortwave_flux_assuming_clear_sky
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         TOA Outgoing Clear-Sky Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          rsutcs
 type:              real
 positive:          up
@@ -1411,14 +1293,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     atmosphere_water_vapor_content
 units:             kg m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Water Vapor Path
 comment:           vertically integrated through the atmospheric column
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          prw
 type:              real
 valid_min:         -0.0006775
@@ -1437,14 +1319,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     cloud_area_fraction
 units:             %
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Total Cloud Fraction
 comment:           for the whole atmospheric column, as seen from the surface or the top of the atmosphere. Include both large-scale and convective cloud.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          clt
 type:              real
 valid_min:         -0.0001822
@@ -1463,14 +1345,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     atmosphere_cloud_condensed_water_content
 units:             kg m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Condensed Water Path
 comment:           calculate mass of condensed (liquid + ice) water in the column divided by the area of the column (not just the area of the cloudy portion of the column). Include precipitating hydrometeors ONLY if the precipitating hydrometeor affects the calculation of radiative transfer in model.  
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          clwvi
 type:              real
 valid_min:         -3.827e-06
@@ -1489,14 +1371,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     atmosphere_cloud_ice_content
 units:             kg m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Ice Water Path
 comment:           calculate mass of ice water in the column divided by the area of the column (not just the area of the cloudy portion of the column). Include precipitating frozen hydrometeors ONLY if the precipitating hydrometeor affects the calculation of radiative transfer in model.  
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          clivi
 type:              real
 valid_min:         -1.872e-06
@@ -1515,14 +1397,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     net_downward_radiative_flux_at_top_of_atmosphere_model
 units:             W m-2
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Net Downward Flux at Top of Model
 comment:           i.e., at the top of that portion of the atmosphere where dynamics are explicitly treated by the model. Report only if this differs from the net downward radiative flux at the top of the atmosphere.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          rtmt
 type:              real
 positive:          down
@@ -1542,13 +1424,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     air_pressure_at_convective_cloud_base
 units:             Pa
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Air Pressure at Convective Cloud Base
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          ccb
 type:              real
 !----------------------------------
@@ -1563,13 +1445,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     air_pressure_at_convective_cloud_top
 units:             Pa
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Air Pressure at Convective Cloud Top
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          cct
 type:              real
 !----------------------------------
@@ -1584,14 +1466,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     convection_time_fraction
 units:             1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Fraction of Time Convection Occurs
 comment:           Fraction of time that convection occurs in the grid cell .
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          ci 
 type:              real
 !----------------------------------
@@ -1606,14 +1488,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     shallow_convection_time_fraction
 units:             1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Fraction of Time Shallow Convection Occurs
 comment:           Fraction of time that shallow convection occurs in the grid cell. ( For models with a distinct shallow convection scheme only)
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          sci
 type:              real
 !----------------------------------
@@ -1628,14 +1510,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     tendency_of_atmosphere_mass_content_of_carbon_dioxide_expressed_as_carbon_due_to_anthropogenic_emission
 units:             kg  m-2 s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Carbon Mass Flux into Atmosphere Due to All Anthropogenic Emissions of CO2
 comment:           This is requested only for the emission-driven coupled carbon climate model runs.  Do not include natural fire sources, but include all anthropogenic sources, including fossil fuel use, cement production, agricultural burning, and sources associated with anthropogenic land use change excluding forest regrowth.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          fco2antt
 type:              real
 positive:          up
@@ -1651,14 +1533,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     tendency_of_atmosphere_mass_content_of_carbon_dioxide_expressed_as_carbon_due_to_emission_from_fossil_fuel_combustion
 units:             kg m-2 s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Carbon Mass Flux into Atmosphere Due to Fossil Fuel Emissions of CO2
 comment:           This is requested only for the emission-driven coupled carbon climate model runs.  Report the prescribed anthropogenic CO2 flux from fossil fuel use, including cement production, and flaring (but not from land-use changes, agricultural burning, forest regrowth, etc.)
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          fco2fos
 type:              real
 positive:          up
@@ -1674,14 +1556,14 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     surface_upward_mass_flux_of_carbon_dioxide_expressed_as_carbon_due_to_emission_from_natural_sources
 units:             kg m-2 s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 cell_measures:     area: areacella
 long_name:         Surface Carbon Mass Flux into the Atmosphere Due to Natural Sources
 comment:           Report from all simulations (both emission-driven and concentration-driven) performed by models with fully interactive and responsive carbon cycles.  This is what the atmosphere sees (on its own grid).  This field should be equivalent to the combined natural fluxes of carbon (requested in the L_mon and O_mon tables) that account for natural exchanges between the atmosphere and land or ocean reservoirs (i.e., ""net ecosystem biospheric productivity"", for land, and ""ai [...]
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        site time1
 out_name:          fco2nat
 type:              real
 positive:          up
@@ -1697,14 +1579,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     cloud_area_fraction_in_atmosphere_layer
 units:             %
-cell_methods:      time: mean
-cell_measures:     area: areacella
+cell_methods:      time: point
 long_name:         Cloud Area Fraction
-comment:           Report on model layers (not standard pressures).  Include both large-scale and convective cloud.
+comment:           Include both large-scale and convective cloud.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude alevel time
+dimensions:        alevel site time1
 out_name:          cl
 type:              real
 valid_min:         0
@@ -1723,14 +1604,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     mass_fraction_of_cloud_liquid_water_in_air
 units:             1
-cell_methods:      time: mean
-cell_measures:     area: areacella
+cell_methods:      time: point
 long_name:         Mass Fraction of Cloud Liquid Water
-comment:           Report on model layers (not standard pressures).  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 cells. Include precipitating hydrometeors ONLY if the precipitating hydrometeor affects the calculation of radiative transfer in model.  
+comment:           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.  
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude alevel time
+dimensions:        alevel site time1
 out_name:          clw
 type:              real
 !----------------------------------
@@ -1745,14 +1625,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     mass_fraction_of_cloud_ice_in_air
 units:             1
-cell_methods:      time: mean
-cell_measures:     area: areacella
+cell_methods:      time: point
 long_name:         Mass Fraction of Cloud Ice
-comment:           Report on model layers (not standard pressures).  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.  
+comment:           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.  
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude alevel time
+dimensions:        alevel site time1
 out_name:          cli
 type:              real
 !----------------------------------
@@ -1767,14 +1646,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     atmosphere_net_upward_convective_mass_flux
 units:             kg m-2 s-1
-cell_methods:      time: mean
-cell_measures:     area: areacella
+cell_methods:      time: point
 long_name:         Convective Mass Flux
-comment:           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.  The flux is computed as the mass divided by the area of the grid cell.  
+comment:           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).
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude alevhalf time
+dimensions:        alevhalf site time1
 out_name:          mc
 type:              real
 positive:          up
@@ -1790,13 +1668,12 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     air_temperature
 units:             K
-cell_methods:      time: mean
-cell_measures:     area: areacella
+cell_methods:      time: point
 long_name:         Air Temperature
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
+dimensions:        alevel site time1
 out_name:          ta
 type:              real
 valid_min:         157.1
@@ -1815,12 +1692,12 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     eastward_wind
 units:             m s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 long_name:         Eastward Wind
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
+dimensions:        alevel site time1
 out_name:          ua
 type:              real
 valid_min:         -68.65
@@ -1839,12 +1716,12 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     northward_wind
 units:             m s-1
-cell_methods:      time: mean
+cell_methods:      time: point
 long_name:         Northward Wind
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
+dimensions:        alevel site time1
 out_name:          va
 type:              real
 valid_min:         -71.1
@@ -1863,13 +1740,12 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     specific_humidity
 units:             1
-cell_methods:      time: mean
-cell_measures:     area: areacella
+cell_methods:      time: point
 long_name:         Specific Humidity
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
+dimensions:        alevel site time1
 out_name:          hus
 type:              real
 valid_min:         -0.000299
@@ -1888,14 +1764,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     relative_humidity
 units:             %
-cell_methods:      time: mean
-cell_measures:     area: areacella
+cell_methods:      time: point
 long_name:         Relative Humidity
 comment:           This is the relative humidity with respect to liquid water for T> 0 C, and with respect to ice for T<0 C.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
+dimensions:        alevel site time1
 out_name:          hur
 type:              real
 valid_min:         -2.642
@@ -1914,14 +1789,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     lagrangian_tendency_of_air_pressure
 units:             Pa s-1
-cell_methods:      time: mean
-cell_measures:     area: areacella
+cell_methods:      time: point
 long_name:         omega (=dp/dt)
 comment:           commonly referred to as ""omega"", this represents the vertical component of velocity in pressure coordinates (positive down)
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
+dimensions:        alevel site time1
 out_name:          wap
 type:              real
 valid_min:         -1.126
@@ -1940,13 +1814,12 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     geopotential_height
 units:             m
-cell_methods:      time: mean
-cell_measures:     area: areacella
+cell_methods:      time: point
 long_name:         Geopotential Height
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
+dimensions:        alevel site time1
 out_name:          zg
 type:              real
 valid_min:         -719.7
@@ -1957,391 +1830,452 @@ ok_max_mean_abs:   3.164e+04
 !
 
 !============
-variable_entry:    tro3
+variable_entry:    rlu
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_ozone_in_air
-units:             1e-9
-cell_methods:      time: mean
-cell_measures:     area: areacella
-long_name:         Mole Fraction of O3
-comment:           If this does not change over time (except possibly to vary identically over each annual cycle), report instead the variable described in the next table entry. 
+standard_name:     upwelling_longwave_flux_in_air
+units:             W m-2
+cell_methods:      time: point
+long_name:         Upwelling Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          tro3
+dimensions:        alevel site time1
+out_name:          rlu
 type:              real
-valid_min:         -419.2
-valid_max:         1.162e+04
-ok_min_mean_abs:   -149.1
-ok_max_mean_abs:   7363
+positive:          up
 !----------------------------------
 !
 
 !============
-variable_entry:    tro3Clim
+variable_entry:    rsu
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_ozone_in_air
-units:             1e-9
-cell_methods:      time: mean within years time: mean over years
-cell_measures:     area: areacella
-long_name:         Mole Fraction of O3
-comment:           If O3 does not vary from one year to the next, report 12 months, starting with January.   (Note: include all 12 months even if the values don't vary seasonally.)  When calling CMOR, identify this variable as tro3Clim, not tro3. If the O3 varies from one year to the next,  then report instead the field described in the previous table entry.  
+standard_name:     upwelling_shortwave_flux_in_air
+units:             W m-2
+cell_methods:      time: point
+long_name:         Upwelling Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time2
-out_name:          tro3
+dimensions:        alevel site time1
+out_name:          rsu
 type:              real
+positive:          up
 !----------------------------------
 !
 
 !============
-variable_entry:    co2
+variable_entry:    rld
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_carbon_dioxide_in_air
-units:             1e-6
-cell_methods:      time: mean
-cell_measures:     area: areacella
-long_name:         Mole Fraction of CO2
-comment:           For some simulations (e.g., prescribed concentration pi-control run), this will not vary from one year to the next, and so report instead the variable described in the next table entry.  If spatially uniform, omit this field, but report Total Atmospheric Mass of CO2 (see the table entry after the next one). 
+standard_name:     downwelling_longwave_flux_in_air
+units:             W m-2
+cell_methods:      time: point
+long_name:         Downwelling Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          co2
+dimensions:        alevel site time1
+out_name:          rld
 type:              real
+positive:          down
 !----------------------------------
 !
 
 !============
-variable_entry:    co2Clim
+variable_entry:    rsd
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_carbon_dioxide_in_air
-units:             1e-6
-cell_methods:      time: mean within years time: mean over years
-cell_measures:     area: areacella
-long_name:         Mole Fraction of CO2
-comment:           Report only for simulations (e.g., prescribed concentration pi-control run), in which the CO2 does not vary from one year to the next. Report 12 monthly values, starting with January, even if the values don't vary seasonally.  When calling CMOR, identify this variable as co2Clim, not co2.   If  CO2 is spatially uniform, omit this field, but report Total Atmospheric Mass of CO2 (see the table entry after the next).
+standard_name:     downwelling_shortwave_flux_in_air
+units:             W m-2
+cell_methods:      time: point
+long_name:         Downwelling Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time2
-out_name:          co2
+dimensions:        alevel site time1
+out_name:          rsd
 type:              real
+positive:          down
 !----------------------------------
 !
 
 !============
-variable_entry:    co2mass
+variable_entry:    rlucs
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     atmosphere_mass_of_carbon_dioxide
-units:             kg
-cell_methods:      time: mean
-long_name:         Total Atmospheric Mass of CO2
-comment:           For some simulations (e.g., prescribed concentration pi-control run), this will not vary from one year to the next, and so report instead the variable described in the next table entry.  If CO2 is spatially nonuniform, omit this field, but report Mole Fraction of CO2 (see the table entry before the previous one). 
+standard_name:     upwelling_longwave_flux_in_air_assuming_clear_sky
+units:             W m-2
+cell_methods:      time: point
+long_name:         Upwelling Clear-Sky Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          co2mass
+dimensions:        alevel site time1
+out_name:          rlucs
 type:              real
+positive:          up
 !----------------------------------
 !
 
 !============
-variable_entry:    co2massClim
+variable_entry:    rsucs
 !============
 modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     atmosphere_mass_of_carbon_dioxide
-units:             kg
-cell_methods:      time: mean within years time: mean over years
-long_name:         Total Atmospheric Mass of CO2
-comment:           Report only for simulations (e.g., prescribed concentration pi-control run), in which the CO2 does not vary from one year to the next. Report 12 monthly values, starting with January, even if the values don't vary seasonally.  When calling CMOR, identify this variable as co2massClim, not co2mass.  If CO2 is spatially nonuniform, omit this field, but report Mole Fraction of CO2 (see the table entry before the previous one). 
+standard_name:     upwelling_shortwave_flux_in_air_assuming_clear_sky
+units:             W m-2
+cell_methods:      time: point
+long_name:         Upwelling Clear-Sky Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time2
-out_name:          co2mass
+dimensions:        alevel site time1
+out_name:          rsucs
 type:              real
+positive:          up
 !----------------------------------
 !
 
 !============
-variable_entry:    ch4
+variable_entry:    rldcs
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_methane_in_air
-units:             1e-9
-cell_methods:      time: mean
-cell_measures:     area: areacella
-long_name:         Mole Fraction of CH4
-comment:           For some simulations (e.g., prescribed concentration pi-control run), this will not vary from one year to the next, and so report instead the variable described in the next table entry.  If CH4 is spatially uniform, omit this field, but report Global Mean Mole Fraction of CH4 (see the table entry after the next one). 
+standard_name:     downwelling_longwave_flux_in_air_assuming_clear_sky
+units:             W m-2
+cell_methods:      time: point
+long_name:         Downwelling Clear-Sky Longwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          ch4
+dimensions:        alevel site time1
+out_name:          rldcs
 type:              real
+positive:          down
 !----------------------------------
 !
 
 !============
-variable_entry:    ch4Clim
+variable_entry:    rsdcs
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_methane_in_air
-units:             1e-9
-cell_methods:      time: mean within years time: mean over years
-cell_measures:     area: areacella
-long_name:         Mole Fraction of CH4
-comment:           Report only for simulations (e.g., prescribed concentration pi-control run), in which the CH4 does not vary from one year to the next. Report 12 monthly values, starting with January, even if the values don't vary seasonally.  When calling CMOR, identify this variable as ch4global, not ch4.   If  CH4 is spatially uniform, omit this field, but report Global Mean Mole Fraction of CH4 (see the table entry after the next).
+standard_name:     downwelling_shortwave_flux_in_air_assuming_clear_sky
+units:             W m-2
+cell_methods:      time: point
+long_name:         Downwelling Clear-Sky Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time2
-out_name:          ch4
+dimensions:        alevel site time1
+out_name:          rsdcs
 type:              real
+positive:          down
 !----------------------------------
 !
 
 !============
-variable_entry:    ch4global
+variable_entry:    tnt 
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_methane_in_air
-units:             1e-9
-cell_methods:      time: mean
-long_name:         Global Mean Mole Fraction of CH4
-comment:           For some simulations (e.g., prescribed concentration pi-control run), this will not vary from one year to the next, and so report instead the variable described in the next table entry.  If CH4 is spatially nonuniform, omit this field, but report Mole Fraction of CH4 (see the table entry before the previous one). 
+standard_name:     tendency_of_air_temperature
+units:             K s-1
+cell_methods:      time: point
+long_name:         Tendency of Air Temperature
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          ch4global
+dimensions:        alevel site time1
+out_name:          tnt 
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    ch4globalClim
+variable_entry:    tnta 
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_methane_in_air
-units:             1e-9
-cell_methods:      time: mean within years time: mean over years
-long_name:         Global Mean Mole Fraction of CH4
-comment:           Report only for simulations (e.g., prescribed concentration pi-control run), in which the CH4 does not vary from one year to the next. Report 12 monthly values, starting with January, even if the values don't vary seasonally.  When calling CMOR, identify this variable as ch4globalClim, not ch4global.  If CH4 is spatially nonuniform, omit this field, but report Global Mean Mole Fraction of CH4 (see the table entry before the previous one). 
+standard_name:     tendency_of_air_temperature_due_to_advection
+units:             K s-1
+cell_methods:      time: point
+long_name:         Tendency of Air Temperature due to Advection
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time2
-out_name:          ch4global
+dimensions:        alevel site time1
+out_name:          tnta 
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    n2o
+variable_entry:    tntmp
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_nitrous_oxide_in_air
-units:             1e-9
-cell_methods:      time: mean
-cell_measures:     area: areacella
-long_name:         Mole Fraction of N2O
-comment:           For some simulations (e.g., prescribed concentration pi-control run), this will not vary from one year to the next, and so report instead the variable described in the next table entry.  If N2O is spatially uniform, omit this field, but report Global Mean Mole Fraction of N2O (see the table entry after the next one). 
+standard_name:     tendency_of_air_temperature_due_to_model_physics
+units:             K s-1
+cell_methods:      time: point
+long_name:         Tendency of Air Temperature due to Diabatic Processes
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time
-out_name:          n2o
+dimensions:        alevel site time1
+out_name:          tntmp
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    n2oClim
+variable_entry:    tntscpbl 
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_nitrous_oxide_in_air
-units:             1e-9
-cell_methods:      time: mean within years time: mean over years
-cell_measures:     area: areacella
-long_name:         Mole Fraction of N2O
-comment:           Report only for simulations (e.g., prescribed concentration pi-control run), in which the N2O does not vary from one year to the next. Report 12 monthly values, starting with January, even if the values don't vary seasonally.  When calling CMOR, identify this variable as n2oglobal, not n2o.   If  N2O is spatially uniform, omit this field, but report Global Mean Mole Fraction of N2O (see the table entry after the next).
+standard_name:     tendency_of_air_temperature_due_to_stratiform_cloud_and_precipitation_and_boundary_layer_mixing
+units:             K s-1
+cell_methods:      time: point
+long_name:         Tendency of Air Temperature due to Stratiform Cloud Condensation and Evaporation
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude plevs time2
-out_name:          n2o
+dimensions:        alevel site time1
+out_name:          tntscpbl 
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    n2oglobal
+variable_entry:    tntr 
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_nitrous_oxide_in_air
-units:             1e-9
-cell_methods:      time: mean
-long_name:         Global Mean Mole Fraction of N2O
-comment:           For some simulations (e.g., prescribed concentration pi-control run), this will not vary from one year to the next, and so report instead the variable described in the next table entry.  If N2O is spatially nonuniform, omit this field, but report Mole Fraction of N2O (see the table entry before the previous one). 
+standard_name:     tendency_of_air_temperature_due_to_radiative_heating
+units:             K s-1
+cell_methods:      time: point
+long_name:         Tendency of Air Temperature due to Radiative Heating
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          n2oglobal
+dimensions:        alevel site time1
+out_name:          tntr 
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    n2oglobalClim
+variable_entry:    tntc
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_nitrous_oxide_in_air
-units:             1e-9
-cell_methods:      time: mean within years time: mean over years
-long_name:         Global Mean Mole Fraction of N2O
-comment:           Report only for simulations (e.g., prescribed concentration pi-control run), in which the N2O does not vary from one year to the next. Report 12 monthly values, starting with January, even if the values don't vary seasonally.  When calling CMOR, identify this variable as ch4globalClim, not ch4global.  If N2O is spatially nonuniform, omit this field, but report Global Mean Mole Fraction of N2O (see the table entry before the previous one). 
+standard_name:     tendency_of_air_temperature_due_to_convection
+units:             K s-1
+cell_methods:      time: point
+long_name:         Tendency of Air Temperature due to Moist Convection
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time2
-out_name:          n2oglobal
+dimensions:        alevel site time1
+out_name:          tntc
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    cfc11global
+variable_entry:    tnhus
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_cfc11_in_air
-units:             1e-12
-cell_methods:      time: mean
-long_name:         Global Mean Mole Fraction of CFC11
+standard_name:     tendency_of_specific_humidity
+units:             s-1
+cell_methods:      time: point
+long_name:         Tendency of Specific Humidity
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          cfc11global
+dimensions:        alevel site time1
+out_name:          tnhus
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    cfc12global
+variable_entry:    tnhusa 
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_cfc12_in_air
-units:             1e-12
-cell_methods:      time: mean
-long_name:         Global Mean Mole Fraction of CFC12
+standard_name:     tendency_of_specific_humidity_due_to_advection
+units:             s-1
+cell_methods:      time: point
+long_name:         Tendency of Specific Humidity due to Advection
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          cfc12global
+dimensions:        alevel site time1
+out_name:          tnhusa 
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    hcfc22global
+variable_entry:    tnhusc 
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_hcfc22_in_air
-units:             1e-12
-cell_methods:      time: mean
-long_name:         Global Mean Mole Fraction of HCFC22
+standard_name:     tendency_of_specific_humidity_due_to_convection
+units:             s-1
+cell_methods:      time: point
+long_name:         Tendency of Specific Humidity due to Convection
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          hcfc22global
+dimensions:        alevel site time1
+out_name:          tnhusc 
 type:              real
 !----------------------------------
 !
 
 !============
-variable_entry:    cfc113global
+variable_entry:    tnhusd 
 !============
-modeling_realm:    atmos atmosChem
+modeling_realm:    atmos
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     mole_fraction_of_cfc113_in_air
-units:             1e-12
-cell_methods:      time: mean
-long_name:         Global Mean Mole Fraction of CFC113
+standard_name:     tendency_of_specific_humidity_due_to_diffusion
+units:             s-1
+cell_methods:      time: point
+long_name:         Tendency of Specific Humidity due to Diffusion
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        time
-out_name:          cfc113global
+dimensions:        alevel site time1
+out_name:          tnhusd 
 type:              real
 !----------------------------------
 !
 
+!============
+variable_entry:    tnhusscpbl 
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     tendency_of_specific_humidity_due_to_stratiform_cloud_and_precipitation_and_boundary_layer_mixing
+units:             s-1
+cell_methods:      time: point
+long_name:         Tendency of Specific Humidity due to Stratiform Cloud Condensation and Evaporation
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        alevel site time1
+out_name:          tnhusscpbl 
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    tnhusmp 
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     tendency_of_specific_humidity_due_to_model_physics
+units:             s-1
+cell_methods:      time: point
+long_name:         Tendency of Specific Humidity due to Model Physics
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        alevel site time1
+out_name:          tnhusmp 
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    evu
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     atmosphere_momentum_diffusivity
+units:             m2 s-1
+cell_methods:      time: point
+long_name:         Eddy Viscosity Coefficient for Momentum Variables
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        alevel site time1
+out_name:          evu
+type:              real
+!----------------------------------
+!
+
+!============
+variable_entry:    edt
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     atmosphere_heat_diffusivity
+units:             m2 s-1
+cell_methods:      time: point
+long_name:         Eddy Diffusivity Coefficient for Temperature Variable
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        alevel site time1
+out_name:          edt
+type:              real
+!----------------------------------
+!
 
 !============
 variable_entry:    pfull
@@ -2352,13 +2286,13 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     air_pressure
 units:             Pa
-cell_methods:      time: mean within years time: mean over years
-cell_measures:     area: areacella
+cell_methods:      time: point
 long_name:         Pressure on Model Levels
+comment:           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.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude alevel time2
+dimensions:        alevel site time1
 out_name:          pfull
 type:              real
 !----------------------------------
@@ -2373,15 +2307,59 @@ modeling_realm:    atmos
 !----------------------------------
 standard_name:     air_pressure
 units:             Pa
-cell_methods:      time: mean within years time: mean over years
-cell_measures:     area: areacella
+cell_methods:      time: point
 long_name:         Pressure on Model Half-Levels
+comment:           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.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude alevhalf time2
+dimensions:        alevel site time1
 out_name:          phalf
 type:              real
 !----------------------------------
 !
 
+!============
+variable_entry:    longitude
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     longitude
+units:             degrees_east
+cell_methods:      0.0
+long_name:         Longitude
+comment:           Note that the CF convention and CMOR2 require that this field will be included in each file that contains a variable that is a function of the ""site"" dimension, so there is no need to save this field by itself.  It is included here simply to indicate that longitudes should be stored for the site grid in each file written.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        site
+out_name:          lon
+type:              real
+valid_min:         360.0
+!----------------------------------
+!
+
+!============
+variable_entry:    latitude
+!============
+modeling_realm:    atmos
+!----------------------------------
+! Variable attributes:
+!----------------------------------
+standard_name:     latitude
+units:             degrees_north
+cell_methods:      -90.0
+long_name:         Latitude
+comment:           the above comment also applies to latitude.
+!----------------------------------
+! Additional variable information:
+!----------------------------------
+dimensions:        site
+out_name:          lat
+type:              real
+valid_min:         90.0
+!----------------------------------
+!
+
diff --git a/TestTables/CMIP5_day b/TestTables/CMIP5_day
index 9ece328..cbe9f5c 100644
--- a/TestTables/CMIP5_day
+++ b/TestTables/CMIP5_day
@@ -3,10 +3,10 @@ modeling_realm: atmos
 
 frequency: day
 
-cmor_version: 2.0         ! version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
 cf_version:   1.4         ! version of CF that output conforms to
 project_id:   CMIP5  ! project id
-table_date:   10 June 2010 ! date this table was constructed
+table_date:   12 November 2010 ! date this table was constructed
 
 missing_value: 1.e20      ! value used to indicate a missing value
                           !   in arrays output by netCDF as 32-bit IEEE 
@@ -15,15 +15,15 @@ missing_value: 1.e20      ! value used to indicate a missing value
 baseURL: http://cmip-pcmdi.llnl.gov/CMIP5/dataLocation 
 product: output
 
-required_global_attributes: creation_date tracking_id forcing model_id parent_experiment_id branch_time contact institute_id ! space separated required global attribute 
+required_global_attributes: creation_date tracking_id forcing model_id parent_experiment_id parent_experiment_rip branch_time contact institute_id ! space separated required global attribute 
 
 forcings:   N/A Nat Ant GHG SD SI SA TO SO Oz LU Sl Vl SS Ds BC MD OC AA
 
 expt_id_ok: '10- or 30-year run initialized in year XXXX' 'decadalXXXX'
-expt_id_ok: 'volcano-free hindcasts XXXX' 'noVolcXXXX'
+expt_id_ok: 'volcano-free hindcast initialized in year XXXX' 'noVolcXXXX'
 expt_id_ok: 'prediction with 2010 volcano' 'volcIn2010'
 expt_id_ok: 'pre-industrial control' 'piControl'
-expt_id_ok: 'Historical' 'historical'
+expt_id_ok: 'historical' 'historical'
 expt_id_ok: 'mid-Holocene' 'midHolocene'
 expt_id_ok: 'last glacial maximum' 'lgm'
 expt_id_ok: 'last millennium' 'past1000'
@@ -42,22 +42,6 @@ expt_id_ok: '1 percent per year CO2' '1pctCO2'
 expt_id_ok: 'abrupt 4XCO2' 'abrupt4xCO2'
 expt_id_ok: 'natural-only' 'historicalNat'
 expt_id_ok: 'GHG-only' 'historicalGHG'
-expt_id_ok: 'anthropogenic-only' 'historicalAnt'
-expt_id_ok: 'anthropogenic sulfate aerosol direct effect only' 'historicalSD'
-expt_id_ok: 'anthropogenic sulfate aerosol indirect effect only' 'historicalSI'
-expt_id_ok: 'anthropogenic sulfate aerosol only' 'historicalSA'
-expt_id_ok: 'tropospheric ozone only' 'historicalTO'
-expt_id_ok: 'stratospheric ozone' 'historicalSO'
-expt_id_ok: 'ozone only' 'historicalOz'
-expt_id_ok: 'land-use change only' 'historicalLU'
-expt_id_ok: 'solar irradiance only' 'historicalSl'
-expt_id_ok: 'volcanic aerosol only' 'historicalVl'
-expt_id_ok: 'sea salt only' 'historicalSS'
-expt_id_ok: 'dust' 'historicalDs'
-expt_id_ok: 'black carbon only' 'historicalBC'
-expt_id_ok: 'mineral dust only' 'historicalMD'
-expt_id_ok: 'organic carbon only' 'historicalOC'
-expt_id_ok: 'anthropogenic aerosols only' 'historicalAA'
 expt_id_ok: 'AMIP' 'amip'
 expt_id_ok: '2030 time-slice' 'sst2030'
 expt_id_ok: 'control SST climatology' 'sstClim'
@@ -139,7 +123,6 @@ long_name:        pressure
 out_name:         plev
 stored_direction: decreasing
 tolerance:        0.001
-
 type:             double
 requested:        100000. 85000. 70000. 50000. 25000. 10000. 5000. 1000.        ! space-separated list of requested coordinates 
 must_have_bounds: no
@@ -217,6 +200,32 @@ must_have_bounds: no
 !----------------------------------
 !
 
+
+!============
+axis_entry: sdepth1 
+!============
+!----------------------------------
+! Axis attributes:
+!----------------------------------
+standard_name:    depth
+units:            m
+axis:             Z             ! X, Y, Z, T (default: undeclared)
+positive:         down         ! up or down (default: undeclared)
+long_name:        depth
+!----------------------------------
+! Additional axis information:
+!----------------------------------
+out_name:         depth
+valid_min:        0.0         
+valid_max:        0.2 
+stored_direction: increasing
+type:             double
+value:            0.05            ! of scalar (singleton) dimension 
+bounds_values:    0.0 0.1    ! of scalar (singleton) dimension bounds
+must_have_bounds: yes
+!----------------------------------
+!
+
 !============
 variable_entry:    huss
 !============
@@ -227,7 +236,7 @@ modeling_realm:    atmos
 standard_name:     specific_humidity
 units:             1
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Near-Surface Specific Humidity
 comment:           near-surface (usually, 2 meter) specific humidity.
 !----------------------------------
@@ -253,7 +262,7 @@ modeling_realm:    atmos
 standard_name:     air_temperature
 units:             K
 cell_methods:      time: minimum
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Daily Minimum Near-Surface Air Temperature
 comment:           daily-minimum near-surface (usually, 2 meter) air temperature.  
 !----------------------------------
@@ -279,7 +288,7 @@ modeling_realm:    atmos
 standard_name:     air_temperature
 units:             K
 cell_methods:      time: maximum
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Daily Maximum Near-Surface Air Temperature
 comment:           daily-maximum near-surface (usually, 2 meter) air temperature.
 !----------------------------------
@@ -305,7 +314,7 @@ modeling_realm:    atmos
 standard_name:     air_temperature
 units:             K
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Near-Surface Air Temperature
 comment:           daily-mean near-surface (usually, 2 meter) air temperature.
 !----------------------------------
@@ -331,7 +340,7 @@ modeling_realm:    atmos
 standard_name:     precipitation_flux
 units:             kg m-2 s-1
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Precipitation
 comment:           at surface; includes both liquid and solid phases from all types of clouds (both large-scale and convective)
 !----------------------------------
@@ -357,7 +366,7 @@ modeling_realm:    atmos
 standard_name:     air_pressure_at_sea_level
 units:             Pa
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Sea Level Pressure
 !----------------------------------
 ! Additional variable information:
@@ -382,7 +391,6 @@ modeling_realm:    atmos
 standard_name:     wind_speed
 units:             m s-1
 cell_methods:      time: mean
-cell_measures:      area: areacella
 long_name:         Daily-Mean Near-Surface Wind Speed
 comment:           near-surface (usually, 10 meters) wind speed.
 !----------------------------------
@@ -404,7 +412,7 @@ modeling_realm:    ocean
 standard_name:     square_of_sea_surface_temperature
 units:             K2
 cell_methods:      time:mean
-cell_measures:      area: areacello
+cell_measures:     area: areacello
 long_name:         Square of Sea Surface Temperature
 comment:           square of temperature of liquid ocean, averaged over the day. Report on the ocean grid.  This variable appears in WGOMD Table 2.2 
 !----------------------------------
@@ -426,7 +434,7 @@ modeling_realm:    ocean
 standard_name:     surface_temperature
 units:             K
 cell_methods:      time: mean
-cell_measures:      area: areacello
+cell_measures:     area: areacello
 long_name:         Sea Surface Temperature
 comment:           temperature of liquid ocean. Report on the ocean grid.  This variable appears in WGOMD Table 2.2 
 !----------------------------------
@@ -452,7 +460,7 @@ modeling_realm:    ocean
 standard_name:     ocean_mixed_layer_thickness_defined_by_mixing_scheme
 units:             m 
 cell_methods:      time: maximum
-cell_measures:      area: areacello
+cell_measures:     area: areacello
 long_name:         Daily Maximum Ocean Mixed Layer Thickness Defined by Mixing Scheme 
 comment:           Report on the ocean grid.  This variable appears in WGOMD Table 2.2 
 !----------------------------------
@@ -467,20 +475,20 @@ type:              real
 !============
 variable_entry:    mrsos
 !============
-modeling_realm:    atmos
+modeling_realm:    land
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
 standard_name:     moisture_content_of_soil_layer
 units:             kg m-2
-cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_methods:      time: mean area: mean where land 
+cell_measures:     area: areacella
 long_name:         Moisture in Upper 0.1 m of Soil Column
 comment:           Compute the mass of water in all phases in the upper 0.1 meters of soil.
 !----------------------------------
 ! Additional variable information:
 !----------------------------------
-dimensions:        longitude latitude time
+dimensions:        longitude latitude time sdepth1
 out_name:          mrsos
 type:              real
 valid_min:         -2.008
@@ -500,7 +508,7 @@ modeling_realm:    atmos
 standard_name:     relative_humidity
 units:             %
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Near-Surface Relative Humidity
 comment:           near-surface (usually, 2 meter) 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.
 !----------------------------------
@@ -522,7 +530,7 @@ modeling_realm:    atmos
 standard_name:     relative_humidity
 units:             %
 cell_methods:      time: minimum
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Surface Daily Minimum Relative Humidity
 comment:           near-surface (usually, 2 meter) minimum  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.
 !----------------------------------
@@ -544,7 +552,7 @@ modeling_realm:    atmos
 standard_name:     relative_humidity
 units:             %
 cell_methods:      time: maximum
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Surface Daily Maximum Relative Humidity
 comment:           near-surface (usually, 2 meter) maximum  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.
 !----------------------------------
@@ -566,7 +574,7 @@ modeling_realm:    atmos
 standard_name:     surface_snow_area_fraction
 units:             %
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Snow Area Fraction
 !----------------------------------
 ! Additional variable information:
@@ -591,7 +599,7 @@ modeling_realm:    atmos
 standard_name:     cloud_area_fraction
 units:             %
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Total Cloud Fraction
 comment:           for the whole atmospheric column, as seen from the surface or the top of the atmosphere. Include both large-scale and convective cloud.
 !----------------------------------
@@ -617,7 +625,7 @@ modeling_realm:    land
 standard_name:     surface_temperature
 units:             K
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:          Surface Temperature Where Land or Sea Ice
 comment:           """skin"" temperature of all surfaces except open ocean.  "
 !----------------------------------
@@ -639,7 +647,7 @@ modeling_realm:    land
 standard_name:     surface_snow_amount
 units:             kg m-2
 cell_methods:      time: mean area: mean where land
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Surface Snow Amount
 comment:           Compute as the mass of surface snow on the land portion of the grid cell divided by the land area in the grid cell; report 0.0 where the land fraction is 0; exclude snow on vegetation canopy or on sea ice.
 !----------------------------------
@@ -665,7 +673,7 @@ modeling_realm:    atmos
 standard_name:     convective_precipitation_flux
 units:             kg m-2 s-1
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Convective Precipitation
 comment:           at surface; includes both liquid and solid phases.
 !----------------------------------
@@ -691,7 +699,7 @@ modeling_realm:    atmos
 standard_name:     snowfall_flux
 units:             kg m-2 s-1
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Solid Precipitation
 comment:           at surface; includes precipitation of all forms of water in the solid phase
 !----------------------------------
@@ -717,7 +725,7 @@ modeling_realm:    land
 standard_name:     runoff_flux
 units:             kg m-2 s-1
 cell_methods:      time: mean area: mean where land 
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Total Runoff
 comment:           "compute as the total runoff (including ""drainage"" through the base of the soil model) leaving the land portion of the grid cell divided by the land area in the grid cell."
 !----------------------------------
@@ -743,7 +751,6 @@ modeling_realm:    atmos
 standard_name:     eastward_wind
 units:             m s-1
 cell_methods:      time: mean
-cell_measures:      area: areacella
 long_name:         Eastward Near-Surface Wind
 comment:           near-surface (usually, 10 meters) eastward component of wind.
 !----------------------------------
@@ -769,7 +776,6 @@ modeling_realm:    atmos
 standard_name:     northward_wind
 units:             m s-1
 cell_methods:      time: mean
-cell_measures:      area: areacella
 long_name:         Northward Near-Surface Wind
 comment:           near-surface (usually, 10 meters) northward component of wind.  
 !----------------------------------
@@ -795,7 +801,6 @@ modeling_realm:    atmos
 standard_name:     wind_speed
 units:             m s-1
 cell_methods:      time: maximum
-cell_measures:      area: areacella
 long_name:         Daily Maximum Near-Surface Wind Speed
 comment:           near-surface (usually, 10 meters) wind speed.  
 !----------------------------------
@@ -817,7 +822,7 @@ modeling_realm:    atmos
 standard_name:     surface_upward_latent_heat_flux
 units:             W m-2
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Surface Upward Latent Heat Flux
 !----------------------------------
 ! Additional variable information:
@@ -843,7 +848,7 @@ modeling_realm:    atmos
 standard_name:     surface_upward_sensible_heat_flux
 units:             W m-2
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Surface Upward Sensible Heat Flux
 !----------------------------------
 ! Additional variable information:
@@ -869,7 +874,7 @@ modeling_realm:    atmos
 standard_name:     surface_downwelling_longwave_flux_in_air
 units:             W m-2
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Surface Downwelling Longwave Radiation
 !----------------------------------
 ! Additional variable information:
@@ -895,7 +900,7 @@ modeling_realm:    atmos
 standard_name:     surface_upwelling_longwave_flux_in_air
 units:             W m-2
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Surface Upwelling Longwave Radiation
 !----------------------------------
 ! Additional variable information:
@@ -921,7 +926,7 @@ modeling_realm:    atmos
 standard_name:     surface_downwelling_shortwave_flux_in_air
 units:             W m-2
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Surface Downwelling Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
@@ -947,7 +952,7 @@ modeling_realm:    atmos
 standard_name:     surface_upwelling_shortwave_flux_in_air
 units:             W m-2
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Surface Upwelling Shortwave Radiation
 !----------------------------------
 ! Additional variable information:
@@ -973,7 +978,7 @@ modeling_realm:    atmos
 standard_name:     toa_outgoing_longwave_flux
 units:             W m-2
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         TOA Outgoing Longwave Radiation
 comment:           at the top of the atmosphere.
 !----------------------------------
@@ -997,11 +1002,10 @@ modeling_realm:    seaIce ocean
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     eastward_sea_ice_velocity
+standard_name:     sea_ice_x_velocity
 units:             m s-1
 cell_methods:      time: mean
-cell_measures:      area: areacella
-long_name:         Eastward Sea Ice Velocity
+long_name:         X-Component of Sea Ice Velocity
 comment:           "Report on ocean's grid.  Report as ""missing"" in regions free of sea ice."
 !----------------------------------
 ! Additional variable information:
@@ -1023,11 +1027,10 @@ modeling_realm:    seaIce ocean
 !----------------------------------
 ! Variable attributes:
 !----------------------------------
-standard_name:     northward_sea_ice_velocity
+standard_name:     sea_ice_y_velocity
 units:             m s-1
 cell_methods:      time: mean
-cell_measures:      area: areacella
-long_name:         Northward Sea Ice Velocity
+long_name:         Y-Component of Sea Ice Velocity
 comment:           "Report on ocean's grid.  Report as ""missing"" in regions free of sea ice."
 !----------------------------------
 ! Additional variable information:
@@ -1052,7 +1055,7 @@ modeling_realm:    seaIce ocean
 standard_name:     sea_ice_area_fraction
 units:             %
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Sea Ice Area Fraction
 comment:           fraction of grid cell covered by sea ice. Report on ocean's grid. 
 !----------------------------------
@@ -1078,7 +1081,7 @@ modeling_realm:    seaIce ocean
 standard_name:     sea_ice_thickness
 units:             m
 cell_methods:      time: mean area: mean where sea 
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Sea Ice Thickness
 comment:           Report on ocean's grid.  Compute the mean thickness of sea ice in the ocean portion of the grid cell (averaging over the entire ocean portion, including the ice-free fraction).  Report as 0.0 in regions free of sea ice.
 !----------------------------------
@@ -1104,7 +1107,7 @@ modeling_realm:    atmos
 standard_name:     air_temperature
 units:             K
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Air Temperature
 !----------------------------------
 ! Additional variable information:
@@ -1129,7 +1132,7 @@ modeling_realm:    atmos
 standard_name:     relative_humidity
 units:             %
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Relative Humidity
 comment:           This is the relative humidity with respect to liquid water for T> 0 C, and with respect to ice for T<0 C.
 !----------------------------------
@@ -1155,7 +1158,7 @@ modeling_realm:    atmos
 standard_name:     specific_humidity
 units:             1
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Specific Humidity
 !----------------------------------
 ! Additional variable information:
@@ -1180,7 +1183,7 @@ modeling_realm:    atmos
 standard_name:     lagrangian_tendency_of_air_pressure
 units:             Pa s-1
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         omega (=dp/dt)
 comment:           commonly referred to as ""omega"", this represents the vertical component of velocity in pressure coordinates (positive down)
 !----------------------------------
@@ -1206,7 +1209,6 @@ modeling_realm:    atmos
 standard_name:     northward_wind
 units:             m s-1 
 cell_methods:      time: mean
-cell_measures:      area: areacella
 long_name:         Northward Wind
 !----------------------------------
 ! Additional variable information:
@@ -1231,7 +1233,6 @@ modeling_realm:    atmos
 standard_name:     eastward_wind
 units:             m s-1 
 cell_methods:      time: mean
-cell_measures:      area: areacella
 long_name:         Eastward Wind
 !----------------------------------
 ! Additional variable information:
@@ -1256,7 +1257,7 @@ modeling_realm:    atmos
 standard_name:     geopotential_height
 units:             m
 cell_methods:      time: mean
-cell_measures:      area: areacella
+cell_measures:     area: areacella
 long_name:         Geopotential Height
 !----------------------------------
 ! Additional variable information:
diff --git a/TestTables/CMIP5_fx b/TestTables/CMIP5_fx
index cf0c36c..abd345b 100644
--- a/TestTables/CMIP5_fx
+++ b/TestTables/CMIP5_fx
@@ -3,10 +3,10 @@ modeling_realm: atmos
 
 frequency: fx
 
-cmor_version: 2.4.0 ! minimum version of CMOR that can read this table
+cmor_version: 2.5.0 ! minimum version of CMOR that can read this table
 cf_version:   1.4         ! version of CF that output conforms to
 project_id:   CMIP5  ! project id
-table_date:   11 November 2010 ! date this table was constructed
+table_date:   12 November 2010 ! date this table was constructed
 
 missing_value: 1.e20      ! value used to indicate a missing value
                           !   in arrays output by netCDF as 32-bit IEEE 
diff --git a/TestTables/CMIP5_grids b/TestTables/CMIP5_grids
index 45cff99..94f6d08 100644
--- a/TestTables/CMIP5_grids
+++ b/TestTables/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:   12 March 2010 ! date this table was constructed
+table_date:   12 November 2010 ! date this table was constructed
 
 missing_value: 1.e20      ! value used to indicate a missing value
                           !   in arrays output by netCDF as 32-bit IEEE 
@@ -13,7 +13,7 @@ missing_value: 1.e20      ! value used to indicate a missing value
 baseURL: http://cmip-pcmdi.llnl.gov/CMIP5/dataLocation 
 product: output
 
-required_global_attributes: creation_date tracking_id forcing model_id parent_experiment_id branch_time ! space separated required global attribute 
+required_global_attributes: creation_date tracking_id forcing model_id parent_experiment_id parent_experiment_rip branch_time contact institute_id ! space separated required global attribute 
 
 expt_id_ok: '10- or 30-year run initialized in year XXXX' 'decadalXXXX'
 expt_id_ok: 'volcano-free hindcasts' 'noVolcXXXX'
@@ -38,22 +38,6 @@ expt_id_ok: '1 percent per year CO2' '1pctCO2'
 expt_id_ok: 'abrupt 4XCO2' 'abrupt4xCO2'
 expt_id_ok: 'natural-only' 'historicalNat'
 expt_id_ok: 'GHG-only' 'historicalGHG'
-expt_id_ok: 'anthropogenic-only' 'historicalAnt'
-expt_id_ok: 'anthropogenic sulfate aerosol direct effect only' 'historicalSD'
-expt_id_ok: 'anthropogenic sulfate aerosol indirect effect only' 'historicalSI'
-expt_id_ok: 'anthropogenic sulfate aerosol only' 'historicalSA'
-expt_id_ok: 'tropospheric ozone only' 'historicalTO'
-expt_id_ok: 'stratospheric ozone' 'historicalSO'
-expt_id_ok: 'ozone only' 'historicalOz'
-expt_id_ok: 'land-use change only' 'historicalLU'
-expt_id_ok: 'solar irradiance only' 'historicalSl'
-expt_id_ok: 'volcanic aerosol only' 'historicalVl'
-expt_id_ok: 'sea salt only' 'historicalSS'
-expt_id_ok: 'dust' 'historicalDs'
-expt_id_ok: 'black carbon only' 'historicalBC'
-expt_id_ok: 'mineral dust only' 'historicalMD'
-expt_id_ok: 'organic carbon only' 'historicalOC'
-expt_id_ok: 'anthropogenic aerosols only' 'historicalAA'
 expt_id_ok: 'AMIP' 'amip'
 expt_id_ok: '2030 time-slice' 'sst2030'
 expt_id_ok: 'control SST climatology' 'sstClim'
@@ -88,6 +72,7 @@ axis_entry: i_index
 out_name:         i
 units:            1
 long_name:        cell index along first dimension
+type: 		  integer
 !----------------------------------	
 !
 !
@@ -102,6 +87,7 @@ axis_entry: j_index
 out_name:         j
 units:            1
 long_name:        cell index along second dimension
+type: 		  integer
 !----------------------------------	
 !
 !
@@ -116,6 +102,7 @@ axis_entry: k_index
 out_name:         k
 units:            1
 long_name:        cell index along third dimension
+type: 		  integer
 !----------------------------------	
 !
 !============
@@ -129,6 +116,7 @@ axis_entry: l_index
 out_name:         l
 units:            1
 long_name:        cell index along fourth dimension
+type: 		  integer
 !----------------------------------	
 !
 !============
@@ -142,6 +130,7 @@ axis_entry: m_index
 out_name:         m
 units:            1
 long_name:        cell index along fifth dimension
+type: 		  integer
 !----------------------------------	
 !
 !============
@@ -179,6 +168,42 @@ axis: Y
 !----------------------------------	
 !
 !============
+axis_entry: x_deg
+!============
+!
+!------------
+!
+! Axis attributes:
+!----------------------------------	
+out_name:         x
+standard_name:    projection_x_coordinate
+units:            degrees
+long_name:        x coordinate of projection
+axis: X
+!----------------------------------	
+!
+! Additional axis information:
+!----------------------------------	
+!
+!============
+axis_entry: y_deg
+!============
+!
+!------------
+!
+! Axis attributes:
+!----------------------------------	
+out_name:         y
+standard_name:    projection_y_coordinate
+units:            degrees
+long_name:        y coordinate of projection
+axis: Y
+!----------------------------------	
+!
+! Additional axis information:
+!----------------------------------	
+!
+!============
 axis_entry: grid_latitude
 !============
 !
diff --git a/TestTables/md5s b/TestTables/md5s
index 13254a9..ad356ee 100644
--- a/TestTables/md5s
+++ b/TestTables/md5s
@@ -1 +1 @@
-{'CMIP5': {'cfSites': {'12 March 2010': '192f07ba869af3794494ea0dc3a72a54', '11 May 2010': '80506c07ed63befd33f9f727b78bde55', '24 May 2010': 'bf9e8c5576fd70aa92d11fe3d4317e9b', '22 March 2010': 'fe60fd7cfbaccc08c75a91dc67a68b99', '12 May 2010': '0ebecf85ba30b2223360a29ece880be4', '28 May 2010': '7eea57df7c12c4d8524da28aa78fbe94', '01 June 2010': '2eb2e9a6a1db0e18dac73e04e0dfbe47', '02 April 2010': '650c6032a9cbeedb142a41b923e85f22', '26 April 2010': '6fe91d86689e2fa1faa2fe7164876ace', ' [...]
\ No newline at end of file
+{'CMIP5': {'cf3hr': {'11 May 2010': 'a59ca1270ff3036d417a7f2217598266', '19 October 2010': '8b5c2f197b70a103393838ebd4075c6c', '12 May 2010': '905f7ccdd5a31cb71e2a6e3b339cd0e1', '23 August 2010': '5ccea11a7c3d165c76df3d9eede395d0', '01 June 2010': '619aa3c816bc25a53335589698e64968', '01 July 2010': 'c0fe9e92115d75292f5009e13761cb4b', '11 November 2010': '35a8e11c7f57f3128517d21d177a8204', '12 March 2010': 'ae9a82f01824d9012aa0657cd7896a9a', '22 March 2010': '712cd14ab6a28116da828ff555e00 [...]
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git



More information about the debian-science-commits mailing list