-
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
Adds support for static models #373
Merged
Merged
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit
Hold shift + click to select a range
a96e90a
Adds psudocode for static models
dalonsoa 45fb958
Integrate renamed project
dalonsoa 6f9b5c5
Add bypassing of methods
dalonsoa f0f90f7
Prevent overriding init
dalonsoa fcdc3ee
Prevent overriding update
dalonsoa 32a08d4
Merge branch 'develop' into frozen_models
dalonsoa 7e730a4
Merge branch 'develop' into frozen_models
dalonsoa 0976da4
Merge branch 'develop' into frozen_models
dalonsoa f9520dc
Merge branch 'develop' into frozen_models
dalonsoa 6ae09ea
:recycle: Rename update with _update in models.
dalonsoa 7c8b987
:recycle: Update setup in abiotic model.
dalonsoa a528278
:recycle: Update setup in abiotic simple model.
dalonsoa dedb2a6
:recycle: Update setup in abiotic animal model.
dalonsoa 6176eb2
:recycle: Add class attribute descriptions to abiotic and abiotic sim…
dalonsoa bbabc61
:recycle: Remove __init__ from hydorlogy model.
dalonsoa b309d52
:recycle: Remove __init__ from litter model.
dalonsoa f336981
:recycle: Remove __init__ from plants model.
dalonsoa 9d6e4af
:recycle: Remove __init__ from soil model.
dalonsoa d9a4fb8
:recycle: Add static flag to abiotic model.
dalonsoa 590846a
:recycle: Add static flag to abiotic simple model.
dalonsoa b94526a
:recycle: Add static flag to animal model.
dalonsoa 38c527e
:recycle: Add static flag to animal model.
dalonsoa 93efe7b
:recycle: Add static flag to litter model.
dalonsoa bcfb968
:recycle: Add static flag to plants model.
dalonsoa 3a4627d
:recycle: Add static flag to soil model.
dalonsoa 7b26336
:recycle: Fix abiotic and abiotic_simple tests.
dalonsoa 04468d0
:recycle: Simplify fix abiotic and abiotic_simple tests.
dalonsoa d335b08
:construction: Fix hydrology tests.
dalonsoa 3bdf682
Merge branch 'develop' into frozen_models
dalonsoa 0a43623
:white_check_mark: Fix remaining tests.
dalonsoa 90fb257
:white_check_mark: Add tests for _bypass_setup_due_to_static_configur…
dalonsoa 4951376
:white_check_mark: Add tests for _run_update_due_to_static_configurat…
dalonsoa 58ada3e
:memo: Adds docs about the static flag.
dalonsoa 05ff05b
:recycle: Remove vars requires for init from update check.
dalonsoa 5d3a200
:recycle: Adapt cli and main tests.
dalonsoa 0171525
:recycle: Adapt litter tests.
dalonsoa 763289f
:recycle: Adapt soil tests.
dalonsoa 7a7e27b
:recycle: Clean up a bit hydrology tests.
dalonsoa d691a34
Apply suggestions from code review
dalonsoa 75f1253
:recycle: Include reviewers comments.
dalonsoa 1ce3aa4
:white_check_mark: Fix failing tests.
dalonsoa cc0590d
Merge branch 'develop' into frozen_models
dalonsoa 2bcb3e9
Merge branch 'develop' into frozen_models
dalonsoa 4948a80
:recycle: Fix issue resulting from merge conflict.
dalonsoa e70adb2
Merge branch 'develop' into frozen_models
dalonsoa 23ab6d7
:twisted_rightwards_arrows: Fix conflicts and finish merge.
dalonsoa d513125
:recycle: Remove unnecessary call to setup.
dalonsoa 78d1a2a
Fixing error with animal respiration in testing data.
TaranRallings 732cea3
Merge branch 'develop' into frozen_models
TaranRallings File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Not sure that I follow this bit, does the update happen and then new static data gets built for the next time step?
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.
Exactly. This is run only once, the first time that we are required to run the update and, thereafter the updated values are used for updating the data object again and again. We need to run update at least once in this case since, otherwise, we do not know what to update the data with.
If pre-set data is provided as an external file/s, then the
static_data
object is not none and this step is not needed.Keeping aside changes in initialisation/validation, the only change to existing models would be to replace
update
by_update
, since they are overwritting only one of the two options for updating the model. The_update_static
option is not model specific, and therefore is coded directly in the base model.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.
Ahh right that makes sense now, cheers!