Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
412adbd
update the parameter file for coastal veg
xuchongang Mar 7, 2019
0e932af
turn on the salinity impact on vegetation for coastal
xuchongang Mar 12, 2019
7b2701c
add the phenology-related mortality for grass in FATES Mortality func…
xuchongang Mar 20, 2019
2900a3f
add the phenology-related mortality for grass in patch dynamics
xuchongang Mar 20, 2019
dd40cc8
add phenology-related mortality for grass in ED types
xuchongang Mar 20, 2019
1459be7
add phenology-related mortality rate and size threshold for grass in …
xuchongang Mar 20, 2019
b74ef1e
add phenology-related mortality rate and size threshold for grass in …
xuchongang Mar 20, 2019
5de042b
add the phenology-related mortality for grass to the history file
xuchongang Mar 20, 2019
163796c
fixed a typo on ccohort
LuZhai Mar 21, 2019
3f47117
Add the stem memory to the copycohort and fusecohort subroutines
LuZhai Jul 3, 2019
94c97f5
add the stem senescence phenology to grasses
LuZhai Jul 3, 2019
a166b7d
add stem memory to FATES initilization
LuZhai Jul 3, 2019
4b9f786
add the stem memory to the FATES data structure
LuZhai Jul 3, 2019
5adc5c2
add the stem memory to forest inventory initialization
LuZhai Jul 3, 2019
d8f220c
turn on the stem biomass change for grass
LuZhai Jul 3, 2019
96cc1a7
Change fraction of phenology-related stem drop from fixed to variable…
LuZhai Jul 9, 2019
d943eec
Add a parameter for fraction of penology-related stem drop in paramet…
LuZhai Jul 9, 2019
630f740
Add fraction of phenology-related stem drop to the data structure EDp…
LuZhai Jul 9, 2019
5a01d20
Merge branch 'master' of github.com:NGEET/fates into xuchongang/coast…
LuZhai Jul 9, 2019
5ec7ff6
remove previously added phenenology mortality
LuZhai Jul 11, 2019
e635d7b
remove previously added phenology mortality
LuZhai Jul 11, 2019
162bca8
update parameter name of DBH threshold value for cold induced leaf/st…
LuZhai Jul 11, 2019
adb3a05
remove previously added phenology mortality, update parameter name of…
LuZhai Jul 11, 2019
a990cad
remove previously added phenology mortality
LuZhai Jul 11, 2019
31e6401
remove previously added phenology mortality
LuZhai Jul 11, 2019
9ef25ec
Add DBH threshould value of cold-related leaf/stem drop, and fraction…
LuZhai Jul 11, 2019
a07ed2a
Add phenoloty-related stem drop to EDInitMod
LuZhai Jul 14, 2019
b910ced
Add phenoloty-related stem drop to FatesInventoryInitMod
LuZhai Jul 14, 2019
9c2edbd
update the stem drop for initilizaton
xuchongang Jul 18, 2019
4149b6f
update stem drop phenology for forest inventory initilization
xuchongang Jul 18, 2019
0d88b40
Merge branch 'master-ngeet' into xuchongang-coastal_veg_ready_to_merg…
Nov 22, 2019
45ae705
Merge pull request #8 from glemieux/xuchongang-coastal_veg_ready_to_m…
xuchongang Jan 16, 2020
ecf219b
deconflict EDPftvarcon.F90 from pr595
glemieux Jan 16, 2020
bfe83fd
Merge pull request #9 from glemieux/xu-coastal-deconflict-pr595
xuchongang Jan 22, 2020
df9b3df
removing merge conflict lines that were missed
glemieux Jan 22, 2020
6c0e236
removing redundant variables that were accidentally adding during wei…
glemieux Jan 22, 2020
16fd560
correcting calls to b_sapw and b_struct missed in deconflict
glemieux Jan 22, 2020
2d38cf1
fixing input call order to create_cohort
glemieux Jan 22, 2020
18db5c8
remove redundant parameter entries
glemieux Jan 23, 2020
54caf33
removing redundant parameters assignments
glemieux Jan 23, 2020
bb06a28
whitespace changes to aid readability
glemieux Jan 24, 2020
a9a068e
adding sapwmem and structmem to EDInit for deciduous stress
glemieux Jan 24, 2020
53e9f71
adding restart code for sapwmem and structmem
glemieux Jan 24, 2020
b9a5483
Merge pull request #10 from glemieux/xu-coast-veg-head-fix
xuchongang Jan 27, 2020
96a5eaf
adding stem drop check for flushing events
glemieux Feb 3, 2020
ca148d0
fixing flush call for non-woody with zero stem drop
glemieux Feb 3, 2020
ef10ec8
Merge pull request #11 from glemieux/xu-pr554-flush-adjust
xuchongang Feb 4, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions biogeochem/EDCohortDynamicsMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@ module EDCohortDynamicsMod

