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
21 stars 28 forks source link

Corrected forcing data script and added function to run biomee multiple times #207

Closed lauramarques closed 4 months ago

codecov-commenter commented 5 months ago

Codecov Report

Attention: Patch coverage is 87.67123% with 36 lines in your changes are missing coverage. Please review.

Project coverage is 75.77%. Comparing base (5c5c364) to head (4b17ec0).

:exclamation: Current head 4b17ec0 differs from pull request most recent head ffc6e81. Consider uploading reports for the commit ffc6e81 to get more accurate results

Files Patch % Lines
src/vegetation_biomee.mod.f90 40.00% 30 Missing :warning:
src/biosphere_biomee.mod.f90 33.33% 6 Missing :warning:

:exclamation: Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files ```diff @@ Coverage Diff @@ ## master #207 +/- ## ========================================== + Coverage 75.56% 75.77% +0.20% ========================================== Files 36 36 Lines 4162 4268 +106 ========================================== + Hits 3145 3234 +89 - Misses 1017 1034 +17 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

stineb commented 4 months ago

Great you managed to get all checks passing! And great work on all the output variable additions. Just two small remaining points:

Could you resolve this before I merge @lauramarques?

Did you merge the latest rsofun master into your master before making the PR? If not, please do so.

lauramarques commented 4 months ago

Yes, I will resolve these two points and I also need to add a couple of commits more needed to run the DBEN simulations. Yes, my fork is up to date with geco-bern/rsofun:master.

lauramarques commented 4 months ago

I have now added the last commits and all checks have passed. I have deleted data-raw/generate_biomee_driver_data_DBEN.R, and updated data-raw/generate_biomee_driver_data.R I have removed the duplicate data/biomee_validation.rda. You can proceed with the merge now.

stineb commented 4 months ago

@lauramarques I've merged it but there were weird things happening in the merging. I'm resolving this now. There is hard-coded stuff in there that seems D-BEN-specific ("Reset vegetation to initial conditions" in biosphere_biomee). I'm removing this now. Find a solution to specify the re-setting through modifying the model forcing.

Please remember, when adding code, using indenting.

lauramarques commented 4 months ago

Ok, I see. The SR reset_vegn_initial only runs when do_reset_veg = TRUE in params_siml. We can specify this when preparing the drivers.