From bfa211730d112817c09538eaf8e458cb00b5c216 Mon Sep 17 00:00:00 2001 From: Jingru923 Date: Tue, 13 Aug 2024 13:59:33 +0000 Subject: [PATCH] deploy: 123c75244e189d0779e2c496e0835aff24ffa14d --- concept/allocation.html | 22 +- dev/addnode.html | 12 +- dev/allocation.html | 6 + dev/benchmark.html | 709 ++++++++++++++++++ dev/bmi.html | 6 + dev/ci.html | 6 + dev/core.html | 12 +- dev/index.html | 6 + dev/python.html | 6 + dev/qgis.html | 6 + dev/release.html | 6 + .../figure-html/cell-18-output-1.png | Bin 86755 -> 86875 bytes .../figure-html/cell-19-output-1.png | Bin 120665 -> 120920 bytes reference/node/basin.html | 2 +- reference/node/discrete-control.html | 2 +- reference/test-models.html | 2 +- reference/validation.html | 4 +- search.json | 164 ++-- 18 files changed, 878 insertions(+), 93 deletions(-) create mode 100644 dev/benchmark.html diff --git a/concept/allocation.html b/concept/allocation.html index 794c5c3d9..9b534f81c 100644 --- a/concept/allocation.html +++ b/concept/allocation.html @@ -584,7 +584,7 @@

4.4 Example

The following is an example of an optimization problem for the example shown here:

-
+
Code
using Ribasim
@@ -607,27 +607,27 @@ 

println(p.allocation.allocation_models[1].problem)

-
Min F[(Basin #5, UserDemand #6)]² + F[(Basin #2, UserDemand #3)]²
+
Min F[(Basin #2, UserDemand #3)]² + F[(Basin #5, UserDemand #6)]²
 Subject to
  source[(FlowBoundary #1, Basin #2)] : F[(FlowBoundary #1, Basin #2)] ≤ 172800
  source_user[UserDemand #6] : F[(UserDemand #6, Basin #5)] ≤ 0
  source_user[UserDemand #3] : F[(UserDemand #3, Basin #2)] ≤ 0
- flow_conservation[LinearResistance #4] : F[(Basin #2, LinearResistance #4)] - F[(LinearResistance #4, Basin #2)] - F[(LinearResistance #4, Basin #5)] + F[(Basin #5, LinearResistance #4)] = 0
- flow_conservation[Terminal #1] : F[(TabulatedRatingCurve #7, Terminal #1)] = 0
- flow_conservation[Basin #5] : -F[(Basin #5, UserDemand #6)] + F[(UserDemand #6, Basin #5)] + F[(LinearResistance #4, Basin #5)] - F[(Basin #5, LinearResistance #4)] - F[(Basin #5, TabulatedRatingCurve #7)] = 0
- flow_conservation[Basin #2] : F[(UserDemand #3, Basin #2)] + F[(FlowBoundary #1, Basin #2)] - F[(Basin #2, UserDemand #3)] - F[(Basin #2, LinearResistance #4)] + F[(LinearResistance #4, Basin #2)] = 0
+ flow_conservation[Basin #5] : F[(UserDemand #6, Basin #5)] - F[(Basin #5, UserDemand #6)] + F[(LinearResistance #4, Basin #5)] - F[(Basin #5, LinearResistance #4)] - F[(Basin #5, TabulatedRatingCurve #7)] = 0
+ flow_conservation[LinearResistance #4] : -F[(LinearResistance #4, Basin #5)] + F[(Basin #5, LinearResistance #4)] + F[(Basin #2, LinearResistance #4)] - F[(LinearResistance #4, Basin #2)] = 0
  flow_conservation[TabulatedRatingCurve #7] : -F[(TabulatedRatingCurve #7, Terminal #1)] + F[(Basin #5, TabulatedRatingCurve #7)] = 0
- F[(UserDemand #3, Basin #2)] ≥ 0
+ flow_conservation[Terminal #1] : F[(TabulatedRatingCurve #7, Terminal #1)] = 0
+ flow_conservation[Basin #2] : -F[(Basin #2, UserDemand #3)] + F[(FlowBoundary #1, Basin #2)] + F[(UserDemand #3, Basin #2)] - F[(Basin #2, LinearResistance #4)] + F[(LinearResistance #4, Basin #2)] = 0
+ F[(Basin #2, UserDemand #3)] ≥ 0
  F[(FlowBoundary #1, Basin #2)] ≥ 0
- F[(Basin #5, UserDemand #6)] ≥ 0
+ F[(UserDemand #3, Basin #2)] ≥ 0
  F[(UserDemand #6, Basin #5)] ≥ 0
- F[(Basin #2, UserDemand #3)] ≥ 0
- F[(Basin #2, LinearResistance #4)] ≥ 0
- F[(LinearResistance #4, Basin #2)] ≥ 0
+ F[(Basin #5, UserDemand #6)] ≥ 0
  F[(TabulatedRatingCurve #7, Terminal #1)] ≥ 0
  F[(LinearResistance #4, Basin #5)] ≥ 0
  F[(Basin #5, LinearResistance #4)] ≥ 0
  F[(Basin #5, TabulatedRatingCurve #7)] ≥ 0
+ F[(Basin #2, LinearResistance #4)] ≥ 0
+ F[(LinearResistance #4, Basin #2)] ≥ 0
 
diff --git a/dev/addnode.html b/dev/addnode.html index fd43a0f1f..c61a96930 100644 --- a/dev/addnode.html +++ b/dev/addnode.html @@ -65,7 +65,7 @@ - + @@ -221,6 +221,12 @@ Julia core development
+ + + + + + + + + +