cleaned up some scripts, added some crop types to active CFTs

Author: odombro

src/clm5/biogeochem/CNBalanceCheckMod.F90

@@ -105,6 +105,7 @@ subroutine BeginCNBalance(this, bounds, num_soilc, filter_soilc, &
        c = filter_soilc(fc)
        col_begcb(c) = totcolc(c)
        col_begnb(c) = totcoln(c)
+    
     end do
 
     end associate
@@ -161,10 +162,9 @@ subroutine CBalanceCheck(this, bounds, num_soilc, filter_soilc, &
 
          ! calculate the total column-level carbon storage, for mass conservation check
          col_endcb(c) = totcolc(c)
-
          ! calculate total column-level inputs
          col_cinputs = gpp(c)
-
+         
          ! calculate total column-level outputs
          ! er = ar + hr, col_fire_closs includes patch-level fire losses
          col_coutputs = er(c) + col_fire_closs(c) + col_hrv_xsmrpool_to_atm(c) + &
@@ -181,7 +181,7 @@ subroutine CBalanceCheck(this, bounds, num_soilc, filter_soilc, &
 
          ! subtract leaching flux
          col_coutputs = col_coutputs - som_c_leached(c)
-
+         
          ! calculate the total column-level carbon balance error for this time step
          col_errcb(c) = (col_cinputs - col_coutputs)*dt - &
               (col_endcb(c) - col_begcb(c))

src/clm5/biogeochem/CNVegCarbonStateType.F90

@@ -2602,7 +2602,6 @@ subroutine Summary_carbonstate(this, bounds, num_allc, filter_allc, &
             soilbiogeochem_totlitc_col(c)   + &
             soilbiogeochem_totsomc_col(c)   + &
             soilbiogeochem_ctrunc_col(c)
-
     end do
 
   end subroutine Summary_carbonstate

src/clm5/biogeochem/CropType.F90

@@ -533,7 +533,7 @@ subroutine CropUpdateAccVars(this, bounds, t_ref2m_patch, t_soisno_col)
     use shr_const_mod    , only : SHR_CONST_CDAY, SHR_CONST_TKFRZ
     use clm_time_manager , only : get_step_size, get_nstep
     use clm_varpar       , only : nlevsno, nlevgrnd
-    use pftconMod        , only : nswheat, nirrig_swheat, ncitrus, nirrig_citrus, ngrapes, nirrig_grapes, pftcon
+    use pftconMod        , only : nswheat, nirrig_swheat, ncitrus, nirrig_citrus, pftcon
     use pftconMod        , only : nwwheat, nirrig_wwheat
     use pftconMod        , only : nsugarcane, nirrig_sugarcane
     use ColumnType       , only : col
@@ -589,7 +589,6 @@ subroutine CropUpdateAccVars(this, bounds, t_ref2m_patch, t_soisno_col)
           if ( (trim(this%baset_mapping) == baset_map_latvary) .and. &
              ((ivt == nswheat) .or. (ivt == nirrig_swheat) .or. &
               (ivt == ncitrus) .or. (ivt == nirrig_citrus) .or. & ! added by Olga
-              (ivt == ngrapes) .or. (ivt == nirrig_grapes) .or. & ! added by Olga
               (ivt == nsugarcane) .or. (ivt == nirrig_sugarcane)) ) then
              rbufslp(p) = max(0._r8, min(pftcon%mxtmp(ivt), &
              t_ref2m_patch(p)-(SHR_CONST_TKFRZ + this%latbaset_patch(p)))) &

src/clm5/biogeochem/NutrientCompetitionFlexibleCNMod.F90

@@ -1329,7 +1329,7 @@ subroutine calc_plant_nitrogen_demand(this, bounds,  num_soilp, filter_soilp, &
     use pftconMod              , only : ntmp_soybean, nirrig_tmp_soybean
     use pftconMod              , only : ntrp_soybean, nirrig_trp_soybean
     use clm_varcon             , only : secspday, dzsoi_decomp
-    use clm_varctl             , only : iulog, use_c13, use_c14
+    use clm_varctl             , only : use_c13, use_c14
     use clm_varctl             , only : nscalar_opt, plant_ndemand_opt, substrate_term_opt, temp_scalar_opt
     use clm_varpar             , only : nlevdecomp
     use clm_time_manager       , only : get_step_size,get_curr_calday
@@ -1651,7 +1651,6 @@ subroutine calc_plant_nitrogen_demand(this, bounds,  num_soilp, filter_soilp, &
                         ! of amount allocated to roots over course of the growing season
 
                         if (peaklai(p) == 1) then ! lai at maximum allowed
-                           write(iulog,*) 'hit peaklai, allocation to leaf is set to small value'
                            arepr(p) = 0._r8
                            aleaf(p) = 1.e-5_r8
                            astem(p) = astem(p)
@@ -1690,8 +1689,7 @@ subroutine calc_plant_nitrogen_demand(this, bounds,  num_soilp, filter_soilp, &
                                 (huigrain(p)-huileaf(p))),1._r8)**allconss(ivt(p)) )))
                         end if
                        ! If crops have hit peaklai, then set leaf allocation to small value
-                        if (peaklai(p) == 1) then
-                           write(iulog,*) 'hit peaklai, allocation to leaf is set to small value' 
+                        if (peaklai(p) == 1) then 
                            aleaf(p) = 1.e-5_r8
                         else if (aleafi(p) > aleaff(ivt(p))) then
                            fleaf = aleafi(p) * (exp(-bfact(ivt(p))) - &
@@ -1718,7 +1716,6 @@ subroutine calc_plant_nitrogen_demand(this, bounds,  num_soilp, filter_soilp, &
                        ! small value
                         if (peaklai(p) == 1) then
                            aleaf(p) = 1.e-5_r8
-                           write(iulog,*) 'hit peaklai, allocation to leaf is set to small value'
                         else if (aleafi3(p) > aleaff(ivt(p))) then
                            fleaf = fleafi(ivt(p)) * (exp(-bfact(ivt(p))) - &
                                 exp(-bfact(ivt(p))*(hui(p)-huileaf(p))/(huilfmat(p)-huileaf(p)))) / &

src/clm5/biogeochem/dynHarvestMod.F90

@@ -499,7 +499,7 @@ subroutine CNHarvestPftToColumn (num_soilc, filter_soilc, &
                  p = col%patchi(c) + pi - 1
 
                  if (patch%active(p)) then
-
+                    
                     ! leaf harvest mortality carbon fluxes
                     harvest_c_to_litr_met_c(c,j) = harvest_c_to_litr_met_c(c,j) + &
                          hrv_leafc_to_litter(p) * lf_flab(ivt(p)) * wtcol(p) * leaf_prof(p,j)