Merge pull request #317 from rgknox/rgknox-uninit-fixes

Fixed uninitialized dhdd

Author: ckoven

biogeochem/EDCohortDynamicsMod.F90

@@ -235,7 +235,7 @@ subroutine allocate_live_biomass(cc_p,mode)
 
     call bleaf(currentcohort%dbh,currentcohort%hite,ft,currentcohort%canopy_trim,tar_bl)
     call bfineroot(currentcohort%dbh,currentcohort%hite,ft,currentcohort%canopy_trim,tar_br)
-    call bsap_allom(currentcohort%dbh,currentcohort%hite,ft,currentcohort%canopy_trim,tar_bsw)
+    call bsap_allom(currentcohort%dbh,ft,currentcohort%canopy_trim,tar_bsw)
 
     leaf_frac = tar_bl/(tar_bl+tar_br+tar_bsw)
     bfr_per_leaf = tar_br/tar_bl

biogeochem/EDPhysiologyMod.F90

@@ -885,7 +885,7 @@ subroutine Growth_Derivatives( currentSite, currentCohort, bc_in)
     call bfineroot(currentCohort%dbh,currentCohort%hite,ipft,currentCohort%canopy_trim,b_fineroot)
 
     ! Calculate sapwood biomass
-    call bsap_allom(currentCohort%dbh,currentCohort%hite,ipft,currentCohort%canopy_trim,b_sap)
+    call bsap_allom(currentCohort%dbh,ipft,currentCohort%canopy_trim,b_sap)
 
     target_balive = b_leaf + b_fineroot + b_sap
 
@@ -1055,7 +1055,7 @@ subroutine Growth_Derivatives( currentSite, currentCohort, bc_in)
                   currentCohort%canopy_trim,b_leaf,db_leaf_dd)
        call bfineroot(currentCohort%dbh,currentCohort%hite,ipft, &
                       currentCohort%canopy_trim,b_fineroot,db_fineroot_dd)
-       call bsap_allom(currentCohort%dbh,currentCohort%hite,ipft, &
+       call bsap_allom(currentCohort%dbh,ipft, &
                        currentCohort%canopy_trim,b_sap,db_sap_dd)
 
        ! Total change in alive biomass relative to dead biomass [kgC/kgC]
@@ -1190,7 +1190,7 @@ subroutine recruitment( currentSite, currentPatch, bc_in )
        ! Initialize balive (leaf+fineroot+sapwood)
        call bleaf(temp_cohort%dbh,temp_cohort%hite,ft,temp_cohort%canopy_trim,b_leaf)
        call bfineroot(temp_cohort%dbh,temp_cohort%hite,ft,temp_cohort%canopy_trim,b_fineroot)
-       call bsap_allom(temp_cohort%dbh,temp_cohort%hite,ft,temp_cohort%canopy_trim,b_sapwood)
+       call bsap_allom(temp_cohort%dbh,ft,temp_cohort%canopy_trim,b_sapwood)
 
        call bag_allom(temp_cohort%dbh,temp_cohort%hite,ft,b_aboveground)
        call bcr_allom(temp_cohort%dbh,temp_cohort%hite,ft,b_coarseroot)

biogeochem/FatesAllometryMod.F90

@@ -377,15 +377,15 @@ end subroutine bleaf
   ! Generic sapwood biomass interface
   ! ============================================================================
 
-  subroutine bsap_allom(d,h,ipft,canopy_trim,bsap,dbsapdd)
+  subroutine bsap_allom(d,ipft,canopy_trim,bsap,dbsapdd)
 
     real(r8),intent(in)           :: d         ! plant diameter [cm]
-    real(r8),intent(in)           :: h         ! plant height   [m]
     integer(i4),intent(in)        :: ipft      ! PFT index
     real(r8),intent(in)           :: canopy_trim
     real(r8),intent(out)          :: bsap      ! plant leaf biomass [kgC]
     real(r8),intent(out),optional :: dbsapdd   ! change leaf bio per d [kgC/cm]
 
+    real(r8) :: h         ! Plant height [m]
     real(r8) :: dhdd
     real(r8) :: blmax
     real(r8) :: dblmaxdd
@@ -401,6 +401,7 @@ subroutine bsap_allom(d,h,ipft,canopy_trim,bsap,dbsapdd)
        ! ---------------------------------------------------------------------
     case(1,2) !"constant","dlinear") 
 
+       call h_allom(d,ipft,h,dhdd)
        if(test_b4b)then
           call bleaf(d,h,ipft,canopy_trim,blmax,dblmaxdd)
        else

main/EDInitMod.F90

@@ -384,7 +384,7 @@ subroutine init_cohorts( patch_in, bc_in)
        call bfineroot(temp_cohort%dbh,temp_cohort%hite,pft,temp_cohort%canopy_trim,b_fineroot)
 
        ! Calculate sapwood biomass
-       call bsap_allom(temp_cohort%dbh,temp_cohort%hite,pft,temp_cohort%canopy_trim,b_sapwood)
+       call bsap_allom(temp_cohort%dbh,pft,temp_cohort%canopy_trim,b_sapwood)
 
        temp_cohort%balive = b_leaf + b_fineroot + b_sapwood
 

main/FatesInventoryInitMod.F90

@@ -889,7 +889,7 @@ subroutine set_inventory_edcohort_type1(csite,bc_in,css_file_unit,npatches, &
       call bfineroot(temp_cohort%dbh,temp_cohort%hite,c_pft,temp_cohort%canopy_trim,b_fineroot)
 
       ! Calculate sapwood biomass
-      call bsap_allom(temp_cohort%dbh,temp_cohort%hite,c_pft,temp_cohort%canopy_trim,b_sapwood)
+      call bsap_allom(temp_cohort%dbh,c_pft,temp_cohort%canopy_trim,b_sapwood)
 
       temp_cohort%balive = b_leaf + b_fineroot + b_sapwood