Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 5 additions & 22 deletions Manifest-v1.11.toml.default
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

julia_version = "1.11.5"
manifest_format = "2.0"
project_hash = "f9f7424be55e7c582f860e66512280fdde05365c"
project_hash = "68e47961fc0a02ad352b159a56f527bb8f6669a3"

[[deps.ADTypes]]
git-tree-sha1 = "e2478490447631aedba0823d4d7a80b2cc8cdb32"
Expand Down Expand Up @@ -187,11 +187,6 @@ weakdeps = ["ChainRulesCore", "ForwardDiff"]
BracketingNonlinearSolveChainRulesCoreExt = ["ChainRulesCore", "ForwardDiff"]
BracketingNonlinearSolveForwardDiffExt = "ForwardDiff"

[[deps.CEnum]]
git-tree-sha1 = "389ad5c84de1ae7cf0e28e381131c98ea87d54fc"
uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82"
version = "0.5.0"

[[deps.CPUSummary]]
deps = ["CpuId", "IfElse", "PrecompileTools", "Static"]
git-tree-sha1 = "5a97e67919535d6841172016c9530fd69494e5ec"
Expand Down Expand Up @@ -613,9 +608,9 @@ uuid = "4e289a0a-7415-4d19-859d-a7e5c4648b56"
version = "1.0.5"

[[deps.EnzymeCore]]
git-tree-sha1 = "7d7822a643c33bbff4eab9c87ca8459d7c688db0"
git-tree-sha1 = "8272a687bca7b5c601c0c24fc0c71bff10aafdfd"
uuid = "f151be2c-9106-41f4-ab19-57ee4f262869"
version = "0.8.11"
version = "0.8.12"
weakdeps = ["Adapt"]

[deps.EnzymeCore.extensions]
Expand Down Expand Up @@ -790,9 +785,9 @@ uuid = "d25df0c9-e2be-5dd7-82c8-3ad0b3e990b9"
version = "0.1.5"

[[deps.InlineStrings]]
git-tree-sha1 = "6a9fde685a7ac1eb3495f8e812c5a7c3711c2d5e"
git-tree-sha1 = "8594fac023c5ce1ef78260f24d1ad18b4327b420"
uuid = "842dd82b-1e85-43dc-bf29-5d0ee9dffc48"
version = "1.4.3"
version = "1.4.4"
weakdeps = ["ArrowTypes", "Parsers"]

[deps.InlineStrings.extensions]
Expand Down Expand Up @@ -1906,18 +1901,6 @@ deps = ["Artifacts", "Libdl", "libblastrampoline_jll"]
uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c"
version = "7.7.0+0"

[[deps.Sundials]]
deps = ["CEnum", "DataStructures", "DiffEqBase", "Libdl", "LinearAlgebra", "Logging", "PrecompileTools", "Reexport", "SciMLBase", "SparseArrays", "Sundials_jll"]
git-tree-sha1 = "7c7a7ee705724b3c80d5451ac49779db36c6f758"
uuid = "c3572dad-4567-51f8-b174-8c6c989267f4"
version = "4.28.0"

[[deps.Sundials_jll]]
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "SuiteSparse_jll", "libblastrampoline_jll"]
git-tree-sha1 = "91db7ed92c66f81435fe880947171f1212936b14"
uuid = "fb77eaff-e24c-56d4-86b1-d163f2edb164"
version = "5.2.3+0"

[[deps.SymbolicIndexingInterface]]
deps = ["Accessors", "ArrayInterface", "PrettyTables", "RuntimeGeneratedFunctions", "StaticArraysCore"]
git-tree-sha1 = "b6a641e38efa01355aa721246dd246e10c7dcd4d"
Expand Down
4 changes: 1 addition & 3 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4"
SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
Timers = "21f18d07-b854-4dab-86f0-c15a3821819a"
Expand Down Expand Up @@ -90,7 +89,6 @@ Serialization = "1.10, 1.11"
StaticArrays = "1.9.7"
Statistics = "1"
StatsBase = "0.34"
Sundials = "4.24"
SymbolicIndexingInterface = "0.3"
SymbolicUtils = "3.25"
Test = "1"
Expand All @@ -104,14 +102,14 @@ Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
ControlPlots = "23c2ee80-7a9e-4350-b264-8e670f12517c"
ControlSystemsBase = "aaaaaaaa-a6ca-5380-bf3e-84a91bcd477e"
DSP = "717857b8-e6f2-59f4-9121-6e50c889abd2"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
PackageCompiler = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d"
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
ControlSystemsBase = "aaaaaaaa-a6ca-5380-bf3e-84a91bcd477e"

