-
Notifications
You must be signed in to change notification settings - Fork 334
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
Add Kennedy simphydro to ELM #3001
Conversation
@pnlfang has this PR gone through any testing with the test suites? Is it BFB? |
Is this a v2 feature? Its needs a pointer to a design document. https://acme-climate.atlassian.net/wiki/spaces/ED/pages/976946346/W2%2B-%2BPlant%2BHydraulics |
@pnlfang has this PR gone through any testing with the test suites? Is it BFB? |
c041942
to
fcd0c3d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are multiple new lines that have been commented. These new lines were probably used for debugging the model and can be deleted now.
lai_z_sun => canopystate_inst%laisun_z_patch ! Input: [real(r8) (:,:) ] leaf area index for canopy layer, sunlit or shaded | ||
vcmaxcint_sun => surfalb_inst%vcmaxcintsun_patch ! Input: [real(r8) (:) ] leaf to canopy scaling coefficient | ||
alphapsn_sun => photosyns_inst%alphapsnsun_patch ! Input: [real(r8) (:) ] 13C fractionation factor for PSN () | ||
!o3coefv_sun => ozone_inst%o3coefvsun_patch ! Input: [real(r8) (:) ] O3 coefficient used in photosynthesis calculation |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please delete the commented out lines
! Photosynthesis and stomatal conductance parameters, from: | ||
! Bonan et al (2011) JGR, 116, doi:10.1029/2010JG001593 | ||
!==============================================================================! | ||
! calculate root-soil interface conductance |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please indent this comment and multiple comments that are below
|
||
! Compare with Ball-Berry model: gs_mol = m * an * hs/cs p + b | ||
|
||
hs = (gb_mol(p)*ceair + gs_m |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please delete the commented out lines
|
||
! Compare with Ball-Berry model: gs_mol = m * an * hs/cs p + b | ||
|
||
hs = (gb_mol(p)*ceair + gs_m |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please delete the commented out lines
|
||
! Compare with Ball-Berry model: gs_mol = m * an * hs/cs p + b | ||
|
||
hs = (gb_mol(p)*ceair + gs_m |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please delete the commented out lines
|
||
! Compare with Ball-Berry model: gs_mol = m * an * hs/cs p + b | ||
|
||
hs = (gb_mol(p)*ceair + gs_m |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please delete the commented out lines
|
||
! Compare with Ball-Berry model: gs_mol = m * an * hs/cs p + b | ||
|
||
hs = (gb_mol(p)*ceair + gs_m |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please delete the commented out lines
@pnlfang just to follow up, is this PR bit-for-bit against the test suites? |
@jqyin yes |
@bishtgautam please re-review to see if your requested changes were made. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please delete the commented out lines.
! if ( stomatalcond_mtd == stomatalcond_mtd_bb1987 )then | ||
gsminsun = bbb(p) | ||
gsminsha = bbb(p) | ||
! else if ( stomatalcond_mtd == stomatalcond_mtd_medlyn2011 )then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please delete the commented out lines.
@jqyin please start merging this. |
Nevermind, still needs a code review document approval from @kvcalvin |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@pnlfang I'm sorry for the slow action on this review. I have two questions/suggestions: If there is a new namelist variable that triggers this capability, could you add that as documentation in the design document? And have you considered adding a new test to the land developer's test suite to protect this new capability against unintended harm by subsequent PRs? I think with so much new mechanism within the model it would be wise to have both a multi-day smoke test and an exact restart test.
@thorntonpe I added a new namelist variable "use_hydrstress" to trigger this capability. This capability also requires an updated clm_params parameter file, which needs to be parameterized for application. I'll add this in the design document. I have a global test case that could potentially be added to the land developer's test suit. |
Reassigning to balance load. |
@thorntonpe can you please finish the review for this? |
@bishtgautam looks like this can finally be merged. |
Today I re-merged #3107, so I will merge this PR tomorrow. |
Adding plant hydraulics model of Kennedy et al. (2019). Kennedy, D., S. Swenson, K. W. Oleson, D. M. Lawrence, R. Fisher, A. C. L. da Costa, and P. Gentine (2019), Implementing Plant Hydraulics in the Community Land Model, Version 5, J Adv Model Earth Sy, 11(2), 485-513, doi:10.1029/2018MS001500. [BFB]
Adding plant hydraulics model of Kennedy et al. (2019). Kennedy, D., S. Swenson, K. W. Oleson, D. M. Lawrence, R. Fisher, A. C. L. da Costa, and P. Gentine (2019), Implementing Plant Hydraulics in the Community Land Model, Version 5, J Adv Model Earth Sy, 11(2), 485-513, doi:10.1029/2018MS001500. [BFB]
Adding plant hydraulics model of Kennedy et al. (2019).
Kennedy, D., S. Swenson, K. W. Oleson, D. M. Lawrence, R. Fisher, A. C. L. da Costa,
and P. Gentine (2019), Implementing Plant Hydraulics in the Community Land Model,
Version 5, J Adv Model Earth Sy, 11(2), 485-513, doi:10.1029/2018MS001500.
[BFB]