Merge pull request #120 from OpenSourceAWE/improve-simple-model

- [x]  Use VSM coefficients
- [x] Add a drag offset
- [x] Improve R_t_w calculations
- [x] Add option to disable sheer
- [x] Add wind elevation
- [x] Add turning acceleration offset
- [x] Add calc_winch_force function
- [x] Add back and improve sphere vel and acc calculations

Author: 1-Bart-1

LICENSE-MIT

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Uwe Fechner <fechner@aenarete.eu>, Bart van de Lint <bart@vandelint.net> and contributors. Files, contributed by Bart van de Lint are subject to the MPL-2.0 license. The documentation is subject to the CC-BY-4.0 license.
+Copyright (c) 2025 Uwe Fechner <fechner@aenarete.eu>, Bart van de Lint <bart@vandelint.net> and contributors. Files, contributed by Bart van de Lint are subject to the MPL-2.0 license.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE-MPLtwo

@@ -1,4 +1,4 @@
-Copyright (c) 2025 Uwe Fechner <fechner@aenarete.eu>, Bart van de Lint <bart@vandelint.net> and contributors. Files, contributed by Bart van de Lint are subject to the MPL-2.0 license. The documentation is subject to the CC-BY-4.0 license.
+Copyright (c) 2025 Uwe Fechner <fechner@aenarete.eu>, Bart van de Lint <bart@vandelint.net> and contributors. Files, contributed by Bart van de Lint are subject to the MPL-2.0 license.
 
 Mozilla Public License Version 2.0
 ==================================

LICENSES/CC-BY-4.0.txt

@@ -41,7 +41,6 @@ Tar = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
 Timers = "21f18d07-b854-4dab-86f0-c15a3821819a"
 UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
 VortexStepMethod = "ed3cd733-9f0f-46a9-93e0-89b8d4998dd9"
-WinchModels = "7dcfa46b-7979-4771-bbf4-0aee0da42e1f"
 
 [weakdeps]
 ControlPlots = "23c2ee80-7a9e-4350-b264-8e670f12517c"
@@ -51,15 +50,15 @@ SymbolicAWEModelsControlPlotsExt = "ControlPlots"
 
 [compat]
 Aqua = "0.8.13"
-AtmosphericModels = "0.3.0"
+AtmosphericModels = "0.3.2"
 BenchmarkTools = "1.6"
 CodecZlib = "0.7.8"
 ControlPlots = "0.2.4"
 ControlSystemsBase = "1.18.1"
 DiffEqBase = "6.161.0"
 DocStringExtensions = "0.9.4"
 Documenter = "1.10.1"
-KiteUtils = "0.10.10"
+KiteUtils = "0.11.0"
 LaTeXStrings = "1.4.0"
 LinearAlgebra = "1"
 LinearSolve = "2 - 3.24"
@@ -92,8 +91,7 @@ Tar = "1.10.0"
 Test = "1"
 Timers = "0.1.5"
 UnPack = "1.0.2"
-VortexStepMethod = "2.0.0"
-WinchModels = "0.3.6"
+VortexStepMethod = "2.2.0"
 julia = "1"
 
 [extras]

Manifest-v1.11.toml.default

@@ -106,7 +106,7 @@ init!(sam)
 
 ```julia
 (log, _) = sim_oscillate!(sam)
-plot(sam.sys_struct, log; plot_all=false, plot_heading=true)
+plot(sam.sys_struct, log; plot_default=false, plot_heading=true)
 ```
 
 ![Ram heading](docs/src/assets/ram_heading.png)
@@ -132,7 +132,7 @@ init!(simple_sam)
 ```julia
 SymbolicAWEModels.copy_to_simple!(sam, tether_sam, simple_sam)
 (simple_log, _) = sim_oscillate!(simple_sam)
-plot(simple_sam.sys_struct, simple_log; plot_all=false, plot_heading=true)
+plot(simple_sam.sys_struct, simple_log; plot_default=false, plot_heading=true)
 ```
 
 ![Simple ram heading](docs/src/assets/simple_ram_heading.png)

Project.toml

@@ -1,2 +1,2 @@
 SPDX-FileCopyrightText: 2020 Roland Schmehl
-SPDX-License-Identifier: CC-BY-4.0
+SPDX-License-Identifier: MIT

README.md

@@ -12,7 +12,7 @@ system:
 
 initial:
     l_tethers: [50.0, 50.0, 50.0]  # initial tether length       [m]
-    elevation: 70.8                # initial elevation angle   [deg]
+    elevations: [70]                # initial elevation angle   [deg]
     v_reel_outs: [0.0, 0.0, 0.0]   # initial reel out speed    [m/s]
 
 solver:
@@ -40,8 +40,8 @@ tether:
     power_tether_diameter: 2 # [mm]
     steering_tether_diameter: 1 # [mm]
     cd_tether: 0.958       # drag coefficient of the tether
-    damping: 473.0         # unit damping coefficient        [Ns]
-    c_spring: 614600.0     # unit spring constant coefficient [N]
+    axial_damping: 473.0         # unit damping coefficient        [Ns]
+    axial_stiffness: 614600.0     # unit spring constant coefficient [N]
     rho_tether:  724.0     # density of Dyneema           [kg/m³]
     e_tether: 55000000000.0 # axial tensile modulus of Dyneema (M.B. Ruppert) [Pa]
                            # SK75: 109 to 132 GPa according to datasheet

data/kite.obj.license

@@ -1,7 +1,6 @@
 [deps]
 ControlPlots = "23c2ee80-7a9e-4350-b264-8e670f12517c"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
-KitePodModels = "9de5dc81-f971-414a-927b-652b2f41c539"
 KiteUtils = "90980105-b163-44e5-ba9f-8b1c83bb0533"
 OpenSSL_jll = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
 SymbolicAWEModels = "9c9a347c-5289-41db-a9b9-25ccc76c3360"
@@ -10,7 +9,6 @@ VortexStepMethod = "ed3cd733-9f0f-46a9-93e0-89b8d4998dd9"
 [compat]
 ControlPlots = "0.2.7"
 Documenter = "1.11"
-KitePodModels = "0.3"
-KiteUtils = "0.7, 0.8, 0.9, 0.10"
+KiteUtils = "0.7, 0.8, 0.9, 0.10, 0.11"
 OpenSSL_jll = "~3.0.0"
 julia = "1.10, 1.11"

data/settings.yaml

@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2025 Uwe Fechner
 
-SPDX-License-Identifier: CC-BY-4.0
+SPDX-License-Identifier: MIT