Add some basic concentration tests. (#1934)

Ideally we merge this before #1933 and #1929, so we know they don't break anything. --------- Co-authored-by: Martijn Visser <[email protected]>
Deltares · Nov 14, 2024 · 47b4fa7 · 47b4fa7
1 parent 8c96dfc
commit 47b4fa7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/core/src/util.jl b/core/src/util.jl
@@ -359,6 +359,7 @@ function FlatVector(saveval::Vector{<:SavedFlow}, sym::Symbol)
     v = isempty(saveval) ? Vector{Float64}[] : getfield.(saveval, sym)
     FlatVector(v)
 end
+FlatVector(v::Vector{Matrix{Float64}}) = FlatVector(vec.(v))
 
 """
 Function that goes smoothly from 0 to 1 in the interval [0,threshold],

diff --git a/core/test/run_models_test.jl b/core/test/run_models_test.jl
@@ -222,6 +222,11 @@ end
 
     # flows are recorded at the end of each period, and are undefined at the start
     @test unique(table.time) == Ribasim.datetimes(model)[1:(end - 1)]
+
+    @test isfile(joinpath(dirname(toml_path), "results/concentration.arrow"))
+    table = Ribasim.concentration_table(model)
+    @test "Continuity" in table.substance
+    @test all(isapprox.(table.concentration[table.substance .== "Continuity"], 1.0))
 end
 
 @testitem "basic arrow model" begin

diff --git a/python/ribasim_testmodels/ribasim_testmodels/basic.py b/python/ribasim_testmodels/ribasim_testmodels/basic.py
@@ -5,7 +5,7 @@
 import numpy as np
 import pandas as pd
 import ribasim
-from ribasim.config import Node
+from ribasim.config import Experimental, Node
 from ribasim.input_base import TableModel
 from ribasim.nodes import (
     basin,
@@ -26,6 +26,7 @@ def basic_model() -> ribasim.Model:
         starttime="2020-01-01",
         endtime="2021-01-01",
         crs="EPSG:28992",
+        experimental=Experimental(concentration=True),
     )
     model.logging = ribasim.Logging(verbosity="debug")
 

diff --git a/python/ribasim_testmodels/ribasim_testmodels/discrete_control.py b/python/ribasim_testmodels/ribasim_testmodels/discrete_control.py
@@ -1,6 +1,6 @@
 import numpy as np
 import pandas as pd
-from ribasim.config import Node
+from ribasim.config import Experimental, Node
 from ribasim.model import Model, Solver
 from ribasim.nodes import (
     basin,
@@ -604,6 +604,7 @@ def continuous_concentration_condition_model() -> Model:
         endtime="2020-02-01",
         crs="EPSG:28992",
         solver=Solver(saveat=86400 / 8),
+        experimental=Experimental(concentration=True),
     )
 
     basi = model.basin.add(