From f52d8ca5f1d5d6e981b47e39e7073c81fca5109e Mon Sep 17 00:00:00 2001 From: Willem van Verseveld Date: Fri, 17 Jan 2025 11:18:10 +0100 Subject: [PATCH] Improve input parameter names (not directly part of model) Use `count` instead of `number` as quantity as it preferable according CSDMS. Move reservoir and lake location and area IDs to this list (from `input.parameters`), for the `sediment` model type reservoir and lake area IDS were already part of `input`. --- server/test/sbm_config.toml | 16 ++++++++-------- src/demand/water_demand.jl | 2 +- src/routing/lake.jl | 10 +++++----- src/routing/reservoir.jl | 4 ++-- src/sbm_gwf_model.jl | 6 +++--- src/sbm_model.jl | 4 ++-- .../sediment_transport/river_transport.jl | 4 ++-- src/sediment_model.jl | 8 ++++---- test/run_sbm.jl | 4 ++-- test/sbm_config.toml | 16 ++++++++-------- test/sbm_gw.toml | 16 ++++++++-------- test/sbm_gwf_config.toml | 6 +++--- test/sbm_gwf_piave_demand_config.toml | 14 +++++++------- test/sbm_piave_config.toml | 12 ++++++------ test/sbm_piave_demand_config.toml | 13 +++++++------ test/sbm_simple.toml | 8 ++++---- test/sbm_swf_config.toml | 12 ++++++------ test/sediment_config.toml | 13 ++++++------- test/sediment_eurosem_engelund_config.toml | 13 ++++++------- 19 files changed, 90 insertions(+), 91 deletions(-) diff --git a/server/test/sbm_config.toml b/server/test/sbm_config.toml index fadb7b40e..bf0b46d82 100644 --- a/server/test/sbm_config.toml +++ b/server/test/sbm_config.toml @@ -50,10 +50,12 @@ path_forcing = "forcing-moselle.nc" path_static = "staticmaps-moselle.nc" # these are not directly part of the model -gauges = "wflow_gauges_grdc" +river_gauge = "wflow_gauges_grdc" local_drain_direction = "wflow_ldd" -river_location = "wflow_river" -subcatchment = "wflow_subcatch" +river_location__mask = "wflow_river" +reservoir_area__count = "wflow_reservoirareas" +reservoir_location__count = "wflow_reservoirlocs" +subcatchment_location__count = "wflow_subcatch" [input.forcing] atmosphere_water__precipitation_volume_flux = "precip" @@ -99,8 +101,6 @@ river_bank_water__elevation = "RiverZ" land_surface_water_flow__manning_n_parameter = "N" land_surface__slope = "Slope" -reservoir_area__number = "wflow_reservoirareas" -reservoir_location__number = "wflow_reservoirlocs" reservoir_surface__area = "ResSimpleArea" "reservoir_water_demand~required~downstream__volume_flow_rate" = "ResDemand" reservoir_water_release-below-spillway__max_volume_flow_rate = "ResMaxRelease" @@ -159,7 +159,7 @@ path = "output_scalar_moselle.nc" [[netcdf.variable]] name = "Q" -map = "gauges" +map = "river_gauge" parameter = "routing.river_flow.variables.q" [[netcdf.variable]] @@ -210,12 +210,12 @@ parameter = "atmosphere_air__temperature" [[csv.column]] header = "Q" -map = "gauges" +map = "river_gauge" parameter = "river_water__volume_flow_rate" [[csv.column]] header = "recharge" -map = "subcatchment" +map = "subcatchment_location__count" parameter = "soil_water_sat-zone_top__recharge_volume_flux" reducer = "mean" diff --git a/src/demand/water_demand.jl b/src/demand/water_demand.jl index 89a811eba..5e4f5dbf4 100644 --- a/src/demand/water_demand.jl +++ b/src/demand/water_demand.jl @@ -63,7 +63,7 @@ end irrigation_efficiency::Vector{T} | "-" # irrigation efficiency [-] maximum_irrigation_rate::Vector{T} # maximum irrigation rate [mm Δt⁻¹] irrigation_areas::Vector{Bool} | "-" # irrigation areas [-] - irrigation_trigger::Vector{Bool} | "-" # irrigation on or off [-]end + irrigation_trigger::Vector{Bool} | "-" # irrigation on or off [-] end "Non-paddy (other crops than flooded rice) irrigation model" diff --git a/src/routing/lake.jl b/src/routing/lake.jl index 4f2daa37c..a797918a8 100644 --- a/src/routing/lake.jl +++ b/src/routing/lake.jl @@ -17,12 +17,12 @@ function LakeParameters(config, dataset, inds_riv, nriv, pits) # read only lake data if lakes true # allow lakes only in river cells # note that these locations are only the lake outlet pixels - lens = lens_input("lake_location__number") + lens = lens_input("lake_location__count") lakelocs_2d = ncread(dataset, config, lens; optional = false, type = Int, fill = 0) lakelocs = lakelocs_2d[inds_riv] # this holds the same ids as lakelocs, but covers the entire lake - lens = lens_input("lakes_area__number") + lens = lens_input("lakes_area__count") lakecoverage_2d = ncread(dataset, config, lens; optional = false, allow_missing = true) # for each lake, a list of 2D indices, needed for getting the mean precipitation inds_lake_cov = Vector{CartesianIndex{2}}[] @@ -90,10 +90,10 @@ function LakeParameters(config, dataset, inds_riv, nriv, pits) type = Float, fill = 0, ) - lens = lens_input_parameter("lake~lower_location__number") + lens = lens_input("lake~lower_location__count") linked_lakelocs = ncread(dataset, config, lens; sel = inds_lake, defaults = 0, type = Int, fill = 0) - lens = lens_input_parameter("lake_water__storage_curve_type_number") + lens = lens_input_parameter("lake_water__storage_curve_type_count") lake_storfunc = ncread( dataset, config, @@ -103,7 +103,7 @@ function LakeParameters(config, dataset, inds_riv, nriv, pits) type = Int, fill = 0, ) - lens = lens_input_parameter("lake_water__rating_curve_type_number") + lens = lens_input_parameter("lake_water__rating_curve_type_count") lake_outflowfunc = ncread( dataset, config, diff --git a/src/routing/reservoir.jl b/src/routing/reservoir.jl index 86eed4c34..a1ae82d3d 100644 --- a/src/routing/reservoir.jl +++ b/src/routing/reservoir.jl @@ -13,7 +13,7 @@ function ReservoirParameters(dataset, config, indices_river, n_river_cells, pits # read only reservoir data if reservoirs true # allow reservoirs only in river cells # note that these locations are only the reservoir outlet pixels - lens = lens_input_parameter("reservoir_location__number") + lens = lens_input("reservoir_location__count") reslocs = ncread( dataset, config, @@ -25,7 +25,7 @@ function ReservoirParameters(dataset, config, indices_river, n_river_cells, pits ) # this holds the same ids as reslocs, but covers the entire reservoir - lens = lens_input_parameter("reservoir_area__number") + lens = lens_input("reservoir_area__count") rescoverage_2d = ncread(dataset, config, lens; optional = false, allow_missing = true) # for each reservoir, a list of 2D indices, needed for getting the mean precipitation inds_res_cov = Vector{CartesianIndex{2}}[] diff --git a/src/sbm_gwf_model.jl b/src/sbm_gwf_model.jl index 9ddf52a88..b8a881319 100644 --- a/src/sbm_gwf_model.jl +++ b/src/sbm_gwf_model.jl @@ -40,14 +40,14 @@ function initialize_sbm_gwf_model(config::Config) dataset = NCDataset(static_path) - lens = lens_input("subcatchment") + lens = lens_input("subcatchment_location__count") subcatch_2d = ncread(dataset, config, lens; optional = false, allow_missing = true) # indices based on catchment indices, reverse_indices = active_indices(subcatch_2d, missing) n_land_cells = length(indices) modelsize_2d = size(subcatch_2d) - lens = lens_input("river_location") + lens = lens_input("river_location__mask") river_location_2d = ncread(dataset, config, lens; optional = false, type = Bool, fill = false) river_location = river_location_2d[indices] @@ -61,7 +61,7 @@ function initialize_sbm_gwf_model(config::Config) ncread(dataset, config, lens; optional = false, type = Float, fill = 0) river_length = river_length_2d[indices] - lens = lens_input("altitude") + lens = lens_input_parameter("land_surface__elevation") altitude = ncread(dataset, config, lens; optional = false, sel = indices, type = Float) # read x, y coordinates and calculate cell length [m] diff --git a/src/sbm_model.jl b/src/sbm_model.jl index 97d4d2457..99f5f18cc 100644 --- a/src/sbm_model.jl +++ b/src/sbm_model.jl @@ -40,14 +40,14 @@ function initialize_sbm_model(config::Config) dataset = NCDataset(static_path) - lens = lens_input("subcatchment") + lens = lens_input("subcatchment_location__count") subcatch_2d = ncread(dataset, config, lens; optional = false, allow_missing = true) # indices based on sub-catchments indices, reverse_indices = active_indices(subcatch_2d, missing) n_land_cells = length(indices) modelsize_2d = size(subcatch_2d) - lens = lens_input("river_location") + lens = lens_input("river_location__mask") river_location_2d = ncread(dataset, config, lens; optional = false, type = Bool, fill = false) river_location = river_location_2d[indices] diff --git a/src/sediment/sediment_transport/river_transport.jl b/src/sediment/sediment_transport/river_transport.jl index e276b6351..074b6b88b 100644 --- a/src/sediment/sediment_transport/river_transport.jl +++ b/src/sediment/sediment_transport/river_transport.jl @@ -198,7 +198,7 @@ function SedimentRiverTransportParameters(dataset, config, indices) do_lakes = get(config.model, "dolake", false)::Bool if do_reservoirs - lens = lens_input_parameter("reservoir_location__number") + lens = lens_input("reservoir_location__count") reslocs = ncread( dataset, config, @@ -237,7 +237,7 @@ function SedimentRiverTransportParameters(dataset, config, indices) end if do_lakes - lens = lens_input_parameter("lake_location__number") + lens = lens_input("lake_location__count") lakelocs = ncread( dataset, config, diff --git a/src/sediment_model.jl b/src/sediment_model.jl index 445f499e0..bb7ba00d1 100644 --- a/src/sediment_model.jl +++ b/src/sediment_model.jl @@ -15,13 +15,13 @@ function initialize_sediment_model(config::Config) clock = Clock(config, reader) dataset = NCDataset(static_path) - lens = lens_input("subcatchment") + lens = lens_input("subcatchment_location__count") subcatch_2d = ncread(dataset, config, lens; optional = false, allow_missing = true) # indices based on catchment indices, rev_indices = active_indices(subcatch_2d, missing) n = length(indices) - lens = lens_input("river_location") + lens = lens_input("river_location__mask") river_2d = ncread(dataset, config, lens; optional = false, type = Bool, fill = false) river = river_2d[indices] @@ -32,7 +32,7 @@ function initialize_sediment_model(config::Config) do_lakes = get(config.model, "dolake", false)::Bool waterbodies = fill(0.0, n) if do_reservoirs - lens = lens_input("reservoir_area__number") + lens = lens_input("reservoir_area__count") reservoirs = ncread( dataset, config, @@ -45,7 +45,7 @@ function initialize_sediment_model(config::Config) waterbodies = waterbodies .+ reservoirs end if do_lakes - lens = lens_input("lake_area__number") + lens = lens_input("lake_area__count") lakes = ncread( dataset, config, diff --git a/test/run_sbm.jl b/test/run_sbm.jl index 584b8be81..2b7a3a0f6 100644 --- a/test/run_sbm.jl +++ b/test/run_sbm.jl @@ -62,10 +62,10 @@ end 8.601765f0, 2.7730224f0, ] - @test ds["Q_gauges"].attrib["cf_role"] == "timeseries_id" + @test ds["Q_river_gauge"].attrib["cf_role"] == "timeseries_id" @test ds["temp_index"][:] ≈ [2.39f0] @test ds["temp_coord"][:] ≈ [2.39f0] - @test keys(ds.dim) == ["time", "layer", "Q_gauges", "temp_bycoord", "temp_byindex"] + @test keys(ds.dim) == ["time", "layer", "Q_river_gauge", "temp_bycoord", "temp_byindex"] end @testset "first timestep" begin diff --git a/test/sbm_config.toml b/test/sbm_config.toml index 7a8af1567..d7913b476 100644 --- a/test/sbm_config.toml +++ b/test/sbm_config.toml @@ -50,10 +50,12 @@ path_forcing = "forcing-moselle.nc" path_static = "staticmaps-moselle.nc" # these are not directly part of the model -gauges = "wflow_gauges_grdc" local_drain_direction = "wflow_ldd" -river_location = "wflow_river" -subcatchment = "wflow_subcatch" +river_location__mask = "wflow_river" +reservoir_area__count = "wflow_reservoirareas" +reservoir_location__count = "wflow_reservoirlocs" +subcatchment_location__count = "wflow_subcatch" +river_gauge = "wflow_gauges_grdc" [input.forcing] atmosphere_water__precipitation_volume_flux = "precip" @@ -99,8 +101,6 @@ river_bank_water__elevation = "RiverZ" land_surface_water_flow__manning_n_parameter = "N" land_surface__slope = "Slope" -reservoir_area__number = "wflow_reservoirareas" -reservoir_location__number = "wflow_reservoirlocs" reservoir_surface__area = "ResSimpleArea" "reservoir_water_demand~required~downstream__volume_flow_rate" = "ResDemand" reservoir_water_release-below-spillway__max_volume_flow_rate = "ResMaxRelease" @@ -159,7 +159,7 @@ path = "output_scalar_moselle.nc" [[netcdf.variable]] name = "Q" -map = "gauges" +map = "river_gauge" parameter = "routing.river_flow.variables.q" [[netcdf.variable]] @@ -210,12 +210,12 @@ parameter = "atmosphere_air__temperature" [[csv.column]] header = "Q" -map = "gauges" +map = "river_gauge" parameter = "river_water__volume_flow_rate" [[csv.column]] header = "recharge" -map = "subcatchment" +map = "subcatchment_location__count" parameter = "soil_water_sat-zone_top__net_recharge_volume_flux" reducer = "mean" diff --git a/test/sbm_gw.toml b/test/sbm_gw.toml index 4e758154a..a483acbfd 100644 --- a/test/sbm_gw.toml +++ b/test/sbm_gw.toml @@ -47,10 +47,12 @@ path_forcing = "forcing-moselle.nc" path_static = "staticmaps-moselle.nc" # these are not directly part of the model -gauges = "wflow_gauges_grdc" local_drain_direction = "wflow_ldd" -river_location = "wflow_river" -subcatchment = "wflow_subcatch" +river_location__mask = "wflow_river" +reservoir_area__count = "wflow_reservoirareas" +reservoir_location__count = "wflow_reservoirlocs" +subcatchment_location__count = "wflow_subcatch" +river_gauge = "wflow_gauges_grdc" [input.forcing] atmosphere_water__precipitation_volume_flux = "precip" @@ -93,8 +95,6 @@ river__width = "wflow_riverwidth" land_surface_water_flow__manning_n_parameter = "N" land_surface__slope = "Slope" -reservoir_area__number = "wflow_reservoirareas" -reservoir_location__number = "wflow_reservoirlocs" reservoir_surface__area = "ResSimpleArea" "reservoir_water_demand~required~downstream__volume_flow_rate" = "ResDemand" reservoir_water_release-below-spillway__max_volume_flow_rate = "ResMaxRelease" @@ -144,7 +144,7 @@ path = "output_scalar_moselle.nc" [[netcdf.variable]] name = "Q" -map = "gauges" +map = "river_gauge" parameter = "river_water__volume_flow_rate" [[netcdf.variable]] @@ -188,12 +188,12 @@ parameter = "atmosphere_air__temperature" [[csv.column]] header = "Q" -map = "gauges" +map = "river_gauge" parameter = "river_water__volume_flow_rate" [[csv.column]] header = "recharge" -map = "subcatchment" +map = "subcatchment_location__count" parameter = "soil_water_sat-zone_top__recharge_volume_flux" reducer = "mean" diff --git a/test/sbm_gwf_config.toml b/test/sbm_gwf_config.toml index 6f6a9b838..02bdf55f6 100644 --- a/test/sbm_gwf_config.toml +++ b/test/sbm_gwf_config.toml @@ -42,9 +42,8 @@ path_static = "staticmaps-sbm-groundwater.nc" # these are not directly part of the model local_drain_direction = "wflow_ldd" -river_location = "wflow_river" -subcatchment = "wflow_subcatch" -altitude = "wflow_dem" +river_location__mask = "wflow_river" +subcatchment_location__count = "wflow_subcatch" [input.forcing] atmosphere_water__precipitation_volume_flux = "P" @@ -69,6 +68,7 @@ river__slope = "RiverSlope" river__width = "wflow_riverwidth" land_surface_water_flow__manning_n_parameter = "N" +land_surface__elevation = "wflow_dem" land_surface__slope = "Slope" subsurface_surface_water__horizontal_saturated_hydraulic_conductivity = "k" diff --git a/test/sbm_gwf_piave_demand_config.toml b/test/sbm_gwf_piave_demand_config.toml index 577f56d80..a74a9e358 100644 --- a/test/sbm_gwf_piave_demand_config.toml +++ b/test/sbm_gwf_piave_demand_config.toml @@ -43,11 +43,10 @@ path_forcing = "forcing-piave.nc" path_static = "staticmaps-piave.nc" local_drain_direction = "wflow_ldd" -river_location = "wflow_river" -altitude = "wflow_dem" -subcatchment = "wflow_subcatch" -gauges = "wflow_gauges" -gauges_grdc = "wflow_gauges_grdc" +river_location__mask = "wflow_river" +subcatchment_location__count = "wflow_subcatch" +river_gauge = "wflow_gauges" +river_gauge_grdc = "wflow_gauges_grdc" [input.forcing] atmosphere_water__precipitation_volume_flux = "precip" @@ -105,6 +104,7 @@ river__width = "wflow_riverwidth" river_bank_water__depth = "RiverDepth" land_surface_water_flow__manning_n_parameter = "N" +land_surface__elevation = "wflow_dem" land_surface__slope = "Slope" land_water_allocation_area__number = "allocation_areas" @@ -183,10 +183,10 @@ path = "output.csv" [[csv.column]] header = "Q" -map = "gauges" +map = "river_gauge" parameter = "river_water__time_average_of_volume_flow_rate" [[csv.column]] header = "Q" -map = "gauges_grdc" +map = "river_gauge_grdc" parameter = "river_water__time_average_of_volume_flow_rate" diff --git a/test/sbm_piave_config.toml b/test/sbm_piave_config.toml index f8d7ed436..9684a7e7e 100644 --- a/test/sbm_piave_config.toml +++ b/test/sbm_piave_config.toml @@ -20,10 +20,10 @@ path_forcing = "forcing-piave.nc" path_static = "staticmaps-piave.nc" local_drain_direction = "wflow_ldd" -river_location = "wflow_river" -subcatchment = "wflow_subcatch" -gauges = "wflow_gauges" -gauges_grdc = "wflow_gauges_grdc" +river_location__mask = "wflow_river" +subcatchment_location__count = "wflow_subcatch" +river_gauge = "wflow_gauges" +river_gauge_grdc = "wflow_gauges_grdc" [input.forcing] atmosphere_water__precipitation_volume_flux = "precip" @@ -139,10 +139,10 @@ path = "output-piave.csv" [[csv.column]] header = "Q" -map = "gauges" +map = "river_gauge" parameter = "river_water__time_average_of_volume_flow_rate" [[csv.column]] header = "Q" -map = "gauges_grdc" +map = "river_gauge_grdc" parameter = "river_water__time_average_of_volume_flow_rate" diff --git a/test/sbm_piave_demand_config.toml b/test/sbm_piave_demand_config.toml index ec223d69e..c78130910 100644 --- a/test/sbm_piave_demand_config.toml +++ b/test/sbm_piave_demand_config.toml @@ -41,11 +41,12 @@ glacier_ice__leq-volume = "glacierstore" [input] path_forcing = "forcing-piave.nc" path_static = "staticmaps-piave.nc" + local_drain_direction = "wflow_ldd" -river_location = "wflow_river" -subcatchment = "wflow_subcatch" -gauges = "wflow_gauges" -gauges_grdc = "wflow_gauges_grdc" +river_location__mask = "wflow_river" +subcatchment_location__count = "wflow_subcatch" +river_gauge = "wflow_gauges" +river_gauge_grdc = "wflow_gauges_grdc" [input.forcing] atmosphere_water__precipitation_volume_flux = "precip" @@ -171,12 +172,12 @@ path = "output-piave-demand.csv" [[csv.column]] header = "Q" -map = "gauges" +map = "river_gauge" parameter = "river_water__time_average_of_volume_flow_rate" [[csv.column]] header = "Q" -map = "gauges_grdc" +map = "river_gauge_grdc" parameter = "river_water__time_average_of_volume_flow_rate" [[csv.column]] diff --git a/test/sbm_simple.toml b/test/sbm_simple.toml index 25d9a6e41..6f44fb39d 100644 --- a/test/sbm_simple.toml +++ b/test/sbm_simple.toml @@ -18,8 +18,10 @@ path_static = "staticmaps-moselle.nc" # these are not directly part of the model local_drain_direction = "wflow_ldd" -river_location = "wflow_river" -subcatchment = "wflow_subcatch" +river_location__mask = "wflow_river" +reservoir_area__count = "wflow_reservoirareas" +reservoir_location__count = "wflow_reservoirlocs" +subcatchment_location__count = "wflow_subcatch" [input.forcing] atmosphere_water__precipitation_volume_flux = "precip" @@ -63,8 +65,6 @@ river__width = "wflow_riverwidth" land_surface_water_flow__manning_n_parameter = "N" land_surface__slope = "Slope" -reservoir_area__number = "wflow_reservoirareas" -reservoir_location__number = "wflow_reservoirlocs" reservoir_surface__area = "ResSimpleArea" "reservoir_water_demand~required~downstream__volume_flow_rate" = "ResDemand" reservoir_water_release-below-spillway__max_volume_flow_rate = "ResMaxRelease" diff --git a/test/sbm_swf_config.toml b/test/sbm_swf_config.toml index bd5fda820..4eb47e4f0 100644 --- a/test/sbm_swf_config.toml +++ b/test/sbm_swf_config.toml @@ -44,10 +44,12 @@ path_forcing = "forcing-moselle.nc" path_static = "staticmaps-moselle.nc" # these are not directly part of the model -gauges = "wflow_gauges_grdc" +river_gauge = "wflow_gauges_grdc" local_drain_direction = "wflow_ldd" -river_location = "wflow_river" -subcatchment = "wflow_subcatch" +river_location__mask = "wflow_river" +reservoir_area__count = "wflow_reservoirareas" +reservoir_location__count = "wflow_reservoirlocs" +subcatchment_location__count = "wflow_subcatch" [input.forcing] atmosphere_water__precipitation_volume_flux = "precip" @@ -94,8 +96,6 @@ land_surface_water_flow__manning_n_parameter = "N" land_surface_water_flow__ground_elevation = "FloodplainZ" land_surface__slope = "Slope" -reservoir_area__number = "wflow_reservoirareas" -reservoir_location__number = "wflow_reservoirlocs" reservoir_surface__area = "ResSimpleArea" "reservoir_water_demand~required~downstream__volume_flow_rate" = "ResDemand" reservoir_water_release-below-spillway__max_volume_flow_rate = "ResMaxRelease" @@ -153,6 +153,6 @@ path = "output_moselle_swf.csv" [[csv.column]] header = "Q" -map = "gauges" +map = "river_gauge" parameter = "river_water__time_average_of_volume_flow_rate" diff --git a/test/sediment_config.toml b/test/sediment_config.toml index b8e754164..fd058c358 100644 --- a/test/sediment_config.toml +++ b/test/sediment_config.toml @@ -45,12 +45,13 @@ path_forcing = "forcing-moselle-sed.nc" path_static = "staticmaps-moselle-sed.nc" # these are not directly part of the model -gauges = "wflow_gauges" local_drain_direction = "wflow_ldd" -river_location = "wflow_river" -subcatchment = "wflow_subcatch" -reservoir_area__number = "wflow_reservoirareas" -lake_area__number = "wflow_lakeareas" +river_location__mask = "wflow_river" +reservoir_location__count = "wflow_reservoirlocs" +lake_location__count = "wflow_lakelocs" +subcatchment_location__count = "wflow_subcatch" +reservoir_area__count = "wflow_reservoirareas" +lake_area__count = "wflow_lakeareas" [input.forcing] atmosphere_water__precipitation_volume_flux = "P" @@ -66,9 +67,7 @@ river__slope = "RiverSlope" river__width = "wflow_riverwidth" reservoir_surface__area = "ResSimpleArea" -reservoir_location__number = "wflow_reservoirlocs" lake_surface__area = "LakeArea" -lake_location__number = "wflow_lakelocs" "reservoir_sediment~bedload__trapping_efficiency_coefficient" = "ResTrapEff" vegetation_canopy__gap_fraction = "CanopyGapFraction" diff --git a/test/sediment_eurosem_engelund_config.toml b/test/sediment_eurosem_engelund_config.toml index ac972b477..e73e8e5c8 100644 --- a/test/sediment_eurosem_engelund_config.toml +++ b/test/sediment_eurosem_engelund_config.toml @@ -45,12 +45,13 @@ path_forcing = "forcing-moselle-sed.nc" path_static = "staticmaps-moselle-sed.nc" # these are not directly part of the model -gauges = "wflow_gauges" local_drain_direction = "wflow_ldd" -river_location = "wflow_river" -subcatchment = "wflow_subcatch" -reservoir_area__number = "wflow_reservoirareas" -lake_area__number = "wflow_lakeareas" +river_location__mask = "wflow_river" +subcatchment_location__count = "wflow_subcatch" +reservoir_location__count = "wflow_reservoirlocs" +reservoir_area__count = "wflow_reservoirareas" +lake_location__count = "wflow_lakelocs" +lake_area__count = "wflow_lakeareas" [input.forcing] atmosphere_water__precipitation_volume_flux = "P" @@ -67,9 +68,7 @@ river__slope = "RiverSlope" river__width = "wflow_riverwidth" reservoir_surface__area = "ResSimpleArea" -reservoir_location__number = "wflow_reservoirlocs" lake_surface__area = "LakeArea" -lake_location__number = "wflow_lakelocs" "reservoir_sediment~bedload__trapping_efficiency_coefficient" = "ResTrapEff" vegetation_canopy__height = "CanopyHeight"