Code

Allocation beyond max flow#663

Code

Merged

visr merged 34 commits intomainDeltares/Ribasim:mainfrom allocation_beyond_max_flowDeltares/Ribasim:allocation_beyond_max_flowCopy head branch name to clipboardOct 19, 2023

+1,537-27

Commits

Commits on Oct 4, 2023

• Move get_max_flow_graph to Ribasim core

  SouthEndMusic

  committed
  6239397

  Copy full SHA for 6239397

Commits on Oct 5, 2023

• Move functions allocate! and plot_graph_max_flow to Ribasim core

  SouthEndMusic

  committed
  c10b95a

  Copy full SHA for c10b95a

• Add Subnetwork struct

  SouthEndMusic

  committed
  ea8fd24

  Copy full SHA for ea8fd24

• Merge branch 'main' into allocation

  SouthEndMusic

  committed
  e61b54e

  Copy full SHA for e61b54e

• Add start of looped_subnetwork_model testmodel

  SouthEndMusic

  committed
  1903edd

  Copy full SHA for 1903edd

• Compute node_id_mapping_inverse only once

  SouthEndMusic

  committed
  b4a582a

  Copy full SHA for b4a582a

Commits on Oct 6, 2023

• Towards return flow support in allocation

  SouthEndMusic

  committed
  e36d325

  Copy full SHA for e36d325

• Merge branch 'main' into allocation

  SouthEndMusic

  committed
  00d634f

  Copy full SHA for 00d634f

Commits on Oct 10, 2023

• Merge branch 'main' into allocation

  SouthEndMusic

  committed
  328bac1

  Copy full SHA for 328bac1

• user static sorting in ribasim python

  SouthEndMusic

  committed
  dd325bb

  Copy full SHA for dd325bb

• Make allocation compatible with multiple demands per user

  SouthEndMusic

  committed
  80ae966

  Copy full SHA for 80ae966

Commits on Oct 11, 2023

• Allocation solve with juMP.jl and HiGHS half a POC

  SouthEndMusic

  committed
  a5b46d3

  Copy full SHA for a5b46d3

• Introduce AllocationModel struct

  SouthEndMusic

  committed
  0f99889

  Copy full SHA for 0f99889

• Start docs page on allocation

  SouthEndMusic

  committed
  32959fc

  Copy full SHA for 32959fc

Commits on Oct 13, 2023

• Allocation documentation update

  SouthEndMusic

  committed
  41c18b0

  Copy full SHA for 41c18b0

• Remove unused packages from project

  SouthEndMusic

  committed
  488429c

  Copy full SHA for 488429c

• Update get_allocation_model

  SouthEndMusic

  committed
  4884eb1

  Copy full SHA for 4884eb1

• Merge branch 'main' into allocation_beyond_max_flow

  SouthEndMusic

  committed
  76c8db6

  Copy full SHA for 76c8db6

Commits on Oct 16, 2023

• Small updates

  SouthEndMusic

  committed
  2f69eda

  Copy full SHA for 2f69eda

• Merge branch 'main' into allocation_beyond_max_flow

  SouthEndMusic

  committed
  bd4d19e

  Copy full SHA for bd4d19e

Commits on Oct 17, 2023

• Stop users from using their own return flow

  SouthEndMusic

  committed
  d7c613a

  Copy full SHA for d7c613a

• Add tests

  SouthEndMusic

  committed
  98528a5

  Copy full SHA for 98528a5

• Fixing tests

  SouthEndMusic

  committed
  370b08b

  Copy full SHA for 370b08b

• Merge branch 'main' into allocation_beyond_max_flow

  SouthEndMusic

  committed
  1b2a7bc

  Copy full SHA for 1b2a7bc

• Fix allocation test

  SouthEndMusic

  committed
  548a98a

  Copy full SHA for 548a98a

• opt in to extrapolation for rating curves on DataInterpolations 4.4

  visr

  committed
  959075f

  Copy full SHA for 959075f

Commits on Oct 18, 2023

• Review comments adressed

  SouthEndMusic

  committed
  9d4dea5

  Copy full SHA for 9d4dea5

• Merge branch 'main' into allocation_beyond_max_flow

  SouthEndMusic

  committed
  d64024b

  Copy full SHA for d64024b

• Refactor: divide generating JuMP model in subfunctions

  SouthEndMusic

  committed
  ab716a9

  Copy full SHA for ab716a9

Commits on Oct 19, 2023

• Refactor: divide performing allocation in subfunctions

  SouthEndMusic

  committed
  5ce6d5e

  Copy full SHA for 5ce6d5e

• Refactor: divide constructing allocation graph into subfunctions

  SouthEndMusic

  committed
  3b82615

  Copy full SHA for 3b82615

• Remarks by Julian processed

  SouthEndMusic

  committed
  c02ee56

  Copy full SHA for c02ee56

• Merge branch 'main' into allocation_beyond_max_flow

  SouthEndMusic

  committed
  eb68873

  Copy full SHA for eb68873

• Update manifest

  SouthEndMusic

  committed
  ec8b416

  Copy full SHA for ec8b416