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

Water supply/demand by basins in allocation (new node type LevelDemand) #1082

Merged
merged 46 commits into from
Feb 16, 2024
Merged
Show file tree
Hide file tree
Changes from 42 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
38c981c
Add node AllocationLevelControl in Julia core
SouthEndMusic Feb 6, 2024
fdc6ccb
Add AllocationLevelControl node to QGIS plugin
SouthEndMusic Feb 6, 2024
31d6603
Add validation rules for AllocationLevelControl
SouthEndMusic Feb 6, 2024
06db1ac
add AllocationLevelControl to Ribasim python
SouthEndMusic Feb 6, 2024
67f2cf2
add test model allocation_level_control
SouthEndMusic Feb 6, 2024
3aa0c30
Merge branch 'main' into allocation_level_control_node
SouthEndMusic Feb 6, 2024
9812528
Add basin flow variables and include in flow conservation constraints
SouthEndMusic Feb 6, 2024
c24143f
Accepted level window instead of single level
SouthEndMusic Feb 7, 2024
c714de9
Towards basin flow constraints
SouthEndMusic Feb 7, 2024
8a89906
Complete basin capacity constraints
SouthEndMusic Feb 7, 2024
25cba1c
Update testmodel
SouthEndMusic Feb 7, 2024
821c574
Split allocation code into inititialization and optimization
SouthEndMusic Feb 7, 2024
e5b7c88
Refactor priority handling
SouthEndMusic Feb 7, 2024
3f9c271
Towards adding terms in objective function for allocation to basins
SouthEndMusic Feb 7, 2024
a88dbfa
Merge branch 'main' into allocation_level_control_node
SouthEndMusic Feb 7, 2024
0edc31b
Split basin flow into inflow and outflow
SouthEndMusic Feb 8, 2024
e5be0f0
Towards saving basin allocation flows
SouthEndMusic Feb 8, 2024
bfcc07d
Towards adding flows into basins to objective function
SouthEndMusic Feb 8, 2024
a560d43
Add basin absolute value variables
SouthEndMusic Feb 9, 2024
6c757c0
Merge branch 'main' into allocation_level_control_node
SouthEndMusic Feb 9, 2024
22d73bb
Add constraints on basin absolute value variables
SouthEndMusic Feb 9, 2024
03a3262
Merge branch 'main' into allocation_level_control_node
SouthEndMusic Feb 9, 2024
de7cd83
Finish adding basin flow terms to objective function
SouthEndMusic Feb 9, 2024
59508a0
Fix tests
SouthEndMusic Feb 9, 2024
1e27b36
Fix documentation optimization problem example
SouthEndMusic Feb 9, 2024
da374b0
Add docstrings
SouthEndMusic Feb 9, 2024
5dbd09a
Merge branch 'main' into allocation_level_control_node
SouthEndMusic Feb 12, 2024
aaed23c
Update documentation
SouthEndMusic Feb 12, 2024
b0cfd19
Align implementation with documentation
SouthEndMusic Feb 12, 2024
02944d0
Rename AllocationLevelControl -> AllocationTarget
SouthEndMusic Feb 13, 2024
a30ad96
Merge branch 'main' into allocation_level_control_node
SouthEndMusic Feb 13, 2024
724caa0
Merge fix
SouthEndMusic Feb 13, 2024
5e763b8
Merge branch 'main' into allocation_level_control_node
SouthEndMusic Feb 13, 2024
ae49fb2
happify mypy
SouthEndMusic Feb 13, 2024
d1ae0f8
Fix initialization of AllocationTarget
SouthEndMusic Feb 13, 2024
34d7bdb
Merge branch 'main' into allocation_level_control_node
SouthEndMusic Feb 14, 2024
fcee66a
test model adjustments
SouthEndMusic Feb 14, 2024
9a91ce1
Add tests
SouthEndMusic Feb 14, 2024
1f0876b
Small fixes
SouthEndMusic Feb 14, 2024
82b5660
Finalize tests
SouthEndMusic Feb 14, 2024
8fd9d5c
Add AllocationTarget node to usage.qmd
SouthEndMusic Feb 14, 2024
4e7d8e5
Introduce results section in usage.qmd
SouthEndMusic Feb 14, 2024
4655047
Comments adressed
SouthEndMusic Feb 16, 2024
4b2b7dc
Merge branch 'main' into allocation_level_control_node
SouthEndMusic Feb 16, 2024
f0e70c8
Fix saving results
SouthEndMusic Feb 16, 2024
dd273e6
Fix test model
SouthEndMusic Feb 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/src/Ribasim.jl
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ include("parameter.jl")
include("validation.jl")
include("solve.jl")
include("logging.jl")
include("allocation.jl")
include("allocation_init.jl")
include("allocation_optim.jl")
include("util.jl")
include("sparsity.jl")
include("graph.jl")
Expand Down
Loading
Loading