Merge pull request NCAR#387 from grantfirl/ufs-dev-PR26

UFS-dev PR#26

ccpp/config/ccpp_prebuild_config.py

@@ -186,6 +186,7 @@
     'ccpp/physics/physics/lsm_noah.f'                       ,
     'ccpp/physics/physics/noahmpdrv.F90'                    ,
     'ccpp/physics/physics/flake_driver.F90'                 ,
+    'ccpp/physics/physics/clm_lake.f90'                     ,
     'ccpp/physics/physics/sfc_nst_pre.f'                    ,
     'ccpp/physics/physics/sfc_nst.f'                        ,
     'ccpp/physics/physics/sfc_nst_post.f'                   ,

ccpp/suites/suite_SCM_HRRR.xml

@@ -46,6 +46,7 @@
       <scheme>sfc_nst</scheme>
       <scheme>sfc_nst_post</scheme>
       <scheme>lsm_ruc</scheme>
+      <scheme>clm_lake</scheme>
       <scheme>GFS_surface_loop_control_part2</scheme>
     </subcycle>
     <!-- End of surface iteration loop -->

scm/src/CCPP_typedefs.F90

@@ -181,7 +181,6 @@ module CCPP_typedefs
     integer,               pointer      :: idxday(:)          => null()  !<
     logical,               pointer      :: icy(:)             => null()  !<
     logical,               pointer      :: lake(:)            => null()  !<
-    logical,               pointer      :: use_flake(:)       => null()  !<
     logical,               pointer      :: ocean(:)           => null()  !<
     integer                             :: ipr                           !<
     integer,               pointer      :: islmsk(:)          => null()  !<
@@ -576,7 +575,6 @@ subroutine gfs_interstitial_create (Interstitial, IM, Model)
     allocate (Interstitial%idxday          (IM))
     allocate (Interstitial%icy             (IM))
     allocate (Interstitial%lake            (IM))
-    allocate (Interstitial%use_flake       (IM))
     allocate (Interstitial%ocean           (IM))
     allocate (Interstitial%islmsk          (IM))
     allocate (Interstitial%islmsk_cice     (IM))
@@ -1255,7 +1253,6 @@ subroutine gfs_interstitial_phys_reset (Interstitial, Model)
     Interstitial%dry             = .false.
     Interstitial%icy             = .false.
     Interstitial%lake            = .false.
-    Interstitial%use_flake       = .false.
     Interstitial%ocean           = .false.
     Interstitial%islmsk          = 0
     Interstitial%islmsk_cice     = 0

scm/src/CCPP_typedefs.meta

@@ -1238,12 +1238,6 @@
   units = flag
   dimensions = (horizontal_loop_extent)
   type = logical
-[use_flake]
-  standard_name = flag_for_using_flake
-  long_name = flag indicating lake points using flake model
-  units = flag
-  dimensions = (horizontal_loop_extent)
-  type = logical
 [ocean]
   standard_name = flag_nonzero_ocean_surface_fraction
   long_name = flag indicating presence of some ocean surface area fraction