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

Resolve compilation issue; 3 ET options #219

Merged
merged 6 commits into from
Aug 14, 2024

Conversation

jaideep777
Copy link

In this PR I have:

  1. Removed nested functions, so code should compile on mac
  2. Added 3 ET options via params_siml:
    • use_gs - whether to use pmodel/phydro derived stomatal conductance in ET calcs. If false, SPLASH-based Priestly Taylor ET will be used.
    • use_pml - when use_gs is true, this determines if PML formulation is used for ET calcs. If false, diffusion equation is used. Note that currently PM is not implemented, so always set this to false.
  3. Removed garbage files from vignettes. sensititivity_analysis.Rmd doesn't compile, I don't know why.
  4. Repo still uses external data for the pmodel_use_newdata.Rmd vignette. I didn't have time to fix this at the moment.

The three ET options are demonstrated by pmodel_use_newdata.Rmd vignette

@jaideep777
Copy link
Author

Now I have also added the new format demo data to the data folder, so the vignette pmodel_use_newdata.Rmd should compile without relying on external data

@stineb stineb merged commit 106a0e9 into geco-bern:phydro Aug 14, 2024
@stineb stineb mentioned this pull request Aug 14, 2024
13 tasks
@stineb
Copy link
Collaborator

stineb commented Aug 14, 2024

Thanks a lot for this gargantuan effort @jaideep777!

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