V3 kite

.github/workflows/CI.yml

@@ -85,6 +85,24 @@ jobs:
 
       - uses: julia-actions/cache@v2
       - uses: julia-actions/julia-buildpkg@v1
+
+      - name: Install display dependencies for GLMakie
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y xvfb libgl1-mesa-dri
+
+      - name: Instantiate docs project
+        run: |
+          julia --project=docs -e '
+            using Pkg
+            Pkg.develop(PackageSpec(path=pwd()))
+            Pkg.instantiate()'
+
+      - name: Generate figures
+        run: >
+          xvfb-run -a
+          julia --project=docs docs/generate_figures.jl
+
       - uses: julia-actions/julia-docdeploy@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,4 +1,7 @@
 /LocalPreferences*
+*.old
+*.mp4
+*.gif
 .helix
 *.arrow
 *.bin
@@ -39,6 +42,22 @@ Artifacts.toml
 data/settings_v9f.yaml
 Manifest-v1.10.toml.bak
 Manifest-v1.11.toml.bak
-Manifest-v1.11.toml.backup 
+Manifest-v1.11.toml.backup
 data/model*.default
 docs/src/.$kite_power_tools.drawio.bkp
+.bash_profile
+.bashrc
+.gitconfig
+.gitmodules
+.idea
+.mcp.json
+.profile
+.ripgreprc
+.vscode
+.zprofile
+.zshrc
+/HEAD
+/config
+/hooks
+/objects
+/refs

Project.toml

@@ -7,12 +7,12 @@ authors = ["Bart van de Lint <bart@vandelint.net> and contributors"]
 AtmosphericModels = "c59cac55-771d-4f45-b14d-1c681463a295"
 CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"
 ControlSystemsBase = "aaaaaaaa-a6ca-5380-bf3e-84a91bcd477e"
-DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
+Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 KiteUtils = "90980105-b163-44e5-ba9f-8b1c83bb0533"
 LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
-LinearSolve = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
+Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
 NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
 OrdinaryDiffEqBDF = "6ad6398a-0878-4a85-9266-38940aa047c8"
@@ -23,71 +23,64 @@ Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
-Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
-Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
-Rotations = "6038ab10-8711-5258-84ad-4b1120ba62dc"
 SHA = "ea8e919c-243c-51af-8825-aaa63cd721ce"
-SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
-SciMLOperators = "c0aeaf25-5076-4817-a8d5-81caf7dfa961"
+Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
-StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 SteadyStateDiffEq = "9672c7b4-1e72-59bd-8a11-6ac3964bc41f"
 Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
 SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
 SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
+Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
+TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
 Tar = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
 Timers = "21f18d07-b854-4dab-86f0-c15a3821819a"
-TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
 UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
 VortexStepMethod = "ed3cd733-9f0f-46a9-93e0-89b8d4998dd9"
+YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6"
 
 [weakdeps]
-ControlPlots = "23c2ee80-7a9e-4350-b264-8e670f12517c"
+GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
 Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 
 [extensions]
-SymbolicAWEModelsControlPlotsExt = "ControlPlots"
-SymbolicAWEModelsMakieExt = "Makie"
+SymbolicAWEModelsMakieExt = ["GeometryBasics", "Makie"]
 
 [compat]
 AtmosphericModels = "0.3.2"
 CodecZlib = "0.7.8"
-ControlPlots = "0.2.4"
 ControlSystemsBase = "1.18.1"
-DiffEqBase = "6.161.0"
+Dates = "1"
 DocStringExtensions = "0.9.4"
-KiteUtils = "0.11.0"
+GeometryBasics = "0.5.10"
+KiteUtils = "0.11.1"
 LaTeXStrings = "1.4.0"
 LinearAlgebra = "1"
-LinearSolve = "2 - 3.24"
+Logging = "1"
 Makie = "0.24.6"
-ModelingToolkit = "~10.16"
+ModelingToolkit = "11"
 NonlinearSolve = "4.8.0"
