search

geco-bern / rsofun

Implements the Simulating Optimal FUNctioning framework for site-scale simulations of ecosystem processes, including model calibration. It contains Fortran 90 modules for the P-model, SPLASH, and BiomeE models.
https://geco-bern.github.io/rsofun/
GNU General Public License v3.0
25 stars 29 forks source link

Resolve compilation issue; 3 ET options #219

Closed jaideep777 closed 3 months ago

jaideep777 commented 3 months ago

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 commented 3 months ago

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 commented 3 months ago

Thanks a lot for this gargantuan effort @jaideep777!