From c9661508c67d1c2743879396019ec20023fba000 Mon Sep 17 00:00:00 2001 From: Uwe Fechner Date: Thu, 23 Jan 2025 11:58:44 +0100 Subject: [PATCH 1/4] Bump KiteUtils --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index a56aa683..8c568f5f 100644 --- a/Project.toml +++ b/Project.toml @@ -50,7 +50,7 @@ DocStringExtensions = "0.8, 0.9" Documenter = "1.0" Interpolations = "0.15" KitePodModels = "0.3.6" -KiteUtils = "0.9.5" +KiteUtils = "0.9.7" LaTeXStrings = "1.4.0" ModelingToolkit = "~9.54.0" NLsolve = "4.5" From b6e0741763c4ad8c6d77e00ebd226bdf01cee56a Mon Sep 17 00:00:00 2001 From: Uwe Fechner Date: Thu, 23 Jan 2025 12:16:19 +0100 Subject: [PATCH 2/4] log kcu_steering --- src/KPS4.jl | 2 ++ src/KiteModels.jl | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/KPS4.jl b/src/KPS4.jl index 0d159257..40b9a662 100644 --- a/src/KPS4.jl +++ b/src/KPS4.jl @@ -163,6 +163,8 @@ $(TYPEDFIELDS) depower::S = 0.0 "actual relative steering setting, must be between -1.0 .. 1.0" steering::S = 0.0 + "steering after the kcu, before applying offset and depower sensitivity, -1.0 .. 1.0" + kcu_steering::S = 0.0 "multiplier for the stiffniss of tether and bridle" stiffness_factor::S = 1.0 "initial masses of the point masses" diff --git a/src/KiteModels.jl b/src/KiteModels.jl index de5cc00b..6661847e 100644 --- a/src/KiteModels.jl +++ b/src/KiteModels.jl @@ -157,10 +157,11 @@ Parameters: This function sets the variables s.depower, s.steering and s.alpha_depower. It takes the depower offset c0 and the dependency of the steering sensitivity from -the depower settings into account. +the depower settings into account. The raw steering value is stored in s.kcu_steering. """ function set_depower_steering!(s::AKM, depower, steering) s.depower = depower + s.kcu_steering = steering s.alpha_depower = calc_alpha_depower(s.kcu, depower) s.steering = (steering - s.set.c0) / (1.0 + s.set.k_ds * (s.alpha_depower / deg2rad(s.set.alpha_d_max))) nothing @@ -427,6 +428,7 @@ function update_sys_state!(ss::SysState, s::AKM, zoom=1.0) ss.v_reelout = s.v_reel_out ss.depower = s.depower ss.steering = s.steering/s.set.cs_4p + ss.kcu_steering = s.kcu_steering/s.set.cs_4p ss.vel_kite .= s.vel_kite ss.t_sim = 0.0 ss.AoA = deg2rad(s.alpha_2) From d8b63c26cc13907ba1cecb98fdac4fb6bddf335d Mon Sep 17 00:00:00 2001 From: Uwe Fechner Date: Thu, 23 Jan 2025 13:53:36 +0100 Subject: [PATCH 3/4] add kcu_steering to KPS3 --- src/KPS3.jl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/KPS3.jl b/src/KPS3.jl index fff98200..a2afd8ed 100644 --- a/src/KPS3.jl +++ b/src/KPS3.jl @@ -142,6 +142,8 @@ $(TYPEDFIELDS) depower::S = 0.0 "actual relative steering setting, must be between -1.0 .. 1.0" steering::S = 0.0 + "steering after the kcu, before applying offset and depower sensitivity, -1.0 .. 1.0" + kcu_steering::S = 0.0 "factor for the tether stiffness, used to find the steady state with a low stiffness first" stiffness_factor::S = 1.0 "initial masses of the point masses" From 5cd060d193d64a32b2da1041e5a79a8fe3ff2ed2 Mon Sep 17 00:00:00 2001 From: Uwe Fechner Date: Thu, 23 Jan 2025 18:11:44 +0100 Subject: [PATCH 4/4] add file to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 01a6e1c8..2786c05f 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ data/settings_v9d.yaml data/spectrum*.jld2 data/settings_v9e.yaml cspell.config.yaml +Manifest-v1.11.toml