bugfix tests

Deltares · Oct 18, 2024 · 809db48 · 809db48
1 parent a9c4283
commit 809db48
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 7 deletions.
diff --git a/examples/linux64/wflow_piave_clip/wflow_sbm.toml b/examples/linux64/wflow_piave_clip/wflow_sbm.toml
@@ -65,7 +65,6 @@ canopystorage = "canopystorage"
 glacierstore = "glacierstore"
 
 [input.vertical]
-alpha_h1 = "alpha_h1"
 altitude = "wflow_dem"
 c = "c"
 cf_soil = "cf_soil"
@@ -101,6 +100,13 @@ glacierfrac = "wflow_glacierfrac"
 g_cfmax = "G_Cfmax"
 g_tt = "G_TT"
 g_sifrac = "G_SIfrac"
+kc = "kc"
+alpha_h1 = "alpha_h1"
+h1 = "h1"
+h2 = "h2"
+h3_high = "h3_high"
+h3_low = "h3_low"
+h4 = "h4"
 
 [state.lateral.river]
 q = "q_river"

diff --git a/examples/linux64/wflow_piave_subbasin/staticmaps.nc b/examples/linux64/wflow_piave_subbasin/staticmaps.nc
diff --git a/examples/linux64/wflow_piave_subbasin/wflow_sbm.toml b/examples/linux64/wflow_piave_subbasin/wflow_sbm.toml
@@ -65,7 +65,6 @@ canopystorage = "canopystorage"
 glacierstore = "glacierstore"
 
 [input.vertical]
-alpha_h1 = "alpha_h1"
 altitude = "wflow_dem"
 c = "c"
 cf_soil = "cf_soil"
@@ -101,6 +100,13 @@ glacierfrac = "wflow_glacierfrac"
 g_cfmax = "G_Cfmax"
 g_tt = "G_TT"
 g_sifrac = "G_SIfrac"
+kc = "kc"
+alpha_h1 = "alpha_h1"
+h1 = "h1"
+h2 = "h2"
+h3_high = "h3_high"
+h3_low = "h3_low"
+h4 = "h4"
 
 [state.lateral.river]
 q = "q_river"

diff --git a/examples/wflow_piave_clip/staticmaps.nc b/examples/wflow_piave_clip/staticmaps.nc
diff --git a/examples/wflow_piave_clip/wflow_sbm.toml b/examples/wflow_piave_clip/wflow_sbm.toml
@@ -65,7 +65,6 @@ canopystorage = "canopystorage"
 glacierstore = "glacierstore"
 
 [input.vertical]
-alpha_h1 = "alpha_h1"
 altitude = "wflow_dem"
 c = "c"
 cf_soil = "cf_soil"
@@ -101,6 +100,13 @@ glacierfrac = "wflow_glacierfrac"
 g_cfmax = "G_Cfmax"
 g_tt = "G_TT"
 g_sifrac = "G_SIfrac"
+kc = "kc"
+alpha_h1 = "alpha_h1"
+h1 = "h1"
+h2 = "h2"
+h3_high = "h3_high"
+h3_low = "h3_low"
+h4 = "h4"
 
 [state.lateral.river]
 q = "q_river"

diff --git a/examples/wflow_piave_subbasin/staticmaps.nc b/examples/wflow_piave_subbasin/staticmaps.nc
diff --git a/examples/wflow_piave_subbasin/wflow_sbm.toml b/examples/wflow_piave_subbasin/wflow_sbm.toml
@@ -65,7 +65,6 @@ canopystorage = "canopystorage"
 glacierstore = "glacierstore"
 
 [input.vertical]
-alpha_h1 = "alpha_h1"
 altitude = "wflow_dem"
 c = "c"
 cf_soil = "cf_soil"
@@ -101,6 +100,13 @@ glacierfrac = "wflow_glacierfrac"
 g_cfmax = "G_Cfmax"
 g_tt = "G_TT"
 g_sifrac = "G_SIfrac"
+kc = "kc"
+alpha_h1 = "alpha_h1"
+h1 = "h1"
+h2 = "h2"
+h3_high = "h3_high"
+h3_low = "h3_low"
+h4 = "h4"
 
 [state.lateral.river]
 q = "q_river"

diff --git a/tests/test_model_methods.py b/tests/test_model_methods.py
@@ -954,8 +954,7 @@ def test_setup_allocation_surfacewaterfrac(example_wflow_model, tmpdir):
 
     # Use the method without gwbodies and ncfrac and waterareas from wflow
     example_wflow_model.setup_allocation_areas(
-        admin_bounds_fn="gadm_level2",
-        min_area=30,
+        waterareas_fn="gadm_level2",
     )
     example_wflow_model.setup_allocation_surfacewaterfrac(
         gwfrac_fn="lisflood_gwfrac",
@@ -1004,7 +1003,7 @@ def test_setup_non_irrigation(example_wflow_model, tmpdir):
         .isel(latitude=32, longitude=26)
         .values
     )
-    assert int(np.mean(dom_gross_vals) * 100) == 89
+    assert int(np.mean(dom_gross_vals) * 100) == 136
     popu_val = (
         example_wflow_model.grid["population"].isel(latitude=32, longitude=26).values
     )