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

Including new vulnerability and p to theta curves #185

Merged
merged 1 commit into from
May 31, 2023
Merged

Conversation

gagnelandmanna
Copy link
Contributor

@gagnelandmanna gagnelandmanna commented Apr 12, 2023

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

  • relevant unit tests, and integration tests,
  • appropriate docstrings on all functions, structs, and modules, and included relevant documentation.

  • I have read and checked the items on the review checklist.

@kmdeck kmdeck mentioned this pull request Apr 27, 2023
15 tasks
@kmdeck kmdeck force-pushed the new_psi2theta_and_k branch 2 times, most recently from 3ae34b7 to 45012fa Compare May 31, 2023 16:57
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 kmdeck marked this pull request as ready for review May 31, 2023 18:56
@kmdeck
Copy link
Collaborator

kmdeck commented 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>
@bors
Copy link
Contributor

bors bot commented May 31, 2023

Build failed:

@kmdeck
Copy link
Collaborator

kmdeck commented May 31, 2023

bors r+

@bors
Copy link
Contributor

bors bot commented May 31, 2023

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.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

@bors bors bot merged commit ccb194a into main May 31, 2023
@bors bors bot deleted the new_psi2theta_and_k branch May 31, 2023 21:23
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants