cleanup: Removed whitespaces and preserved newlines

Removed trivial diffs to reduce review burden.

Author: kvrigor

src/clm5/biogeochem/CNBalanceCheckMod.F90

@@ -105,7 +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
@@ -164,7 +164,7 @@ subroutine CBalanceCheck(this, bounds, num_soilc, filter_soilc, &
          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/CNCIsoFluxMod.F90

@@ -135,7 +135,7 @@ subroutine CIsoFlux1(num_soilc, filter_soilc, num_soilp, filter_soilp,         &
            iso_cnveg_cf%frootc_to_litter_patch              , cnveg_cf%frootc_to_litter_patch, &
            iso_cnveg_cs%frootc_patch                        , cnveg_cs%frootc_patch, &
            num_soilp                                        , filter_soilp, 1._r8, 0, isotope)
- 
+
       call CIsoFluxCalc(&
            iso_cnveg_cf%livestemc_to_deadstemc_patch        , cnveg_cf%livestemc_to_deadstemc_patch, &
            iso_cnveg_cs%livestemc_patch                     , cnveg_cs%livestemc_patch, &
@@ -1233,7 +1233,7 @@ subroutine CNCIsoLitterToColumn (num_soilc, filter_soilc, &
                           + frootc_to_litter(p) * fr_fcel(ivt(p)) * wtcol(p) * froot_prof(p,j)
                      phenology_c_to_litr_lig_c(c,j) = phenology_c_to_litr_lig_c(c,j) &
                           + frootc_to_litter(p) * fr_flig(ivt(p)) * wtcol(p) * froot_prof(p,j)
-                     
+
 !DML
                      if (ivt(p) >= npcropmin) then ! add livestemc to litter
                         ! stem litter carbon fluxes

src/clm5/biogeochem/CNCStateUpdate1Mod.F90

@@ -397,7 +397,6 @@ subroutine CStateUpdate1( num_soilc, filter_soilc, num_soilp, filter_soilp, &
               cs_veg%deadcrootc_patch(p)         = cs_veg%deadcrootc_patch(p)         + cf_veg%cpool_to_deadcrootc_patch(p)*dt
               cs_veg%cpool_patch(p)              = cs_veg%cpool_patch(p)              - cf_veg%cpool_to_deadcrootc_storage_patch(p)*dt
               cs_veg%deadcrootc_storage_patch(p) = cs_veg%deadcrootc_storage_patch(p) + cf_veg%cpool_to_deadcrootc_storage_patch(p)*dt
-              
            end if
            if (ivt(p) >= npcropmin) then ! skip 2 generic crops
               if (carbon_resp_opt == 1 .and. perennial(ivt(p)) == 0._r8) then !(perennial flag added by O.Dombrowski)
@@ -548,7 +547,6 @@ subroutine CStateUpdate1( num_soilc, filter_soilc, num_soilp, filter_soilp, &
                  cs_veg%xsmrpool_patch(p)        = 0._r8
                  cs_veg%cpool_patch(p)           = 0._r8
                  cs_veg%frootc_patch(p)          = 0._r8
-                 
               end if
 
               ! Slowly release xsmrpool to atmosphere
@@ -560,7 +558,6 @@ subroutine CStateUpdate1( num_soilc, filter_soilc, num_soilp, filter_soilp, &
                  cs_veg%xsmrpool_loss_patch(p) = cs_veg%xsmrpool_loss_patch(p) - cf_veg%xsmrpool_to_atm_patch(p) * dt
 
               end if
-  
            end if
 
 

src/clm5/biogeochem/CNCStateUpdate2Mod.F90

@@ -178,6 +178,7 @@ subroutine CStateUpdate2h(num_soilc, filter_soilc, num_soilp, filter_soilp, &
                  cs_soil%decomp_cpools_vr_col(c,j,i_lig_lit) + cf_veg%harvest_c_to_litr_lig_c_col(c,j) * dt
             cs_soil%decomp_cpools_vr_col(c,j,i_cwd) = &
                  cs_soil%decomp_cpools_vr_col(c,j,i_cwd) + cf_veg%harvest_c_to_cwdc_col(c,j)  * dt
+
             ! wood to product pools - states updated in CNProducts
          end do
       end do
@@ -200,6 +201,7 @@ subroutine CStateUpdate2h(num_soilc, filter_soilc, num_soilp, filter_soilp, &
               - cf_veg%hrv_livecrootc_to_litter_patch(p) * dt
          cs_veg%deadcrootc_patch(p) = cs_veg%deadcrootc_patch(p)                 &
               - cf_veg%hrv_deadcrootc_to_litter_patch(p) * dt
+
          ! xsmrpool
          cs_veg%xsmrpool_patch(p) = cs_veg%xsmrpool_patch(p)                     &
               - cf_veg%hrv_xsmrpool_to_atm_patch(p) * dt

src/clm5/biogeochem/CNFUNMod.F90

@@ -1523,7 +1523,9 @@ subroutine CNFUN(bounds,num_soilc, filter_soilc,num_soilp&
       npp_Nuptake(p)            = soilc_change(p)
       ! how much carbon goes to growth of tissues?  
       npp_growth(p)             = (Nuptake(p)- free_retransn_to_npool(p))*plantCN(p)+(excess_carbon_acc/dt) !does not include gresp, since this is calculated from growth
-     
+
+
+
       !-----------------------Diagnostic Fluxes------------------------------!
       if(availc(p).gt.0.0_r8)then !what happens in the night? 
         nuptake_npp_fraction_patch(p) = npp_Nuptake(p)/availc(p)

src/clm5/biogeochem/CNGRespMod.F90

@@ -214,7 +214,6 @@ subroutine CNGResp(num_soilp, filter_soilp, cnveg_carbonflux_inst, canopystate_i
             cpool_deadcroot_storage_gr(p) = cpool_to_deadcrootc_storage(p) * grperc(ivt(p)) * grpnow(ivt(p)) 
 
             transfer_deadcroot_gr(p) = deadcrootc_xfer_to_deadcrootc(p) * grperc(ivt(p)) * (1._r8 - grpnow(ivt(p))) 
-            
          end if
 
       end do

src/clm5/biogeochem/CNNStateUpdate1Mod.F90

@@ -164,7 +164,6 @@ subroutine NStateUpdate1(num_soilc, filter_soilc, num_soilp, filter_soilp, &
             ns_veg%livecrootn_xfer_patch(p) = ns_veg%livecrootn_xfer_patch(p) - nf_veg%livecrootn_xfer_to_livecrootn_patch(p)*dt
             ns_veg%deadcrootn_patch(p)      = ns_veg%deadcrootn_patch(p)      + nf_veg%deadcrootn_xfer_to_deadcrootn_patch(p)*dt
             ns_veg%deadcrootn_xfer_patch(p) = ns_veg%deadcrootn_xfer_patch(p) - nf_veg%deadcrootn_xfer_to_deadcrootn_patch(p)*dt
-            
          end if
 
          if (ivt(p) >= npcropmin) then ! skip 2 generic crops
@@ -198,7 +197,6 @@ subroutine NStateUpdate1(num_soilc, filter_soilc, num_soilp, filter_soilp, &
             ns_veg%deadcrootn_patch(p)   = ns_veg%deadcrootn_patch(p) + nf_veg%livecrootn_to_deadcrootn_patch(p)*dt
             ns_veg%livecrootn_patch(p)   = ns_veg%livecrootn_patch(p) - nf_veg%livecrootn_to_retransn_patch(p)*dt
             ns_veg%retransn_patch(p)     = ns_veg%retransn_patch(p)   + nf_veg%livecrootn_to_retransn_patch(p)*dt
-            
          end if
          if (ivt(p) >= npcropmin) then ! Beth adds retrans from froot
             if (perennial(ivt(p)) == 1._r8 .and. woody(ivt(p)) == 1.0_r8) then ! (added by O.Dombrowski)
@@ -270,7 +268,6 @@ subroutine NStateUpdate1(num_soilc, filter_soilc, num_soilp, filter_soilp, &
             ns_veg%deadcrootn_storage_patch(p) = ns_veg%deadcrootn_storage_patch(p) + nf_veg%npool_to_deadcrootn_storage_patch(p)*dt
 
          end if
-
          if (ivt(p) >= npcropmin) then ! skip 2 generic crops
             if (perennial(ivt(p)) == 1._r8 .and. woody(ivt(p)) == 1.0_r8) then ! (added by O.Dombrowski)
                ns_veg%npool_patch(p)           = ns_veg%npool_patch(p)              - nf_veg%npool_to_grainn_patch(p)*dt
@@ -306,7 +303,6 @@ subroutine NStateUpdate1(num_soilc, filter_soilc, num_soilp, filter_soilp, &
             ns_veg%livecrootn_xfer_patch(p)    = ns_veg%livecrootn_xfer_patch(p)    + nf_veg%livecrootn_storage_to_xfer_patch(p)*dt
             ns_veg%deadcrootn_storage_patch(p) = ns_veg%deadcrootn_storage_patch(p) - nf_veg%deadcrootn_storage_to_xfer_patch(p)*dt
             ns_veg%deadcrootn_xfer_patch(p)    = ns_veg%deadcrootn_xfer_patch(p)    + nf_veg%deadcrootn_storage_to_xfer_patch(p)*dt
-            
          end if
 
          if (ivt(p) >= npcropmin) then ! skip 2 generic crops

src/clm5/biogeochem/CNVegCarbonStateType.F90

@@ -2522,6 +2522,7 @@ subroutine Summary_carbonstate(this, bounds, num_allc, filter_allc, &
             this%deadstemc_patch(p)  + &
             this%livecrootc_patch(p) + &
             this%deadcrootc_patch(p)
+
        ! stored vegetation carbon, excluding cpool (STORVEGC)
        this%storvegc_patch(p) =                &
             this%cpool_patch(p)              + &
@@ -2550,16 +2551,18 @@ subroutine Summary_carbonstate(this, bounds, num_allc, filter_allc, &
                this%dispvegc_patch(p)       + &
                this%grainc_patch(p)
        end if
-       
+
        ! total vegetation carbon, excluding cpool (TOTVEGC)
        this%totvegc_patch(p) = &
             this%dispvegc_patch(p) + &
             this%storvegc_patch(p)
+
        ! total patch-level carbon, including xsmrpool, ctrunc
        this%totc_patch(p) = &
             this%totvegc_patch(p) + &
             this%xsmrpool_patch(p) + &
             this%ctrunc_patch(p)
+
        if (use_crop) then 
           this%totc_patch(p) = this%totc_patch(p) + this%cropseedc_deficit_patch(p) + &
                this%xsmrpool_loss_patch(p)
@@ -2602,6 +2605,7 @@ 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/NutrientCompetitionFlexibleCNMod.F90

@@ -97,6 +97,7 @@ subroutine InitAllocate(this, bounds)
 
     allocate(this%actual_leafcn(bounds%begp:bounds%endp))         ; this%actual_leafcn(:)         = nan
     allocate(this%actual_storage_leafcn(bounds%begp:bounds%endp)) ; this%actual_storage_leafcn(:) = nan
+
   end subroutine InitAllocate
 
   !------------------------------------------------------------------------
@@ -403,12 +404,14 @@ subroutine calc_plant_cn_alloc(this, bounds, num_soilp, filter_soilp,   &
 
       ! set time steps
       dt = real( get_step_size(), r8 )
+
       ! patch loop to distribute the available N between the competing patches
       ! on the basis of relative demand, and allocate C and N to new growth and storage
 
       do fp = 1,num_soilp
          p = filter_soilp(fp)
          c = patch%column(p)
+
          ! set some local allocation variables
          f1 = froot_leaf(ivt(p))
          f2 = croot_stem(ivt(p))
@@ -517,6 +520,7 @@ subroutine calc_plant_cn_alloc(this, bounds, num_soilp, filter_soilp,   &
          ! transfer pools
 
          nlc = plant_calloc(p) / c_allometry(p)
+
          cpool_to_leafc(p)          = nlc * fcur
          cpool_to_leafc_storage(p)  = nlc * (1._r8 - fcur)
          cpool_to_frootc(p)         = nlc * f1 * fcur
@@ -886,6 +890,8 @@ subroutine calc_plant_cn_alloc(this, bounds, num_soilp, filter_soilp,   &
                             + cpool_to_grainc_storage(p) 
          end if
          cpool_to_gresp_storage(p) = gresp_storage * g1 * (1._r8 - g2)
+
+
          ! computing 1.) fractional N demand and 2.) N allocation after uptake for different plant parts
          !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
          if (downreg_opt .eqv. .false. .AND. CN_partition_opt == 1) then
@@ -1594,11 +1600,13 @@ subroutine calc_plant_nitrogen_demand(this, bounds,  num_soilp, filter_soilp, &
 
          ! no allocation when available c is negative
          availc(p) = max(availc(p),0.0_r8)
+
          ! test for an xsmrpool deficit
          if (xsmrpool(p) < 0.0_r8) then
             ! Running a deficit in the xsmrpool, so the first priority is to let
             ! some availc from this timestep accumulate in xsmrpool.
             ! Determine rate of recovery for xsmrpool deficit
+
             xsmrpool_recover(p) = -xsmrpool(p)/(dayscrecover*secspday)
             if (xsmrpool_recover(p) < availc(p)) then
                ! available carbon reduced by amount for xsmrpool recovery

src/clm5/biogeochem/dynHarvestMod.F90

@@ -330,14 +330,13 @@ subroutine CNHarvest (num_soilc, filter_soilc, num_soilp, filter_soilp, &
             else
                m = 0._r8
             end if
-            
+
             ! patch-level harvest carbon fluxes
             ! displayed pools
             hrv_leafc_to_litter(p)               = leafc(p)               * m
             hrv_frootc_to_litter(p)              = frootc(p)              * m
             hrv_livestemc_to_litter(p)           = livestemc(p)           * m
             wood_harvestc(p)                     = deadstemc(p)           * m
-            
             hrv_livecrootc_to_litter(p)          = livecrootc(p)          * m
             hrv_deadcrootc_to_litter(p)          = deadcrootc(p)          * m
             hrv_xsmrpool_to_atm(p)               = xsmrpool(p)            * m
@@ -499,7 +498,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)
@@ -630,7 +629,7 @@ subroutine CNHarvestPftToColumn (num_soilc, filter_soilc, &
                  ! wood harvest mortality carbon fluxes to product pools
                  cwood_harvestc(c)  = cwood_harvestc(c)  + &
                       pwood_harvestc(p)  * wtcol(p)
-                 
+
                  ! wood harvest mortality nitrogen fluxes to product pools
                  cwood_harvestn(c)  = cwood_harvestn(c)  + &
                       pwood_harvestn(p)  * wtcol(p)