[targets]
test = ["Test", "BenchmarkTools", "PackageCompiler", "Documenter", "ControlPlots", "Colors", "LaTeXStrings", "StatsBase", "JLD2", "Aqua", "DSP", "ControlSystemsBase"]
2 changes: 0 additions & 2 deletions examples_3d/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ Rotations = "6038ab10-8711-5258-84ad-4b1120ba62dc"
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
SteadyStateDiffEq = "9672c7b4-1e72-59bd-8a11-6ac3964bc41f"
Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4"
SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
Timers = "21f18d07-b854-4dab-86f0-c15a3821819a"
WinchModels = "7dcfa46b-7979-4771-bbf4-0aee0da42e1f"
Expand All @@ -51,7 +50,6 @@ Reexport = "1.1, 1.2"
Rotations = "1.3"
StaticArrays = "1.9"
SteadyStateDiffEq = "2.3.0"
Sundials = "4.24"
SymbolicIndexingInterface = "0.3.27"
Timers = "0.1.5"
WinchModels = "0.3.3"
Expand Down
6 changes: 3 additions & 3 deletions mwes/mwe_03.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using Pkg
if ! ("ControlPlots" ∈ keys(Pkg.project().dependencies))
using TestEnv; TestEnv.activate()
end
using Sundials, ControlPlots
using ControlPlots

const G_EARTH = [0.0, 0.0, -9.81] # gravitational acceleration
const dt = 0.05
Expand Down Expand Up @@ -34,7 +34,7 @@ function solve(integrator, dt, t_final)
time=Float64[]
for t in 0:0.05:t_final
push!(time, t)
Sundials.step!(integrator, dt, true)
step!(integrator, dt, true)
push!(pos_z, integrator.u[3])
push!(vel_z, integrator.u[6])
end
Expand All @@ -56,7 +56,7 @@ abstol = 0.0006 # max error in m/s and m
s = nothing

prob = DAEProblem(res!, yd0, y0, tspan, s, differential_vars=differential_vars)
integrator = Sundials.init(prob, solver, abstol, reltol=0.001)
integrator = init(prob, solver, abstol, reltol=0.001)

@time time_, pos_z, vel_z = solve(integrator, dt, t_final)

Expand Down
6 changes: 3 additions & 3 deletions mwes/mwe_04.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using Pkg
if ! ("ControlPlots" ∈ keys(Pkg.project().dependencies))
using TestEnv; TestEnv.activate()
end
using Sundials, ControlPlots
using ControlPlots

const G_EARTH = [0.0, 0.0, -9.81] # gravitational acceleration
const dt = 0.05
Expand Down Expand Up @@ -35,7 +35,7 @@ end
function solve!(res, integrator, dt, t_final)
for (i,t) in pairs(0:dt:t_final)
res.time[i] = t
Sundials.step!(integrator, dt, true)
step!(integrator, dt, true)
res.pos_z[i] = integrator.u[3]
res.vel_z[i] = integrator.u[6]
end
Expand All @@ -56,7 +56,7 @@ function init()
s = nothing

prob = DAEProblem(res!, yd0, y0, tspan, s, differential_vars=differential_vars)
integrator = Sundials.init(prob, solver, abstol, reltol=0.001, save_everystep=false)
integrator = init(prob, solver, abstol, reltol=0.001, save_everystep=false)
end

function plot(res::Result)
Expand Down
2 changes: 1 addition & 1 deletion mwes/mwe_05.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using Pkg
if ! ("ControlPlots" ∈ keys(Pkg.project().dependencies))
using TestEnv; TestEnv.activate()
end
using Sundials, ControlPlots
using ControlPlots

const G_EARTH = [0.0, 0.0, -9.81] # gravitational acceleration
const dt = 0.05
Expand Down
2 changes: 1 addition & 1 deletion mwes/mwe_07.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using Pkg
if ! ("ControlPlots" ∈ keys(Pkg.project().dependencies))
using TestEnv; TestEnv.activate()
end
using ControlPlots, OrdinaryDiffEq, Sundials #, DASKR
using ControlPlots, OrdinaryDiffEq #, DASKR

const G_EARTH = [0.0, 0.0, -9.81] # gravitational acceleration
const dt = 0.05
Expand Down
2 changes: 1 addition & 1 deletion mwes/mwe_08.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using Pkg
if ! ("ControlPlots" ∈ keys(Pkg.project().dependencies))
using TestEnv; TestEnv.activate()
end
using ControlPlots, OrdinaryDiffEq, Sundials
using ControlPlots, OrdinaryDiffEq

