Change mapping name waterfrac to standard name

Deltares · Dec 11, 2024 · 24f9435 · 24f9435
1 parent 1256662
commit 24f9435
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 28 deletions.
diff --git a/server/test/sbm_config.toml b/server/test/sbm_config.toml
@@ -59,6 +59,9 @@ subcatchment = "wflow_subcatch"
 
 atmosphere_air__snowfall_temperature_threshold = "TT"
 atmosphere_air__snowfall_temperature_interval = "TTI"
+
+"land~water-covered__area_fraction" = "WaterFrac"
+
 snowpack__melting_temperature_threshold = "TTM"
 snowpack__degree-day_coefficient = "Cfmax"
 snowpack__liquid_water_holding_capacity =  "WHC"
@@ -92,12 +95,6 @@ forcing = [
 
 cyclic = ["vegetation__leaf-area_index"]
 
-[input.vertical.runoff.parameters]
-waterfrac = "WaterFrac"
-
-[input.vertical.interception.parameters]
-e_r = "EoverR"
-
 [input.vertical.atmospheric_forcing]
 potential_evaporation = "pet"
 precipitation = "precip"

diff --git a/src/surfacewater/runoff.jl b/src/surfacewater/runoff.jl
@@ -39,7 +39,7 @@ function OpenWaterRunoffParameters(dataset, config, indices, riverfrac)
     waterfrac = ncread(
         dataset,
         config,
-        "vertical.runoff.parameters.waterfrac";
+        "land~water-covered__area_fraction";
         sel = indices,
         defaults = 0.0,
         type = Float,

diff --git a/test/sbm_config.toml b/test/sbm_config.toml
@@ -59,6 +59,9 @@ subcatchment = "wflow_subcatch"
 
 atmosphere_air__snowfall_temperature_threshold = "TT"
 atmosphere_air__snowfall_temperature_interval = "TTI"
+
+"land~water-covered__area_fraction" = "WaterFrac"
+
 snowpack__melting_temperature_threshold = "TTM"
 snowpack__degree-day_coefficient = "Cfmax"
 snowpack__liquid_water_holding_capacity =  "WHC"
@@ -92,9 +95,6 @@ forcing = [
 
 cyclic = ["vegetation__leaf-area_index"]
 
-[input.vertical.runoff.parameters]
-waterfrac = "WaterFrac"
-
 [input.vertical.atmospheric_forcing]
 potential_evaporation = "pet"
 precipitation = "precip"

diff --git a/test/sbm_gw.toml b/test/sbm_gw.toml
@@ -55,6 +55,9 @@ subcatchment = "wflow_subcatch"
 
 atmosphere_air__snowfall_temperature_threshold = "TT"
 atmosphere_air__snowfall_temperature_interval = "TTI"
+
+"land~water-covered__area_fraction" = "WaterFrac"
+
 snowpack__melting_temperature_threshold = "TTM"
 snowpack__degree-day_coefficient = "Cfmax"
 
@@ -92,9 +95,6 @@ potential_evaporation = "pet"
 precipitation = "precip"
 temperature = "temp"
 
-[input.vertical.runoff.parameters]
-waterfrac = "WaterFrac"
-
 [input.lateral.river]
 length = "wflow_riverlength"
 mannings_n = "N_River"

diff --git a/test/sbm_gwf_piave_demand_config.toml b/test/sbm_gwf_piave_demand_config.toml
@@ -23,6 +23,9 @@ gauges_grdc = "wflow_gauges_grdc"
 
 atmosphere_air__snowfall_temperature_threshold = "TT"
 atmosphere_air__snowfall_temperature_interval = "TTI"
+
+"land~water-covered__area_fraction" = "WaterFrac"
+
 snowpack__melting_temperature_threshold = "TTM"
 snowpack__degree-day_coefficient = "Cfmax"
 snowpack__liquid_water_holding_capacity =  "WHC"
@@ -121,9 +124,6 @@ potential_evaporation = "pet"
 precipitation = "precip"
 temperature = "temp"
 
-[input.vertical.runoff.parameters]
-waterfrac = "WaterFrac"
-
 [model.water_demand]
 domestic = true
 industry = true

diff --git a/test/sbm_piave_config.toml b/test/sbm_piave_config.toml
@@ -22,6 +22,9 @@ gauges_grdc = "wflow_gauges_grdc"
 
 atmosphere_air__snowfall_temperature_threshold = "TT"
 atmosphere_air__snowfall_temperature_interval = "TTI"
+
+"land~water-covered__area_fraction" = "WaterFrac"
+
 snowpack__melting_temperature_threshold = "TTM"
 snowpack__degree-day_coefficient = "Cfmax"
 
@@ -102,9 +105,6 @@ potential_evaporation = "pet"
 precipitation = "precip"
 temperature = "temp"
 
-[input.vertical.runoff.parameters]
-waterfrac = "WaterFrac"
-
 [state.lateral.river.variables]
 q = "q_river"
 h = "h_river"

diff --git a/test/sbm_piave_demand_config.toml b/test/sbm_piave_demand_config.toml
@@ -22,6 +22,9 @@ gauges_grdc = "wflow_gauges_grdc"
 
 atmosphere_air__snowfall_temperature_threshold = "TT"
 atmosphere_air__snowfall_temperature_interval = "TTI"
+
+"land~water-covered__area_fraction" = "WaterFrac"
+
 snowpack__melting_temperature_threshold = "TTM"
 snowpack__degree-day_coefficient = "Cfmax"
 
@@ -115,9 +118,6 @@ potential_evaporation = "pet"
 precipitation = "precip"
 temperature = "temp"
 
-[input.vertical.runoff.parameters]
-waterfrac = "WaterFrac"
-
 [model.water_demand]
 domestic = true
 industry = true

diff --git a/test/sbm_simple.toml b/test/sbm_simple.toml
@@ -19,6 +19,9 @@ subcatchment = "wflow_subcatch"
 
 atmosphere_air__snowfall_temperature_threshold = "TT"
 atmosphere_air__snowfall_temperature_interval = "TTI"
+
+"land~water-covered__area_fraction" = "WaterFrac"
+
 snowpack__melting_temperature_threshold = "TTM"
 snowpack__degree-day_coefficient = "Cfmax"
 
@@ -64,9 +67,6 @@ potential_evaporation = "pet"
 precipitation = "precip"
 temperature = "temp"
 
-[input.vertical.runoff.parameters]
-waterfrac = "WaterFrac"
-
 [input.lateral.river]
 length = "wflow_riverlength"
 n = "N_River"

diff --git a/test/sbm_swf_config.toml b/test/sbm_swf_config.toml
@@ -55,6 +55,9 @@ subcatchment = "wflow_subcatch"
 
 atmosphere_air__snowfall_temperature_threshold = "TT"
 atmosphere_air__snowfall_temperature_interval = "TTI"
+
+"land~water-covered__area_fraction" = "WaterFrac"
+
 snowpack__melting_temperature_threshold = "TTM"
 snowpack__degree-day_coefficient = "Cfmax"
 
@@ -93,9 +96,6 @@ potential_evaporation = "pet"
 precipitation = "precip"
 temperature = "temp"
 
-[input.vertical.runoff.parameters]
-waterfrac = "WaterFrac"
-
 [input.lateral.river]
 length = "wflow_riverlength"
 mannings_n = "N_River"