More changes to identify lake columns

Author: bishtgautam

components/elm/src/biogeochem/DUSTMod.F90

@@ -184,15 +184,13 @@ subroutine InitCold(this, bounds)
     type(bounds_type), intent(in) :: bounds
     !
     ! !LOCAL VARIABLES:
-    integer :: c,l
+    integer :: c
     !-----------------------------------------------------------------------
 
     ! Set basin factor to 1 for now
 
     do c = bounds%begc, bounds%endc
-       l = col_pp%landunit(c)
-
-       if (.not.lun_pp%lakpoi(l)) then
+       if (.not.col_pp%is_lake(c)) then
           this%mbl_bsn_fct_col(c) = 1.0_r8
        end if
     end do

components/elm/src/biogeophys/LakeStateType.F90

@@ -227,8 +227,7 @@ subroutine InitCold(this, bounds)
       !-------------------------------------------------
 
       do c = bounds%begc, bounds%endc
-         l = col_pp%landunit(c)
-         if (lun_pp%lakpoi(l)) then
+         if (col_pp%is_lake(c)) then
             ! Set lake ice fraction and top eddy conductivity from previous timestep
             ! Always initialize with no ice to prevent excessive ice sheets from forming when
             ! starting with old lake model that has unrealistically cold lake conseratures.

components/elm/src/biogeophys/PhotosynthesisType.F90

@@ -426,7 +426,8 @@ subroutine TimeStepInit (this, bounds)
 
     do p = bounds%begp, bounds%endp
        l = veg_pp%landunit(p)
-       if (.not. lun_pp%lakpoi(l)) then
+       c = veg_pp%column(p)
+       if (.not. col_pp%is_lake(c)) then
           this%psnsun_patch(p)    = 0._r8
           this%psnsun_wc_patch(p) = 0._r8
           this%psnsun_wj_patch(p) = 0._r8
@@ -486,7 +487,8 @@ subroutine photosyns_vars_TimeStepInit (photosyns_vars, bounds)
 
     do p = bounds%begp, bounds%endp
        l = veg_pp%landunit(p)
-       if (.not. lun_pp%lakpoi(l)) then
+       c = veg_pp%column(p)
+       if (.not. col_pp%is_lake(c)) then
           photosyns_vars%psnsun_patch(p)    = 0._r8
           photosyns_vars%psnsun_wc_patch(p) = 0._r8
           photosyns_vars%psnsun_wj_patch(p) = 0._r8

components/elm/src/biogeophys/SnowHydrologyMod.F90

@@ -2148,7 +2148,7 @@ subroutine InitSnowLayers (bounds, snow_depth)
     real(r8)               , intent(in)    :: snow_depth(bounds%begc:)
     !
     ! LOCAL VARAIBLES:
-    integer               :: c,l,j              ! indices
+    integer               :: c,j                ! indices
     real(r8)              :: minbound, maxbound ! helper variables
 
     !SHR_ASSERT_ALL((ubound(snow_depth)  == (/bounds%endc/)), errMsg(sourcefile, __LINE__))
@@ -2160,14 +2160,13 @@ subroutine InitSnowLayers (bounds, snow_depth)
          zi  => col_pp%zi     & ! Output: [real(r8) (:,:) ]  interface level below a "z" level (m) (-nlevsno+0:nlevgrnd)
     )
     loop_columns: do c = bounds%begc,bounds%endc
-       l = col_pp%landunit(c)
 
        dz(c,-nlevsno+1: 0) = spval
        z (c,-nlevsno+1: 0) = spval
        zi(c,-nlevsno  :-1) = spval
 
        ! Special case: lake
-       if (lun_pp%lakpoi(l)) then
+       if (col_pp%is_lake(c)) then
           snl(c)              = 0
           dz(c,-nlevsno+1:0)  = 0._r8
           z(c,-nlevsno+1:0)   = 0._r8

components/elm/src/data_types/ColumnDataType.F90

@@ -1234,7 +1234,7 @@ subroutine col_es_init(this, begc, endc)
        end if
 
        ! Below snow temperatures - nonlake points (lake points are set below)
-       if (.not. lun_pp%lakpoi(l)) then
+       if (.not. col_pp%is_lake(c)) then
 
           if (lun_pp%itype(l) == istice .or. lun_pp%itype(l) == istice_mec) then
              this%t_soisno(c,1:nlevgrnd) = 250._r8
@@ -1292,7 +1292,7 @@ subroutine col_es_init(this, begc, endc)
           this%t_grnd(c) = this%t_soisno(c,snl(c)+1)
        endif
 
-       if (lun_pp%lakpoi(l)) then ! special handling for lake points
+       if (col_pp%is_lake(c)) then ! special handling for lake points
           this%t_soisno(c,1:nlevgrnd) = 277._r8
           this%t_lake(c,1:nlevlak) = 277._r8
           this%t_grnd(c) = 277._r8
@@ -1733,7 +1733,7 @@ subroutine col_ws_init(this, begc, endc, h2osno_input, snow_depth_input, watsat_
        this%h2osoi_liq(c,-nlevsno+1:) = spval
        this%h2osoi_ice(c,-nlevsno+1:) = spval
 
-       if (.not. lun_pp%lakpoi(l)) then  !not lake
+       if (.not. col_pp%is_lake(c)) then  !not lake
 	       nlevbed = col_pp%nlevbed(c)
           ! volumetric water
           if (col_pp%is_soil(c) .or. col_pp%is_crop(c)) then
@@ -1823,7 +1823,7 @@ subroutine col_ws_init(this, begc, endc, h2osno_input, snow_depth_input, watsat_
        !--------------------------------------------
        ! Set Lake water
        !--------------------------------------------
-       if (lun_pp%lakpoi(l)) then
+       if (col_pp%is_lake(c)) then
           do j = -nlevsno+1, 0
              if (j > col_pp%snl(c)) then
                 this%h2osoi_ice(c,j) = col_pp%dz(c,j)*bdsno

components/elm/src/main/initVerticalMod.F90

@@ -476,13 +476,12 @@ subroutine initVertical(bounds, snow_depth, thick_wall, thick_roof)
         associate(snl => col_pp%snl) ! Output: [integer (:)    ]  number of snow layers   
 
           do c = bounds%begc,bounds%endc
-             l = col_pp%landunit(c)
 
              col_pp%dz(c,-nlevsno+1: 0) = spval
              col_pp%z (c,-nlevsno+1: 0) = spval
              col_pp%zi(c,-nlevsno  :-1) = spval
 
-             if (.not. lun_pp%lakpoi(l)) then
+             if (.not. col_pp%is_lake(c)) then
                 if (snow_depth(c) < 0.01_r8) then
                    snl(c)             = 0
                    col_pp%dz(c,-nlevsno+1:0) = 0._r8