Skip to content

Commit a6413a4

Browse files
authored
Add plate model and kps4 example (#201)
* Generalize accessor type * Revert "Generalize accessor type" This reverts commit 254f642. * Eval for symbolic register * Working kps4 example * Fix orientation matrix * Looks to work fine * More general types, bench still passes * Getting close to kitemodels example * Use data interpolations * Improved match by using cubic spline * Update settings fields * Keep one example * Use simplified aero * Don't enforce nonlin * Add example and test * Add forwarddiff * Remove separate twist * Update manifests * Working lin example * Simplified aero and improved twisting * Align examples * Fix rhs allocs * Test allocs for all integrators * Update manifests * Add alloc testing to all integrators * Update manifests * Add missing docstrings * Remove render * Update packages * Require vsm update * Update default manifests * Correct citations * Reset integ by default * Simplify init * Larger dt for linear wing * Update manifests * Tighter tol * Update default manifests * Fix licenses * Default no remake * Better prn true false * Fix conflicts * Fix documentation * Move to exported * Same name for faster testing * Fix yaml weighted ref test * Update default manifests * Larger dt for lin wing * Widen tol * Rm useless aero from transform test
1 parent 0dab1d2 commit a6413a4

46 files changed

Lines changed: 2216 additions & 490 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Manifest-v1.11.toml.default

Lines changed: 48 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
julia_version = "1.11.9"
44
manifest_format = "2.0"
5-
project_hash = "73e80d319ed3398dce6244244e8d9f4c900730cf"
5+
project_hash = "80ce663e119d994868ba53c3bad85d62444e1883"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "bbc22a9a08a0ef6460041086d8a7b27940ed4ffd"
@@ -389,6 +389,32 @@ git-tree-sha1 = "abe83f3a2f1b857aac70ef8b269080af17764bbe"
389389
uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
390390
version = "1.16.0"
391391

392+
[[deps.DataInterpolations]]
393+
deps = ["EnumX", "FindFirstFunctions", "ForwardDiff", "LinearAlgebra", "PrettyTables", "RecipesBase", "Reexport"]
394+
git-tree-sha1 = "4d50e83772222ce023efb7d30632198828ea56a6"
395+
uuid = "82cc6244-b520-54b8-b5a6-8a565e85f1d0"
396+
version = "8.10.0"
397+
398+
[deps.DataInterpolations.extensions]
399+
DataInterpolationsChainRulesCoreExt = "ChainRulesCore"
400+
DataInterpolationsMakieExt = "Makie"
401+
DataInterpolationsMooncakeExt = ["Mooncake", "ChainRulesCore"]
402+
DataInterpolationsOptimExt = "Optim"
403+
DataInterpolationsRegularizationToolsExt = "RegularizationTools"
404+
DataInterpolationsSparseConnectivityTracerExt = ["SparseConnectivityTracer", "FillArrays"]
405+
DataInterpolationsSymbolicsExt = "Symbolics"
406+
407+
[deps.DataInterpolations.weakdeps]
408+
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
409+
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
410+
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
411+
Mooncake = "da2b9cff-9c12-43a0-ae48-6db2b0edb7d6"
412+
Optim = "429524aa-4258-5aef-a3af-852621145aeb"
413+
RegularizationTools = "29dad682-9a27-4bc3-9c72-016788665182"
414+
SparseConnectivityTracer = "9f842d2f-2579-4b1d-911e-f412cf18a3f5"
415+
Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
416+
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
417+
392418
[[deps.DataStructures]]
393419
deps = ["OrderedCollections"]
394420
git-tree-sha1 = "e86f4a2805f7f19bec5129bc9150c38208e5dc23"
@@ -1540,6 +1566,18 @@ git-tree-sha1 = "8b770b60760d4451834fe79dd483e318eee709c4"
15401566
uuid = "21216c6a-2e73-6563-6e65-726566657250"
15411567
version = "1.5.2"
15421568

1569+
[[deps.PrettyTables]]
1570+
deps = ["Crayons", "LaTeXStrings", "Markdown", "PrecompileTools", "Printf", "REPL", "Reexport", "StringManipulation", "Tables"]
1571+
git-tree-sha1 = "624de6279ab7d94fc9f672f0068107eb6619732c"
1572+
uuid = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
1573+
version = "3.3.2"
1574+
1575+
[deps.PrettyTables.extensions]
1576+
PrettyTablesTypstryExt = "Typstry"
1577+
1578+
[deps.PrettyTables.weakdeps]
1579+
Typstry = "f0ed7684-a786-439e-b1e3-3b82803b501e"
1580+
15431581
[[deps.Primes]]
15441582
deps = ["IntegerMathUtils"]
15451583
git-tree-sha1 = "25cdd1d20cd005b52fc12cb6be3f75faaf59bb9b"
@@ -1959,6 +1997,12 @@ git-tree-sha1 = "b765e46ba27ecf6b44faf70df40c57aa3a547dcb"
19591997
uuid = "69024149-9ee7-55f6-a4c4-859efe599b68"
19601998
version = "0.3.7"
19611999

2000+
[[deps.StringManipulation]]
2001+
deps = ["PrecompileTools"]
2002+
git-tree-sha1 = "d05693d339e37d6ab134c5ab53c29fce5ee5d7d5"
2003+
uuid = "892a3eda-7b42-436c-8928-eab12a02cf0e"
2004+
version = "0.4.4"
2005+
19622006
[[deps.StringViews]]
19632007
git-tree-sha1 = "f2dcb92855b31ad92fe8f079d4f75ac57c93e4b8"
19642008
uuid = "354b36f9-a18e-4713-926e-db85100087ba"
@@ -2016,13 +2060,11 @@ deps = ["Accessors", "ArrayInterface", "RuntimeGeneratedFunctions", "StaticArray
20162060
git-tree-sha1 = "64b15330b9e3c91a86bcac92f369c58e382981c6"
20172061
uuid = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
20182062
version = "0.3.48"
2063+
weakdeps = ["PrettyTables"]
20192064

20202065
[deps.SymbolicIndexingInterface.extensions]
20212066
SymbolicIndexingInterfacePrettyTablesExt = "PrettyTables"
20222067

2023-
[deps.SymbolicIndexingInterface.weakdeps]
2024-
PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
2025-
20262068
[[deps.SymbolicLimits]]
20272069
deps = ["SymbolicUtils", "TermInterface"]
20282070
git-tree-sha1 = "5085671d2cba1eb02136a3d6661c583e801984c1"
@@ -2049,9 +2091,9 @@ version = "4.30.0"
20492091

20502092
[[deps.Symbolics]]
20512093
deps = ["ADTypes", "AbstractPlutoDingetjes", "ArrayInterface", "Bijections", "CommonWorldInvalidations", "ConstructionBase", "DataStructures", "DiffRules", "DocStringExtensions", "DomainSets", "DynamicPolynomials", "Libdl", "LinearAlgebra", "LogExpFunctions", "MacroTools", "Markdown", "Moshi", "MultivariatePolynomials", "MutableArithmetics", "NaNMath", "PrecompileTools", "Preferences", "Primes", "RecipesBase", "Reexport", "RuntimeGeneratedFunctions", "SciMLPublic", "Setfield", "SparseArrays", "SpecialFunctions", "StaticArraysCore", "SymbolicIndexingInterface", "SymbolicLimits", "SymbolicUtils", "TermInterface"]
2052-
git-tree-sha1 = "cbc51a9d875c95d31b25b17468acd5386f69a534"
2094+
git-tree-sha1 = "52482f662eb3be684c299416526d28306001d0b5"
20532095
uuid = "0c5d862f-8b57-4792-8d23-62f2024744c7"
2054-
version = "7.24.0"
2096+
version = "7.24.1"
20552097

20562098
[deps.Symbolics.extensions]
20572099
SymbolicsD3TreesExt = "D3Trees"

Manifest-v1.12.toml.default

Lines changed: 86 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
julia_version = "1.12.5"
44
manifest_format = "2.0"
5-
project_hash = "7464b14434ed89dedaf8552681e672cecdaf5469"
5+
project_hash = "f89b9896c530ac9b2ec27d601e08d4cd75c71942"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "bbc22a9a08a0ef6460041086d8a7b27940ed4ffd"
@@ -541,6 +541,32 @@ git-tree-sha1 = "5fab31e2e01e70ad66e3e24c968c264d1cf166d6"
541541
uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
542542
version = "1.8.2"
543543

544+
[[deps.DataInterpolations]]
545+
deps = ["EnumX", "FindFirstFunctions", "ForwardDiff", "LinearAlgebra", "PrettyTables", "RecipesBase", "Reexport"]
546+
git-tree-sha1 = "4d50e83772222ce023efb7d30632198828ea56a6"
547+
uuid = "82cc6244-b520-54b8-b5a6-8a565e85f1d0"
548+
version = "8.10.0"
549+
550+
[deps.DataInterpolations.extensions]
551+
DataInterpolationsChainRulesCoreExt = "ChainRulesCore"
552+
DataInterpolationsMakieExt = "Makie"
553+
DataInterpolationsMooncakeExt = ["Mooncake", "ChainRulesCore"]
554+
DataInterpolationsOptimExt = "Optim"
555+
DataInterpolationsRegularizationToolsExt = "RegularizationTools"
556+
DataInterpolationsSparseConnectivityTracerExt = ["SparseConnectivityTracer", "FillArrays"]
557+
DataInterpolationsSymbolicsExt = "Symbolics"
558+
559+
[deps.DataInterpolations.weakdeps]
560+
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
561+
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
562+
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
563+
Mooncake = "da2b9cff-9c12-43a0-ae48-6db2b0edb7d6"
564+
Optim = "429524aa-4258-5aef-a3af-852621145aeb"
565+
RegularizationTools = "29dad682-9a27-4bc3-9c72-016788665182"
566+
SparseConnectivityTracer = "9f842d2f-2579-4b1d-911e-f412cf18a3f5"
567+
Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
568+
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
569+
544570
[[deps.DataStructures]]
545571
deps = ["OrderedCollections"]
546572
git-tree-sha1 = "e86f4a2805f7f19bec5129bc9150c38208e5dc23"
@@ -587,6 +613,18 @@ git-tree-sha1 = "a55766a9c8f66cf19ffcdbdb1444e249bb4ace33"
587613
uuid = "85a47980-9c8c-11e8-2b9f-f7ca1fa99fb4"
588614
version = "0.4.6"
589615

616+
[[deps.Dierckx]]
617+
deps = ["Dierckx_jll"]
618+
git-tree-sha1 = "7da4b14cc4c3443a1afc64abee17f4fcb45ad837"
619+
uuid = "39dd38d3-220a-591b-8e3c-4c3a8c710a94"
620+
version = "0.5.4"
621+
622+
[[deps.Dierckx_jll]]
623+
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl"]
624+
git-tree-sha1 = "3251f44b3cac6fec4cec8db45d3ab0bfed51c4d8"
625+
uuid = "cd4c43a9-7502-52ba-aa6d-59fb2a88580b"
626+
version = "0.2.0+0"
627+
590628
[[deps.DiffEqBase]]
591629
deps = ["ArrayInterface", "BracketingNonlinearSolve", "ConcreteStructs", "DocStringExtensions", "FastBroadcast", "FastClosures", "FastPower", "FunctionWrappers", "FunctionWrappersWrappers", "LinearAlgebra", "Logging", "Markdown", "MuladdMacro", "PrecompileTools", "Printf", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLLogging", "SciMLOperators", "SciMLStructures", "Setfield", "Static", "StaticArraysCore", "SymbolicIndexingInterface", "TruncatedStacktraces"]
592630
git-tree-sha1 = "9d333db14895e8c7d4857ed228eb1e72d3b302ec"
@@ -1302,9 +1340,9 @@ weakdeps = ["ForwardDiff", "Unitful"]
13021340

13031341
[[deps.IntervalArithmetic]]
13041342
deps = ["CRlibm", "CoreMath", "MacroTools", "OpenBLASConsistentFPCSR_jll", "Printf", "Random", "RoundingEmulator"]
1305-
git-tree-sha1 = "3e6273749a2df3a5c9067657510ad01ba5039a92"
1343+
git-tree-sha1 = "921d7e91687e15a2c7c269c226960491fc041832"
13061344
uuid = "d1acc4aa-44c8-5952-acd4-ba5d80a2a253"
1307-
version = "1.0.8"
1345+
version = "1.0.9"
13081346

13091347
[deps.IntervalArithmetic.extensions]
13101348
IntervalArithmeticArblibExt = "Arblib"
@@ -1433,6 +1471,18 @@ git-tree-sha1 = "4260cfc991b8885bf747801fb60dd4503250e478"
14331471
uuid = "5ab0869b-81aa-558d-bb23-cbf5423bbe9b"
14341472
version = "0.6.11"
14351473

1474+
[[deps.KiteModels]]
1475+
deps = ["AtmosphericModels", "Dierckx", "DiffEqBase", "DiscretePIDs", "DocStringExtensions", "Interpolations", "KitePodModels", "KiteUtils", "LinearAlgebra", "LinearSolve", "Logging", "NLSolversBase", "NLsolve", "NonlinearSolve", "OrdinaryDiffEqBDF", "OrdinaryDiffEqCore", "OrdinaryDiffEqNonlinearSolve", "Parameters", "Pkg", "PrecompileTools", "REPL", "Reexport", "Rotations", "StaticArrays", "Statistics", "Sundials", "Suppressor", "WinchModels"]
1476+
git-tree-sha1 = "f85d3db792d967ccab5105e51f9e45a668af3802"
1477+
uuid = "b94af626-7959-4878-9336-2adc27959007"
1478+
version = "0.11.13"
1479+
1480+
[[deps.KitePodModels]]
1481+
deps = ["DocStringExtensions", "KiteUtils", "Reexport"]
1482+
git-tree-sha1 = "57f6f71a75d2d26f199a64c03a03796139c540f4"
1483+
uuid = "9de5dc81-f971-414a-927b-652b2f41c539"
1484+
version = "0.4.0"
1485+
14361486
[[deps.KiteUtils]]
14371487
deps = ["Arrow", "CSV", "DocStringExtensions", "LinearAlgebra", "OrderedCollections", "Parameters", "Parsers", "Pkg", "PrecompileTools", "RecursiveArrayTools", "ReferenceFrameRotations", "Rotations", "StaticArrays", "StructArrays", "StructTypes", "YAML"]
14381488
git-tree-sha1 = "edd32b16440b162db774dc42604f7faa921541e6"
@@ -2068,6 +2118,12 @@ git-tree-sha1 = "b6aa4566bb7ae78498a5e68943863fa8b5231b59"
20682118
uuid = "e7412a2a-1a6e-54c0-be00-318e2571c051"
20692119
version = "1.3.6+0"
20702120

2121+
[[deps.OpenBLAS32_jll]]
2122+
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "libblastrampoline_jll"]
2123+
git-tree-sha1 = "565175ce692c065e50ad32efbb61ba69b1586593"
2124+
uuid = "656ef2d0-ae68-5445-9ca0-591084a874a2"
2125+
version = "0.3.33+1"
2126+
20712127
[[deps.OpenBLASConsistentFPCSR_jll]]
20722128
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl"]
20732129
git-tree-sha1 = "3287ec88df50429a934ebc6cf14606215e27b987"
@@ -2969,19 +3025,37 @@ version = "1.11.0"
29693025
deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"]
29703026
uuid = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9"
29713027

3028+
[[deps.SuiteSparse32_jll]]
3029+
deps = ["Artifacts", "JLLWrappers", "Libdl", "libblastrampoline_jll"]
3030+
git-tree-sha1 = "1d43a4874b879f381b8a3a978f0ebe837cfd0922"
3031+
uuid = "ca45d3f4-326b-53b0-9957-23b75aacb3f2"
3032+
version = "7.12.1+0"
3033+
29723034
[[deps.SuiteSparse_jll]]
29733035
deps = ["Artifacts", "Libdl", "libblastrampoline_jll"]
29743036
uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c"
29753037
version = "7.8.3+2"
29763038

3039+
[[deps.Sundials]]
3040+
deps = ["Accessors", "ArrayInterface", "CEnum", "DataStructures", "DiffEqBase", "Libdl", "LinearAlgebra", "LinearSolve", "Logging", "NonlinearSolveBase", "PrecompileTools", "Reexport", "SciMLBase", "SciMLLogging", "SparseArrays", "Sundials_jll", "SymbolicIndexingInterface"]
3041+
git-tree-sha1 = "b2bdc0fe9e7987ae15c9b9507dc26ea048ece9f3"
3042+
uuid = "c3572dad-4567-51f8-b174-8c6c989267f4"
3043+
version = "5.3.0"
3044+
3045+
[[deps.Sundials_jll]]
3046+
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "OpenBLAS32_jll", "SuiteSparse32_jll"]
3047+
git-tree-sha1 = "a872f379c836e9cb5734485ca0681b192a59b98b"
3048+
uuid = "fb77eaff-e24c-56d4-86b1-d163f2edb164"
3049+
version = "7.5.0+0"
3050+
29773051
[[deps.Suppressor]]
29783052
deps = ["Logging"]
29793053
git-tree-sha1 = "6dbb5b635c5437c68c28c2ac9e39b87138f37c0a"
29803054
uuid = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
29813055
version = "0.2.8"
29823056

29833057
[[deps.SymbolicAWEModels]]
2984-
deps = ["AtmosphericModels", "CodecZlib", "ControlSystemsBase", "Dates", "DocStringExtensions", "ForwardDiff", "KiteUtils", "LaTeXStrings", "LinearAlgebra", "Logging", "ModelingToolkit", "NonlinearSolve", "NonlinearSolveQuasiNewton", "OrdinaryDiffEqBDF", "OrdinaryDiffEqCore", "OrdinaryDiffEqNonlinearSolve", "Parameters", "Pkg", "PrecompileTools", "Printf", "RecipesBase", "SHA", "Serialization", "StaticArrays", "Statistics", "SteadyStateDiffEq", "Suppressor", "SymbolicIndexingInterface", "SymbolicUtils", "Symbolics", "TOML", "Tar", "Timers", "UnPack", "VortexStepMethod", "YAML"]
3058+
deps = ["AtmosphericModels", "CodecZlib", "ControlSystemsBase", "DataInterpolations", "Dates", "DocStringExtensions", "ForwardDiff", "KiteUtils", "LaTeXStrings", "LinearAlgebra", "Logging", "ModelingToolkit", "NonlinearSolve", "NonlinearSolveQuasiNewton", "OrdinaryDiffEqBDF", "OrdinaryDiffEqCore", "OrdinaryDiffEqNonlinearSolve", "Parameters", "Pkg", "PrecompileTools", "Printf", "RecipesBase", "SHA", "Serialization", "StaticArrays", "Statistics", "SteadyStateDiffEq", "Suppressor", "SymbolicIndexingInterface", "SymbolicUtils", "Symbolics", "TOML", "Tar", "Timers", "UnPack", "VortexStepMethod", "YAML"]
29853059
path = "."
29863060
uuid = "9c9a347c-5289-41db-a9b9-25ccc76c3360"
29873061
version = "0.8.3"
@@ -3026,9 +3100,9 @@ version = "4.30.0"
30263100

30273101
[[deps.Symbolics]]
30283102
deps = ["ADTypes", "AbstractPlutoDingetjes", "ArrayInterface", "Bijections", "CommonWorldInvalidations", "ConstructionBase", "DataStructures", "DiffRules", "DocStringExtensions", "DomainSets", "DynamicPolynomials", "Libdl", "LinearAlgebra", "LogExpFunctions", "MacroTools", "Markdown", "Moshi", "MultivariatePolynomials", "MutableArithmetics", "NaNMath", "PrecompileTools", "Preferences", "Primes", "RecipesBase", "Reexport", "RuntimeGeneratedFunctions", "SciMLPublic", "Setfield", "SparseArrays", "SpecialFunctions", "StaticArraysCore", "SymbolicIndexingInterface", "SymbolicLimits", "SymbolicUtils", "TermInterface"]
3029-
git-tree-sha1 = "cbc51a9d875c95d31b25b17468acd5386f69a534"
3103+
git-tree-sha1 = "52482f662eb3be684c299416526d28306001d0b5"
30303104
uuid = "0c5d862f-8b57-4792-8d23-62f2024744c7"
3031-
version = "7.24.0"
3105+
version = "7.24.1"
30323106

30333107
[deps.Symbolics.extensions]
30343108
SymbolicsD3TreesExt = "D3Trees"
@@ -3245,6 +3319,12 @@ git-tree-sha1 = "aa1ca3c47f119fbdae8770c29820e5e6119b83f2"
32453319
uuid = "e3aaa7dc-3e4b-44e0-be63-ffb868ccd7c1"
32463320
version = "0.1.3"
32473321

3322+
[[deps.WinchModels]]
3323+
deps = ["DiscretePIDs", "KiteUtils", "Parameters"]
3324+
git-tree-sha1 = "f069217475c08e9dffc2a26457556efcc8e236f3"
3325+
uuid = "7dcfa46b-7979-4771-bbf4-0aee0da42e1f"
3326+
version = "0.3.9"
3327+
32483328
[[deps.WoodburyMatrices]]
32493329
deps = ["LinearAlgebra", "SparseArrays"]
32503330
git-tree-sha1 = "248a7031b3da79a127f14e5dc5f417e26f9f6db7"

Project.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ projects = ["docs", "examples", "scripts", "test"]
1010
AtmosphericModels = "c59cac55-771d-4f45-b14d-1c681463a295"
1111
CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"
1212
ControlSystemsBase = "aaaaaaaa-a6ca-5380-bf3e-84a91bcd477e"
13+
DataInterpolations = "82cc6244-b520-54b8-b5a6-8a565e85f1d0"
1314
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
1415
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
1516
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
@@ -55,6 +56,7 @@ SymbolicAWEModelsMakieExt = ["GeometryBasics", "Makie"]
5556
AtmosphericModels = "0.3.2"
5657
CodecZlib = "0.7.8"
5758
ControlSystemsBase = "1.18.1"
59+
DataInterpolations = "8.10.0"
5860
Dates = "1"
5961
DocStringExtensions = "0.9.4"
6062
ForwardDiff = "1, 2"

data/base/settings.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ solver:
1414
solver: "FBDF"
1515
abs_tol: 0.01 # absolute tolerance of the DAE solver [m, m/s]
1616
rel_tol: 0.01 # relative tolerance of the DAE solver [-]
17-
relaxation: 0.6 # relaxation factor of inner linear Newton solver, needed for quasi-steady solver
17+
relaxation: 0.4 # relaxation factor of inner linear Newton solver, needed for quasi-steady solver
1818

1919
kite:
2020
model: "" # 3D model of the kite
@@ -29,6 +29,9 @@ kite:
2929
bridle_fracs: [0.088, 0.31, 0.58, 0.93] # distances along normalized foil chord for bridle attachment points
3030
mass: 0.9 # kite mass [kg]
3131
quasi_static: false # whether to use quasi static kite points or not
32+
rel_mass_p2: 0.25
33+
rel_mass_p3: 0.25
34+
rel_mass_p4: 0.25
3235

3336
tether:
3437
# Bosch et al. 2014 used k = AE/L = 4.52E3 N/m for the bridles of the V3
@@ -37,8 +40,8 @@ tether:
3740
power_tether_diameter: 2 # [mm]
3841
steering_tether_diameter: 1 # [mm]
3942
cd_tether: 0.958 # drag coefficient of the tether
40-
damping: 473.0 # unit damping coefficient [Ns]
41-
c_spring: 614600.0 # unit spring constant coefficient [N]
43+
axial_damping: 473.0 # unit damping coefficient [Ns]
44+
axial_stiffness: 614600.0 # unit spring constant coefficient [N]
4245
rho_tether: 724.0 # density of Dyneema [kg/m³]
4346
e_tether: 55000000000.0 # axial tensile modulus of Dyneema (M.B. Ruppert) [Pa]
4447
# SK75: 109 to 132 GPa according to datasheet

0 commit comments

Comments
 (0)