deploy: 94ad129

concept/allocation.html

@@ -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="31a0f557" class="cell" data-execution_count="1">
+<div id="33946caa" 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>
@@ -602,25 +602,25 @@ <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 #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[Terminal #8] : F[(TabulatedRatingCurve #7, Terminal #8)] = 0
- flow_conservation[Basin #5] : -F[(Basin #5, TabulatedRatingCurve #7)] + F[(LinearResistance #4, Basin #5)] - F[(Basin #5, LinearResistance #4)] - F[(Basin #5, UserDemand #6)] + F[(UserDemand #6, Basin #5)] = 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 #2] : -F[(Basin #2, UserDemand #3)] - F[(Basin #2, LinearResistance #4)] + F[(LinearResistance #4, Basin #2)] + F[(UserDemand #3, Basin #2)] + F[(FlowBoundary #1, Basin #2)] = 0
+ flow_conservation[Basin #5] : F[(UserDemand #6, Basin #5)] - F[(Basin #5, TabulatedRatingCurve #7)] - F[(Basin #5, UserDemand #6)] + F[(LinearResistance #4, Basin #5)] - F[(Basin #5, LinearResistance #4)] = 0
  flow_conservation[TabulatedRatingCurve #7] : F[(Basin #5, TabulatedRatingCurve #7)] - F[(TabulatedRatingCurve #7, Terminal #8)] = 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 #6, Basin #5)] ≥ 0
  F[(Basin #2, LinearResistance #4)] ≥ 0
  F[(LinearResistance #4, Basin #2)] ≥ 0
- F[(LinearResistance #4, Basin #5)] ≥ 0
- F[(Basin #5, LinearResistance #4)] ≥ 0
+ F[(Basin #5, TabulatedRatingCurve #7)] ≥ 0
+ F[(UserDemand #3, Basin #2)] ≥ 0
  F[(TabulatedRatingCurve #7, Terminal #8)] ≥ 0
  F[(Basin #5, UserDemand #6)] ≥ 0
- F[(UserDemand #3, Basin #2)] ≥ 0
  F[(FlowBoundary #1, Basin #2)] ≥ 0
- F[(UserDemand #6, Basin #5)] ≥ 0
+ F[(LinearResistance #4, Basin #5)] ≥ 0
+ F[(Basin #5, LinearResistance #4)] ≥ 0
 </code></pre>
 </div>
 </div>

concept/core.html

@@ -248,7 +248,7 @@ <h1 class="title">Julia core</h1>
 <p>With the term “core”, we mean the computational engine of Ribasim. As detailed in the <a href="../reference/usage.html">usage</a> documentation, it is generally used as a command line tool.</p>
 <p>A quick overview of the model concept is available in the <a href="../concept/concept.html#sec-concept">introduction</a>, while a more in depth discussion is available on the <a href="../concept/modelconcept.html">model concept</a> page. The theory is described on the <a href="../concept/equations.html">equations</a> page, and more in-depth numerical considerations are described on the <a href="../concept/numerics.html">numerical considerations</a> page. As allocation is a large and self-contained part of the Ribasim core, it is described on the separate <a href="../concept/allocation.html">allocation</a> page. Input validation is described on the <a href="../reference/validation.html">validation</a> page.</p>
 <p>The core is implemented in the <a href="https://julialang.org/">Julia programming language</a>, and can be found in the <a href="https://github.com/Deltares/Ribasim">Ribasim repository</a> under the <code>core/</code> folder. For developers we also advise to read the <a href="../dev/core.html">developer documentation</a>. Information on coupling can be found <a href="../guide/coupling.html">here</a>.</p>
-<p>An overview of all components is given in the <a href="../tutorial/index.qmd#sec-components">Get Started</a> section.</p>
+<p>An overview of all components is given in the <a href="../install.html#sec-components">installation</a> section.</p>
 <section id="sec-simulationloop" class="level1" data-number="1">
 <h1 data-number="1"><span class="header-section-number">1</span> The simulation loop</h1>
 <p>The computational process can be divided in three phases:</p>

dev/core.html

@@ -309,7 +309,7 @@ <h1 class="title">Julia core development</h1>
 
 <section id="julia-core-overview" class="level1" data-number="1">
 <h1 data-number="1"><span class="header-section-number">1</span> Julia core overview</h1>
-<p>The computational core is one of the components of Ribasim as illustrated in the <a href="../tutorial/index.qmd#sec-components">component overview</a>.</p>
+<p>The computational core is one of the components of Ribasim as illustrated in the <a href="../install.html#sec-components">component overview</a>.</p>
 <p>The computational process can be divided in three phases:</p>
 <ul>
 <li>Model initialization</li>

index.html

@@ -202,7 +202,7 @@ <h1 class="title">Ribasim</h1>
 
 <p>Ribasim is a water resources model to simulate the physical behavior of a managed open water system based on a set of control rules and a prioritized water allocation strategy.</p>
 <p>Ribasim is written in the <a href="https://julialang.org/">Julia programming language</a> and is built on top of the <a href="https://sciml.ai/">SciML: Open Source Software for Scientific Machine Learning</a> libraries.</p>
-<p>Ribasim is developed and supported by <a href="https://www.deltares.nl">Deltares</a>. The first version of Ribasim is developed by Deltares as part of a consortium with funding from TKI by Deltares for the Dutch watersystem.</p>
+<p>The initial version of Ribasim is developed by <a href="https://www.deltares.nl">Deltares</a> as part of a consortium for the Dutch watersystem. This activity is co-funded by <a href="https://tkideltatechnologie.nl/">TKI Deltatechnology</a>, a Dutch public–private partnership innovation program from the Ministry of Economic Affairs. Ribasim will be used as the surface water module of the <a href="https://nhi.nu/">Netherlands Hydrologic Instrument (NHI)</a>.</p>
 <p><img src="https://publicwiki.deltares.nl/download/attachments/232326570/image-2023-3-7_16-39-24-1.png?version=1&amp;modificationDate=1678203564884&amp;api=v2" class="img-fluid" alt="TKI partner logos"></p>
 <p>Ribasim model of the main water distribution network in the Netherlands.</p>
 <p><img alt="HWS on map" src="https://github.com/user-attachments/assets/5095a4fe-c336-4380-aa0c-851c851d3895" class="img-fluid"></p>

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="9bf1bbf7" class="cell" data-execution_count="1">
+<div id="574ba0db" 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

@@ -539,7 +539,7 @@ <h1 data-number="2"><span class="header-section-number">2</span> Equations</h1>
   \end{cases}
 \end{align}
 \]</span></p>
-<div id="8df5d55b" class="cell" data-execution_count="1">
+<div id="9b493f42" 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

@@ -480,7 +480,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="cf5116eb" class="cell" data-execution_count="1">
+<div id="2e110db2" 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

@@ -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="5610035c" class="cell" data-execution_count="1">
+<div id="5fc493f5" 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

@@ -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="7422a0e9" class="cell" data-execution_count="1">
+<div id="3d6dc303" 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="5482af91" class="cell" data-execution_count="2">
+<div id="107d4f4b" 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>