Skip to content

Commit 3c24978

Browse files
ckovenckoven
committed
merged in master
2 parents 4640b85 + 94ef851 commit 3c24978

File tree

4 files changed

+26
-14
lines changed

4 files changed

+26
-14
lines changed

‎biogeochem/EDCohortDynamicsMod.F90‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -874,18 +874,27 @@ subroutine fuse_cohorts(patchptr, bc_in)
874874
nextc%n*nextc%lmort_infra)/newn
875875

876876
! npp diagnostics
877-
currentCohort%npp_leaf = (currentCohort%n*currentCohort%npp_leaf + nextc%n*nextc%npp_leaf)/newn
878-
currentCohort%npp_froot = (currentCohort%n*currentCohort%npp_froot + nextc%n*nextc%npp_froot)/newn
879-
currentCohort%npp_bsw = (currentCohort%n*currentCohort%npp_bsw + nextc%n*nextc%npp_bsw)/newn
880-
currentCohort%npp_bdead = (currentCohort%n*currentCohort%npp_bdead + nextc%n*nextc%npp_bdead)/newn
881-
currentCohort%npp_bseed = (currentCohort%n*currentCohort%npp_bseed + nextc%n*nextc%npp_bseed)/newn
882-
currentCohort%npp_store = (currentCohort%n*currentCohort%npp_store + nextc%n*nextc%npp_store)/newn
877+
currentCohort%npp_leaf = (currentCohort%n*currentCohort%npp_leaf + nextc%n*nextc%npp_leaf) &
878+
/newn
879+
currentCohort%npp_froot = (currentCohort%n*currentCohort%npp_froot + nextc%n*nextc%npp_froot) &
880+
/newn
881+
currentCohort%npp_bsw = (currentCohort%n*currentCohort%npp_bsw + nextc%n*nextc%npp_bsw) &
882+
/newn
883+
currentCohort%npp_bdead = (currentCohort%n*currentCohort%npp_bdead + nextc%n*nextc%npp_bdead) &
884+
/newn
885+
currentCohort%npp_bseed = (currentCohort%n*currentCohort%npp_bseed + nextc%n*nextc%npp_bseed) &
886+
/newn
887+
currentCohort%npp_store = (currentCohort%n*currentCohort%npp_store + nextc%n*nextc%npp_store) &
888+
/newn
883889

884890
! biomass and dbh tendencies
885891
currentCohort%ddbhdt = (currentCohort%n*currentCohort%ddbhdt + nextc%n*nextc%ddbhdt)/newn
886-
currentCohort%dbalivedt = (currentCohort%n*currentCohort%dbalivedt + nextc%n*nextc%dbalivedt)/newn
887-
currentCohort%dbdeaddt = (currentCohort%n*currentCohort%dbdeaddt + nextc%n*nextc%dbdeaddt)/newn
888-
currentCohort%dbstoredt = (currentCohort%n*currentCohort%dbstoredt + nextc%n*nextc%dbstoredt)/newn
892+
currentCohort%dbalivedt = (currentCohort%n*currentCohort%dbalivedt + nextc%n*nextc%dbalivedt) &
893+
/newn
894+
currentCohort%dbdeaddt = (currentCohort%n*currentCohort%dbdeaddt + nextc%n*nextc%dbdeaddt) &
895+
/newn
896+
currentCohort%dbstoredt = (currentCohort%n*currentCohort%dbstoredt + nextc%n*nextc%dbstoredt) &
897+
/newn
889898

890899
do i=1, nlevleaf
891900
if (currentCohort%year_net_uptake(i) == 999._r8 .or. nextc%year_net_uptake(i) == 999._r8) then

‎biogeochem/EDPatchDynamicsMod.F90‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -759,8 +759,10 @@ subroutine average_patch_properties( currentPatch, newPatch, patch_site_areadis
759759
! some of their area has been carved out for this new patches which is receiving donations.
760760
! Lets maintain conservation on that pre-existing mass flux in these newly disturbed patches
761761

762-
newPatch%root_litter_out(p) = newPatch%root_litter_out(p) + currentPatch%root_litter_out(p) * patch_site_areadis/newPatch%area
763-
newPatch%leaf_litter_out(p) = newPatch%leaf_litter_out(p) + currentPatch%leaf_litter_out(p) * patch_site_areadis/newPatch%area
762+
newPatch%root_litter_out(p) = newPatch%root_litter_out(p) + currentPatch%root_litter_out(p) * &
763+
patch_site_areadis/newPatch%area
764+
newPatch%leaf_litter_out(p) = newPatch%leaf_litter_out(p) + currentPatch%leaf_litter_out(p) * &
765+
patch_site_areadis/newPatch%area
764766

765767
enddo
766768

‎fire/SFMainMod.F90‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,8 @@ subroutine rate_of_spread ( currentSite )
469469

470470
if (DEBUG) then
471471
if ( hlm_masterproc == itrue .and.DEBUG) write(fates_log(),*) 'SF - c ',c
472-
if ( hlm_masterproc == itrue .and.DEBUG) write(fates_log(),*) 'SF - currentPatch%effect_wspeed ',currentPatch%effect_wspeed
472+
if ( hlm_masterproc == itrue .and.DEBUG) write(fates_log(),*) 'SF - currentPatch%effect_wspeed ', &
473+
currentPatch%effect_wspeed
473474
if ( hlm_masterproc == itrue .and.DEBUG) write(fates_log(),*) 'SF - b ',b
474475
if ( hlm_masterproc == itrue .and.DEBUG) write(fates_log(),*) 'SF - beta_ratio ',beta_ratio
475476
if ( hlm_masterproc == itrue .and.DEBUG) write(fates_log(),*) 'SF - e ',e

‎main/FatesHistoryInterfaceMod.F90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3048,8 +3048,8 @@ subroutine define_history_vars(this, initialize_variables)
30483048
upfreq=1, ivar=ivar, initialize=initialize_variables, index = ih_nplant_understory_si_scag )
30493049

30503050
call this%set_history_var(vname='DDBH_CANOPY_SCAG',units = 'cm/yr/ha', &
3051-
long='growth rate of canopy plantsnumber of plants per hectare in canopy in each size x age class', use_default='inactive', &
3052-
avgflag='A', vtype=site_scag_r8, hlms='CLM:ALM', flushval=0.0_r8, &
3051+
long='growth rate of canopy plantsnumber of plants per hectare in canopy in each size x age class', &
3052+
use_default='inactive', avgflag='A', vtype=site_scag_r8, hlms='CLM:ALM', flushval=0.0_r8, &
30533053
upfreq=1, ivar=ivar, initialize=initialize_variables, index = ih_ddbh_canopy_si_scag )
30543054

30553055
call this%set_history_var(vname='DDBH_UNDERSTORY_SCAG',units = 'cm/yr/ha', &

0 commit comments

Comments
 (0)