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

Jump to bottom

Phydro fix le output #221

Merged
merged 16 commits into from
Sep 23, 2024
Merged

Phydro fix le output #221

merged 16 commits into from
Sep 23, 2024

Conversation

fabern
Copy link
Member

@fabern fabern commented Sep 16, 2024

This branch will be used to fix #220

@fabern fabern closed this Sep 16, 2024
@fabern fabern deleted the phydro-fix-le-output branch September 16, 2024 14:32
@fabern fabern restored the phydro-fix-le-output branch September 16, 2024 14:32
@fabern fabern reopened this Sep 17, 2024
@fabern fabern changed the base branch from master to phydro September 17, 2024 07:01
@fabern
Copy link
Member Author

fabern commented Sep 17, 2024

This commit fixes the consistency check that AET (tot) must be equal to AET_soil and AET_canop.

It does so by reducing AET_canop whenever AET reduced, leaving AET_soil untouched.
However, this can yield negative AET_canop fluxes, meaning water is pulled out of the plant into the soil.
It would probably be more reasonable to modify AET_soil and AET_canop accordingly.

@stineb Do you see a good solution to assert AET == AET_soil + AET_canopy when AET is reduced to to soil moisture stress?

@fabern fabern mentioned this pull request Sep 17, 2024
Closed
1 task
@stineb
Copy link
Collaborator

stineb commented Sep 17, 2024

It could be done by maintaining the fraction (canopy transpiration / ET).

@fabern fabern marked this pull request as ready for review September 18, 2024 11:59
@fabern fabern marked this pull request as draft September 18, 2024 12:05
@fabern
Copy link
Member Author

fabern commented Sep 18, 2024

TODO: many tests are currently not working. I fix these before PR merging.

@stineb
Copy link
Collaborator

stineb commented Sep 18, 2024

@fabern tests may fail also in phydro. You don't have to fix those before merging phydro-fix-le-output into phydro.

fabern added 11 commits September 19, 2024 11:15
@fabern
Make parameter calibration more robust
6f6a6f2
@fabern
Fix test-calibration-pmodel.R: add 'whc' and switch prior to uniform
d69acda 
Previously prior was changed to a TruncatedNormal, this then requires additional specifications of mean and sd for each parameter prior. For the tests it is easier to switch to a uniform prior.
@fabern
Fix Vcmax25 tests in test-calibration-pmodel
c836f63
@fabern
Make non-parallel runread_pmodel_f more robust
4674614 
Using rowwise() and column names instead of the positional pmap() makes it less error-prone.
@fabern
Make parallel runread_pmodel_f more robust and simple
08e9cb1
@fabern
Make error message in required_param_names more explicit
7fd4485
@fabern
test: Add reference test-model runs for P and PM model
41f90ff
@fabern
test: Fix quantitative validation tests
40e2ada
@fabern
test: Skip biomee tests (TODO need to fix logp == -Inf)
116d3d2
@fabern
test: Reduce tolerance of regression tests
9c50c33
@fabern
docs: Clean comments (references)
9784913
@fabern fabern marked this pull request as ready for review September 23, 2024 16:14
@fabern fabern merged commit 1e02539 into phydro Sep 23, 2024
@fabern fabern deleted the phydro-fix-le-output branch September 23, 2024 16:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

phydro: le is not equal to aet
2 participants
@fabern @stineb