Add CLM Lake Model and update Flake

.gitmodules

@@ -8,8 +8,8 @@
   branch = main
 [submodule "ccpp/physics"]
   path = ccpp/physics
-  url = https://github.com/ufs-community/ccpp-physics
-  branch = ufs/dev
+  url = https://github.com/SamuelTrahanNOAA/ccpp-physics
+  branch = clm_lake_revert.v9
 [submodule "upp"]
   path = upp
   url = https://github.com/NOAA-EMC/UPP

CMakeLists.txt

@@ -85,6 +85,7 @@ add_library(fv3atm
   cpl/module_block_data.F90
   cpl/module_cplfields.F90
   cpl/module_cap_cpl.F90
+  io/clm_lake_io.F90
   io/FV3GFS_io.F90
   io/FV3GFS_restart_io.F90
   io/module_write_netcdf.F90

ccpp/config/ccpp_prebuild_config.py

@@ -1,3 +1,4 @@
+
 #!/usr/bin/env python
 
 # CCPP prebuild config for GFDL Finite-Volume Cubed-Sphere Model (FV3)
@@ -183,6 +184,7 @@
     'physics/physics/lsm_noah.f',
     'physics/physics/noahmpdrv.F90',
     'physics/physics/flake_driver.F90',
+    'physics/physics/clm_lake.f90',
     'physics/physics/sfc_nst_pre.f',
     'physics/physics/sfc_nst.f',
     'physics/physics/sfc_nst_post.f',

ccpp/data/CCPP_typedefs.F90

@@ -184,7 +184,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()  !<
@@ -647,7 +646,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))
@@ -1327,7 +1325,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

ccpp/data/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