Repository navigation
Add minor reservoirs to hydrology #143
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
Open
Katie Blackford (KatieBlackford)
wants to merge
51
commits into
MetOffice:main
Choose a base branch
from
KatieBlackford:vn8.2_minor_reservoirs
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,903
−682
Open
Changes from 41 commits
Commits
Show all changes
51 commits
Select commit
Hold shift + click to select a range
8f86b82
Rose stem fixes for cehwl site (#35)
ppharris f75c761
rsync-ed with code from my now deleted fork (which was also for branc…
doucla effec7b
Now including modified files that I forgot to "add" last time round!
doucla b50bde9
Merge remote-tracking branch 'doucla/vn8.0_minor_reservoirs' into vn8…
KatieBlackford 2429092
Now passing abstraction from minor reservoirs (from water resource co…
doucla c1921fe
Net abstraction from rivers is now also passed to rivers as a global …
doucla 63bf14b
Added diagnostics conveyance_loss and river_abstracted.
doucla dddcc0b
Tidying and clarifying.
doucla 6acd700
Corrected checks around requirements for return flows.
doucla 4fb2bd6
Fix - minor_res_storage can now be read from a dump.
doucla 68db684
Tidying.
doucla 97407c1
Removed git text from metadata, updated macro.
doucla 98b4634
Corrected and added to CONTRIBUTORS.md.
doucla 50bbfee
Correcting another mistake in previous merge.
doucla a7b192f
Updated user doc to reflect minor reservoirs.
doucla 26e0800
Return flows are now calculated initially assuming the sink is availa…
doucla eeda4c5
Merge remote-tracking branch 'oldfork/doug_vn8.1_minor_reservoirs' in…
KatieBlackford 403ac46
Fixed error in previous merge
KatieBlackford 77d11a3
Fixed another merge error
KatieBlackford d5ab1d6
Fixes to run parallel
KatieBlackford 99029d8
fix to ensure minor reservoirs work when dump file called in JULES_in…
4a30af7
Bug fix for valid ancil data
KatieBlackford 9c68cc1
Fixed metadata error and signed CLA
KatieBlackford e2e83e2
Removed unused calc_avail_river_water subroutine
KatieBlackford 0997888
Cutting down overly long lines
KatieBlackford 3d0a2b6
Apply suggestions from code review
KatieBlackford f82d337
Fixed errors found from initial merge of vn8.1_minor_reservoirs branc…
KatieBlackford ad45024
Small formatting fix missed in last commit
KatieBlackford 10b58c8
Put parallel_mod into UM definition
KatieBlackford e8eb7a7
Corrected typos - from Sonja's review
KatieBlackford 720dcd1
Merge remote-tracking branch 'upstream/main' into vn8.2_minor_reservoirs
KatieBlackford cd30a0b
Fixed error in previous merge
KatieBlackford fd72da1
updating comments and documentation to clarify that conveyance loss o…
HEBaron 62f6f2f
Updating comment to clarify potential negative term
KatieBlackford a2ec9d4
Fixed formatting error
KatieBlackford 6bfdd54
Prevent use of l_minor_reservoirs in UM.
doucla a61de44
Removed redundant arguments.
doucla 8e95450
Signed CONTRIBUTORS.
doucla 464d410
Fixes to avoid abstractions resulting in negative river stores. This …
doucla 57a98bd
Preventing use of water resources with LFRic - as recommended by revi…
doucla 1da9ced
Bug fix (hopefully) to only abstract water from rivers when required.
doucla cdfe96e
Apply some of the batched suggestions from code review
KatieBlackford 1e14805
Merge commit '332ca85' into vn8.2_minor_reservoirs
KatieBlackford 97312c9
Changes to address reviewer comments
KatieBlackford ab46255
Fixed formatting errors and corrected changes to call tot_abstracted_…
KatieBlackford 039e1fb
Fixed error in minor reservoir metadata check
KatieBlackford b266bc7
Correction to BEFORE_TAG and fixed syntax error from d874fb6
KatieBlackford 7d23797
Added dr hook variable calls to subroutines in water_resources_contro…
KatieBlackford 3565e39
Moved the call to initialise_water_resources to init_mod
KatieBlackford af24399
Removed extra space in output-variables.rst and added ereport for l_o…
KatieBlackford 9f55805
Changing to assumed size array in rivers_route_rfm_mod
KatieBlackford 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 hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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.
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.
Uh oh!
There was an error while loading. Please reload this page.