Skip to content

Commit

Permalink
deploy: 329a1e7
Browse files Browse the repository at this point in the history
  • Loading branch information
@visr
visr committed Sep 6, 2024
1 parent ccbaabf commit 08fa5c1
Show file tree
Hide file tree
Showing 14 changed files with 41 additions and 41 deletions.
20 changes: 10 additions & 10 deletions concept/allocation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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="197772ed" class="cell" data-execution_count="1">
<div id="3f232767" 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>
Expand All @@ -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[Basin #5] : -F[(Basin #5, TabulatedRatingCurve #7)] + F[(LinearResistance #4, Basin #5)] - F[(Basin #5, LinearResistance #4)] + F[(UserDemand #6, Basin #5)] - F[(Basin #5, UserDemand #6)] = 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[Terminal #8] : F[(TabulatedRatingCurve #7, Terminal #8)] = 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[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[(Basin #5, TabulatedRatingCurve #7)] - F[(TabulatedRatingCurve #7, Terminal #8)] = 0
flow_conservation[Basin #2] : F[(UserDemand #3, Basin #2)] - F[(Basin #2, UserDemand #3)] - F[(Basin #2, LinearResistance #4)] + F[(LinearResistance #4, Basin #2)] + F[(FlowBoundary #1, Basin #2)] = 0
F[(Basin #5, TabulatedRatingCurve #7)] ≥ 0
F[(Basin #2, LinearResistance #4)] ≥ 0
F[(LinearResistance #4, Basin #2)] ≥ 0
F[(TabulatedRatingCurve #7, Terminal #8)] ≥ 0
F[(UserDemand #3, Basin #2)] ≥ 0
F[(LinearResistance #4, Basin #5)] ≥ 0
F[(Basin #5, LinearResistance #4)] ≥ 0
F[(UserDemand #3, Basin #2)] ≥ 0
F[(Basin #2, UserDemand #3)] ≥ 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[(FlowBoundary #1, Basin #2)] ≥ 0
F[(TabulatedRatingCurve #7, Terminal #8)] ≥ 0
F[(Basin #2, UserDemand #3)] ≥ 0
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
source_user[UserDemand #6] : F[(UserDemand #6, Basin #5)] ≤ 0
</code></pre>
</div>
</div>
Expand Down
Binary file modified guide/examples_files/figure-html/cell-18-output-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified guide/examples_files/figure-html/cell-19-output-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified guide/examples_files/figure-html/cell-56-output-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified guide/examples_files/figure-html/cell-57-output-2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified guide/examples_files/figure-html/cell-68-output-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 17 additions & 17 deletions guide/quickstart.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ <h1 class="title">Quick start guide</h1>

<div class="quarto-figure quarto-figure-left">
<figure class="figure">
<p><img src="https://github.com/user-attachments/assets/467e71da-def4-4723-91de-f76bf78758fe.png" class="img-fluid quarto-figure quarto-figure-left figure-img"></p>
<p><img src="https://s3.deltares.nl/ribasim/doc-image/quickstart/cover.png" class="img-fluid quarto-figure quarto-figure-left figure-img"></p>
</figure>
</div>
<section id="introduction" class="level1" data-number="1">
Expand Down Expand Up @@ -405,7 +405,7 @@ <h1 data-number="3"><span class="header-section-number">3</span> Modual 1 - Crys
<div id="fig-crystal-basin" class="quarto-float quarto-figure quarto-figure-left anchored" data-fig-align="left">
<figure class="quarto-float quarto-float-fig figure">
<div aria-describedby="fig-crystal-basin-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
<img src="https://github.com/user-attachments/assets/e7c4e14c-07ca-416a-877f-9ea0459bdf3d.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
<img src="https://s3.deltares.nl/ribasim/doc-image/quickstart/Crystal-Basin-based-on-natural-flow.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
</div>
<figcaption class="quarto-float-caption-bottom quarto-float-caption quarto-float-fig" id="fig-crystal-basin-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
Figure&nbsp;1: Crystal Basin based on natural flow
Expand Down Expand Up @@ -483,7 +483,7 @@ <h3 data-number="3.1.4" class="anchored" data-anchor-id="step-4-basin-node-confl
<div id="fig-confluence" class="quarto-float quarto-figure quarto-figure-left anchored" data-fig-align="left">
<figure class="quarto-float quarto-float-fig figure">
<div aria-describedby="fig-confluence-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
<img src="https://github.com/user-attachments/assets/3a6b05d9-c535-4054-be92-c593a0c03d93.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
<img src="https://s3.deltares.nl/ribasim/doc-image/quickstart/Basin-node-concept-for-the-confluence.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
</div>
<figcaption class="quarto-float-caption-bottom quarto-float-caption quarto-float-fig" id="fig-confluence-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
Figure&nbsp;2: Basin node concept for the confluence
Expand Down Expand Up @@ -575,7 +575,7 @@ <h3 data-number="3.1.5" class="anchored" data-anchor-id="step-5-tabulated-rating
<div id="fig-discharge" class="quarto-float quarto-figure quarto-figure-left anchored" data-fig-align="left">
<figure class="quarto-float quarto-float-fig figure">
<div aria-describedby="fig-discharge-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
<img src="https://github.com/user-attachments/assets/14799746-3b4d-4d4c-9b8a-37fbe1d88081.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
<img src="https://s3.deltares.nl/ribasim/doc-image/quickstart/Discharge-at-corresponding-water-levels.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
</div>
<figcaption class="quarto-float-caption-bottom quarto-float-caption quarto-float-fig" id="fig-discharge-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
Figure&nbsp;3: Discharge at corresponding water levels
Expand Down Expand Up @@ -622,7 +622,7 @@ <h3 data-number="3.1.8" class="anchored" data-anchor-id="step-8-visualization-an
<div id="fig-cs11" class="quarto-float quarto-figure quarto-figure-left anchored" data-fig-align="left">
<figure class="quarto-float quarto-float-fig figure">
<div aria-describedby="fig-cs11-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
<img src="https://github.com/user-attachments/assets/c3bfceb8-6da0-46d3-9ded-e7a039d874ec.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
<img src="https://s3.deltares.nl/ribasim/doc-image/quickstart/Schematization-of-the-Crystal-basin-1.1.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
</div>
<figcaption class="quarto-float-caption-bottom quarto-float-caption quarto-float-fig" id="fig-cs11-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
Figure&nbsp;4: Schematization of the Crystal basin 1.1
Expand Down Expand Up @@ -703,7 +703,7 @@ <h3 data-number="3.1.9" class="anchored" data-anchor-id="step-9-post-processing-
<div id="fig-sim1" class="quarto-float quarto-figure quarto-figure-left anchored" data-fig-align="left">
<figure class="quarto-float quarto-float-fig figure">
<div aria-describedby="fig-sim1-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
<img src="https://github.com/user-attachments/assets/1e039b16-1db9-4bb1-bd85-9e3b6692d771.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
<img src="https://s3.deltares.nl/ribasim/doc-image/quickstart/Simulated-basin-level-and-storage.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
</div>
<figcaption class="quarto-float-caption-bottom quarto-float-caption quarto-float-fig" id="fig-sim1-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
Figure&nbsp;5: Simulated basin level and storage
Expand All @@ -714,7 +714,7 @@ <h3 data-number="3.1.9" class="anchored" data-anchor-id="step-9-post-processing-
<div id="fig-sim2" class="quarto-float quarto-figure quarto-figure-left anchored" data-fig-align="left">
<figure class="quarto-float quarto-float-fig figure">
<div aria-describedby="fig-sim2-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
<img src="https://github.com/user-attachments/assets/37c99ecf-dfd1-47e0-8be7-61ec885da232.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
<img src="https://s3.deltares.nl/ribasim/doc-image/quickstart/Simulated-flows-on-each-edge.jpg" class="img-fluid quarto-figure quarto-figure-left figure-img">
</div>
<figcaption class="quarto-float-caption-bottom quarto-float-caption quarto-float-fig" id="fig-sim2-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
Figure&nbsp;6: Simulated flows on each edge
Expand All @@ -729,7 +729,7 @@ <h2 data-number="3.2" class="anchored" data-anchor-id="modual-1.2---irrigation-d
<div id="fig-irrigation" class="quarto-float quarto-figure quarto-figure-left anchored" data-fig-align="left">
<figure class="quarto-float quarto-float-fig figure">
<div aria-describedby="fig-irrigation-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
<img src="https://github.com/user-attachments/assets/64fa750c-d7b9-4f5c-9a24-2f95e2b8bba8.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
<img src="https://s3.deltares.nl/ribasim/doc-image/quickstart/Crystal-basin-with-irrigation.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
</div>
<figcaption class="quarto-float-caption-bottom quarto-float-caption quarto-float-fig" id="fig-irrigation-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
Figure&nbsp;7: Crystal basin with irrigation
Expand Down Expand Up @@ -838,7 +838,7 @@ <h3 data-number="3.2.6" class="anchored" data-anchor-id="step-6-plot-model-and-r
<div id="fig-cs12" class="quarto-float quarto-figure quarto-figure-left anchored" data-fig-align="left">
<figure class="quarto-float quarto-float-fig figure">
<div aria-describedby="fig-cs12-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
<img src="https://github.com/user-attachments/assets/6241d388-5373-4f6c-b1f6-ff1a1a34d0e6.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
<img src="https://s3.deltares.nl/ribasim/doc-image/quickstart/Schematization-of-the-Crystal-basin-with-irrigation.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
</div>
<figcaption class="quarto-float-caption-bottom quarto-float-caption quarto-float-fig" id="fig-cs12-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
Figure&nbsp;8: Schematization of the Crystal basin with irrigation
Expand Down Expand Up @@ -921,7 +921,7 @@ <h3 data-number="3.2.8" class="anchored" data-anchor-id="step-8-plot-and-compare
<div id="fig-sim3" class="quarto-float quarto-figure quarto-figure-left anchored" data-fig-align="left">
<figure class="quarto-float quarto-float-fig figure">
<div aria-describedby="fig-sim3-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
<img src="https://github.com/user-attachments/assets/cce87cfb-9a7b-4025-812a-e2c35fa932a9.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
<img src="https://s3.deltares.nl/ribasim/doc-image/quickstart/Simulated-basin-levels-and-storages.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
</div>
<figcaption class="quarto-float-caption-bottom quarto-float-caption quarto-float-fig" id="fig-sim3-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
Figure&nbsp;9: Simulated basin levels and storages
Expand All @@ -947,7 +947,7 @@ <h3 data-number="3.2.9" class="anchored" data-anchor-id="step-9-plot-and-compare
<div id="fig-sim4" class="quarto-float quarto-figure quarto-figure-left anchored" data-fig-align="left">
<figure class="quarto-float quarto-float-fig figure">
<div aria-describedby="fig-sim4-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
<img src="https://github.com/user-attachments/assets/2a27ab07-a4c5-4906-bdcd-45491f868042.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
<img src="https://s3.deltares.nl/ribasim/doc-image/quickstart/Simulated-flows-of-each-edge.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
</div>
<figcaption class="quarto-float-caption-bottom quarto-float-caption quarto-float-fig" id="fig-sim4-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
Figure&nbsp;10: Simulated flows of each edge
Expand All @@ -958,7 +958,7 @@ <h3 data-number="3.2.9" class="anchored" data-anchor-id="step-9-plot-and-compare
<div id="fig-sim5" class="quarto-float quarto-figure quarto-figure-left anchored" data-fig-align="left">
<figure class="quarto-float quarto-float-fig figure">
<div aria-describedby="fig-sim5-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
<img src="https://github.com/user-attachments/assets/e87f75d3-c721-41f5-92c3-768a42ffd92e.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
<img src="https://s3.deltares.nl/ribasim/doc-image/quickstart/Supplied-irrigation-and-return-flow.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
</div>
<figcaption class="quarto-float-caption-bottom quarto-float-caption quarto-float-fig" id="fig-sim5-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
Figure&nbsp;11: Supplied irrigation and return flow
Expand All @@ -969,7 +969,7 @@ <h3 data-number="3.2.9" class="anchored" data-anchor-id="step-9-plot-and-compare
<div id="fig-sim6" class="quarto-float quarto-figure quarto-figure-left anchored" data-fig-align="left">
<figure class="quarto-float quarto-float-fig figure">
<div aria-describedby="fig-sim6-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
<img src="https://github.com/user-attachments/assets/b4563cbd-4919-4422-9cb8-70deebf98094.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
<img src="https://s3.deltares.nl/ribasim/doc-image/quickstart/Simulated-flow-to-Terminal.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
</div>
<figcaption class="quarto-float-caption-bottom quarto-float-caption quarto-float-fig" id="fig-sim6-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
Figure&nbsp;12: Simulated flow to Terminal
Expand All @@ -985,7 +985,7 @@ <h1 data-number="4"><span class="header-section-number">4</span> Modual 2 – Re
<div id="fig-reservoir" class="quarto-float quarto-figure quarto-figure-left anchored" data-fig-align="left">
<figure class="quarto-float quarto-float-fig figure">
<div aria-describedby="fig-reservoir-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
<img src="https://github.com/user-attachments/assets/615f6d93-bdb9-4a38-a308-c5c0929930b5.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
<img src="https://s3.deltares.nl/ribasim/doc-image/quickstart/Crystal-basin-with-demands-and-a-reservoir.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
</div>
<figcaption class="quarto-float-caption-bottom quarto-float-caption quarto-float-fig" id="fig-reservoir-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
Figure&nbsp;13: Crystal basin with demands and a reservoir
Expand Down Expand Up @@ -1055,7 +1055,7 @@ <h3 data-number="4.1.3" class="anchored" data-anchor-id="step-3-plotting-results
<div id="fig-sim7" class="quarto-float quarto-figure quarto-figure-left anchored" data-fig-align="left">
<figure class="quarto-float quarto-float-fig figure">
<div aria-describedby="fig-sim7-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
<img src="https://github.com/user-attachments/assets/545b6ce0-1a87-4f3b-b87e-79d7382beac2.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
<img src="https://s3.deltares.nl/ribasim/doc-image/quickstart/Simulated-basin-storages-and-levels.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
</div>
<figcaption class="quarto-float-caption-bottom quarto-float-caption quarto-float-fig" id="fig-sim7-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
Figure&nbsp;14: Simulated basin storages and levels
Expand Down Expand Up @@ -1133,7 +1133,7 @@ <h3 data-number="4.2.5" class="anchored" data-anchor-id="step-5-check-the-simula
<div id="fig-sim8" class="quarto-float quarto-figure quarto-figure-left anchored" data-fig-align="left">
<figure class="quarto-float quarto-float-fig figure">
<div aria-describedby="fig-sim8-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
<img src="https://github.com/user-attachments/assets/937a4868-87d1-4b5f-b37d-ab865428740d.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
<img src="https://s3.deltares.nl/ribasim/doc-image/quickstart/Simulated-flows-to-and-from-the-city.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
</div>
<figcaption class="quarto-float-caption-bottom quarto-float-caption quarto-float-fig" id="fig-sim8-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
Figure&nbsp;15: Simulated flows to and from the city
Expand All @@ -1143,7 +1143,7 @@ <h3 data-number="4.2.5" class="anchored" data-anchor-id="step-5-check-the-simula
<div id="fig-sim9" class="quarto-float quarto-figure quarto-figure-left anchored" data-fig-align="left">
<figure class="quarto-float quarto-float-fig figure">
<div aria-describedby="fig-sim9-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
<img src="https://github.com/user-attachments/assets/16fce006-5e8b-4657-9b80-f26d1489ca99.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
<img src="https://s3.deltares.nl/ribasim/doc-image/quickstart/Simulated-basin-storages-and-levels-reservoir.png" class="img-fluid quarto-figure quarto-figure-left figure-img">
</div>
<figcaption class="quarto-float-caption-bottom quarto-float-caption quarto-float-fig" id="fig-sim9-caption-0ceaefa1-69ba-4598-a22c-09a6ac19f8ca">
Figure&nbsp;16: Simulated basin storages and levels
Expand Down
Loading

0 comments on commit 08fa5c1

Please sign in to comment.