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.

Sign up for GitHub

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

New allometric modes #1128

Merged
merged 21 commits into from
Apr 23, 2024
Merged

New allometric modes #1128

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
416f70f
Add new allometric modes for multiple quantities, plus a few minor im…
mpaiao Dec 6, 2023
d29e182
Fix swapped arguments for leaf biomass allometry.
mpaiao Dec 7, 2023
8531dda
merge resolution between allometry modes and two-stream
rgknox Feb 5, 2024
118b411
enabling cstarvation mode switch in-code
rgknox Feb 5, 2024
f450fb7
updating parameters for cstarvation and allometry crown depth modes i…
rgknox Feb 5, 2024
92d0dff
Merge pull request #9 from rgknox/mpaiao-pr-allom-modes-cstarve-merge
mpaiao Feb 5, 2024
c644186
Fix crown depth allometry for two stream.
mpaiao Feb 5, 2024
e35f44c
Add in parameter file checks and metadata that ECA phosphatase lambda…
rgknox Feb 6, 2024
37db010
Merge pull request #10 from rgknox/mpaiao-pr-allom-modes-eca
mpaiao Feb 6, 2024
e1e9b07
merging in vert resp scaler coeffs
JessicaNeedham Feb 27, 2024
dc1d029
added leaf vertical scaling parameter coefficients in read-in and xml
rgknox Mar 26, 2024
7ab9bcc
updating api update xml files
rgknox Mar 26, 2024
e218fb3
updated parameter xml names
rgknox Mar 26, 2024
4942a17
Applied batch patch script to api34 update
rgknox Mar 26, 2024
48f0a81
adding daylight factor
rgknox Mar 26, 2024
7444f26
bug fix on parameter printing
rgknox Mar 26, 2024
1aef70f
merge resolution between allom mode updates and api34
rgknox Mar 26, 2024
97dc27a
added carbon starvation mode
rgknox Mar 27, 2024
6573572
Merge pull request #11 from rgknox/mpaiao-pr-allom-modes-moreparams
mpaiao Mar 27, 2024
90350db
Merge tag 'sci.1.72.6_api.34.0.0' into mpaiao-pr-allom-modes
glemieux Apr 11, 2024
0827f05
Merge tag 'sci.1.72.7_api.34.0.0' into mpaiao-pr-allom-modes
glemieux Apr 22, 2024
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
15 changes: 11 additions & 4 deletions biogeochem/EDCanopyStructureMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module EDCanopyStructureMod
use EDCohortDynamicsMod , only : InitPRTObject
use FatesAllometryMod , only : tree_lai
use FatesAllometryMod , only : tree_sai
use FatesAllometryMod , only : CrownDepth
use EDtypesMod , only : ed_site_type
use FatesPatchMod, only : fates_patch_type
use FatesCohortMod, only : fates_cohort_type
Expand Down Expand Up @@ -1527,6 +1528,7 @@ subroutine leaf_area_profile( currentSite )
real(r8) :: max_cheight ! top of cohort canopy (m)
real(r8) :: lai ! leaf area per canopy area
real(r8) :: sai ! stem area per canopy area
real(r8) :: crown_depth ! Current cohort's crown depth

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

Expand Down Expand Up @@ -1603,6 +1605,13 @@ subroutine leaf_area_profile( currentSite )
end if


!---~---
! Find current crown depth using the allometric function.
!---~---
call CrownDepth(currentCohort%height,currentCohort%pft,crown_depth)
!---~---


! --------------------------------------------------------------------------
! Whole layers. Make a weighted average of the leaf area in each layer
! before dividing it by the total area. Fill up layer for whole layers.
Expand All @@ -1616,12 +1625,10 @@ subroutine leaf_area_profile( currentSite )
! is obscured by snow.

layer_top_height = currentCohort%height - &
( real(iv-1,r8)/currentCohort%NV * currentCohort%height * &
prt_params%crown_depth_frac(currentCohort%pft) )
( real(iv-1,r8)/currentCohort%NV * crown_depth )
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice update here @mpaiao

This will have a conflict with the new two-stream PR. I created a new subroutine that calculates the leaf area of crown layers, and it will need to leverage your fixes, see: https://github.com/NGEET/fates/pull/1141/files#diff-4fd8508e4a25680b45ecbfec6b6d80980a5b1e358af731203ee9d29266be46dbR2655

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for spotting this, @rgknox. Once the two-stream PR is integrated, I can update this part. I will leave this conversation open so we don't forget.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rgknox Should I go ahead and edit subroutine VegAreaLayer now that two-stream has been merged?


layer_bottom_height = currentCohort%height - &
( real(iv,r8)/currentCohort%NV * currentCohort%height * &
prt_params%crown_depth_frac(currentCohort%pft) )
( real(iv,r8)/currentCohort%NV * crown_depth )

fraction_exposed = 1.0_r8
if(currentSite%snow_depth > layer_top_height)then
Expand Down
Loading