-OrdinaryDiffEqBDF = "1.5.0"
-OrdinaryDiffEqCore = "1.23.0"
+OrdinaryDiffEqBDF = "1.16.0"
+OrdinaryDiffEqCore = "3"
 OrdinaryDiffEqNonlinearSolve = "1.6.1"
 Parameters = "0.12"
 Pkg = "1"
 PrecompileTools = "1.2.1"
 Printf = "1"
 RecipesBase = "1.3.4"
-Serialization = "1"
-Reexport = "1.1, 1.2"
-Rotations = "1.7"
 SHA = "0.7.0"
-SciMLBase = "2.82.1"
-SciMLOperators = "0.3.13, 1"
+Serialization = "1"
 StaticArrays = "1.9.7"
 Statistics = "1"
-StatsBase = "0.34"
 SteadyStateDiffEq = "2.5"
 Suppressor = "0.2.8"
-SymbolicIndexingInterface = "0.3"
-SymbolicUtils = "~3.29"
+SymbolicIndexingInterface = "0"
+SymbolicUtils = "4"
+Symbolics = "7"
+TOML = "1"
 Tar = "1.10.0"
 Timers = "0.1.5"
-TOML = "1"
 UnPack = "1.0.2"
-VortexStepMethod = "2.3.0"
+VortexStepMethod = "3"
+YAML = "0.4"
 julia = "1.10"

REUSE.toml

@@ -1,17 +1,19 @@
 version = 1
 
 [[annotations]]
-path = ["data/model*", "data/ram*", "examples/discrete_jacobian.jl"]
-SPDX-FileCopyrightText = "2025 Bart van de Lint"
+path = [".github/*", ".gitignore", ".github/workflows/*", "data/*", "docs/src/*", "docs/src/symbolic_awe_model/*", "*.default"]
+SPDX-FileCopyrightText = "2025 Bart van de Lint, Uwe Fechner"
 SPDX-License-Identifier = "MPL-2.0"
 
 [[annotations]]
-path = [".github/*", ".gitignore", ".github/workflows/*", "data/*", "docs/src/*", "docs/src/symbolic_awe_model/*", "*.default"]
-SPDX-FileCopyrightText = "2025 Bart van de Lint, Uwe Fechner"
+path = ["data/**/*.csv", "data/**/*.pdf", "data/**/*.yaml", "data/**/*.obj",
+        "processed_data/**/*.csv",
+        "processed_data/**/*.png", "processed_data/**/*.txt"]
+SPDX-FileCopyrightText = "2025 Bart van de Lint, Jelle Poland"
 SPDX-License-Identifier = "MPL-2.0"
 
 [[annotations]]
