Merge pull request ESCOMP#395 from rgknox/rgknox-growth-allom-fixes

Fixes: growth and allometry
NordicESMhub · Jun 8, 2018 · 94bfdd3 · 94bfdd3
2 parents 0a18594 + 68d2bf6
commit 94bfdd3
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 20 deletions.
diff --git a/biogeochem/EDPhysiologyMod.F90 b/biogeochem/EDPhysiologyMod.F90
@@ -887,9 +887,11 @@ subroutine PlantGrowth( currentSite, currentCohort, bc_in )
     ! Woody turnover timescale [years]
     real(r8), parameter :: cbal_prec = 1.0e-15_r8     ! Desired precision in carbon balance
                                                       ! non-integrator part
-    integer , parameter :: max_substeps = 300
-    real(r8), parameter :: max_trunc_error = 1.0_r8   
-    integer,  parameter :: ODESolve = 2    ! 1=RKF45,  2=Euler
+    integer , parameter :: max_substeps = 300         ! Number of step attempts before
+                                                      ! giving up
+    real(r8), parameter :: max_trunc_error = 1.0_r8   ! allowable numerical truncation error
+    integer,  parameter :: ODESolve = 2               ! 1=RKF45,  2=Euler
+
 
     ipft = currentCohort%pft
 
@@ -952,12 +954,6 @@ subroutine PlantGrowth( currentSite, currentCohort, bc_in )
     ! II. Calculate target size of living biomass compartment for a given dbh.   
     ! -----------------------------------------------------------------------------------
 
-    ! Target leaf biomass according to allometry and trimming
-    call bleaf(currentCohort%dbh,ipft,currentCohort%canopy_trim,bt_leaf,dbt_leaf_dd)
-
-    ! Target fine-root biomass and deriv. according to allometry and trimming [kgC, kgC/cm]
-    call bfineroot(currentCohort%dbh,ipft,currentCohort%canopy_trim,bt_fineroot,dbt_fineroot_dd)
-
     ! Target sapwood biomass and deriv. according to allometry and trimming [kgC, kgC/cm]
     call bsap_allom(currentCohort%dbh,ipft,currentCohort%canopy_trim,bt_sap,dbt_sap_dd)
 
@@ -971,20 +967,42 @@ subroutine PlantGrowth( currentSite, currentCohort, bc_in )
     call bdead_allom( bt_agw, bt_bgw, bt_sap, ipft, bt_dead, &
                       dbt_agw_dd, dbt_bgw_dd, dbt_sap_dd, dbt_dead_dd )
 
-    ! Target storage carbon [kgC,kgC/cm]
-    call bstore_allom(currentCohort%dbh,ipft,currentCohort%canopy_trim,bt_store,dbt_store_dd)
-
     ! ------------------------------------------------------------------------------------
     ! If structure is larger than target, then we need to correct some integration errors
     ! by slightly increasing dbh to match it.
-    ! For grasses, if leaf biomass is larger than target, then we reset dbh to match
     ! -----------------------------------------------------------------------------------
     if( ((currentCohort%bdead-bt_dead) > calloc_abs_error) .and. &
           (EDPftvarcon_inst%woody(ipft) == itrue) ) then
        call StructureResetOfDH( currentCohort%bdead, ipft, &
              currentCohort%canopy_trim, currentCohort%dbh, currentCohort%hite )
+
+       ! Re-calculate the sapwood and structural wood targets based on the new dbh
+       ! ------------------------------------------------------------------------------------------
+
+       ! Target sapwood biomass and deriv. according to allometry and trimming [kgC, kgC/cm]
+       call bsap_allom(currentCohort%dbh,ipft,currentCohort%canopy_trim,bt_sap,dbt_sap_dd)
+
+       ! Target total above ground deriv. biomass in woody/fibrous tissues  [kgC, kgC/cm]
+       call bagw_allom(currentCohort%dbh,ipft,bt_agw,dbt_agw_dd)
+
+       ! Target total below ground deriv. biomass in woody/fibrous tissues [kgC, kgC/cm] 
+       call bbgw_allom(currentCohort%dbh,ipft,bt_bgw,dbt_bgw_dd)
+
+       ! Target total dead (structrual) biomass and deriv. [kgC, kgC/cm]
+       call bdead_allom( bt_agw, bt_bgw, bt_sap, ipft, bt_dead, &
+                         dbt_agw_dd, dbt_bgw_dd, dbt_sap_dd, dbt_dead_dd )
+
     end if
 
+    ! Target leaf biomass according to allometry and trimming
+    call bleaf(currentCohort%dbh,ipft,currentCohort%canopy_trim,bt_leaf,dbt_leaf_dd)
+
+    ! Target fine-root biomass and deriv. according to allometry and trimming [kgC, kgC/cm]
+    call bfineroot(currentCohort%dbh,ipft,currentCohort%canopy_trim,bt_fineroot,dbt_fineroot_dd)
+
+    ! Target storage carbon [kgC,kgC/cm]
+    call bstore_allom(currentCohort%dbh,ipft,currentCohort%canopy_trim,bt_store,dbt_store_dd)
+
 
     ! -----------------------------------------------------------------------------------
     ! III(b). Calculate the maintenance turnover demands 
@@ -1189,8 +1207,6 @@ subroutine PlantGrowth( currentSite, currentCohort, bc_in )
 
     end if
 
-
-
     ! -----------------------------------------------------------------------------------
     ! X.  If carbon is yet still available ...
     !        Our pools are now either on allometry or above (from fusion).
@@ -1203,10 +1219,20 @@ subroutine PlantGrowth( currentSite, currentCohort, bc_in )
     if( carbon_balance<cbal_prec) return
 
 
-    ! This routine checks that actual carbon is not below that targets. It does
+    ! This routine checks that actual carbon is not below the targets. It does
     ! allow actual pools to be above the target, and in these cases, it sends
     ! a false on the "grow_<>" flag, allowing the plant to grow into these pools.
-    ! It also checks to make sure that structural biomass is not above the target.
+    ! Again this is possible due to erors in numerical integration and/or the fusion
+    ! process.
+    ! It also checks to make sure that structural biomass is not below the target.
+    ! Note that we assume structural biomass is always on allometry.
+    ! For non-woody plants, we do not perform this partial growth logic (ie 
+    ! allowing only some pools to grow), we let all pools at or above allometry to 
+    ! grow. This is because we can't force any single pool to be on-allometry, and
+    ! thus a condition could potentially occur where all pools, either from fusion or 
+    ! numerical errors, are above allometry and would be flagged to not grow, in which
+    ! case the plant would be frozen in time
+
     if ( EDPftvarcon_inst%woody(ipft) == itrue ) then
        call TargetAllometryCheck(currentCohort%bl,currentCohort%br,currentCohort%bsw, &
                               currentCohort%bstore,currentCohort%bdead, &

diff --git a/biogeochem/FatesAllometryMod.F90 b/biogeochem/FatesAllometryMod.F90
@@ -669,10 +669,10 @@ subroutine bsap_allom(d,ipft,canopy_trim,bsap,dbsapdd)
        ! Force sapwood to be less than a maximum fraction of total biomass
        ! (this comes into play typically in very small plants)
        bsap_cap = max_frac*(bagw+bbgw)
-       bsap     = min( bsap_cap,bsap)
 
-       if(present(dbsapdd))then
-          if ( bsap  >= bsap_cap ) then
+       if(bsap>bsap_cap) then
+          bsap     = bsap_cap
+          if(present(dbsapdd))then
              dbsapdd = max_frac*(dbagwdd+dbbgwdd)
           end if
        end if