Skip to content

Update KiteUtils #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ufechner7 merged 3 commits into from
Jul 13, 2025
Merged

Update KiteUtils #245

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10d717d
Update KiteUtils
1-Bart-1 Jul 13, 2025
8a5d65c
Import functions
1-Bart-1 Jul 13, 2025
9d45b8d
Remove prefix
1-Bart-1 Jul 13, 2025
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
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Documenter = "1.10.1"
Interpolations = "0.15.1"
JLD2 = "0.5"
KitePodModels = "0.3.8"
KiteUtils = "=0.10.14"
KiteUtils = "0.10.15"
LaTeXStrings = "1.4.0"
LinearAlgebra = "1.10, 1.11"
LinearSolve = "~2.39.0, 3"
Expand Down
13 changes: 6 additions & 7 deletions src/KiteModels.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,15 @@ using Dierckx, Interpolations, Serialization, StaticArrays, LinearAlgebra, Stati
import Sundials
using Reexport, Pkg
using VortexStepMethod
using KiteUtils
import KiteUtils: init!, next_step!, update_sys_state!
import KiteUtils: calc_elevation, calc_heading, calc_course, SysState
@reexport using VortexStepMethod: RamAirWing, BodyAerodynamics, Solver, NONLIN
@reexport using KitePodModels
@reexport using WinchModels
@reexport using AtmosphericModels
using Rotations
import Base.zero
import KiteUtils.calc_elevation
import KiteUtils.calc_heading
import KiteUtils.calc_course
import KiteUtils.SysState
import OrdinaryDiffEqCore.init
import OrdinaryDiffEqCore.step!
using ModelingToolkit, SymbolicIndexingInterface
Expand Down Expand Up @@ -446,7 +445,7 @@ end
# var_16::MyFloat
# end

function update_sys_state!(ss::SysState, s::AKM, zoom=1.0)
function KiteUtils.update_sys_state!(ss::SysState, s::AKM, zoom=1.0)
ss.time = s.t_0
pos = s.pos
P = length(pos)
Expand Down Expand Up @@ -552,7 +551,7 @@ Parameters:
Returns:
An instance of an `ODEIntegrator`.
"""
function init!(s::AKM; stiffness_factor=0.5, delta=0.0001, prn=false)
function KiteUtils.init!(s::AKM; stiffness_factor=0.5, delta=0.0001, prn=false)
clear!(s)
upwind_dir = deg2rad(s.set.upwind_dir)
s.stiffness_factor = stiffness_factor
Expand Down Expand Up @@ -623,7 +622,7 @@ Parameters:
Returns:
`Nothing`
"""
function next_step!(s::AKM, integrator; set_speed = nothing, set_torque=nothing, set_force=nothing, bearing = nothing,
function KiteUtils.next_step!(s::AKM, integrator; set_speed = nothing, set_torque=nothing, set_force=nothing, bearing = nothing,
attractor=nothing, v_wind_gnd=s.set.v_wind, upwind_dir=-pi/2, dt=1/s.set.sample_freq)
KitePodModels.on_timer(s.kcu)
KiteModels.set_depower_steering!(s, get_depower(s.kcu), get_steering(s.kcu))
Expand Down
6 changes: 3 additions & 3 deletions src/symbolic_awe_model.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ function SymbolicAWEModel(set::Settings)
return SymbolicAWEModel(set, sys_struct, [aero], [vsm_solver])
end

function update_sys_state!(ss::SysState, s::SymbolicAWEModel, zoom=1.0)
function KiteUtils.update_sys_state!(ss::SysState, s::SymbolicAWEModel, zoom=1.0)
isnothing(s.integrator) && error("run init!(s) first")
ss.time = s.integrator.t # Use integrator time

Expand Down Expand Up @@ -299,7 +299,7 @@ and only update the state variables. Otherwise, it will create a new model from
# Returns
- `integrator::OrdinaryDiffEqCore.ODEIntegrator`: The initialized ODE integrator.
"""
function init!(s::SymbolicAWEModel;
function KiteUtils.init!(s::SymbolicAWEModel;
solver=nothing, stiffness_factor = nothing, delta = nothing, adaptive=true, prn=true,
precompile=false, remake=false, reload=false,
lin_outputs=Num[]
Expand Down Expand Up @@ -609,7 +609,7 @@ This function performs the following steps:
# Returns
- `Nothing`
"""
function next_step!(s::SymbolicAWEModel, integrator::OrdinaryDiffEqCore.ODEIntegrator; set_values=nothing, dt=1/s.set.sample_freq, vsm_interval=1)
function KiteUtils.next_step!(s::SymbolicAWEModel, integrator::OrdinaryDiffEqCore.ODEIntegrator; set_values=nothing, dt=1/s.set.sample_freq, vsm_interval=1)
!(s.integrator === integrator) && error("The ODEIntegrator doesn't belong to the SymbolicAWEModel")
next_step!(s; set_values, upwind_dir, dt, vsm_interval)
end
Expand Down
Loading