Merge branch 'main' into integrated_flow_states

Deltares · Sep 16, 2024 · fd63588 · fd63588
2 parents 0e9c804 + b1d3994
commit fd63588
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.teamcity/Templates/RegressionTest.kt b/.teamcity/Templates/RegressionTest.kt
@@ -59,7 +59,7 @@ open class RegressionTest (platformOs: String) : Template() {
                 scriptContent = header +
                         """
                 pixi run python utils/get_benchmark.py %MiniO_credential_token% "benchmark/"
-                pixi run python utils/get_benchmark.py %MiniO_credential_token% "hws_2024_7_0/"
+                pixi run python utils/get_benchmark.py %MiniO_credential_token% "hws_migration_test/"
                 pixi run test-ribasim-regression
                 """.trimIndent()
             }
@@ -73,4 +73,4 @@ open class RegressionTest (platformOs: String) : Template() {
 }
 
 object RegressionTestWindows : RegressionTest("Windows")
-object RegressionTestLinux : RegressionTest("Linux")
+object RegressionTestLinux : RegressionTest("Linux")
diff --git a/core/integration_test/hws_integration_test.jl b/core/integration_test/hws_integration_test.jl
@@ -17,7 +17,7 @@
 
     @testset "Results values" begin
         @test basin.node_id == basin_bench.node_id
-        @test all(q -> abs(q) < 0.01, basin.level - basin_bench.level)
+        @test all(q -> abs(q) < 0.06, basin.level - basin_bench.level)
     end
 
     timed = @timed Ribasim.run(toml_path)
@@ -27,6 +27,7 @@
     performance_diff =
         round((timed.time - benchmark_runtime) / benchmark_runtime * 100; digits = 2)
     if performance_diff < 0.0
+        performance_diff = abs(performance_diff)
         @info "Runtime is $(timed.time) and it is $performance_diff % faster than benchmark"
     elseif performance_diff > 0.0 && performance_diff < 0.2
         @info "Runtime is $(timed.time) and it is $performance_diff % slower than benchmark"

diff --git a/python/ribasim/tests/test_migrations.py b/python/ribasim/tests/test_migrations.py
@@ -10,8 +10,8 @@
 
 @pytest.mark.regression
 def test_hws_migration():
-    toml_path = root_folder / "models/hws_2024_7_0/hws.toml"
-    db_path = root_folder / "models/hws_2024_7_0/database.gpkg"
+    toml_path = root_folder / "models/hws_migration_test/hws.toml"
+    db_path = root_folder / "models/hws_migration_test/database.gpkg"
 
     assert (
         toml_path.exists()

diff --git a/utils/get_benchmark.py b/utils/get_benchmark.py
@@ -9,7 +9,7 @@
 minioServer: the access point to MinIO for Deltares
 accessKey: the credentials username
 secreyKey: input from the terminal, the credentials password
-pathToFolder: input from the terminal, the path to the folder to download. E.g. "benchmark/", "hws_2024_7_0/"
+pathToFolder: input from the terminal, the path to the folder to download. E.g. "benchmark/", "hws_2024_7_0/", "hws_migration"
 """
 
 minioServer = "s3.deltares.nl"