Clean out !KO

src/biogeophys/CanopyTemperatureMod.F90

@@ -47,9 +47,7 @@ module CanopyTemperatureMod
   !------------------------------------------------------------------------------
   subroutine CanopyTemperature(bounds, &
        num_nolakec, filter_nolakec, num_nolakep, filter_nolakep, &
-!KO
        num_urbanc, filter_urbanc, &
-!KO
        clm_fates, &
        atm2lnd_inst, canopystate_inst, soilstate_inst, frictionvel_inst, &
        waterstatebulk_inst, waterdiagnosticbulk_inst, waterfluxbulk_inst, &
@@ -93,10 +91,8 @@ subroutine CanopyTemperature(bounds, &
     integer                , intent(in)    :: filter_nolakec(:)   ! column filter for non-lake points
     integer                , intent(in)    :: num_nolakep         ! number of column non-lake points in patch filter
     integer                , intent(in)    :: filter_nolakep(:)   ! patch filter for non-lake points
-!KO
     integer                , intent(in)    :: num_urbanc          ! number of urban columns in clump
     integer                , intent(in)    :: filter_urbanc(:)    ! urban column filter
-!KO
     type(hlm_fates_interface_type), intent(inout)  :: clm_fates
     type(atm2lnd_type)     , intent(in)    :: atm2lnd_inst
     type(canopystate_type) , intent(inout) :: canopystate_inst
@@ -114,9 +110,7 @@ subroutine CanopyTemperature(bounds, &
     integer  :: j            ! soil/snow level index
     integer  :: fp           ! lake filter patch index
     integer  :: fc           ! lake filter column index
-!KO
     integer  :: nlev         ! greater of nlevgrnd and nlevurb
-!KO
     real(r8) :: qred         ! soil surface relative humidity
     real(r8) :: avmuir       ! ir inverse optical depth per unit leaf area
     real(r8) :: eg           ! water vapor pressure at temperature T [pa]
@@ -228,22 +222,15 @@ subroutine CanopyTemperature(bounds, &
       do j = -nlevsno+1, nlevgrnd
          do fc = 1,num_nolakec
             c = filter_nolakec(fc)
-!KO            if ((col%itype(c) == icol_sunwall .or. col%itype(c) == icol_shadewall &
-!KO                 .or. col%itype(c) == icol_roof) .and. j > nlevurb) then
-!KO               tssbef(c,j) = spval 
-!KO            else
-!KO
             if (col%itype(c) /= icol_sunwall .and. col%itype(c) /= icol_shadewall &
                  .and. col%itype(c) /= icol_roof) then
-!KO
                tssbef(c,j) = t_soisno(c,j)
             end if
             ! record t_h2osfc prior to updating
             t_h2osfc_bef(c) = t_h2osfc(c)   
          end do
       end do
 
-!KO
       nlev = max0(nlevgrnd,nlevurb)
       do j = -nlevsno+1, nlev
          do fc = 1,num_urbanc
@@ -260,7 +247,6 @@ subroutine CanopyTemperature(bounds, &
             t_h2osfc_bef(c) = t_h2osfc(c)   
          end do
       end do
-!KO
 
       ! calculate moisture stress/resistance for soil evaporation
       call calc_soilevap_resis(bounds, num_nolakec, filter_nolakec, &

src/biogeophys/HydrologyDrainageMod.F90

@@ -151,19 +151,13 @@ subroutine HydrologyDrainage(bounds,               &
       do j = 1, nlevgrnd
          do fc = 1, num_nolakec
             c = filter_nolakec(fc)
-!KO            if ((ctype(c) == icol_sunwall .or. ctype(c) == icol_shadewall &
-!KO                 .or. ctype(c) == icol_roof) .and. j > nlevurb) then
-!KO
             if (ctype(c) /= icol_sunwall .and. ctype(c) /= icol_shadewall &
                  .and. ctype(c) /= icol_roof) then
-!KO
-!KO            else
                h2osoi_vol(c,j) = h2osoi_liq(c,j)/(dz(c,j)*denh2o) + h2osoi_ice(c,j)/(dz(c,j)*denice)
             end if
          end do
       end do
 
-!KO
       do j = 1, nlevurb
          do fc = 1, num_urbanc
             c = filter_urbanc(fc)
@@ -173,7 +167,6 @@ subroutine HydrologyDrainage(bounds,               &
             end if
          end do
       end do
-!KO
 
       call ComputeWaterMassNonLake(bounds, num_nolakec, filter_nolakec, &
            waterstatebulk_inst, waterdiagnosticbulk_inst, &

src/biogeophys/HydrologyNoDrainageMod.F90

@@ -514,19 +514,13 @@ subroutine HydrologyNoDrainage(bounds, &
       do j = 1, nlevgrnd
          do fc = 1, num_nolakec
             c = filter_nolakec(fc)
-!KO            if ((ctype(c) == icol_sunwall .or. ctype(c) == icol_shadewall &
-!KO                 .or. ctype(c) == icol_roof) .and. j > nlevurb) then
-!KO
             if (ctype(c) /= icol_sunwall .and. ctype(c) /= icol_shadewall &
                  .and. ctype(c) /= icol_roof) then
-!KO
-!KO            else
                h2osoi_vol(c,j) = h2osoi_liq(c,j)/(dz(c,j)*denh2o) + h2osoi_ice(c,j)/(dz(c,j)*denice)
             end if
          end do
       end do
 
-!KO
       do j = 1, nlevurb
          do fc = 1, num_urbanc
             c = filter_urbanc(fc)
@@ -536,7 +530,6 @@ subroutine HydrologyNoDrainage(bounds, &
             end if
          end do
       end do
-!KO
 
 !      if (use_cn) then
          ! Update soilpsi.

src/biogeophys/SoilFluxesMod.F90

@@ -378,12 +378,8 @@ subroutine SoilFluxes (bounds, num_urbanl, filter_urbanl, &
             c = patch%column(p)
 
 ! Do this for perv and imperv road for -nlevsno+1,nlevgrnd
-!KO            if ((col%itype(c) /= icol_sunwall .and. col%itype(c) /= icol_shadewall &
-!KO                 .and. col%itype(c) /= icol_roof) .or. ( j <= nlevurb)) then
-!KO
             if (col%itype(c) /= icol_sunwall .and. col%itype(c) /= icol_shadewall &
                  .and. col%itype(c) /= icol_roof) then
-!KO
                ! area weight heat absorbed by snow layers
                if (j >= col%snl(c)+1 .and. j < 1) errsoi_patch(p) = errsoi_patch(p) &
                     - frac_sno_eff(c)*(t_soisno(c,j)-tssbef(c,j))/fact(c,j)
@@ -392,7 +388,7 @@ subroutine SoilFluxes (bounds, num_urbanl, filter_urbanl, &
             end if
          end do
       end do
-!KO
+
 ! Do this for sunwall, shadewall, roof but for -nlevsno+1,nlevurb
       do j = -nlevsno+1,nlevurb
          do fp = 1,num_urbanp
@@ -409,7 +405,7 @@ subroutine SoilFluxes (bounds, num_urbanl, filter_urbanl, &
             end if
          end do
       end do
-!KO
+
       call t_stopf('bgp2_loop_3')
       call t_startf('bgp2_loop_4')