From 85ad6d30037b18cd8849b406d066a27d56ba10a3 Mon Sep 17 00:00:00 2001 From: Bart de Koning <74617371+SouthEndMusic@users.noreply.github.com> Date: Mon, 21 Oct 2024 17:24:19 +0200 Subject: [PATCH] Update interpolation type parameters (#1913) Fixes https://github.com/Deltares/Ribasim/issues/1910. --- Manifest.toml | 6 +++--- core/Project.toml | 2 +- core/src/parameter.jl | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 13ade21fa..fe3809ebe 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.10.5" manifest_format = "2.0" -project_hash = "a2d1a982c3293971ae40e0a7bdfb40a85bd30ac1" +project_hash = "0257f2772e4bfed0b6316b6871c4495978c173b4" [[deps.ADTypes]] git-tree-sha1 = "eea5d80188827b35333801ef97a40c2ed653b081" @@ -345,9 +345,9 @@ version = "1.7.0" [[deps.DataInterpolations]] deps = ["FindFirstFunctions", "ForwardDiff", "LinearAlgebra", "PrettyTables", "RecipesBase", "Reexport"] -git-tree-sha1 = "1e1a04e3345dee5292b0b89d1f44dd202454e319" +git-tree-sha1 = "3d81cd1fcba530122a5d6c725aa53521d869816a" uuid = "82cc6244-b520-54b8-b5a6-8a565e85f1d0" -version = "6.4.1" +version = "6.5.2" [deps.DataInterpolations.extensions] DataInterpolationsChainRulesCoreExt = "ChainRulesCore" diff --git a/core/Project.toml b/core/Project.toml index 3d40845c7..fdf395970 100644 --- a/core/Project.toml +++ b/core/Project.toml @@ -65,7 +65,7 @@ ComponentArrays = "0.13, 0.14, 0.15" Configurations = "0.17" DBInterface = "2.4" DataFrames = "1.4" -DataInterpolations = "6" +DataInterpolations = "6.5" DataStructures = "0.18" Dates = "1" DiffEqBase = "6.155" diff --git a/core/src/parameter.jl b/core/src/parameter.jl index 8dcf03705..1f9a8f62d 100644 --- a/core/src/parameter.jl +++ b/core/src/parameter.jl @@ -104,6 +104,7 @@ const ScalarInterpolation = LinearInterpolation{ Vector{Float64}, Vector{Float64}, Float64, + (1,), } set_zero!(v) = v .= zero(eltype(v)) @@ -343,6 +344,7 @@ end Vector{Float64}, ScalarInterpolation, Float64, + (1,), }, } level_to_area::Vector{ScalarInterpolation}