simplify get_alias

docs/src/changelog.md

@@ -12,8 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   width `dw` as model type `sbm`.
 - Renamed `h_bankfull` parameter to `bankfull_depth` for consistency between kinematic-wave
   and local-inertial river routing. When using the old name under the
-  `[input.lateral.river]` section of the TOML file, it will still work but suggest to update
-  the name.
+  `[input.lateral.river]` section of the TOML file, it will work but it is suggested to
+  update the name.
 
 ### Added
 - Additional log messages and log file as output, see also [Logging](@ref).

src/flow.jl

@@ -121,17 +121,17 @@ function initialize_surfaceflow_river(
 
     n_river = ncread(
         nc,
-        config.input.lateral.river,
-        "n";
+        config.input,
+        "lateral.river.n";
         sel = inds,
         defaults = 0.036,
         type = Float,
     )
     bankfull_depth = ncread(
         nc,
-        config.input.lateral.river,
-        "bankfull_depth";
-        alias = "h_bankfull",
+        config.input,
+        "lateral.river.bankfull_depth";
+        alias = "lateral.river.h_bankfull",
         sel = inds,
         defaults = 1.0,
         type = Float,
@@ -144,8 +144,8 @@ function initialize_surfaceflow_river(
     end
     sl = ncread(
         nc,
-        config.input.lateral.river,
-        "slope";
+        config.input,
+        "lateral.river.slope";
         optional = false,
         sel = inds,
         type = Float,

src/io.jl

@@ -57,12 +57,8 @@ end
 
 "Get a value from the Config with either the key or an alias of the key."
 function get_alias(config::Config, key, alias, default)
-    dict = Dict(config)
-    path = pathof(config)
-    alias_or_default = get(dict, alias, default)
-    a = get(dict, key, alias_or_default)
-    # if it is a Dict, wrap the result in Config
-    return a isa AbstractDict ? Config(a, path) : a
+    alias_or_default = param(config, alias, default)
+    return param(config, key, alias_or_default)
 end
 
 "Get a value from the Config with a key, throwing an error if it is not one of the options."

test/io.jl

@@ -206,6 +206,9 @@ Wflow.load_dynamic_input!(model)
     @test length(writer.state_parameters) == 14
 end
 
+# get a default value if the parameter does not exist
+@test Wflow.param(model, "lateral.doesnt_exist", -1) == -1
+
 @testset "warm states" begin
     @test Wflow.param(model, "lateral.river.reservoir.volume")[1] ≈ 3.2807224993363418e7
     @test Wflow.param(model, "vertical.satwaterdepth")[9115] ≈ 477.13548089422125