-
Notifications
You must be signed in to change notification settings - Fork 2
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
Feature/update example data code #339
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks sensible to me! In terms of the soil and litter dummy data I don't think it makes sense to talk about them much in the user documentation as they really are just random values to test that the model actually runs sensibly. Obviously, this would change if I e.g. started taking data from soil maps for the example data.
Ok, that makes sense. Maybe I just make it a bit more general and easy to read :-) |
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## develop #339 +/- ##
===========================================
- Coverage 95.94% 93.50% -2.45%
===========================================
Files 52 59 +7
Lines 2614 2954 +340
===========================================
+ Hits 2508 2762 +254
- Misses 106 192 +86 ☔ View full report in Codecov by Sentry. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me. The animal "data" is sort of an oddball right now. It'll make more sense to put a lot of the detail in docs when things are further along.
I've pushed a bunch of changes here to add some structure to the directory and to synchronize some common elements. It fails because I haven't updated the test structure yet. I'm waiting on |
I think this is now ready for review and in a state to merge if everyone is happy. It's probably useful to start by reading
I've also expanded the config file path resolution a bit to cope with different path combinations. There is some minor @vgro - I can't seem to add you to review the PR. I don't know how GH handles multi-author PRs! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, just had a few minor comments.
|
||
This code creates a set of plausible values for which the | ||
{mod}`~virtual_rainforest.models.soil.soil_model` absolutely has to function sensibly | ||
for.Descriptions of the soil pools can be found [here](./soil/soil_details.md). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
space needed between "for." and "Descriptions
# {"file": "file.txt", "var_name": "my_path"}, | ||
# {"file": "file.txt", "var_name": "my_path"}, | ||
# id="variable_not_list", | ||
# ), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess either comment these back in or delete them
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This reminds me of the problem we had with multiple config files (one from each model) has this been resolved?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nope that issue (#234) hasn't been resolved, multiple config files are completely fine, but all of the instructions of where to load data from have to be contained in a single config file
Co-authored-by: vgro <[email protected]>
Co-authored-by: vgro <[email protected]>
Co-authored-by: vgro <[email protected]>
Co-authored-by: vgro <[email protected]>
from virtual_rainforest.example_data.generation_scripts.common import cell_displacements | ||
|
||
# # Load DEM in 30m resolution | ||
# original_data = requests.get( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What happened here, why did you outcomment this part?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seemed like a lot of work to download and preprocess a fairly large file to generate 81 numbers, particularly when those numbers aren't currently meaningfully aligned to reality 😄
At some point, this will become relevant again, but to make it reproducible and easy to re-run here and now, it seemed easier to retire the recipe and just provide the values.
This might be because I create the PR. I added a few minor comments but it looks overall good to me |
…/ImperialCollegeLondon/virtual_rainforest into feature/update_example_data_code
Jacob's comment addressed
This PR moves the recipes for creating dummy data from the documentation to the example_data folder as code that can be run directly to reproduce the data.
I also added a page that describes the example data; at the moment this is a bit cryptic because I wasn't sure what we want this to look like. I feel like there should be some info about the assumptions available in the user documentation. Please give feedback and suggestions on what this could look like.
Finally, I updated the climate data related documentation as a more general resource with lots of links to the code.
Type of change
Key checklist
pre-commit
checks:$ pre-commit run -a
$ poetry run pytest
Further checks