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

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

Merged
merged 21 commits into from
Apr 29, 2024

Conversation

lauramarques
Copy link
Collaborator

No description provided.

@codecov-commenter
Copy link

codecov-commenter commented Apr 19, 2024

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).

❗ 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 ⚠️
src/biosphere_biomee.mod.f90 33.33% 6 Missing ⚠️

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

Additional details and impacted files
@@            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     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@lauramarques lauramarques force-pushed the master branch 2 times, most recently from 66c9fae to f242e45 Compare April 23, 2024 11:57
@stineb
Copy link
Collaborator

stineb commented Apr 25, 2024

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

  • data/biomee_validation_2.rda: how is this different to data/biomee_validation.rda? Can we keep just one of them?
  • data-raw/generate_biomee_driver_data_DBEN.R: seems like this should be in the D-BEN repository, not in rsofun

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
Copy link
Collaborator Author

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 lauramarques force-pushed the master branch 2 times, most recently from a4ea25f to 5363894 Compare April 26, 2024 13:43
@lauramarques
Copy link
Collaborator Author

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 stineb merged commit ccb1e11 into geco-bern:master Apr 29, 2024
7 checks passed
@stineb
Copy link
Collaborator

stineb commented Apr 29, 2024

@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
Copy link
Collaborator Author

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.

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.

3 participants