-
Notifications
You must be signed in to change notification settings - Fork 9
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
Including new vulnerability and p to theta curves #185
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kmdeck
reviewed
Apr 26, 2023
kmdeck
reviewed
Apr 27, 2023
kmdeck
reviewed
Apr 27, 2023
kmdeck
force-pushed
the
new_psi2theta_and_k
branch
2 times, most recently
from
May 31, 2023 16:57
3ae34b7
to
45012fa
Compare
finished adding K(p) and p->theta and doc strings removed some of the options, added structs adapted the water retention functions to include vG, linear, or BC, retention params cleaned up the file, brought minor changes to function signatures simplified (removed model options). Completed the rhs function updates changed param type and removed K_sat from parameter struct Made sure psi(S_l=1)=0. Found very good paper which we should reference in our pplant paper on psi(theta) curve in wood, w complete derivation of potential energy in tree updated plant hydraulics test type issue fixing broadcasting issue updated Ozark test debugging broadcasting issue this works for the first iteration only, for the broadcasting error propagating changes runs fixed a couple bugs, docs add lwp data fixed tests added more unit tests
kmdeck
force-pushed
the
new_psi2theta_and_k
branch
from
May 31, 2023 18:54
4752993
to
860122d
Compare
kmdeck
approved these changes
May 31, 2023
bors r+ |
bors bot
added a commit
that referenced
this pull request
May 31, 2023
185: Including new vulnerability and p to theta curves r=kmdeck a=gagnelandmanna ## Purpose The purpose of this PR is to change the vulnerability curve (K(P)) and water retention curve (to convert between P and theta) used in plant hydraulics, as well as to add in the infrastructure for adding new models for this/allowing for modularity. #159 -- this will link to issue 159 Review checklist I have: - followed the codebase contribution guide: https://clima.github.io/ClimateMachine.jl/latest/Contributing/ - followed the style guide: https://clima.github.io/ClimateMachine.jl/latest/DevDocs/CodeStyle/ - followed the documentation policy: https://github.com/CliMA/policies/wiki/Documentation-Policy - checked that this PR does not duplicate an open PR. In the Content, I have included - relevant unit tests, and integration tests, - appropriate docstrings on all functions, structs, and modules, and included relevant documentation. ---- - [x] I have read and checked the items on the review checklist. Co-authored-by: Anna GL <gagnelandmanna@gmail.com>
Build failed: |
bors r+ |
Build succeeded! The publicly hosted instance of bors-ng is deprecated and will go away soon. If you want to self-host your own instance, instructions are here. If you want to switch to GitHub's built-in merge queue, visit their help page. |
mitraA90
pushed a commit
that referenced
this pull request
Dec 22, 2023
185: Including new vulnerability and p to theta curves r=kmdeck a=gagnelandmanna ## Purpose The purpose of this PR is to change the vulnerability curve (K(P)) and water retention curve (to convert between P and theta) used in plant hydraulics, as well as to add in the infrastructure for adding new models for this/allowing for modularity. #159 -- this will link to issue 159 Review checklist I have: - followed the codebase contribution guide: https://clima.github.io/ClimateMachine.jl/latest/Contributing/ - followed the style guide: https://clima.github.io/ClimateMachine.jl/latest/DevDocs/CodeStyle/ - followed the documentation policy: https://github.com/CliMA/policies/wiki/Documentation-Policy - checked that this PR does not duplicate an open PR. In the Content, I have included - relevant unit tests, and integration tests, - appropriate docstrings on all functions, structs, and modules, and included relevant documentation. ---- - [x] I have read and checked the items on the review checklist. Co-authored-by: Anna GL <gagnelandmanna@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
The purpose of this PR is to change the vulnerability curve (K(P)) and water retention curve (to convert between P and theta) used in plant hydraulics, as well as to add in the infrastructure for adding new models for this/allowing for modularity.
#159 -- this will link to issue 159
Review checklist
I have:
In the Content, I have included