Merge branch 'master' into feat/kinwave_floodplain

Author: vers-w

Wflow.spdx.json

@@ -1165,12 +1165,12 @@
             ]
         },
         {
-            "name": "DelimitedFiles",
-            "SPDXID": "SPDXRef-DelimitedFiles-8bb1440f-4735-579b-a4ab-409b98df4dab",
-            "versionInfo": "1.9.1",
+            "name": "PropertyDicts",
+            "SPDXID": "SPDXRef-PropertyDicts-f8a19df8-e894-5f55-a973-672c1158cbca",
+            "versionInfo": "0.2.1",
             "supplier": "NOASSERTION",
             "originator": "NOASSERTION",
-            "downloadLocation": "git+https://github.com/JuliaData/DelimitedFiles.jl.git@9e2f36d3c96a820c678f2f1f1782582fcf685bae",
+            "downloadLocation": "git+https://github.com/JuliaCollections/PropertyDicts.jl.git@a6b4c12d38387a4382fa53b8a6591f9c219add16",
             "filesAnalyzed": true,
             "packageVerificationCode": {
                 "packageVerificationCodeValue": "75953b0316ba1232a2fbba58bf6fb27d9a676e39"

Wflow/src/io.jl

@@ -42,6 +42,13 @@ const mover_params = (
     "land_surface_water__potential_evaporation_volume_flux",
 )
 
+# Map domain name to regular expression for matching with standard name or model path
+const domain_parameter_map = Dict{String, Regex}(
+    "reservoir" => r"reservoir|routing.river_flow.boundary_conditions.reservoir",
+    "river" => r"river|floodplain|routing.river_flow",
+    "drain" => r"land_drain|routing.subsurface_flow.boundaries.drain",
+)
+
 function routing_with_reservoirs(model)
     (; config) = model
     return config.model.reservoir__flag
@@ -675,34 +682,16 @@ end
 
 function get_reducer_func(col, domain, args...)
     (; parameter) = col
-    if occursin("reservoir", parameter)
-        reducer_func = reducer(
-            col,
-            domain.reservoir.network.reverse_indices,
-            domain.land.network.indices,
-            args...,
-        )
-    elseif occursin("river", parameter) || occursin("floodplain", parameter)
-        reducer_func = reducer(
-            col,
-            domain.river.network.reverse_indices,
-            domain.land.network.indices,
-            args...,
-        )
-    elseif occursin("drain", parameter)
-        reducer_func = reducer(
-            col,
-            domain.drain.network.reverse_indices,
-            domain.land.network.indices,
-            args...,
-        )
+    (; indices) = domain.land.network
+    if startswith(parameter, domain_parameter_map["reservoir"])
+        reducer_func =
+            reducer(col, domain.reservoir.network.reverse_indices, indices, args...)
+    elseif startswith(parameter, domain_parameter_map["river"])
+        reducer_func = reducer(col, domain.river.network.reverse_indices, indices, args...)
+    elseif startswith(parameter, domain_parameter_map["drain"])
+        reducer_func = reducer(col, domain.drain.network.reverse_indices, indices, args...)
     else
-        reducer_func = reducer(
-            col,
-            domain.land.network.reverse_indices,
-            domain.land.network.indices,
-            args...,
-        )
+        reducer_func = reducer(col, domain.land.network.reverse_indices, indices, args...)
     end
 end
 

Wflow/src/sediment/erosion/erosion_process.jl

@@ -19,7 +19,7 @@ Rainfall erosion model based on EUROSEM.
 - `interception` (interception [m s⁻¹])
 - `waterlevel` (water level [m])
 - `soil_detachability` (soil detachability [kg J⁻¹])
-- `eurosem_exponent` (EUROSEM exponent [-])
+- `eurosem_exponent` (EUROSEM exponent [mm-1])
 - `canopy_height` (canopy height [m])
 - `canopy_gap_fraction` (canopy gap fraction [-])
 - `soilcover_fraction` (soil cover fraction [-])

Wflow/src/utils.jl

@@ -98,12 +98,13 @@ function active_indices(
     return indices, reverse_indices
 end
 
+"Get active indices of `key` (standard name or model path) by prefix string matching."
 function active_indices(domain::Domain, key::AbstractString)::Vector{CartesianIndex{2}}
-    if occursin("reservoir", key)
+    if startswith(key, domain_parameter_map["reservoir"])
         return domain.reservoir.network.indices_outlet
-    elseif occursin("river", key) || occursin("floodplain", key)
+    elseif startswith(key, domain_parameter_map["river"])
         return domain.river.network.indices
-    elseif occursin("drain", key)
+    elseif startswith(key, domain_parameter_map["drain"])
         return domain.drain.network.indices
     else
         return domain.land.network.indices

Wflow/test/run_sbm.jl

@@ -74,6 +74,22 @@
               ["time", "layer", "river_gauge__count", "temp_bycoord", "temp_byindex"]
     end
 
+    @testset "NetCDF grid output" begin
+        ds = model.writer.grid_writer.output_dataset
+        land_inds = model.domain.land.network.indices
+        river_inds = model.domain.river.network.indices
+        reservoir_inds = model.domain.reservoir.network.indices_outlet
+        @test ds["time"][1] == DateTime("2000-01-02T00:00:00")
+        @test mean(ds["ustorelayerdepth"][land_inds, 1, 1]) ≈ 1.6280833
+        @test mean(ds["satwaterdepth"][land_inds, 1]) ≈ 428.79132
+        @test mean(ds["snow"][land_inds, 1]) ≈ 0.038019713
+        @test mean(ds["q_av_land"][land_inds, 1]) ≈ 0.00066952046f0
+        @test mean(ds["q_land_to_river"][land_inds, 1]) ≈ 7.3739284f-5
+        @test mean(ds["ssf_to_river"][land_inds, 1]) ≈ 83.955956
+        @test mean(ds["storage_reservoir"][reservoir_inds, 1]) ≈ 3.700436e7
+        @test mean(ds["q_av_river"][river_inds, 1]) ≈ 0.14963673f0
+    end
+
     @testset "First timestep: interception" begin
         (; interception) = model.land
 

Wflow/test/run_sbm_gwf_piave.jl

@@ -60,10 +60,10 @@
         ]
         @test maximum(soil.variables.exfiltration_saturated_water) ≈ 2.5641140612390893e-6
         @test soil.variables.exfiltration_saturated_water[17] == 0.0
-        @test mean(river_flow.variables.q_average) ≈ 30.071991490895094
+        @test mean(river_flow.variables.q_average) ≈ 30.071952652807262
         @test maximum(river_flow.variables.q_average) ≈ 117.48258852034441
         @test soil.variables.total_storage[7503] ≈ 0.4729217078886107
-        @test soil.variables.total_storage[17] ≈ 0.8174107029296707 # river cell
+        @test soil.variables.total_storage[17] ≈ 0.8174041514679893 # river cell
     end
 
     Wflow.run_timestep!(model)
@@ -86,20 +86,20 @@
         @test reservoir.variables.outflow_average ≈
               [3.2489840968665207, 9.467087432483991, 38.61905891069846]
         @test soil.variables.exfiltration_saturated_water[27:33] ≈ [
-            4.450632579987645e-7,
-            2.1330559140556994e-8,
-            1.9144110026163764e-7,
-            1.3173453594410016e-7,
-            3.326227288442264e-7,
-            2.107184034329379e-7,
-            2.2676935706227792e-7,
+            4.4499663949920836e-7,
+            2.1324849628191906e-8,
+            1.9141341039545324e-7,
+            1.3171472423984984e-7,
+            3.3262272882838675e-7,
+            2.1071840342472223e-7,
+            2.2674083769260248e-7,
         ]
         @test maximum(soil.variables.exfiltration_saturated_water) ≈ 3.877067765823678e-6
         @test soil.variables.exfiltration_saturated_water[17] == 0.0
-        @test mean(river_flow.variables.q_average) ≈ 36.80765857144827
-        @test maximum(river_flow.variables.q_average) ≈ 141.84332548772514
+        @test mean(river_flow.variables.q_average) ≈ 36.807481985571734
+        @test maximum(river_flow.variables.q_average) ≈ 141.8432828094925
         @test soil.variables.total_storage[7503] ≈ 0.4634074094243159
-        @test soil.variables.total_storage[17] ≈ 0.8395331546043192 # river cell
+        @test soil.variables.total_storage[17] ≈ 0.8395068501994309 # river cell
     end
 
     Wflow.close_files(model; delete_output = false)

Wflow/test/run_sbm_piave.jl

@@ -16,16 +16,16 @@
 
     idx = 1:3:28
     @test q_demand[idx] ≈ [
-        227.38262076140597,
-        197.77826932854217,
-        267.02912980712193,
-        155.28759918931823,
-        155.82292184228206,
-        143.33475478513975,
-        115.38260642480303,
-        100.99725841800637,
-        166.27201893591504,
-        103.1045884698738,
+        227.38262011461978,
+        197.7764252053005,
+        267.0195222513418,
+        155.26689185747682,
+        155.7833207888182,
+        143.31261663946606,
+        115.37288585606876,
+        100.99592421900839,
+        166.27459603785587,
+        103.10860102357384,
     ]
     @test q_[idx] ≈ [
         230.50830652411622,
@@ -40,16 +40,16 @@
         108.08518587596184,
     ]
     @test riv_storage_demand[idx] ≈ [
-        61262.15586688514,
-        56031.22324367828,
-        61373.56490076488,
-        48073.00601232394,
-        50574.8858099468,
-        42730.438661308515,
-        40760.706597408636,
-        38426.54099045719,
-        43466.61231827235,
-        38558.90224961908,
+        61262.14656138796,
+        56030.678213839215,
+        61376.61248402287,
+        48067.710266972324,
+        50569.606041068684,
+        42727.79363371966,
+        40759.80869303904,
+        38426.760161782266,
+        43467.15893205079,
+        38559.695784094336,
     ]
     @test riv_storage[idx] ≈ [
         61902.31987942963,
@@ -64,16 +64,16 @@
         38512.97533866192,
     ]
     @test ssf_storage_demand[idx] ≈ [
-        148920.45317987585,
-        145035.32705296585,
-        143981.91015223257,
-        140540.61889193894,
-        138341.04974891624,
-        135225.98687730395,
-        132350.44182452557,
-        129525.55864517286,
-        129529.58758586958,
-        127504.02426822705,
+        148919.6495880998,
+        145033.4702126483,
+        143967.11148222588,
+        140525.72997799006,
+        138330.5949371187,
+        135219.02660928076,
+        132344.29857001666,
+        129519.82362007826,
+        129523.35618003459,
+        127497.15699663045,
     ]
     @test ssf_storage[idx] ≈ [
         148907.47777948846,
@@ -149,8 +149,8 @@ end
             1.6261642209308662e-7,
         ]
         @test maximum(soil.variables.exfiltration_saturated_water) ≈ 2.710099850205676e-6
-        @test mean(river_flow.variables.q_average) ≈ 60.35958015226597
-        @test maximum(river_flow.variables.q_average) ≈ 235.44682290212157
+        @test mean(river_flow.variables.q_average) ≈ 60.35956987813754
+        @test maximum(river_flow.variables.q_average) ≈ 235.44680181139788
     end
 
     Wflow.run_timestep!(model)
@@ -180,8 +180,8 @@ end
             1.6873503884561887e-7,
         ]
         @test maximum(soil.variables.exfiltration_saturated_water) ≈ 2.498618226159136e-6
-        @test mean(river_flow.variables.q_average) ≈ 56.22490708883267
-        @test maximum(river_flow.variables.q_average) ≈ 227.21143082238987
+        @test mean(river_flow.variables.q_average) ≈ 56.22484066832971
+        @test maximum(river_flow.variables.q_average) ≈ 227.21136189801825
     end
 
     Wflow.close_files(model; delete_output = false)

Wflow/test/sbm_config.toml

@@ -146,6 +146,8 @@ subsurface_water__volume_flow_rate = "ssf_av"
 land_surface_water__volume_flow_rate = "q_av_land"
 land_surface_water__depth = "h_land"
 land.interception.variables.canopy_storage = "canopystorage"
+land_surface_water__to_river_volume_flow_rate = "q_land_to_river"
+subsurface_water__to_river_volume_flow_rate = "ssf_to_river"
 
 [output.netcdf_scalar]
 path = "output_scalar_moselle.nc"

Wflow/test/sbm_gwf_piave_demand_config.toml

@@ -92,7 +92,7 @@ soil_surface_water__vertical_saturated_hydraulic_conductivity = "KsatVer"
 soil_water__vertical_saturated_hydraulic_conductivity_scale_parameter = "f"
 land_water_allocation_area__count = "allocation_areas_admin2"
 land_surface_water__withdrawal_fraction = "frac_sw_used"
-soil_water__vertical_saturated_hydraulic_conductivity_factor = "kvfrac"
+soil_layer_water__vertical_saturated_hydraulic_conductivity_factor = "kvfrac"
 irrigated_paddy_area__count = "paddy_irrigation_areas"
 irrigated_non_paddy_area__count = "nonpaddy_irrigation_areas"
 model_constant_boundary_condition__hydraulic_head = "constant_head"

Wflow/test/sbm_piave_demand_config.toml

@@ -92,7 +92,7 @@ soil_surface_water__vertical_saturated_hydraulic_conductivity = "KsatVer"
 soil_water__vertical_saturated_hydraulic_conductivity_scale_parameter = "f"
 land_water_allocation_area__count = "allocation_areas_admin2"
 land_surface_water__withdrawal_fraction = "frac_sw_used"
-soil_water__vertical_saturated_hydraulic_conductivity_factor = "kvfrac"
+soil_layer_water__vertical_saturated_hydraulic_conductivity_factor = "kvfrac"
 irrigated_paddy_area__count = "paddy_irrigation_areas"
 irrigated_non_paddy_area__count = "nonpaddy_irrigation_areas"
 subsurface_water__horizontal_to_vertical_saturated_hydraulic_conductivity_ratio.value = 100