deploy: 464caf9

Deltares · Oct 3, 2024 · f34dd88 · f34dd88
1 parent c2e11e1
commit f34dd88
Show file tree

Hide file tree

Showing 128 changed files with 712 additions and 712 deletions.
diff --git a/changelog.html b/changelog.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
 
 <meta charset="utf-8">
-<meta name="generator" content="quarto-1.5.55">
+<meta name="generator" content="quarto-1.5.57">
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
 

diff --git a/concept/allocation.html b/concept/allocation.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
 
 <meta charset="utf-8">
-<meta name="generator" content="quarto-1.5.55">
+<meta name="generator" content="quarto-1.5.57">
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
 
@@ -578,7 +578,7 @@ <h2 data-number="4.3" class="anchored" data-anchor-id="the-optimization-constrai
 <section id="example" class="level2" data-number="4.4">
 <h2 data-number="4.4" class="anchored" data-anchor-id="example"><span class="header-section-number">4.4</span> Example</h2>
 <p>The following is an example of an optimization problem for the example shown <a href="../guide/examples.html#model-with-allocation-user-demand">here</a>:</p>
-<div id="5cb483e0" class="cell" data-execution_count="1">
+<div id="e6adf541" class="cell" data-execution_count="1">
 <details class="code-fold">
 <summary>Code</summary>
 <div class="sourceCode cell-code" id="cb1"><pre class="sourceCode julia code-with-copy"><code class="sourceCode julia"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a><span class="im">using</span> <span class="bu">Ribasim</span></span>
@@ -600,27 +600,27 @@ <h2 data-number="4.4" class="anchored" data-anchor-id="example"><span class="hea
 <span id="cb1-17"><a href="#cb1-17" aria-hidden="true" tabindex="-1"></a><span class="fu">println</span>(p.allocation.allocation_models[<span class="fl">1</span>].problem)</span></code><button title="Copy to Clipboard" class="code-copy-button"><i class="bi"></i></button></pre></div>
 </details>
 <div class="cell-output cell-output-stdout">
