Change mapping name ksathorfrac to standard name

Deltares · Dec 12, 2024 · 9288360 · 9288360
1 parent f692919
commit 9288360
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 19 deletions.
diff --git a/server/test/sbm_config.toml b/server/test/sbm_config.toml
@@ -104,6 +104,8 @@ reservoir_water__max_volume = "ResMaxVolume"
 "reservoir_water~full-target__volume_fraction" = "ResTargetFullFrac"
 "reservoir_water~min-target__volume_fraction" = "ResTargetMinFrac"
 
+subsurface_water__horizontal-to-vertical_saturated_hydraulic_conductivity_ratio = "KsatHorFrac"
+
 # specify the internal IDs of the parameters which vary over time
 # the external name mapping needs to be below together with the other mappings
 forcing = [
@@ -124,9 +126,6 @@ netcdf.variable.name = "KsatVer"
 scale = 1.0
 offset = 0.0
 
-[input.lateral.subsurface]
-ksathorfrac = "KsatHorFrac"
-
 [model]
 kin_wave_iteration = true
 masswasting = true

diff --git a/src/routing/subsurface.jl b/src/routing/subsurface.jl
@@ -47,7 +47,7 @@ function LateralSsfParameters(
     khfrac = ncread(
         dataset,
         config,
-        "lateral.subsurface.ksathorfrac";
+        "subsurface_water__horizontal-to-vertical_saturated_hydraulic_conductivity_ratio";
         sel = indices,
         defaults = 1.0,
         type = Float,

diff --git a/test/sbm_config.toml b/test/sbm_config.toml
@@ -104,6 +104,8 @@ reservoir_water__max_volume = "ResMaxVolume"
 "reservoir_water~full-target__volume_fraction" = "ResTargetFullFrac"
 "reservoir_water~min-target__volume_fraction" = "ResTargetMinFrac"
 
+subsurface_water__horizontal-to-vertical_saturated_hydraulic_conductivity_ratio = "KsatHorFrac"
+
 # specify the internal IDs of the parameters which vary over time
 # the external name mapping needs to be below together with the other mappings
 forcing = [
@@ -124,9 +126,6 @@ netcdf.variable.name = "KsatVer"
 scale = 1.0
 offset = 0.0
 
-[input.lateral.subsurface]
-ksathorfrac = "KsatHorFrac"
-
 [model]
 kin_wave_iteration = true
 masswasting = true

diff --git a/test/sbm_piave_config.toml b/test/sbm_piave_config.toml
@@ -69,6 +69,8 @@ river_bank_water__depth = "RiverDepth"
 land_surface_water_flow__manning_n_parameter = "N"
 land_surface__slope = "Slope"
 
+subsurface_water__horizontal-to-vertical_saturated_hydraulic_conductivity_ratio = "KsatHorFrac"
+
 forcing = [
   "vertical.atmospheric_forcing.precipitation",
   "vertical.atmospheric_forcing.temperature",
@@ -127,9 +129,6 @@ q = "q_land"
 h = "h_land"
 h_av = "h_av_land"
 
-[input.lateral.subsurface]
-ksathorfrac = "KsatHorFrac"
-
 [output]
 path = "output-piave.nc"
 

diff --git a/test/sbm_piave_demand_config.toml b/test/sbm_piave_demand_config.toml
@@ -70,6 +70,8 @@ river_bank_water__depth = "RiverDepth"
 land_surface_water_flow__manning_n_parameter = "N"
 land_surface__slope = "Slope"
 
+subsurface_water__horizontal-to-vertical_saturated_hydraulic_conductivity_ratio = "KsatHorFrac"
+
 forcing = [
   "vertical.atmospheric_forcing.precipitation",
   "vertical.atmospheric_forcing.temperature",
@@ -171,9 +173,6 @@ irrigation_trigger = "irrigation_trigger"
 irrigation_areas = "nonpaddy_irrigation_areas"
 irrigation_trigger = "irrigation_trigger"
 
-[input.lateral.subsurface]
-ksathorfrac = "KsatHorFrac"
-
 [output]
 path = "output-piave-demand.nc"
 

diff --git a/test/sbm_simple.toml b/test/sbm_simple.toml
@@ -62,6 +62,8 @@ reservoir_water__max_volume = "ResMaxVolume"
 "reservoir_water~full-target__volume_fraction" = "ResTargetFullFrac"
 "reservoir_water~min-target__volume_fraction" = "ResTargetMinFrac"
 
+subsurface_water__horizontal-to-vertical_saturated_hydraulic_conductivity_ratio = "KsatHorFrac"
+
 # specify the internal IDs of the parameters which vary over time
 # the external name mapping needs to be below together with the other mappings
 forcing = [
@@ -84,9 +86,6 @@ potential_evaporation = "pet"
 precipitation = "precip"
 temperature = "temp"
 
-[input.lateral.subsurface]
-ksathorfrac = "KsatHorFrac"
-
 [model]
 thicknesslayers = [100, 300, 800]
 type = "sbm"

diff --git a/test/sbm_swf_config.toml b/test/sbm_swf_config.toml
@@ -101,6 +101,8 @@ reservoir_water__max_volume = "ResMaxVolume"
 "reservoir_water~full-target__volume_fraction" = "ResTargetFullFrac"
 "reservoir_water~min-target__volume_fraction" = "ResTargetMinFrac"
 
+subsurface_water__horizontal-to-vertical_saturated_hydraulic_conductivity_ratio = "KsatHorFrac"
+
 # specify the internal IDs of the parameters which vary over time
 # the external name mapping needs to be below together with the other mappings
 forcing = [
@@ -116,9 +118,6 @@ potential_evaporation = "pet"
 precipitation = "precip"
 temperature = "temp"
 
-[input.lateral.subsurface]
-ksathorfrac = "KsatHorFrac"
-
 [model]
 kin_wave_iteration = true
 masswasting = true