deploy: 0e98525

concept/allocation.html

@@ -574,7 +574,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="53f361be" class="cell" data-execution_count="1">
+<div id="71a22ce4" 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>
@@ -597,27 +597,27 @@ <h2 data-number="4.4" class="anchored" data-anchor-id="example"><span class="hea
 <span id="cb1-18"><a href="#cb1-18" 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[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 #2] : -F[(Basin #2, LinearResistance #4)] + F[(LinearResistance #4, Basin #2)] + F[(UserDemand #3, Basin #2)] + F[(FlowBoundary #1, Basin #2)] - F[(Basin #2, UserDemand #3)] = 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 #8)] + 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[Basin #5] : -F[(Basin #5, TabulatedRatingCurve #7)] + F[(UserDemand #6, Basin #5)] - F[(Basin #5, UserDemand #6)] + F[(LinearResistance #4, Basin #5)] - F[(Basin #5, LinearResistance #4)] = 0
+ flow_conservation[Basin #2] : -F[(Basin #2, UserDemand #3)] + F[(UserDemand #3, Basin #2)] - F[(Basin #2, LinearResistance #4)] + F[(LinearResistance #4, Basin #2)] + F[(FlowBoundary #1, 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
+ F[(Basin #2, UserDemand #3)] ≥ 0
+ F[(Basin #5, TabulatedRatingCurve #7)] ≥ 0
+ F[(UserDemand #3, Basin #2)] ≥ 0
+ F[(UserDemand #6, Basin #5)] ≥ 0
  F[(Basin #2, LinearResistance #4)] ≥ 0
  F[(LinearResistance #4, Basin #2)] ≥ 0
  F[(Basin #5, UserDemand #6)] ≥ 0
- F[(TabulatedRatingCurve #7, Terminal #8)] ≥ 0
  F[(LinearResistance #4, Basin #5)] ≥ 0
  F[(Basin #5, LinearResistance #4)] ≥ 0
- F[(UserDemand #3, Basin #2)] ≥ 0
- F[(UserDemand #6, Basin #5)] ≥ 0
- F[(Basin #5, TabulatedRatingCurve #7)] ≥ 0
  F[(FlowBoundary #1, Basin #2)] ≥ 0
- F[(Basin #2, UserDemand #3)] ≥ 0
+ F[(TabulatedRatingCurve #7, Terminal #8)] ≥ 0
 </code></pre>
 </div>
 </div>

guide/delwaq.html

@@ -560,21 +560,21 @@ <h1 class="title">Ribasim Delwaq coupling</h1>
 <div id="cell-9" class="cell" data-execution_count="5">
 <div class="sourceCode cell-code" id="cb4"><pre class="sourceCode python code-with-copy"><code class="sourceCode python"><span id="cb4-1"><a href="#cb4-1" aria-hidden="true" tabindex="-1"></a><span class="bu">list</span>(output_path.iterdir())</span></code><button title="Copy to Clipboard" class="code-copy-button"><i class="bi"></i></button></pre></div>
 <div class="cell-output cell-output-display" data-execution_count="5">
-<pre><code>[PosixPath('../../generated_testmodels/basic/delwaq/delwaq.inp'),
- PosixPath('../../generated_testmodels/basic/delwaq/ribasim_bndlist.inc'),
- PosixPath('../../generated_testmodels/basic/delwaq/ribasim.poi'),
- PosixPath('../../generated_testmodels/basic/delwaq/ribasim.len'),
+<pre><code>[PosixPath('../../generated_testmodels/basic/delwaq/ribasim.flo'),
  PosixPath('../../generated_testmodels/basic/delwaq/volumes.csv'),
+ PosixPath('../../generated_testmodels/basic/delwaq/ribasim.are'),
+ PosixPath('../../generated_testmodels/basic/delwaq/ribasim.poi'),
  PosixPath('../../generated_testmodels/basic/delwaq/dimr_config.xml'),
- PosixPath('../../generated_testmodels/basic/delwaq/ribasim.vol'),
- PosixPath('../../generated_testmodels/basic/delwaq/ribasim.vel'),
- PosixPath('../../generated_testmodels/basic/delwaq/ribasim.atr'),
- PosixPath('../../generated_testmodels/basic/delwaq/flows.csv'),
  PosixPath('../../generated_testmodels/basic/delwaq/ribasim.nc'),
- PosixPath('../../generated_testmodels/basic/delwaq/ribasim.are'),
- PosixPath('../../generated_testmodels/basic/delwaq/ribasim.flo'),
+ PosixPath('../../generated_testmodels/basic/delwaq/flows.csv'),
  PosixPath('../../generated_testmodels/basic/delwaq/network.csv'),
- PosixPath('../../generated_testmodels/basic/delwaq/B5_bounddata.inc')]</code></pre>
+ PosixPath('../../generated_testmodels/basic/delwaq/ribasim.len'),
+ PosixPath('../../generated_testmodels/basic/delwaq/B5_bounddata.inc'),
+ PosixPath('../../generated_testmodels/basic/delwaq/ribasim.atr'),
+ PosixPath('../../generated_testmodels/basic/delwaq/ribasim_bndlist.inc'),
+ PosixPath('../../generated_testmodels/basic/delwaq/delwaq.inp'),
+ PosixPath('../../generated_testmodels/basic/delwaq/ribasim.vel'),
+ PosixPath('../../generated_testmodels/basic/delwaq/ribasim.vol')]</code></pre>
 </div>
 </div>
 <p>These files form a complete Delwaq simulation, and can be run by either pointing DIMR to the <code>dimr_config.xml</code> file or pointing Delwaq to the <code>delwaq.inp</code> file.</p>

reference/node/discrete-control.html

@@ -379,7 +379,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="6be9ee07" class="cell" data-execution_count="1">
+<div id="cd0580de" 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/node/manning-resistance.html

@@ -535,7 +535,7 @@ <h1 data-number="2"><span class="header-section-number">2</span> Equations</h1>
   \end{cases}
 \end{align}
 \]</span></p>
-<div id="50f1690d" class="cell" data-execution_count="1">
+<div id="d835ec48" 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> numpy <span class="im">as</span> np</span>

reference/node/tabulated-rating-curve.html

@@ -476,7 +476,7 @@ <h2 data-number="1.1" class="anchored" data-anchor-id="static"><span class="head
 <section id="interpolation" class="level3" data-number="1.1.1">
 <h3 data-number="1.1.1" class="anchored" data-anchor-id="interpolation"><span class="header-section-number">1.1.1</span> Interpolation</h3>
 <p>The <span class="math inline">\(Q(h)\)</span> relationship of a tabulated rating curve is defined as a linear interpolation.</p>
-<div id="d86186c6" class="cell" data-execution_count="1">
+<div id="c757189e" 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> numpy <span class="im">as</span> np</span>

reference/test-models.html

@@ -339,7 +339,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="92ee9843" class="cell" data-execution_count="1">
+<div id="ce992ad7" 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>

reference/validation.html

@@ -349,7 +349,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="bec4132b" class="cell" data-execution_count="1">
+<div id="37d451ef" 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>
@@ -699,7 +699,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="5f4c6268" class="cell" data-execution_count="2">
+<div id="7cfeb5cf" 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>