!-------------------------------------------------------------------------------------!

subroutine create_cohort(currentSite, patchptr, pft, nn, hite, dbh, &
prt, laimemory, status, recruitstatus,ctrim, &
clayer, spread, bc_in)
subroutine create_cohort(currentSite, patchptr, pft, nn, hite, dbh, &
prt, laimemory, sapwmemory, structmemory, &
status, recruitstatus, ctrim, clayer, spread, bc_in)

!
! !DESCRIPTION:
Expand Down Expand Up @@ -164,6 +164,10 @@ subroutine create_cohort(currentSite, patchptr, pft, nn, hite, dbh, &
! object
real(r8), intent(in) :: laimemory ! target leaf biomass- set from
! previous year: kGC per indiv
real(r8), intent(in) :: sapwmemory ! target sapwood biomass- set from
! previous year: kGC per indiv
real(r8), intent(in) :: structmemory ! target structural biomass- set from
! previous year: kGC per indiv
real(r8), intent(in) :: ctrim ! What is the fraction of the maximum
! leaf biomass that we are targeting?
real(r8), intent(in) :: spread ! The community assembly effects how
Expand Down Expand Up @@ -212,7 +216,8 @@ subroutine create_cohort(currentSite, patchptr, pft, nn, hite, dbh, &
new_cohort%canopy_layer = clayer
new_cohort%canopy_layer_yesterday = real(clayer, r8)
new_cohort%laimemory = laimemory

new_cohort%sapwmemory = sapwmemory
new_cohort%structmemory = structmemory

! This sets things like vcmax25top, that depend on the
! leaf age fractions (which are defined by PARTEH)
Expand Down Expand Up @@ -476,6 +481,8 @@ subroutine nan_cohort(cc_p)
currentCohort%dbh = nan ! 'diameter at breast height' in cm
currentCohort%hite = nan ! height: meters
currentCohort%laimemory = nan ! target leaf biomass- set from previous year: kGC per indiv
currentCohort%sapwmemory = nan ! target sapwood biomass- set from previous year: kGC per indiv
currentCohort%structmemory = nan ! target structural biomass- set from previous year: kGC per indiv
currentCohort%lai = nan ! leaf area index of cohort m2/m2
currentCohort%sai = nan ! stem area index of cohort m2/m2
currentCohort%g_sb_laweight = nan ! Total leaf conductance of cohort (stomata+blayer) weighted by leaf-area [m/s]*[m2]
Expand Down Expand Up @@ -1046,6 +1053,12 @@ subroutine fuse_cohorts(currentSite, currentPatch, bc_in)

currentCohort%laimemory = (currentCohort%n*currentCohort%laimemory &
+ nextc%n*nextc%laimemory)/newn

currentCohort%sapwmemory = (currentCohort%n*currentCohort%sapwmemory &
+ nextc%n*nextc%sapwmemory)/newn

currentCohort%structmemory = (currentCohort%n*currentCohort%structmemory &
+ nextc%n*nextc%structmemory)/newn

currentCohort%canopy_trim = (currentCohort%n*currentCohort%canopy_trim &
+ nextc%n*nextc%canopy_trim)/newn
Expand Down Expand Up @@ -1572,6 +1585,8 @@ subroutine copy_cohort( currentCohort,copyc )
n%dbh = o%dbh
n%hite = o%hite
n%laimemory = o%laimemory
n%sapwmemory = o%sapwmemory
n%structmemory = o%structmemory
n%lai = o%lai
n%sai = o%sai
n%g_sb_laweight = o%g_sb_laweight
Expand Down
4 changes: 2 additions & 2 deletions biogeochem/EDMortalityFunctionsMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ subroutine mortality_rates( cohort_in,bc_in,cmort,hmort,bmort,frmort )
real(r8),intent(out) :: hmort ! hydraulic failure mortality
real(r8),intent(out) :: frmort ! freezing stress mortality


real(r8) :: frac ! relativised stored carbohydrate
real(r8) :: leaf_c_target ! target leaf biomass kgC
real(r8) :: store_c
Expand Down Expand Up @@ -125,8 +126,7 @@ subroutine mortality_rates( cohort_in,bc_in,cmort,hmort,bmort,frmort )
write(fates_log(),*) 'dbh problem in mortality_rates', &
cohort_in%dbh,cohort_in%pft,cohort_in%n,cohort_in%canopy_layer
endif


!--------------------------------------------------------------------------------
! Mortality due to cold and freezing stress (frmort), based on ED2 and:
! Albani, M.; D. Medvigy; G. C. Hurtt; P. R. Moorcroft, 2006: The contributions
! of land-use change, CO2 fertilization, and climate variability to the
Expand Down
Loading