Updates identification of crop patches and columns

Author: bishtgautam

components/elm/src/biogeochem/CropType.F90

@@ -331,7 +331,7 @@ subroutine InitCold(this, bounds)
           t = veg_pp%topounit(p)
           topi = grc_pp%topi(g)
 
-          if (lun_pp%itype(l) == istcrop) then
+          if (veg_pp%is_on_crop_col(p)) then
              ti = t - topi + 1
              m  = veg_pp%itype(p)
              this%fertnitro_patch(p) = fert_cft(g,ti,m)

components/elm/src/biogeochem/FanUpdateMod.F90

@@ -319,7 +319,7 @@ subroutine fan_eval(bounds, num_soilc, filter_soilc, &
 
        ! Find and average the atmospheric resistances Rb and Ra.
        ! 
-       if (lun_pp%itype(l) == istcrop) then
+       if (veg_pp%is_on_crop_col(p)) then
           ! Crop column, only one patch
           p = col_pp%pfti(c)
           if (p /= col_pp%pftf(c)) call endrun(msg='Strange patch for crop')
@@ -901,7 +901,7 @@ subroutine update_summary(filter_soilc, num_soilc)
        total = total + col_ns%manure_n_stored(c)
        col_ns%fan_totn(c) = total
 
-       if (lun_pp%itype(l) == istcrop) then
+       if (col_pp%is_crop(c)) then
           ! no grazing, manure_n_appl is from the same column and not counted as input
           fluxin = col_nf%manure_n_mix(c) + col_nf%fert_n_appl(c)
        else

components/elm/src/dyn_subgrid/dyncropFileMod.F90

@@ -194,7 +194,7 @@ subroutine dyncrop_interp(bounds,crop_vars)
        topi = grc_pp%topi(g)
        ti = t - topi + 1
 
-       if (lun_pp%itype(l) == istcrop) then
+       if (veg_pp%is_on_crop_col(p)) then
           m = veg_pp%itype(p)
 
           ! The following assumes there is a single CFT on each crop column. The

components/elm/src/main/subgridWeightsMod.F90

@@ -961,7 +961,7 @@ subroutine set_pct_pft_diagnostics(bounds)
        if (veg_pp%is_on_soil_col(p)) then
           ptype_1indexing = ptype + (1 - natpft_lb)
           subgrid_weights_diagnostics%pct_nat_pft(t, ptype_1indexing) = veg_pp%wtlunit(p) * 100._r8
-       else if (lun_pp%itype(l) == istcrop) then
+       else if (veg_pp%is_on_crop_col(p)) then
           ptype_1indexing = ptype + (1 - cft_lb)
           subgrid_weights_diagnostics%pct_cft(t, ptype_1indexing) = veg_pp%wtlunit(p) * 100._r8
        end if