Merge branch 'feature/trend-scaling' into 'master'

Add period scaling to LinearTrend parameter transform

See merge request sparcs/cryogrid/cryogridjulia!66

Project.toml

 name = "CryoGrid"
 uuid = "a535b82e-5f3d-4d97-8b0b-d6483f5bebd5"
 authors = ["Brian Groenke <brian.groenke@awi.de>", "Moritz Langer <moritz.langer@awi.de>"]
-version = "0.6.0"
+version = "0.6.1"
 
 [deps]
 ComponentArrays = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66"

src/Physics/Physics.jl

@@ -12,14 +12,15 @@ using Unitful
 
 include("coupled.jl")
 include("Boundaries/Boundaries.jl")
-include("WaterBalance/WaterBalance.jl")
 include("HeatConduction/HeatConduction.jl")
+include("WaterBalance/WaterBalance.jl")
 include("Soils/Soils.jl")
 include("SEB/SEB.jl")
 include("Sources/Sources.jl")
 
 @reexport using .Boundaries
 @reexport using .HeatConduction
+@reexport using .WaterBalance
 @reexport using .Soils
 @reexport using .SEB
 @reexport using .Sources

src/Strat/params.jl

@@ -76,19 +76,19 @@ end
         return pmodel
     end
 end
-
 # Transform implementations
 @with_kw struct LinearTrend{P} <: ParamTransform
     slope::P = Param(0.0)
     intercept::P = Param(0.0)
     tstart::Float64 = 0.0
     tstop::Float64 = Inf; @assert tstop > tstart
+    period::Float64 = 1.0
     minval::Float64 = -Inf
     maxval::Float64 = Inf
 end
 function transform(state, trend::LinearTrend)
     let t = min(state.t - trend.tstart, trend.tstop),
-        β = trend.slope,
+        β = trend.slope / trend.period,
         α = trend.intercept;
         min(max(β*t + α, trend.minval), trend.maxval)
     end