Merge branch 'master' into kvfrac_leakage

Deltares · Jan 11, 2024 · b3e4c07 · b3e4c07
2 parents 9f5af8e + 1856c32
commit b3e4c07
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 13 deletions.
diff --git a/.zenodo.json b/.zenodo.json
@@ -13,6 +13,16 @@
             "name": "Visser, Martijn",
             "orcid": "0000-0001-9838-1590"
         },
+        {
+            "affiliation": "Deltares",
+            "name": "Buitink, Joost",
+            "orcid": "0000-0002-5156-0329"
+        },
+        {
+            "affiliation": "Deltares",
+            "name": "Bouaziz, Laurène",
+            "orcid": "0000-0003-0597-8051"
+        },
         {
             "affiliation": "Deltares",
             "name": "Boisgontier, Hélène"
@@ -23,15 +33,30 @@
         },
         {
             "affiliation": "Deltares",
-            "name": "Bouaziz, Laurène"
+            "name": "Pronk, Maarten",
+            "orcid": "0000-0001-8758-3939"
+        },
+        {
+            "affiliation": "Deltares",
+            "name": "Hartgring, Sebastian"
+        },
+        {
+            "affiliation": "Deltares",
+            "name": "Eilander, Dirk",
+            "orcid": "0000-0002-0951-8418"
+        },
+        {
+            "affiliation": "Deltares",
+            "name": "Weerts, Albrecht",
+            "orcid": "0000-0002-3249-8363"
         },
         {
             "affiliation": "Deltares",
-            "name": "Buitink, Joost"
+            "name": "Dalmijn, Brendan"
         },
         {
             "affiliation": "Deltares",
-            "name": "Eilander, Dirk"
+            "name": "Hofer, Julian"
         },
         {
             "affiliation": "Deltares",

diff --git a/docs/src/changelog.md b/docs/src/changelog.md
@@ -15,7 +15,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   (BasicModelInterface.jl), including function arguments, return types and the BMI
   specification that arrays are always flattened (this was not the case for variables stored
   as 2-dimensional arrays or as vector of SVectors).
-- Bump compat for NCDatasets to 0.13.
+- Bump compat for NCDatasets to 0.13, 0.14.
+- The solution for lake outflow as part of the Modified Puls Approach. The inflow and
+  outflow variables are defined for period `Δt`, and not at `t1` and `t2` (instantaneous) as
+  in the original mass balance equation of the Modified Puls Approach. Because of this, the
+  terms of the quadratic equation (and solution) were fixed.
 - Use `kvfrac` for the computation of vertical saturated hydraulic conductivity at the
   bottom of the soil layer, since `kvfrac` is also used for the computation of vertical
   unsaturated flow. 

diff --git a/docs/src/intro/publications.md b/docs/src/intro/publications.md
@@ -18,8 +18,9 @@ latest release. The DOIs of previous versions are also available at Zenodo.
 
 If you use a snapshot of the development (without a DOI) please cite as follows:
 
-van Verseveld, Willem, Visser, Martijn, Boisgontier, Hélène, Bootsma, Huite, Bouaziz,
-Laurène, Buitink, Joost, Eilander, Dirk & Hegnauer, Mark (YEAR). Deltares/Wflow.jl:
+van Verseveld, Willem, Visser, Martijn, Buitink, Joost, Bouaziz, Laurène, Boisgontier,
+Hélène, Bootsma, Huite, Pronk, Maarten, Hartgring, Sebastian, Eilander, Dirk, Weerts,
+Albrecht, Dalmijn, Brendan, Hofer, Julian, & Hegnauer, Mark (YEAR). Deltares/Wflow.jl:
 unstable-master. <https://github.com/Deltares/Wflow.jl>, obtained: DATE\_OF\_DOWNLOAD.
 
 ## Publications using wflow

diff --git a/docs/src/model_docs/lateral/waterbodies.md b/docs/src/model_docs/lateral/waterbodies.md
@@ -91,8 +91,8 @@ Inserting this equation in the mass balance gives:
 The solution for Q is then:
 
 ```math
-    Q = { \left( -LF + \sqrt{LF^{2} + 2  \left( SI - \dfrac{A*H_{0}}{\Delta t} \right)
-    } \right) }^{2} \text{for } SI > \dfrac{A H_{0}}{\Delta t}  \text{ and where}\\
+    Q = { \left( \dfrac{-LF + \sqrt{LF^{2} + 4  \left( SI - \dfrac{A*H_{0}}{\Delta t} \right)}}
+    {2} \right) }^{2} \text{for } SI > \dfrac{A H_{0}}{\Delta t}  \text{ and where}\\
     LF = \dfrac{A}{\Delta t \sqrt{\alpha}} \\~\\
     Q = 0 \text{ for } SI \leq \dfrac{A*H_{0}}{\Delta t}
 ```

diff --git a/src/reservoir_lake.jl b/src/reservoir_lake.jl
@@ -513,7 +513,8 @@ function update(lake::Lake, i, inflow, doy, timestepsecs)
 
         if si_factor_adj > 0.0
             outflow = pow(
-                -lakefactor + pow((pow(lakefactor, 2.0) + 2.0 * si_factor_adj), 0.5),
+                0.5 *
+                (-lakefactor + pow((pow(lakefactor, 2.0) + 4.0 * si_factor_adj), 0.5)),
                 2.0,
             )
         else

diff --git a/test/reservoir_lake.jl b/test/reservoir_lake.jl
@@ -50,10 +50,10 @@ end
     )
 
     Wflow.update(lake, 1, 2500.0, 181, 86400.0)
-    @test lake.outflow[1] ≈ 85.31903276150577
-    @test lake.totaloutflow[1] ≈ 7.371564430594098e6
-    @test lake.storage[1] ≈ 3.551103576940606e9
-    @test lake.waterlevel[1] ≈ 19.672569557695734
+    @test lake.outflow[1] ≈ 85.14292808113598
+    @test lake.totaloutflow[1] ≈ 7.356348986210149e6
+    @test lake.storage[1] ≈ 3.55111879238499e9
+    @test lake.waterlevel[1] ≈ 19.672653848925634
     @test lake.precipitation[1] ≈ 20.0
     @test lake.evaporation[1] ≈ 3.2
 end