Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes addressing leaf area and demotion/promotion #501

Merged
merged 37 commits into from
Apr 5, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
e48065b
changed cohort fusion to conserve crown area
ckoven Nov 17, 2018
7cdca13
Some minor syntax updates to inverse crown area allometry. Minor opti…
rgknox Dec 13, 2018
3c01f12
Merge pull request #2 from rgknox/cohortfusion_crownareaconserv_offma…
ckoven Dec 13, 2018
a722053
merged master and resolved conflicts
ckoven Feb 16, 2019
7d49bef
reincorporated old conservation-of-dbh logic as an option in a case s…
ckoven Feb 16, 2019
36ea2c0
merged master and resolved conflict
ckoven Feb 19, 2019
a6305b1
Increased the number of maximum leaf layers back up, to 30. Was creat…
rgknox Feb 25, 2019
a6e3b48
Merge branch 'cohortfusion_crownareaconserv_offmaster' into rgk-cdk-l…
rgknox Feb 27, 2019
e3a3b75
Updating some error diagnostics and the precision thresholds for demo…
rgknox Feb 28, 2019
4b6a363
Added some updates to area threshold checks in promotion/demotion, up…
rgknox Feb 28, 2019
fb9aaf3
Added new algorithm for scaling promotion/demotion weights to within …
rgknox Feb 28, 2019
7ff6e9d
Small fixes and checks to the updated promotion/demotion logic
rgknox Feb 28, 2019
f289603
Various fixes to promotion/demotion. Notably, fixed filter on zeroing…
rgknox Mar 1, 2019
bcc719d
Expanded leaf layers to 30
rgknox Mar 1, 2019
ea7678e
resolved merge conflicts
rgknox Mar 1, 2019
9991227
Changed flag back to conservation of crown area
rgknox Mar 1, 2019
fdebaa7
increased number of leaf levels to 40 after overflows
rgknox Mar 1, 2019
53775ba
Minor comment updates
rgknox Mar 1, 2019
e1052ff
Merge branch 'rgknox-demprob-logic' of github.com:rgknox/fates into r…
rgknox Mar 1, 2019
9c28206
Updated diagnostics on LAI exceedance check
rgknox Mar 4, 2019
7e1b7d4
adding a lai check function
rgknox Mar 5, 2019
5ad22a1
Updating diagnostics in tree_sai
rgknox Mar 5, 2019
3204b39
Now tying allometry in grasses to root biomass. ie if root biomass ex…
rgknox Mar 6, 2019
6b22ae7
Reduced number of canopy layers back to 2 in attempts to avoid canopy…
rgknox Mar 8, 2019
bc93389
Changed logic to patch termination to ensure no super small patches e…
rgknox Mar 8, 2019
5b41ed6
Syntax fix on select case
rgknox Mar 12, 2019
668e3de
Added a re-calculation of crown areas prior to crown fusion
rgknox Mar 13, 2019
b3703f3
Merge branch 'cohortfusion_crownareaconserv_offmaster_merged' into rg…
rgknox Mar 13, 2019
f27108d
Cleaned up some temporary diagnostics related to crown fusion
rgknox Mar 13, 2019
86a3b28
Updated structure reset to use the new caling convention of forcedbh
rgknox Mar 13, 2019
e0e65f4
Merge branch 'master' into rgknox-demprob-merge-carea
rgknox Mar 15, 2019
d6c81e0
Fixed a diagnostic in LAI during fusion and changed forced dbh resets…
rgknox Mar 15, 2019
2bfdb1d
Added a check on the number of loops allowed to catch super-small pat…
rgknox Mar 26, 2019
e735fef
Merge branch 'master' into rgknox-demprob-merge-carea
rgknox Mar 27, 2019
19bcfb3
Removed unnecessary error checks, and bound others behind logical con…
rgknox Mar 27, 2019
a1eff33
Reduced some line lengths
rgknox Mar 27, 2019
f6734ab
Fixed comment typo
rgknox Apr 5, 2019
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
Prev Previous commit
Next Next commit
Updated diagnostics on LAI exceedance check
  • Loading branch information
rgknox committed Mar 4, 2019
commit 9c282067775bb44ba67748b78c016a2f78aac3b3
2 changes: 1 addition & 1 deletion biogeochem/EDCohortDynamicsMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ module EDCohortDynamicsMod
integer, parameter, private :: conserve_crownarea_and_number_not_dbh = 1
integer, parameter, private :: conserve_dbh_and_number_not_crownarea = 2

integer, parameter, private :: cohort_fusion_conservation_method = conserve_crownarea_and_number_not_dbh
integer, parameter, private :: cohort_fusion_conservation_method = conserve_dbh_and_number_not_crownarea

! 10/30/09: Created by Rosie Fisher
!-------------------------------------------------------------------------------------!
Expand Down
10 changes: 10 additions & 0 deletions biogeochem/FatesAllometryMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -744,8 +744,18 @@ real(r8) function tree_sai( pft, dbh, canopy_trim, c_area, nplant, cl, canopy_la
write(fates_log(),*) 'The leaf and stem are predicted for a cohort, maxed out the array size'
write(fates_log(),*) 'lai: ',treelai
write(fates_log(),*) 'sai: ',tree_sai
write(fates_log(),*) 'target_lai: ',target_lai
write(fates_log(),*) 'lai+sai: ',treelai+tree_sai
write(fates_log(),*) 'nlevleaf,dinc_ed,nlevleaf*dinc_ed :',nlevleaf,dinc_ed,nlevleaf*dinc_ed
write(fates_log(),*) 'pft: ',pft
write(fates_log(),*) 'n: ',nplant
write(fates_log(),*) 'c_area: ',c_area
write(fates_log(),*) 'dbh: ',dbh
write(fates_log(),*) 'canopy_trim: ',canopy_trim
write(fates_log(),*) 'target_bleaf: ',target_bleaf
write(fates_log(),*) 'canopy layer: ',cl
write(fates_log(),*) 'canopy_tlai: ',canopy_lai(:)
write(fates_log(),*) 'vcmax25top: ',vcmax25top
call endrun(msg=errMsg(sourcefile, __LINE__))
end if

Expand Down
2 changes: 1 addition & 1 deletion main/EDTypesMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module EDTypesMod
! to understory layers (all layers that
! are not the top canopy layer)

integer, parameter :: nlevleaf = 40 ! number of leaf layers in canopy layer
integer, parameter :: nlevleaf = 30 ! number of leaf layers in canopy layer
integer, parameter :: maxpft = 15 ! maximum number of PFTs allowed
! the parameter file may determine that fewer
! are used, but this helps allocate scratch
Expand Down