-
Notifications
You must be signed in to change notification settings - Fork 31
Inland basin flow coupling and use land fractions on rivers grid #89
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
Merged
James Bruten (james-bruten-mo)
merged 43 commits into
MetOffice:main
from
DanCopsey:inland_flow
Jun 22, 2026
Merged
Changes from all commits
Commits
Show all changes
43 commits
Select commit
Hold shift + click to select a range
e4af37f
Merge in FCM version of this branch
DanCopsey 2e888fb
Upgraded to vn8.0
DanCopsey b0ce765
Correct upgrade macro
DanCopsey b8a7998
merged in trunk
DanCopsey d20756b
Correct URL
DanCopsey 35e447d
Corrected version for upgrade
DanCopsey c84474d
Corrected some meta data
DanCopsey 582b1d8
Fix units that do not allow upgrade
DanCopsey c725632
updated meta data
DanCopsey 58587ec
Added my name to CONTRIBUTORS.md
DanCopsey a2f80cb
Get inland outflow and river outflow to be initialised for coupled mo…
DanCopsey 9baf7ce
Added documentation changes from https://github.com/jules-lsm/jules-l…
DanCopsey 2444a28
Added reviewer suggested changes from https://code.metoffice.gov.uk/t…
DanCopsey 27a474d
Fix user guide build-and-deploy failures
DanCopsey a8a0077
Removed micro gram change that I made to get upgrade to work
DanCopsey 8ef3479
Remove rose-meta.conf.orig that somehow got added by accident
DanCopsey fcf6e14
Edit warning message
DanCopsey cbad875
Applied most of the reviewer comments from here https://github.com/Me…
DanCopsey ac7f3be
Merged in head of trunk
DanCopsey d552462
Add check that land frations have correct land points
DanCopsey 46f03ab
Ran umdp3_fixer.py
DanCopsey 0a3cc30
Remove /= bit to if test
DanCopsey e7c60bf
Change from COUNT to SUM
DanCopsey 804c8db
Update doc/source/namelists/initial_conditions.nml.rst
DanCopsey f550110
Update doc/source/namelists/initial_conditions.nml.rst
DanCopsey 8ae1116
Update doc/source/output-variables.rst
DanCopsey 3ad4965
Update src/initialisation/standalone/ancillaries/init_ancillaries_cou…
DanCopsey 322f05d
Update src/initialisation/standalone/ancillaries/init_ancillaries_cou…
DanCopsey 14e7aa3
Replace log_error with log_fatal (to get the model to stop)
DanCopsey a79c51d
Fix issue with table in documentation
DanCopsey fd34c2c
Remove option to initialise river_outflow_rp and inland_outflow_rp fr…
DanCopsey 46109fa
Update doc/source/output-variables.rst
DanCopsey 03fbde4
Update doc/source/output-variables.rst
DanCopsey 0057f5d
Update rose-meta/jules-shared/jules-hydrology/HEAD/rose-meta.conf
DanCopsey 6e678d1
merged in main
DanCopsey dc034ab
Update src/initialisation/standalone/ancillaries/init_rivers_process_…
DanCopsey c6bdf47
Merge remote-tracking branch 'origin/main' into inland_flow
james-bruten-mo 29bc5be
Corrected jules_initial for rivers-only simulations in rose-stem
DanCopsey 4945a12
Revert back to previous jules_initial apart from rivers_sto_rp has be…
DanCopsey a4bd3f3
apply macros
james-bruten-mo 79eec37
Merge branch 'inland_flow' of github.com:DanCopsey/jules into inland_…
DanCopsey 230a619
Merge branch 'inland_flow' of ssh://github.com/DanCopsey/jules into i…
james-bruten-mo 1513152
kgo
james-bruten-mo 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
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
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.