MIMICS into vertically resolved CTSM

src/soilbiogeochem/SoilBiogeochemCompetitionMod.F90

@@ -557,29 +557,7 @@ subroutine SoilBiogeochemCompetition (bounds, num_soilc, filter_soilc,num_soilp,
                sum_nh4_demand_scaled(c,j) = plant_ndemand(c)* nuptake_prof(c,j) * compet_plant_nh4 + &
                     potential_immob_vr(c,j)*compet_decomp_nh4 + pot_f_nit_vr(c,j)*compet_nit
 
-               if (use_mimics_decomp) then
-                  ! this turns off fpi for MIMICS and only lets plants
-                  ! take up available mineral nitrogen.
-                  ! TODO slevis: -ve or tiny sminn_vr could cause problems
-                  nlimit_nh4(c,j) = 1
-                  fpi_nh4_vr(c,j) = 1.0_r8
-                  actual_immob_nh4_vr(c,j) = potential_immob_vr(c,j)
-                  ! TODO slevis: check the logic here...
-                  f_nit_vr(c,j) = pot_f_nit_vr(c,j)
-                  if ( .not. local_use_fun ) then
-                     smin_nh4_to_plant_vr(c,j) = min((smin_nh4_vr(c,j) / dt) * &
-                                                     plant_ndemand(c) * &
-                                                     nuptake_prof(c,j) * &
-                                                     compet_plant_nh4 / &
-                                                     sum_nh4_demand_scaled(c,j), &
-                                                     plant_ndemand(c) * &
-                                                     nuptake_prof(c,j))
-                  else
-                     smin_nh4_to_plant_vr(c,j) = smin_nh4_vr(c,j) / dt - &
-                                                 actual_immob_nh4_vr(c,j) - &
-                                                 f_nit_vr(c,j)
-                  end if
-               else if (sum_nh4_demand(c,j)*dt < smin_nh4_vr(c,j)) then
+               if (sum_nh4_demand(c,j)*dt < smin_nh4_vr(c,j)) then
 
                   ! NH4 availability is not limiting immobilization or plant
                   ! uptake, and all can proceed at their potential rates
@@ -596,6 +574,31 @@ subroutine SoilBiogeochemCompetition (bounds, num_soilc, filter_soilc,num_soilp,
                      smin_nh4_to_plant_vr(c,j) = smin_nh4_vr(c,j)/dt - actual_immob_nh4_vr(c,j) - f_nit_vr(c,j)
                   end if
 
+               else if (use_mimics_decomp) then
+                  ! this turns off fpi for MIMICS and only lets plants
+                  ! take up available mineral nitrogen.
+                  ! TODO slevis: -ve or tiny sminn_vr could cause problems
+                  nlimit_nh4(c,j) = 1
+                  if (sum_nh4_demand(c,j) > 0.0_r8) then
+                     fpi_nh4_vr(c,j) = 1.0_r8
+                     actual_immob_nh4_vr(c,j) = potential_immob_vr(c,j)
+                     ! TODO slevis: consolidate repeating code if poss.
+                     f_nit_vr(c,j) =  min((smin_nh4_vr(c,j)/dt)*(pot_f_nit_vr(c,j)*compet_nit / &
+                          sum_nh4_demand_scaled(c,j)), pot_f_nit_vr(c,j))
+                     if ( .not. local_use_fun ) then
+                        smin_nh4_to_plant_vr(c,j) = min((smin_nh4_vr(c,j) / dt) * &
+                                                        plant_ndemand(c) * &
+                                                        nuptake_prof(c,j) * &
+                                                        compet_plant_nh4 / &
+                                                        sum_nh4_demand_scaled(c,j), &
+                                                        plant_ndemand(c) * &
+                                                        nuptake_prof(c,j))
+                     else
+                        smin_nh4_to_plant_vr(c,j) = smin_nh4_vr(c,j) / dt - &
+                                                    actual_immob_nh4_vr(c,j) - &
+                                                    f_nit_vr(c,j)
+                     end if
+                  end if
                else
 
                   ! NH4 availability can not satisfy the sum of immobilization, nitrification, and
@@ -650,32 +653,7 @@ subroutine SoilBiogeochemCompetition (bounds, num_soilc, filter_soilc,num_soilp,
 
 
 
-               if (use_mimics_decomp) then
-                  ! this turns off fpi for MIMICS and only lets plants
-                  ! take up available mineral nitrogen.
-                  ! TODO slevis: -ve or tiny sminn_vr could cause problems
-                  nlimit_no3(c,j) = 1
-                  fpi_no3_vr(c,j) = 1.0_r8 - fpi_nh4_vr(c,j)  ! currently 0
-                  actual_immob_no3_vr(c,j) = potential_immob_vr(c,j) - &
-                                             actual_immob_nh4_vr(c,j)  ! currently 0
-                  ! TODO slevis: check the logic here...
-                  f_denit_vr(c,j) = pot_f_denit_vr(c,j)
-                  if ( .not. local_use_fun ) then
-                     smin_no3_to_plant_vr(c,j) = min((smin_no3_vr(c,j) / dt) * &
-                                                     (plant_ndemand(c) * &
-                                                      nuptake_prof(c,j) - &
-                                                      smin_nh4_to_plant_vr(c,j)) * &
-                                                      compet_plant_no3 / &
-                                                      sum_no3_demand_scaled(c,j), &
-                                                      plant_ndemand(c) * &
-                                                      nuptake_prof(c,j) - &
-                                                      smin_nh4_to_plant_vr(c,j))
-                  else
-                     smin_no3_to_plant_vr(c,j) = smin_no3_vr(c,j) / dt - &
-                                                 actual_immob_no3_vr(c,j) - &
-                                                 f_denit_vr(c,j)
-                  end if
-               else if (sum_no3_demand(c,j)*dt < smin_no3_vr(c,j)) then
+               if (sum_no3_demand(c,j)*dt < smin_no3_vr(c,j)) then
 
                   ! NO3 availability is not limiting immobilization or plant
                   ! uptake, and all can proceed at their potential rates
@@ -698,6 +676,34 @@ subroutine SoilBiogeochemCompetition (bounds, num_soilc, filter_soilc,num_soilp,
                      end if
                   endif
 
+               else if (use_mimics_decomp) then
+                  ! this turns off fpi for MIMICS and only lets plants
+                  ! take up available mineral nitrogen.
+                  ! TODO slevis: -ve or tiny sminn_vr could cause problems
+                  nlimit_no3(c,j) = 1
+                  if (sum_no3_demand(c,j) > 0.0_r8) then
+                     fpi_no3_vr(c,j) = 1.0_r8 - fpi_nh4_vr(c,j)  ! => 0
+                     actual_immob_no3_vr(c,j) = potential_immob_vr(c,j) - &
+                                                actual_immob_nh4_vr(c,j)  ! => 0
+                     ! TODO slevis: consolidate repeating code if poss.
+                     f_denit_vr(c,j) = min((smin_no3_vr(c,j)/dt)*(pot_f_denit_vr(c,j)*compet_denit / &
+                                  sum_no3_demand_scaled(c,j)), pot_f_denit_vr(c,j))
+                     if ( .not. local_use_fun ) then
+                        smin_no3_to_plant_vr(c,j) = min((smin_no3_vr(c,j) / dt) * &
+                                                        (plant_ndemand(c) * &
+                                                         nuptake_prof(c,j) - &
+                                                         smin_nh4_to_plant_vr(c,j)) * &
+                                                         compet_plant_no3 / &
+                                                         sum_no3_demand_scaled(c,j), &
+                                                         plant_ndemand(c) * &
+                                                         nuptake_prof(c,j) - &
+                                                         smin_nh4_to_plant_vr(c,j))
+                     else
+                        smin_no3_to_plant_vr(c,j) = smin_no3_vr(c,j) / dt - &
+                                                    actual_immob_no3_vr(c,j) - &
+                                                    f_denit_vr(c,j)
+                     end if
+                  end if
                else 
 
                   ! NO3 availability can not satisfy the sum of immobilization, denitrification, and

src/soilbiogeochem/SoilBiogeochemDecompMod.F90

@@ -88,7 +88,7 @@ subroutine SoilBiogeochemDecomp (bounds, num_soilc, filter_soilc,
     real(r8)                                , intent(inout) :: cn_decomp_pools(bounds%begc:,1:,1:)     ! c:n ratios of applicable pools
     real(r8)                                , intent(inout) :: p_decomp_cpool_loss(bounds%begc:,1:,1:) ! potential C loss from one pool to another
     real(r8)                                , intent(inout) :: pmnf_decomp_cascade(bounds%begc:,1:,1:) ! potential mineral N flux from one pool to another
-    real(r8)                                , intent(inout) :: p_decomp_npool_to_din(bounds%begc:,1:,1:) ! potential flux to dissolved inorganic N
+    real(r8)                                , intent(in)    :: p_decomp_npool_to_din(bounds%begc:,1:,1:) ! potential flux to dissolved inorganic N
     !
     ! !LOCAL VARIABLES:
     integer :: c,j,k,l,m                                    ! indices
@@ -121,7 +121,7 @@ subroutine SoilBiogeochemDecomp (bounds, num_soilc, filter_soilc,
          decomp_cascade_sminn_flux_vr     =>    soilbiogeochem_nitrogenflux_inst%decomp_cascade_sminn_flux_vr_col     , & ! Output: [real(r8) (:,:,:) ]  vert-res mineral N flux for transition along decomposition cascade (gN/m3/s)
          potential_immob_vr               =>    soilbiogeochem_nitrogenflux_inst%potential_immob_vr_col               , & ! Output: [real(r8) (:,:)   ]                                                  
          sminn_to_denit_decomp_cascade_vr =>    soilbiogeochem_nitrogenflux_inst%sminn_to_denit_decomp_cascade_vr_col , & ! Output: [real(r8) (:,:,:) ] 
-         gross_nmin_vr                    =>    soilbiogeochem_nitrogenflux_inst%gross_nmin_vr_col                    , & ! Output: [real(r8) (:,:)   ]                                                  
+         gross_nmin_vr                    =>    soilbiogeochem_nitrogenflux_inst%gross_nmin_vr_col                    , & ! Input: [real(r8) (:,:)   ]
          net_nmin_vr                      =>    soilbiogeochem_nitrogenflux_inst%net_nmin_vr_col                      , & ! Output: [real(r8) (:,:)   ]                                                  
          gross_nmin                       =>    soilbiogeochem_nitrogenflux_inst%gross_nmin_col                       , & ! Output: [real(r8) (:)     ]  gross rate of N mineralization (gN/m2/s)          
          net_nmin                         =>    soilbiogeochem_nitrogenflux_inst%net_nmin_col                         , & ! Output: [real(r8) (:)     ]  net rate of N mineralization (gN/m2/s)            
@@ -204,10 +204,8 @@ subroutine SoilBiogeochemDecomp (bounds, num_soilc, filter_soilc,
                      decomp_cascade_sminn_flux_vr(c,j,k) = - pmnf_decomp_cascade(c,j,k)
                   endif
                   net_nmin_vr(c,j) = net_nmin_vr(c,j) - pmnf_decomp_cascade(c,j,k)
-! TODO slevis: NEED THIS if-block? If so, need anything additional that
-!              is done to pmnf_decomp_cascade or other?
                   if (use_mimics_decomp) then
-                     decomp_cascade_sminn_flux_vr(c,j,k) = decomp_cascade_sminn_flux_vr(c,j,k) + p_decomp_npool_to_din(c,j,k)
+                     decomp_cascade_sminn_flux_vr(c,j,k) = decomp_cascade_sminn_flux_vr(c,j,k) - p_decomp_npool_to_din(c,j,k)
                      net_nmin_vr(c,j) = net_nmin_vr(c,j) + p_decomp_npool_to_din(c,j,k)
                   end if
                else

src/soilbiogeochem/SoilBiogeochemNitrogenStateType.F90

@@ -541,8 +541,10 @@ subroutine Restart ( this,  bounds, ncid, flag, totvegc_col )
     ! matches what the restart file was generated with.  
     ! add info about the SOM decomposition cascade
 
-    if (use_century_decomp .or. use_mimics_decomp) then
+    if (use_century_decomp) then
        decomp_cascade_state = 1
+    else if (use_mimics_decomp) then
+       decomp_cascade_state = 2
     else
        decomp_cascade_state = 0
     end if

src/soilbiogeochem/SoilBiogeochemPotentialMod.F90

@@ -273,9 +273,10 @@ subroutine SoilBiogeochemPotential (bounds, num_soilc, filter_soilc, &
                          decomp_k(c,j,cascade_donor_pool(k)) > 0._r8 ) then
                         ! if p_decomp_cn_diff < 0  N mineralization
                         !                     > 0  immobilization
-                        p_decomp_cn_diff_ratio =  &
+                        ! "min" in next line turns off immobilization flux
+                        p_decomp_cn_diff_ratio = min(0.0_r8,  &
                            (p_decomp_cn_gain(c,j,cascade_receiver_pool(k)) - &
-                            cn_col(c,cascade_receiver_pool(k))) / cn_col(c,cascade_receiver_pool(k))
+                            cn_col(c,cascade_receiver_pool(k))) / cn_col(c,cascade_receiver_pool(k)))
                         ! Actual amount of N that's mineralized or that would
                         ! need to be immobilized
                         ! negative=mineralization: add to the DIN pool