deploy: 6919dd8

concept/allocation.html

@@ -584,7 +584,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="0dd75012" class="cell" data-execution_count="1">
+<div id="18cfe63d" 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>
@@ -609,22 +609,22 @@ <h2 data-number="4.4" class="anchored" data-anchor-id="example"><span class="hea
 <div class="cell-output cell-output-stdout">
 <pre><code>Min F[(Basin #5, UserDemand #6)]² + F[(Basin #2, UserDemand #3)]²
 Subject to
- F[(FlowBoundary #1, Basin #2)] ≥ 0
+ F[(Basin #5, UserDemand #6)] ≥ 0
+ F[(Basin #2, UserDemand #3)] ≥ 0
  F[(LinearResistance #4, Basin #5)] ≥ 0
  F[(Basin #5, LinearResistance #4)] ≥ 0
- F[(Basin #5, TabulatedRatingCurve #7)] ≥ 0
+ F[(TabulatedRatingCurve #7, Terminal #1)] ≥ 0
  F[(Basin #2, LinearResistance #4)] ≥ 0
  F[(LinearResistance #4, Basin #2)] ≥ 0
- F[(Basin #5, UserDemand #6)] ≥ 0
- F[(UserDemand #6, Basin #5)] ≥ 0
- F[(TabulatedRatingCurve #7, Terminal #1)] ≥ 0
- F[(Basin #2, UserDemand #3)] ≥ 0
+ F[(FlowBoundary #1, Basin #2)] ≥ 0
  F[(UserDemand #3, Basin #2)] ≥ 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[Basin #2] : F[(FlowBoundary #1, Basin #2)] - F[(Basin #2, LinearResistance #4)] + F[(LinearResistance #4, Basin #2)] - F[(Basin #2, UserDemand #3)] + F[(UserDemand #3, Basin #2)] = 0
- flow_conservation[Basin #5] : F[(LinearResistance #4, Basin #5)] - F[(Basin #5, LinearResistance #4)] - F[(Basin #5, TabulatedRatingCurve #7)] - F[(Basin #5, UserDemand #6)] + F[(UserDemand #6, Basin #5)] = 0
+ F[(UserDemand #6, Basin #5)] ≥ 0
+ F[(Basin #5, TabulatedRatingCurve #7)] ≥ 0
  flow_conservation[Terminal #1] : F[(TabulatedRatingCurve #7, Terminal #1)] = 0
- flow_conservation[TabulatedRatingCurve #7] : F[(Basin #5, TabulatedRatingCurve #7)] - F[(TabulatedRatingCurve #7, Terminal #1)] = 0
+ flow_conservation[Basin #2] : -F[(Basin #2, UserDemand #3)] - F[(Basin #2, LinearResistance #4)] + F[(LinearResistance #4, Basin #2)] + F[(FlowBoundary #1, Basin #2)] + F[(UserDemand #3, Basin #2)] = 0
+ flow_conservation[Basin #5] : -F[(Basin #5, UserDemand #6)] + F[(LinearResistance #4, Basin #5)] - F[(Basin #5, LinearResistance #4)] + F[(UserDemand #6, Basin #5)] - F[(Basin #5, TabulatedRatingCurve #7)] = 0
+ flow_conservation[TabulatedRatingCurve #7] : -F[(TabulatedRatingCurve #7, Terminal #1)] + 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
  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

reference/node/basin.html

@@ -829,7 +829,7 @@ <h2 data-number="2.1" class="anchored" data-anchor-id="sec-reduction_factor"><sp
     \end{cases}
 \end{align}\]</span></p>
 <p>Here <span class="math inline">\(p &gt; 0\)</span> is the threshold value which determines the interval <span class="math inline">\([0,p]\)</span> of the smooth transition between <span class="math inline">\(0\)</span> and <span class="math inline">\(1\)</span>, see the plot below.</p>
-<div id="f42ca713" class="cell" data-execution_count="1">
+<div id="b9117644" class="cell" data-execution_count="1">
 <details class="code-fold">
 <summary>Code</summary>
 <div class="sourceCode cell-code" id="cb2"><pre class="sourceCode python code-with-copy"><code class="sourceCode python"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a><span class="im">import</span> numpy <span class="im">as</span> np</span>

reference/node/discrete-control.html

@@ -383,7 +383,7 @@ <h1 class="title">DiscreteControl</h1>
 
 
 <p>Set parameters of other nodes based on model state conditions (e.g.&nbsp;Basin level). The table below shows which parameters are controllable for a given node type.</p>
-<div id="6b57a3e6" class="cell" data-execution_count="1">
+<div id="523d5db7" 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>

reference/test-models.html

@@ -343,7 +343,7 @@ <h1 class="title">Test models</h1>
 
 
 <p>Ribasim developers use the following models in their testbench and in order to test new features.</p>
-<div id="27352f5f" class="cell" data-execution_count="1">
+<div id="bc1be3f1" class="cell" data-execution_count="1">
 <details class="code-fold">
 <summary>Code</summary>
 <div class="sourceCode cell-code" id="cb1"><pre class="sourceCode python code-with-copy"><code class="sourceCode python"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a><span class="im">import</span> ribasim_testmodels</span>
@@ -414,217 +414,224 @@ <h1 class="title">Test models</h1>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-8.png" width="677" height="433" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-8.png" width="677" height="450" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-9.png" width="676" height="359" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-9.png" width="677" height="433" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-10.png" width="677" height="443" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-10.png" width="676" height="359" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-11.png" width="677" height="303" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-11.png" width="677" height="443" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-12.png" width="677" height="367" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-12.png" width="677" height="303" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-13.png" width="676" height="420" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-13.png" width="677" height="367" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-14.png" width="677" height="494" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-14.png" width="676" height="420" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-15.png" width="677" height="353" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-15.png" width="677" height="494" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-16.png" width="677" height="367" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-16.png" width="677" height="353" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-17.png" width="676" height="455" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-17.png" width="677" height="367" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-18.png" width="677" height="403" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-18.png" width="676" height="455" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-19.png" width="677" height="302" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-19.png" width="677" height="403" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-20.png" width="711" height="494" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-20.png" width="677" height="302" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-21.png" width="649" height="524" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-21.png" width="711" height="494" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-22.png" width="676" height="411" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-22.png" width="649" height="524" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-23.png" width="677" height="302" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-23.png" width="676" height="411" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-24.png" width="606" height="494" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-24.png" width="677" height="302" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-25.png" width="510" height="494" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-25.png" width="606" height="494" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-26.png" width="677" height="401" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-26.png" width="510" height="494" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-27.png" width="676" height="303" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-27.png" width="677" height="401" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-28.png" width="676" height="409" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-28.png" width="676" height="303" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-29.png" width="676" height="438" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-29.png" width="676" height="409" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-30.png" width="681" height="539" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-30.png" width="676" height="438" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-31.png" width="676" height="301" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-31.png" width="681" height="539" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-32.png" width="627" height="524" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-32.png" width="676" height="301" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-33.png" width="676" height="411" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-33.png" width="627" height="524" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-34.png" width="676" height="469" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-34.png" width="676" height="411" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-35.png" width="697" height="569" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-35.png" width="676" height="469" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-36.png" width="676" height="332" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-36.png" width="697" height="569" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-37.png" width="676" height="427" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-37.png" width="676" height="332" class="figure-img"></p>
 </figure>
 </div>
 </div>
 <div class="cell-output cell-output-display">
 <div>
 <figure class="figure">
-<p><img src="test-models_files/figure-html/cell-2-output-38.png" width="677" height="406" class="figure-img"></p>
+<p><img src="test-models_files/figure-html/cell-2-output-38.png" width="676" height="427" class="figure-img"></p>
+</figure>
+</div>
+</div>
+<div class="cell-output cell-output-display">
+<div>
+<figure class="figure">
+<p><img src="test-models_files/figure-html/cell-2-output-39.png" width="677" height="406" class="figure-img"></p>
 </figure>
 </div>
 </div>

reference/validation.html

@@ -353,7 +353,7 @@ <h1 class="title">Validation</h1>
 <section id="connectivity" class="level1" data-number="1">
 <h1 data-number="1"><span class="header-section-number">1</span> Connectivity</h1>
 <p>In the table below, each column shows which node types are allowed to be downstream (or ‘down-control’) of the node type at the top of the column.</p>
-<div id="8a7a6086" class="cell" data-execution_count="1">
+<div id="5438a65a" 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>
@@ -703,7 +703,7 @@ <h1 data-number="1"><span class="header-section-number">1</span> Connectivity</h
 <section id="neighbor-amounts" class="level1" data-number="2">
 <h1 data-number="2"><span class="header-section-number">2</span> Neighbor amounts</h1>
 <p>The table below shows for each node type between which bounds the amount of in- and outneighbors must be, for both flow and control edges.</p>
-<div id="c7b7eeb1" class="cell" data-execution_count="2">
+<div id="cf0f4579" class="cell" data-execution_count="2">
 <details class="code-fold">
 <summary>Code</summary>
 <div class="sourceCode cell-code" id="cb2"><pre class="sourceCode julia code-with-copy"><code class="sourceCode julia"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a>flow_in_min <span class="op">=</span> <span class="fu">Vector</span><span class="dt">{String}</span>()</span>