-path = ["docs/.gitignore", "docs/src/assets/*.png", "docs/src/assets/*.svg", 
+path = ["docs/.gitignore", "docs/src/assets/*.png", "docs/src/assets/*.svg",
         "docs/Project.toml", "Manifest*", "docs/LocalPreferences.toml", "*/Project*", "Project*", 
         "CITATION.cff", "Artifacts*"]
 SPDX-FileCopyrightText = "2025 Bart van de Lint, Uwe Fechner"

data/2plate_kite/aero_geometry.yaml

@@ -0,0 +1,23 @@
+# 2-plate kite aero geometry
+# Must match structural geometry in struc_geometry.yaml
+# 3 sections with LE/TE pairs matching points 2-7
+
+wing_sections:
+  # headers: [airfoil_id, LE_x, LE_y, LE_z, TE_x, TE_y, TE_z]
+  headers: [airfoil_id, LE_x, LE_y, LE_z, TE_x, TE_y, TE_z]
+  data:
+    # Right section: points 2 (LE) and 3 (TE)
+    - [1, -0.5, 1.0, 2.0, 0.5, 1.0, 2.2]
+
+    # Center section: points 4 (LE) and 5 (TE)
+    - [1, -0.5, 0.0, 2.5, 0.5, 0.0, 2.7]
+
+    # Left section: points 6 (LE) and 7 (TE)
+    - [1, -0.5, -1.0, 2.0, 0.5, -1.0, 2.2]
+
+wing_airfoils:
+  alpha_range: [-180, 180, 1]  # deg
+  reynolds: 1e6
+  headers: [airfoil_id, type, info_dict]
+  data:
+    - [1, polars, {csv_file_path: "polars/1.csv"}]

data/2plate_kite/aero_geometry_old.yaml

@@ -0,0 +1,28 @@
+# Kite system geometry for simulation - CONVERGED CONFIGURATION
+# Generated from converged simulation output (iteration 4, converged=True)
+
+wing_sections:
+  # ---------------------------------------------------------------
+  # headers: [airfoil_id, LE_x, LE_y, LE_z, TE_x, TE_y, TE_z]
+  # airfoil_id: 1 (since only one polar/interpolator is used)
+  # Converged positions from structural simulation
+  # Units: meters
+  # ---------------------------------------------------------------
+  headers: [airfoil_id, LE_x, LE_y, LE_z, TE_x, TE_y, TE_z]
+  data:
+    # Right tip chord (nodes 1-2)
+    - [1, -2.52658787,  3.90998347, 8.63399119, -0.56907534,  3.88818007, 8.98058423]
+    # Left tip chord (nodes 5-6)
+    - [1, -2.45823156, -4.29483032, 8.46964736, -0.50150718, -4.25484541, 8.81709563]
+    # Center/apex chord (nodes 3-4)
+    - [1, -3.10388086, -0.25998045, 11.66322754, -1.14745968, -0.25104609, 12.00319579]
+
+wing_airfoils:
+  # ---------------------------------------------------------------
+  # Only one polar, which is interpolated in code; you may later link to a CSV file.
+  # ---------------------------------------------------------------
+  alpha_range: [-180, 180, 1] # deg
+  reynolds: 1e6
+  headers: [airfoil_id, type, info_dict]
+  data:
+    - [1, polars, {csv_file_path: "polars/1.csv"}]

data/2plate_kite/aero_geometry_unconverged.yaml

@@ -0,0 +1,26 @@
+# Kite system geometry for simulation based on provided Julia code
+
+wing_sections:
+  # ---------------------------------------------------------------
+  # headers: [airfoil_id, LE_x, LE_y, LE_z, TE_x, TE_y, TE_z]
+  # airfoil_id: 1 (since only one polar/interpolator is used)
+  # The kite is represented by 4 chordwise points at y = width/2, -width/2 and at y = 0.
+  # Chord positions from get_kite_points(s): P2 (center right), P3 (center left)
+  # Bridle/other points are omitted for simplicity.
+  # Units: meters
+  # ---------------------------------------------------------------
+  headers: [airfoil_id, LE_x, LE_y, LE_z, TE_x, TE_y, TE_z]
+  data:
+    - [1, 0.0,  4.08, 4.9, 2.0,  4.08, 4.9]      # Right tip chord (P2)
+    - [1, 0.0, -4.08, 4.9, 2.0, -4.08, 4.9]      # Left tip chord  (P3)
+    - [1, 0.0, 0.0,   8.05,  2.0, 0.0,   8.05]       # Bridle attachment (P4/P5 merged, approx.)
+
+wing_airfoils:
+  # ---------------------------------------------------------------
+  # Only one polar, which is interpolated in code; you may later link to a CSV file.
+  # ---------------------------------------------------------------
+  alpha_range: [-180, 180, 1] # deg
+  reynolds: 1e6
+  headers: [airfoil_id, type, info_dict]
+  data:
+    - [1, polars, {csv_file_path: "polars/1.csv"}]

data/2plate_kite/polars/1.csv

@@ -0,0 +1,71 @@
+alpha,Cd,Cs,Cl,Cm
+-10.0,0.1759893858334057,2.963819078393553e-21,-0.7493726713784946,0.2323775006207747
+-9.5,0.16289734924603438,2.7877286866584314e-21,-0.6924217529040287,0.2150382675337481
+-9.0,0.1504301874457461,2.6166544368792525e-21,-0.6371323632116463,0.1982607529225381
+-8.5,0.13862765245364775,2.4505707167459407e-21,-0.583498032661642,0.182046261914037
+-8.0,0.1275294962908461,2.2894519139484196e-21,-0.5315122916143107,0.16639609963513724
+-7.5,0.11717547097844788,2.133272416176612e-21,-0.4811686704299467,0.15131157121273117
+-7.0,0.10760532853756002,1.9820066111204418e-21,-0.4324606994688453,0.13679398177371113
+-6.5,0.09885882098928928,1.8356288864698326e-21,-0.38538190909130093,0.12284463644496953
+-6.0,0.09097570035474245,1.694113629914708e-21,-0.3399258296576083,0.10946484035339869
+-5.5,0.08399571865502635,1.557435229144991e-21,-0.2960859915280623,0.09665589862589102
+-5.0,0.0779586279112478,1.4255680718506053e-21,-0.2538559250629577,0.0844191163893389
+-4.5,0.07276768079432067,1.304392579507697e-21,-0.21595504346747285,0.07305505165488536
+-4.0,0.06820918462412777,1.1952100521496464e-21,-0.18295885873231385,0.06261743540439639
+-3.5,0.06414747339522936,1.0911261953022303e-21,-0.15164504939606627,0.05273733222084856
+-3.0,0.06044688110218564,9.852467144912246e-22,-0.11879129399731583,0.0430458066872185
+-2.5,0.056971741739556846,8.706773152424055e-22,-0.08117527107464828,0.03317392338648285
+-2.0,0.0535863893019032,7.405237030815495e-22,-0.0355746591666493,0.0227527469016182
+-1.5,0.050350423572556896,5.856067102929198e-22,0.026226099750827674,0.011481449300827454
+-1.0,0.04735778299115752,4.0923582258582316e-22,0.10429086281980794,-0.00026565530478757544
+-0.5,0.04452430953672641,2.232497256236004e-22,0.189614400178524,-0.011844789267901869
+0.0,0.0417658451882849,3.948710506959264e-23,0.2731914819652083,-0.0226121749411904
+0.5,0.038938158507699175,-1.5308243840478701e-22,0.3557444890017091,-0.03336699893672287
+1.0,0.036117770291757965,-3.560898065690111e-22,0.4410912179803868,-0.0442048470204237
+1.5,0.03355165087186637,-5.435970674210673e-22,0.5248695628452424,-0.05342654027574999
+2.0,0.0314867705794295,-6.896662889589436e-22,0.6027174175402769,-0.0593328997861588
+2.5,0.029737782322488943,-8.01300470612271e-22,0.6754871235581754,-0.06287604536210906
+3.0,0.028000254685969946,-9.031057734401621e-22,0.7466883077319687,-0.06610779561686102
+3.5,0.026342531516603155,-9.955490078848253e-22,0.8159447920161751,-0.06897851983807372
+4.0,0.024832956661119197,-1.07909698438847e-21,0.882880398365313,-0.0714385873134062
+4.5,0.023539873966248726,-1.1542165133933057e-21,0.9471189487339009,-0.07343836733051758
+5.0,0.022531627278722356,-1.221374405341541e-21,1.0082842650764576,-0.07492822917706685
+5.5,0.021876560445270733,-1.2810374706753849e-21,1.0660001693475016,-0.07585854214071311
+6.0,0.0216430173126245,-1.3336725198370469e-21,1.1198904835015508,-0.0761796755091154
+6.5,0.021855502747260325,-1.3836048414175573e-21,1.1730032825989054,-0.07614317006852858
+7.0,0.022476813390075807,-1.4334901652977566e-21,1.2273051287313683,-0.07604692845243605
+7.5,0.023482730749432957,-1.4812909638545697e-21,1.280797574400714,-0.0759108627193397
+8.0,0.02484903633369378,-1.52496970946492e-21,1.3314821721087169,-0.07575488492774146
+8.5,0.026551511651220286,-1.5624888745057316e-21,1.3773604743571508,-0.07559890713614321
+9.0,0.028565938210374484,-1.5918109313539293e-21,1.4164340336477907,-0.07546284140304686
+9.5,0.030868097519518387,-1.610898352386437e-21,1.4467044024824103,-0.07536659978695433
+10.0,0.033433771087014,-1.6177136099801785e-21,1.4661731333627843,-0.0753300943463675
+10.5,0.03772956880131731,-1.6057175342808367e-21,1.4791075252059553,-0.07796780684956318
+11.0,0.04483478356085069,-1.573737170673408e-21,1.4901408957026034,-0.0844740956822261
+11.5,0.054144221388925814,-1.527784314393788e-21,1.4978238255149576,-0.09273868782897009
+12.0,0.0650526883088543,-1.473870760677872e-21,1.5007068953052467,-0.100651310274409
+12.5,0.0813064038148973,-1.376249216669895e-21,1.4478125078785742,-0.10828545090079453
+13.0,0.10393510413553603,-1.227647034548664e-21,1.327791188740308,-0.11661304574760116
+13.5,0.12825887039541226,-1.0767879771019317e-21,1.1986357026030765,-0.12487149403527704
+14.0,0.1495977837191678,-9.723958071174512e-22,1.1183388141795072,-0.1322981949842703
+14.5,0.16758478702300417,-9.126318501956502e-22,1.0836834275674483,-0.13916224193214982
+15.0,0.18464791495839383,-8.633432558691364e-22,1.0549329936239267,-0.14581097523802025
+15.5,0.20029988625288483,-8.247825228239323e-22,1.0353010972003385,-0.15159916465463338
+16.0,0.2140534196340252,-7.972021497460613e-22,1.028001323148079,-0.155881579934741
+16.5,0.22575911507873533,-7.765045354525572e-22,1.0279465928930964,-0.1588574292964903
+17.0,0.23609366837079485,-7.591163461883778e-22,1.0279074596231041,-0.1612711173409803
+17.5,0.24580894194804037,-7.460764817814329e-22,1.0278839558321435,-0.1632952083953905
+18.0,0.2556567982483086,-7.38423842059632e-22,1.0278761140142585,-0.1651022667869003
+18.5,0.265699815399311,-7.344986178163224e-22,1.0281104344749106,-0.16669752709328292
+19.0,0.27558646593010794,-7.316573885898107e-22,1.0287304726554904,-0.16807297439296806
+19.5,0.28544745388056003,-7.294636373254447e-22,1.0296118437539339,-0.1693812987641203
+20.0,0.2954134832905278,-7.274808469685726e-22,1.030630162968177,-0.1707751902849041
+20.5,0.3055500999908466,-7.253401091686849e-22,1.0321158975458387,-0.17232913459444757
+21.0,0.3157783912824044,-7.232601462733436e-22,1.034270073518937,-0.17395281724452416
+21.5,0.32601237341014067,-7.216858872750047e-22,1.036774144262008,-0.17555172818226641
+22.0,0.3361660626189948,-7.210622611661238e-22,1.039309563149587,-0.1770313573548068
+22.5,0.3462258406278082,-7.210927738558214e-22,1.0418506907541978,-0.17838813341813575
+23.0,0.35623515262436534,-7.213063626837044e-22,1.044574269637424,-0.17967706251871235
+23.5,0.36619361005701967,-7.21886103787958e-22,1.0474653261573934,-0.18089150083937203
+24.0,0.3761008243741252,-7.230150733067677e-22,1.0505088866722323,-0.18202480456295017
+24.5,0.38595640702403533,-7.248763473783189e-22,1.0536899775400672,-0.18307032987228236