-<pre><code>Min F[(Basin #5, UserDemand #6)]² + F[(Basin #2, UserDemand #3)]²
+<pre><code>Min F[(Basin #2, UserDemand #3)]² + F[(Basin #5, UserDemand #6)]²
 Subject to
+ flow_conservation[Basin #5] : -F[(Basin #5, TabulatedRatingCurve #7)] + F[(UserDemand #6, Basin #5)] + F[(LinearResistance #4, Basin #5)] - F[(Basin #5, LinearResistance #4)] - F[(Basin #5, UserDemand #6)] = 0
+ flow_conservation[Basin #2] : -F[(Basin #2, LinearResistance #4)] + F[(LinearResistance #4, Basin #2)] - F[(Basin #2, UserDemand #3)] + F[(UserDemand #3, Basin #2)] + F[(FlowBoundary #1, 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[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[TabulatedRatingCurve #7] : F[(Basin #5, TabulatedRatingCurve #7)] - F[(TabulatedRatingCurve #7, Terminal #8)] = 0
  flow_conservation[Terminal #8] : F[(TabulatedRatingCurve #7, Terminal #8)] = 0
- flow_conservation[TabulatedRatingCurve #7] : -F[(TabulatedRatingCurve #7, Terminal #8)] + F[(Basin #5, TabulatedRatingCurve #7)] = 0
- flow_conservation[Basin #2] : -F[(Basin #2, LinearResistance #4)] + F[(LinearResistance #4, Basin #2)] + F[(FlowBoundary #1, Basin #2)] + F[(UserDemand #3, Basin #2)] - F[(Basin #2, UserDemand #3)] = 0
  source[(FlowBoundary #1, Basin #2)] : F[(FlowBoundary #1, Basin #2)] ≤ 172800
- source_user[UserDemand #3] : F[(UserDemand #3, Basin #2)] ≤ 0
  source_user[UserDemand #6] : F[(UserDemand #6, Basin #5)] ≤ 0
+ source_user[UserDemand #3] : F[(UserDemand #3, Basin #2)] ≤ 0
+ F[(Basin #5, TabulatedRatingCurve #7)] ≥ 0
  F[(Basin #2, LinearResistance #4)] ≥ 0
  F[(LinearResistance #4, Basin #2)] ≥ 0
  F[(UserDemand #6, Basin #5)] ≥ 0
  F[(TabulatedRatingCurve #7, Terminal #8)] ≥ 0
- F[(FlowBoundary #1, Basin #2)] ≥ 0
- F[(Basin #5, UserDemand #6)] ≥ 0
- F[(UserDemand #3, Basin #2)] ≥ 0
  F[(LinearResistance #4, Basin #5)] ≥ 0
  F[(Basin #5, LinearResistance #4)] ≥ 0
  F[(Basin #2, UserDemand #3)] ≥ 0
- F[(Basin #5, TabulatedRatingCurve #7)] ≥ 0
+ F[(UserDemand #3, Basin #2)] ≥ 0
+ F[(FlowBoundary #1, Basin #2)] ≥ 0
+ F[(Basin #5, UserDemand #6)] ≥ 0
 </code></pre>
 </div>
 </div>

diff --git a/concept/concept.html b/concept/concept.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
 
 <meta charset="utf-8">
-<meta name="generator" content="quarto-1.5.55">
+<meta name="generator" content="quarto-1.5.57">
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
 

diff --git a/concept/core.html b/concept/core.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
 
 <meta charset="utf-8">
-<meta name="generator" content="quarto-1.5.55">
+<meta name="generator" content="quarto-1.5.57">
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
 

diff --git a/concept/equations.html b/concept/equations.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
 
 <meta charset="utf-8">
-<meta name="generator" content="quarto-1.5.55">
+<meta name="generator" content="quarto-1.5.57">
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
 

diff --git a/concept/modelconcept.html b/concept/modelconcept.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
 
 <meta charset="utf-8">
-<meta name="generator" content="quarto-1.5.55">
+<meta name="generator" content="quarto-1.5.57">
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
 

diff --git a/concept/numerics.html b/concept/numerics.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
 
 <meta charset="utf-8">
-<meta name="generator" content="quarto-1.5.55">
+<meta name="generator" content="quarto-1.5.57">
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
 

diff --git a/dev/addnode.html b/dev/addnode.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
 
 <meta charset="utf-8">
-<meta name="generator" content="quarto-1.5.55">
+<meta name="generator" content="quarto-1.5.57">
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
 

diff --git a/dev/allocation.html b/dev/allocation.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
 
 <meta charset="utf-8">
-<meta name="generator" content="quarto-1.5.55">
+<meta name="generator" content="quarto-1.5.57">
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
 
@@ -371,66 +371,66 @@ <h1 data-number="1"><span class="header-section-number">1</span> Overview of all
 <section id="sec-allocation-struct" class="level2" data-number="1.1">
 <h2 data-number="1.1" class="anchored" data-anchor-id="sec-allocation-struct"><span class="header-section-number">1.1</span> The <code>Allocation</code> struct</h2>
 <p>The <code>Allocation</code> struct stores necessary data and calculation results.</p>
-<table class="caption-top">
+<table class="caption-top table">
 <colgroup>
 <col style="width: 20%">
 <col style="width: 13%">
 <col style="width: 66%">
 </colgroup>
 <thead>
-<tr>
+<tr class="header">
 <th>field</th>
 <th>type</th>
 <th>description</th>
 </tr>
 </thead>
 <tbody>
-<tr>
+<tr class="odd">
 <td>subnetwork_ids</td>
 <td>Vector{Int32}</td>
 <td>The unique sorted allocation network IDs</td>
 </tr>
-<tr>
+<tr class="even">
 <td>allocation_models</td>
 <td>AllocationModel</td>
 <td>The allocation models for the main network and subnetworks corresponding to subnetwork_ids</td>
 </tr>
-<tr>
+<tr class="odd">
 <td>main_network_connections</td>
 <td>Vector{Vector{Tuple{NodeID, NodeID}}}</td>
 <td>(from_id, to_id) from the main network to the subnetwork per subnetwork</td>
 </tr>
-<tr>
+<tr class="even">
 <td>priorities</td>
 <td>Vector{Int32}</td>
 <td>All used priority values.</td>
 </tr>
-<tr>
+<tr class="odd">
 <td>subnetwork_demands</td>
 <td>Dict{Tuple{NodeID, NodeID}, Vector{Float64}}</td>
 <td>The demand of an edge from the main network to a subnetwork</td>
 </tr>
-<tr>
+<tr class="even">
 <td>subnetwork_allocateds</td>
 <td>Dict{Tuple{NodeID, NodeID}, Vector{Float64}}</td>
 <td>The allocated flow of an edge from the main network to a subnetwork</td>
 </tr>
-<tr>
+<tr class="odd">
 <td>mean_input_flows</td>
 <td>Dict{Tuple{NodeID, NodeID}, Float64}</td>
 <td>Flows averaged over Δt_allocation over edges that are allocation sources</td>
 </tr>
-<tr>
+<tr class="even">
 <td>mean_realized_flows</td>
 <td>Dict{Tuple{NodeID, NodeID}, Float64}</td>
 <td>Flows averaged over Δt_allocation over edges that realize a demand</td>
 </tr>
-<tr>
+<tr class="odd">
 <td>record_demand</td>
 <td></td>
 <td>A record of demands and allocated flows for nodes that have these</td>
 </tr>
-<tr>
+<tr class="even">
 <td>record_flow</td>
 <td></td>
 <td>A record of all flows computed by allocation optimization, eventually saved to output file</td>
@@ -441,36 +441,36 @@ <h2 data-number="1.1" class="anchored" data-anchor-id="sec-allocation-struct"><s
 <section id="sec-allocation-model-struct" class="level2" data-number="1.2">
 <h2 data-number="1.2" class="anchored" data-anchor-id="sec-allocation-model-struct"><span class="header-section-number">1.2</span> The <code>AllocationModel</code> struct</h2>
 <p>The <code>AllocationModel</code> struct has all the data that is needed for the JuMP optimization problem.</p>
-<table class="caption-top">
+<table class="caption-top table">
 <colgroup>
 <col style="width: 20%">
 <col style="width: 13%">
 <col style="width: 66%">
 </colgroup>
 <thead>
-<tr>
+<tr class="header">
 <th>field</th>
 <th>type</th>
 <th>description</th>
 </tr>
 </thead>
 <tbody>
-<tr>
+<tr class="odd">
 <td>subnetwork_id</td>
 <td>Int32</td>
 <td>The ID of this allocation network</td>
 </tr>
-<tr>
+<tr class="even">
 <td>capacity</td>
 <td>JuMP.Containers.SparseAxisArray</td>
 <td>The capacity per edge of the allocation network, as constrained by nodes that have a max_flow_rate</td>
 </tr>
-<tr>
+<tr class="odd">
 <td>problem</td>
 <td>JuMP.Model</td>
 <td>The JuMP.jl model for solving the allocation problem</td>
 </tr>
-<tr>
+<tr class="even">
 <td>Δt_allocation</td>
 <td>Float64</td>
 <td>The time interval between consecutive allocation solves</td>

diff --git a/dev/benchmark.html b/dev/benchmark.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
 
 <meta charset="utf-8">
-<meta name="generator" content="quarto-1.5.55">
+<meta name="generator" content="quarto-1.5.57">
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">