const G_EARTH = [0.0, 0.0, -9.81] # gravitational acceleration
const dt = 0.05
Expand Down
2 changes: 1 addition & 1 deletion mwes/mwe_09.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ end
if ! ("OrdinaryDiffEq" ∈ keys(Pkg.project().dependencies))
Pkg.add("OrdinaryDiffEq")
end
using OrdinaryDiffEq, ControlPlots, Sundials, StaticArrays
using OrdinaryDiffEq, ControlPlots, StaticArrays

STATIC_ARRAYS::Bool = false
if STATIC_ARRAYS
Expand Down
11 changes: 2 additions & 9 deletions src/KiteModels.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ using PrecompileTools: @setup_workload, @compile_workload
using Dierckx, Interpolations, Serialization, StaticArrays, LinearAlgebra, Statistics, Parameters, NLsolve,
DocStringExtensions, OrdinaryDiffEqCore, OrdinaryDiffEqBDF, OrdinaryDiffEqNonlinearSolve,
NonlinearSolve
import Sundials
using Reexport, Pkg
using VortexStepMethod
@reexport using VortexStepMethod: RamAirWing, BodyAerodynamics, Solver, NONLIN
Expand Down Expand Up @@ -580,9 +579,7 @@ function init_sim!(s::AKM; stiffness_factor=0.5, delta=0.0001, upwind_dir=-pi/2,
y0 = Vector{SimFloat}(y0)
yd0 = Vector{SimFloat}(yd0)

if s.set.solver=="IDA"
solver = Sundials.IDA(linear_solver=Symbol(s.set.linear_solver), max_order = s.set.max_order)
elseif s.set.solver=="DImplicitEuler"
if s.set.solver=="DImplicitEuler"
solver = DImplicitEuler(autodiff=AutoFiniteDiff())
elseif s.set.solver=="DFBDF"
solver = DFBDF(autodiff=AutoFiniteDiff(), max_order=Val{s.set.max_order}())
Expand Down Expand Up @@ -646,11 +643,7 @@ function next_step!(s::AKM, integrator; set_speed = nothing, set_torque=nothing,
s.t_0 = integrator.t
set_v_wind_ground!(s, calc_height(s), v_wind_gnd; upwind_dir)
s.iter = 0
if s.set.solver == "IDA"
Sundials.step!(integrator, dt, true)
else
OrdinaryDiffEqCore.step!(integrator, dt, true)
end
OrdinaryDiffEqCore.step!(integrator, dt, true)
if s.stiffness_factor < 1.0
s.stiffness_factor+=0.01
if s.stiffness_factor > 1.0
Expand Down
4 changes: 2 additions & 2 deletions test/create_sys_image.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if ! ("PackageCompiler" ∈ keys(Pkg.project().dependencies))
Pkg.update()
end
@info "Loading packages ..."
using Dierckx, StaticArrays, LinearAlgebra, Parameters, NLsolve, DocStringExtensions, Sundials, KiteUtils,
using Dierckx, StaticArrays, LinearAlgebra, Parameters, NLsolve, DocStringExtensions, KiteUtils,
KitePodModels, AtmosphericModels, OrdinaryDiffEqCore, OrdinaryDiffEqBDF, ModelingToolkit,
DSP, JLD2, Colors, REPL, VortexStepMethod, NonlinearSolve, OrdinaryDiffEqNonlinearSolve, StatsBase,
DiscretePIDs, WinchModels, ControlSystemsBase
Expand All @@ -18,7 +18,7 @@ using PackageCompiler, BenchmarkTools, Documenter
push!(LOAD_PATH,joinpath(pwd(),"src"))

PackageCompiler.create_sysimage(
[:Dierckx, :StaticArrays, :Parameters, :NLsolve, :DocStringExtensions, :Sundials, :KiteUtils,
[:Dierckx, :StaticArrays, :Parameters, :NLsolve, :DocStringExtensions, :KiteUtils,
:KitePodModels, :AtmosphericModels, :OrdinaryDiffEqCore, :OrdinaryDiffEqBDF, :WinchModels,
:OrdinaryDiffEqNonlinearSolve, :StatsBase, :PackageCompiler, :BenchmarkTools, :Documenter,
:ModelingToolkit, :JLD2, :Colors, :REPL, :VortexStepMethod, :NonlinearSolve, :DSP, :DiscretePIDs,
Expand Down
34 changes: 0 additions & 34 deletions test/test_sundials.jl

This file was deleted.

Loading