diff --git a/Manifest.toml b/Manifest.toml index 8bc6d6479..87be2301d 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.12.4" manifest_format = "2.0" -project_hash = "badd957f704270f43f2834df09918eb2df0429e1" +project_hash = "123ac1e48e37d52c5c4798d8f6762d3db1ec1a2b" [[deps.ADTypes]] git-tree-sha1 = "f7304359109c768cf32dc5fa2d371565bb63b68a" @@ -853,21 +853,21 @@ version = "0.2.0" [[deps.GR]] deps = ["Artifacts", "Base64", "DelimitedFiles", "Downloads", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Preferences", "Printf", "Qt6Wayland_jll", "Random", "Serialization", "Sockets", "TOML", "Tar", "Test", "p7zip_jll"] -git-tree-sha1 = "f305bdb91e1f3fcc687944c97f2ede40585b1bd5" +git-tree-sha1 = "6949039c4db076a5967228bf9d7b6f32f2324328" uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71" -version = "0.73.19" +version = "0.73.20" [deps.GR.extensions] - GRIJuliaExt = "IJulia" + IJuliaExt = "IJulia" [deps.GR.weakdeps] IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a" [[deps.GR_jll]] deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "FreeType2_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Qt6Base_jll", "Zlib_jll", "libpng_jll"] -git-tree-sha1 = "de439fbc02b9dc0e639e67d7c5bd5811ff3b6f06" +git-tree-sha1 = "04a6eb1e57dc3a6992b5af5aa753a2f8d3a1028e" uuid = "d2c73de3-f751-5644-a686-071e5b155ba9" -version = "0.73.19+1" +version = "0.73.20+0" [[deps.GettextRuntime_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Libiconv_jll"] @@ -1107,9 +1107,9 @@ version = "1.12.0" [[deps.Krylov]] deps = ["LinearAlgebra", "Printf", "SparseArrays"] -git-tree-sha1 = "09895a8e17b0aa97df8964ed13c94d1b6d9de666" +git-tree-sha1 = "fd0812fa5d58edfa2948342adca9b0a175b17d8a" uuid = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7" -version = "0.10.3" +version = "0.10.4" [[deps.LAME_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -1711,15 +1711,15 @@ version = "1.8.1" [[deps.OrdinaryDiffEqBDF]] deps = ["ADTypes", "ArrayInterface", "DiffEqBase", "FastBroadcast", "LinearAlgebra", "MacroTools", "MuladdMacro", "OrdinaryDiffEqCore", "OrdinaryDiffEqDifferentiation", "OrdinaryDiffEqNonlinearSolve", "OrdinaryDiffEqSDIRK", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "SciMLBase", "StaticArrays", "TruncatedStacktraces"] -git-tree-sha1 = "ce8db53fd1e4e41c020fd53961e7314f75e4c21c" +git-tree-sha1 = "156f2623ac97e7cf340848ba606f1226998980af" uuid = "6ad6398a-0878-4a85-9266-38940aa047c8" -version = "1.10.1" +version = "1.14.0" [[deps.OrdinaryDiffEqCore]] -deps = ["ADTypes", "Accessors", "Adapt", "ArrayInterface", "DataStructures", "DiffEqBase", "DocStringExtensions", "EnumX", "FastBroadcast", "FastClosures", "FastPower", "FillArrays", "FunctionWrappersWrappers", "InteractiveUtils", "LinearAlgebra", "Logging", "MacroTools", "MuladdMacro", "Polyester", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "SciMLStructures", "SimpleUnPack", "Static", "StaticArrayInterface", "StaticArraysCore", "SymbolicIndexingInterface", "TruncatedStacktraces"] -git-tree-sha1 = "4b68f9ca0cfa68cb9ee544df96391d47ca0e62a9" +deps = ["ADTypes", "Accessors", "Adapt", "ArrayInterface", "ConcreteStructs", "DataStructures", "DiffEqBase", "DocStringExtensions", "EnumX", "FastBroadcast", "FastClosures", "FastPower", "FillArrays", "FunctionWrappersWrappers", "InteractiveUtils", "LinearAlgebra", "Logging", "MacroTools", "MuladdMacro", "Polyester", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLLogging", "SciMLOperators", "SciMLStructures", "Static", "StaticArrayInterface", "StaticArraysCore", "SymbolicIndexingInterface", "TruncatedStacktraces"] +git-tree-sha1 = "862b950dd2a4d406b6e9cbb71f6e3b2043647665" uuid = "bbf590c4-e513-4bbe-9b18-05decba2e5d8" -version = "1.36.0" +version = "3.2.0" [deps.OrdinaryDiffEqCore.extensions] OrdinaryDiffEqCoreEnzymeCoreExt = "EnzymeCore" @@ -1731,9 +1731,9 @@ version = "1.36.0" [[deps.OrdinaryDiffEqDifferentiation]] deps = ["ADTypes", "ArrayInterface", "ConcreteStructs", "ConstructionBase", "DiffEqBase", "DifferentiationInterface", "FastBroadcast", "FiniteDiff", "ForwardDiff", "FunctionWrappersWrappers", "LinearAlgebra", "LinearSolve", "OrdinaryDiffEqCore", "SciMLBase", "SciMLOperators", "SparseMatrixColorings", "StaticArrayInterface", "StaticArrays"] -git-tree-sha1 = "320b5f3e4e61ca0ad863c63c803f69973ba6efce" +git-tree-sha1 = "c3706545346a550a2669d8bcfe6db683af04a21c" uuid = "4302a76b-040a-498a-8c04-15b101fed76b" -version = "1.16.1" +version = "1.22.0" weakdeps = ["SparseArrays"] [deps.OrdinaryDiffEqDifferentiation.extensions] @@ -1741,33 +1741,33 @@ weakdeps = ["SparseArrays"] [[deps.OrdinaryDiffEqLowOrderRK]] deps = ["DiffEqBase", "FastBroadcast", "LinearAlgebra", "MuladdMacro", "OrdinaryDiffEqCore", "RecursiveArrayTools", "Reexport", "SciMLBase", "Static"] -git-tree-sha1 = "3cc4987c8e4725276b55a52e08b56ded4862917e" +git-tree-sha1 = "78223e34d4988070443465cd3f2bdc38d6bd14b0" uuid = "1344f307-1e59-4825-a18e-ace9aa3fa4c6" -version = "1.6.0" +version = "1.10.0" [[deps.OrdinaryDiffEqNonlinearSolve]] -deps = ["ADTypes", "ArrayInterface", "DiffEqBase", "FastBroadcast", "FastClosures", "ForwardDiff", "LinearAlgebra", "LinearSolve", "MuladdMacro", "NonlinearSolve", "OrdinaryDiffEqCore", "OrdinaryDiffEqDifferentiation", "PreallocationTools", "RecursiveArrayTools", "SciMLBase", "SciMLOperators", "SciMLStructures", "SimpleNonlinearSolve", "StaticArrays"] -git-tree-sha1 = "f59c1c07cfa674c1d3f5dd386c4274d9bc2be221" +deps = ["ADTypes", "ArrayInterface", "DiffEqBase", "FastBroadcast", "FastClosures", "ForwardDiff", "LinearAlgebra", "LinearSolve", "MuladdMacro", "NonlinearSolve", "OrdinaryDiffEqCore", "OrdinaryDiffEqDifferentiation", "PreallocationTools", "RecursiveArrayTools", "SciMLBase", "SciMLOperators", "SciMLStructures", "SimpleNonlinearSolve", "SparseArrays", "StaticArrays"] +git-tree-sha1 = "9f0be4bd586829a28a04c8f923598497f56ac226" uuid = "127b3ac7-2247-4354-8eb6-78cf4e7c58e8" -version = "1.15.0" +version = "1.19.0" [[deps.OrdinaryDiffEqRosenbrock]] deps = ["ADTypes", "DiffEqBase", "DifferentiationInterface", "FastBroadcast", "FiniteDiff", "ForwardDiff", "LinearAlgebra", "LinearSolve", "MacroTools", "MuladdMacro", "OrdinaryDiffEqCore", "OrdinaryDiffEqDifferentiation", "Polyester", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "SciMLBase", "Static"] -git-tree-sha1 = "f34bc2f58656843596d09a4c4de8c20724ebc2f1" +git-tree-sha1 = "e4605c3930703b5d38083ce1a998ee824dd67266" uuid = "43230ef6-c299-4910-a778-202eb28ce4ce" -version = "1.18.1" +version = "1.22.0" [[deps.OrdinaryDiffEqSDIRK]] deps = ["ADTypes", "DiffEqBase", "FastBroadcast", "LinearAlgebra", "MacroTools", "MuladdMacro", "OrdinaryDiffEqCore", "OrdinaryDiffEqDifferentiation", "OrdinaryDiffEqNonlinearSolve", "RecursiveArrayTools", "Reexport", "SciMLBase", "TruncatedStacktraces"] -git-tree-sha1 = "20caa72c004414435fb5769fadb711e96ed5bcd4" +git-tree-sha1 = "5d0a230f4e431e53af19502eaea8778f8f15edd4" uuid = "2d112036-d095-4a1e-ab9a-08536f3ecdbf" -version = "1.7.0" +version = "1.11.0" [[deps.OrdinaryDiffEqTsit5]] deps = ["DiffEqBase", "FastBroadcast", "LinearAlgebra", "MuladdMacro", "OrdinaryDiffEqCore", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "SciMLBase", "Static", "TruncatedStacktraces"] -git-tree-sha1 = "778c7d379265f17f40dbe9aaa6f6a2a08bc7fa3e" +git-tree-sha1 = "8be4cba85586cd2efa6c76d1792c548758610901" uuid = "b1df2697-797e-41e3-8120-5422d3b24e4a" -version = "1.5.0" +version = "1.9.0" [[deps.OteraEngine]] deps = ["Markdown", "TOML"] @@ -1879,9 +1879,9 @@ version = "1.4.3" [[deps.PreallocationTools]] deps = ["Adapt", "ArrayInterface", "PrecompileTools"] -git-tree-sha1 = "c05b4c6325262152483a1ecb6c69846d2e01727b" +git-tree-sha1 = "6c6925c42710b794dbb8fe7ab0cbc393c5b59fbe" uuid = "d236fae5-4411-538c-8e31-a6e3d9e00b46" -version = "0.4.34" +version = "1.0.0" [deps.PreallocationTools.extensions] PreallocationToolsForwardDiffExt = "ForwardDiff" @@ -2240,11 +2240,6 @@ git-tree-sha1 = "be8eeac05ec97d379347584fa9fe2f5f76795bcb" uuid = "699a6c99-e7fa-54fc-8d76-47d257e15c1d" version = "0.9.5" -[[deps.SimpleUnPack]] -git-tree-sha1 = "58e6353e72cde29b90a69527e56df1b5c3d8c437" -uuid = "ce78b400-467f-4804-87d8-8f486da07d0a" -version = "1.1.0" - [[deps.Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" version = "1.11.0" @@ -2383,9 +2378,9 @@ uuid = "892a3eda-7b42-436c-8928-eab12a02cf0e" version = "0.4.2" [[deps.StringViews]] -git-tree-sha1 = "2f11ed108d0b2a8d64cc069a868c3017714bea64" +git-tree-sha1 = "f2dcb92855b31ad92fe8f079d4f75ac57c93e4b8" uuid = "354b36f9-a18e-4713-926e-db85100087ba" -version = "1.3.6" +version = "1.3.7" [[deps.StructArrays]] deps = ["ConstructionBase", "DataAPI", "Tables"] diff --git a/Project.toml b/Project.toml index 95ad12f08..7fd54f186 100644 --- a/Project.toml +++ b/Project.toml @@ -87,7 +87,7 @@ PackageCompiler = {rev = "bundle_less_artifacts_v1.12", url = "https://github.co Ribasim = {path = "core"} [compat] +OrdinaryDiffEqCore = "3.2.0" PythonCall = "=0.9.31" - [preferences.Ribasim] precompile_workload = false diff --git a/core/Project.toml b/core/Project.toml index 49e7f849a..b09060584 100644 --- a/core/Project.toml +++ b/core/Project.toml @@ -86,7 +86,7 @@ MetaGraphsNext = "0.6, 0.7" Moshi = "0.3.7" NCDatasets = "0.14.8" OrdinaryDiffEqBDF = "1.1" -OrdinaryDiffEqCore = "1.3" +OrdinaryDiffEqCore = "1.3, 3.2" OrdinaryDiffEqDifferentiation = "1.16.1" OrdinaryDiffEqLowOrderRK = "1.1" OrdinaryDiffEqNonlinearSolve = "1.1" diff --git a/core/test/Project.toml b/core/test/Project.toml index bda02af7f..8654d1912 100644 --- a/core/test/Project.toml +++ b/core/test/Project.toml @@ -46,6 +46,7 @@ CSV = "0.10" DataFrames = "1.4" Glob = "1.3" IOCapture = "0.2, 1" +OrdinaryDiffEqCore = "3.2.0" Statistics = "1" TOML = "1" Test = "1"