Merge branch 'develop' into bugfix/zhaobin1974/do-not-terminate-surfst

Author: sdrabenh

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOS_PhysicsGridComp.F90

@@ -1215,8 +1215,8 @@ subroutine SetServices ( GC, RC )
      call MAPL_AddConnectivity ( GC,                                      &
         SHORT_NAME  = (/ 'RL      ',  'QL      ', 'QLTOT   ', 'DQLDT   ', &
                          'RI      ',  'QI      ', 'QITOT   ', 'DQIDT   ', &
-                         'QLCN    ',  'PFL_CN  ', 'PFL_LSAN',             &
-                         'QICN    ',  'PFI_CN  ', 'PFI_LSAN',             &
+                         'QLCN    ',  'PFL_CN  ', 'PFL_LSAN', 'ZLCL    ', &
+                         'QICN    ',  'PFI_CN  ', 'PFI_LSAN', 'ZLFC    ', &
                          'FCLD    ',  'QCTOT   ', 'CNV_QC  ',             &
                          'REV_LS  ',  'REV_AN  ', 'REV_CN  ', 'TPREC   ', &
                          'Q       ',  'DQDT    ', 'DQRL    ', 'DQRC    ', &

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOS_SurfaceGridComp.F90

@@ -137,7 +137,7 @@ subroutine SetServices ( GC, RC )
      VERIFY_(STATUS)
 
      call MAPL_AddExportSpec(GC,                             &
-        LONG_NAME          = 'surface_albedo_for_visible_beam',   &
+        LONG_NAME          = 'surface_reflectivity_for_visible_beam',   &
         UNITS              = '1',                                 &
         SHORT_NAME         = 'ALBVR',                             &
         DIMS               = MAPL_DimsTileOnly,                   &
@@ -146,7 +146,7 @@ subroutine SetServices ( GC, RC )
      VERIFY_(STATUS)
 
      call MAPL_AddExportSpec(GC,                             &
-        LONG_NAME          = 'surface_albedo_for_visible_diffuse',&
+        LONG_NAME          = 'surface_reflectivity_for_visible_diffuse',&
         UNITS              = '1',                                 &
         SHORT_NAME         = 'ALBVF',                             &
         DIMS               = MAPL_DimsTileOnly,                   &
@@ -155,7 +155,7 @@ subroutine SetServices ( GC, RC )
      VERIFY_(STATUS)
 
      call MAPL_AddExportSpec(GC,                             &
-        LONG_NAME          = 'surface_albedo_for_near_infrared_beam', &
+        LONG_NAME          = 'surface_reflectivity_for_near_infrared_beam', &
         UNITS              = '1',                                 &
         SHORT_NAME         = 'ALBNR',                             &
         DIMS               = MAPL_DimsTileOnly,                   &
@@ -164,7 +164,7 @@ subroutine SetServices ( GC, RC )
      VERIFY_(STATUS)
 
      call MAPL_AddExportSpec(GC,                             &
-        LONG_NAME          = 'surface_albedo_for_near_infrared_diffuse', &
+        LONG_NAME          = 'surface_reflectivity_for_near_infrared_diffuse', &
         UNITS              = '1',                                 &
         SHORT_NAME         = 'ALBNF',                             &
         DIMS               = MAPL_DimsTileOnly,                   &
@@ -192,7 +192,7 @@ subroutine SetServices ( GC, RC )
      VERIFY_(STATUS)
 
      call MAPL_AddExportSpec(GC,                     &
-          LONG_NAME          = 'runoff_flux',&
+          LONG_NAME          = 'runoff_total_flux'         ,&
           UNITS              = 'kg m-2 s-1'                ,&
           SHORT_NAME         = 'RUNOFF'                    ,&
           DIMS               = MAPL_DimsTileOnly           ,&

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSlake_GridComp/GEOS_LakeGridComp.F90

@@ -245,7 +245,7 @@ subroutine SetServices ( GC, RC )
     VERIFY_(STATUS)
 
     call MAPL_AddImportSpec(GC                         ,&
-         LONG_NAME          = 'surface_downwelling_par_beam_flux',&
+         LONG_NAME          = 'surface_downwelling_PAR_beam_flux',&
          UNITS              = 'W m-2'                       ,&
          SHORT_NAME         = 'DRPAR'                       ,&
          DIMS               = MAPL_DimsTileOnly             ,&
@@ -254,7 +254,7 @@ subroutine SetServices ( GC, RC )
     VERIFY_(STATUS)
 
     call MAPL_AddImportSpec(GC                         ,&
-         LONG_NAME          = 'surface_downwelling_par_diffuse_flux',&
+         LONG_NAME          = 'surface_downwelling_PAR_diffuse_flux',&
          UNITS              = 'W m-2'                       ,&
          SHORT_NAME         = 'DFPAR'                       ,&
          DIMS               = MAPL_DimsTileOnly             ,&
@@ -346,7 +346,7 @@ subroutine SetServices ( GC, RC )
     VERIFY_(STATUS)
 
     call MAPL_AddImportSpec(GC                         ,&
-         LONG_NAME          = 'greeness_fraction'           ,&
+         LONG_NAME          = 'vegetation_greenness_fraction',&
          UNITS              = '1'                           ,&
          SHORT_NAME         = 'GRN'                         ,&
          DIMS               = MAPL_DimsTileOnly             ,&