Skip to content

Commit be003b9

Browse files
authored
Merge branch 'main' into kps5_uwe
2 parents b08cf39 + c231082 commit be003b9

24 files changed

+2772
-92
lines changed

.github/workflows/CI.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
reuse-lint:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v5
1818
- name: Run REUSE lint
1919
run: |
2020
docker run --rm --volume ${{ github.workspace }}:/data fsfe/reuse lint
@@ -48,7 +48,7 @@ jobs:
4848
run: if [ "$RUNNER_OS" = "Linux" ]; then sudo apt-get install -y python3-matplotlib; fi
4949
shell: bash
5050

51-
- uses: actions/checkout@v4
51+
- uses: actions/checkout@v5
5252

5353
- name: Use default manifest
5454
run: |
@@ -92,7 +92,7 @@ jobs:
9292
run: if [ "$RUNNER_OS" = "Linux" ]; then sudo apt-get install -y python3-matplotlib; fi
9393
shell: bash
9494

95-
- uses: actions/checkout@v4
95+
- uses: actions/checkout@v5
9696

9797
- name: Use default manifest
9898
run: |
@@ -131,7 +131,7 @@ jobs:
131131
- name: Install matplotlib
132132
run: sudo apt-get install -y python3-matplotlib
133133
shell: bash
134-
- uses: actions/checkout@v4
134+
- uses: actions/checkout@v5
135135
- uses: julia-actions/setup-julia@v2
136136
- name: Build PyCall
137137
run: julia --project=docs/ -e 'ENV["PYTHON"]=""; using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate(); Pkg.build("PyCall")'

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,5 @@ docs/src/.$kite_power_tools.drawio.bkp
6060
data/linear_model.arrow
6161
data/nonlinear_model.arrow
6262
coverage/lcov.info
63+
temp_benchmark.jl
64+
Manifest-v1.12.toml

CHANGELOG.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22
SPDX-FileCopyrightText: 2025 Uwe Fechner, Bart van de Lint
33
SPDX-License-Identifier: MIT
44
-->
5+
### Unreleased
6+
#### Changed
7+
- Support Julia 1.12
8+
59
### KiteModels v0.9.0 2025-07-14
610
#### Changed
711
- BREAKING: rename `init_sim!` to `init!`
812
- removed the parameter `upwind_dir!` from `init!`; use set.upwind_dir instead. Careful: This is in degrees.
9-
- the function `init!` accepts (and ignores) the parameters `delta` and `stiffness_factor` if applied to a
10-
SymbolicAWEModel
13+
- the function `init!` accepts (and ignores) the parameters `delta` and `stiffness_factor` if applied to a SymbolicAWEModel
1114
- bump `KiteUtils.jl` to v0.10.15
1215
- bump `AtmosphericModels` to v0.3.0, the first version that supports turbulent wind fields
1316
#### Added

Manifest-v1.11.toml.default

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

33
julia_version = "1.11.7"
44
manifest_format = "2.0"
5-
project_hash = "f8d7baab81ade64745245465e94bd2e24e181637"
5+
project_hash = "e7ac8df9ddf8ca60a678500df1c5281c8ac21435"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "27cecae79e5cc9935255f90c53bb831cc3c870d7"
@@ -159,9 +159,9 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
159159
version = "1.11.0"
160160

161161
[[deps.Bijections]]
162-
git-tree-sha1 = "a2d308fcd4c2fb90e943cf9cd2fbfa9c32b69733"
162+
git-tree-sha1 = "6aaafea90a56dc1fc8cbc15e3cf26d6bc81eb0a3"
163163
uuid = "e2ed5e7c-b2de-5872-ae92-c73ca462fb04"
164-
version = "0.2.2"
164+
version = "0.1.10"
165165

166166
[[deps.BitIntegers]]
167167
deps = ["Random"]
@@ -211,6 +211,12 @@ git-tree-sha1 = "f3a21d7fc84ba618a779d1ed2fcca2e682865bab"
211211
uuid = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9"
212212
version = "0.2.7"
213213

214+
[[deps.CSTParser]]
215+
deps = ["Tokenize"]
216+
git-tree-sha1 = "0157e592151e39fa570645e2b2debcdfb8a0f112"
217+
uuid = "00ebfdb7-1f24-5e51-bd34-a7502290713f"
218+
version = "3.4.3"
219+
214220
[[deps.CSV]]
215221
deps = ["CodecZlib", "Dates", "FilePathsBase", "InlineStrings", "Mmap", "Parsers", "PooledArrays", "PrecompileTools", "SentinelArrays", "Tables", "Unicode", "WeakRefStrings", "WorkerUtilities"]
216222
git-tree-sha1 = "deddd8725e5e1cc49ee205a1964256043720a6c3"
@@ -274,15 +280,15 @@ uuid = "5ae59095-9a9b-59fe-a467-6f913c188581"
274280
version = "0.13.1"
275281

276282
[[deps.Combinatorics]]
277-
git-tree-sha1 = "08c8b6831dc00bfea825826be0bc8336fc369860"
283+
git-tree-sha1 = "8010b6bb3388abe68d95743dcbea77650bb2eddf"
278284
uuid = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
279-
version = "1.0.2"
285+
version = "1.0.3"
280286

281287
[[deps.CommonMark]]
282-
deps = ["PrecompileTools"]
283-
git-tree-sha1 = "351d6f4eaf273b753001b2de4dffb8279b100769"
288+
deps = ["Crayons", "PrecompileTools"]
289+
git-tree-sha1 = "5fdf00d1979fd4883b44b754fc3423175c9504b4"
284290
uuid = "a80b9123-70ca-4bc0-993e-6e3bcb318db6"
285-
version = "0.9.1"
291+
version = "0.8.16"
286292

287293
[[deps.CommonSolve]]
288294
git-tree-sha1 = "0eee5eb66b1cf62cd6ad1b460238e60e4b09400c"
@@ -923,15 +929,10 @@ uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8"
923929
version = "3.1.3+0"
924930

925931
[[deps.JuliaFormatter]]
926-
deps = ["CommonMark", "Glob", "JuliaSyntax", "PrecompileTools", "TOML"]
927-
git-tree-sha1 = "f512fefd5fdc7dd1ca05778f08f91e9e4c9fdc37"
932+
deps = ["CSTParser", "CommonMark", "DataStructures", "Glob", "PrecompileTools", "TOML", "Tokenize"]
933+
git-tree-sha1 = "59cf7ad64f1b0708a4fa4369879d33bad3239b56"
928934
uuid = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
929-
version = "2.1.6"
930-
931-
[[deps.JuliaSyntax]]
932-
git-tree-sha1 = "937da4713526b96ac9a178e2035019d3b78ead4a"
933-
uuid = "70703baa-626e-46a2-a12c-08ffd08c73b4"
934-
version = "0.4.10"
935+
version = "1.0.62"
935936

936937
[[deps.JumpProcesses]]
937938
deps = ["ArrayInterface", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "DocStringExtensions", "FunctionWrappers", "Graphs", "LinearAlgebra", "PoissonRandom", "Random", "RecursiveArrayTools", "Reexport", "SciMLBase", "Setfield", "StaticArrays", "SymbolicIndexingInterface", "UnPack"]
@@ -961,9 +962,9 @@ version = "0.10.16"
961962

962963
[[deps.Krylov]]
963964
deps = ["LinearAlgebra", "Printf", "SparseArrays"]
964-
git-tree-sha1 = "b94257a1a8737099ca40bc7271a8b374033473ed"
965+
git-tree-sha1 = "d1fc961038207e43982851e57ee257adc37be5e8"
965966
uuid = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7"
966-
version = "0.10.1"
967+
version = "0.10.2"
967968

968969
[[deps.LaTeXStrings]]
969970
git-tree-sha1 = "dda21b8cbd6a6c40d9d02a73230f9d70fed6918c"
@@ -1219,9 +1220,9 @@ version = "0.8.1"
12191220

12201221
[[deps.ModelingToolkit]]
12211222
deps = ["ADTypes", "AbstractTrees", "ArrayInterface", "BlockArrays", "Combinatorics", "CommonSolve", "Compat", "ConstructionBase", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "DiffEqNoiseProcess", "DiffRules", "DifferentiationInterface", "Distributed", "Distributions", "DocStringExtensions", "DomainSets", "DynamicQuantities", "EnumX", "ExprTools", "FindFirstFunctions", "ForwardDiff", "FunctionWrappers", "FunctionWrappersWrappers", "Graphs", "InteractiveUtils", "JuliaFormatter", "JumpProcesses", "Latexify", "Libdl", "LinearAlgebra", "MLStyle", "Moshi", "NaNMath", "NonlinearSolve", "OffsetArrays", "OrderedCollections", "PrecompileTools", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SCCNonlinearSolve", "SciMLBase", "SciMLStructures", "Serialization", "Setfield", "SimpleNonlinearSolve", "SparseArrays", "SpecialFunctions", "StaticArrays", "SymbolicIndexingInterface", "SymbolicUtils", "Symbolics", "URIs", "UnPack", "Unitful"]
1222-
git-tree-sha1 = "c0a7d2a91d8cce967744918d811d74f30af8cdd6"
1223+
git-tree-sha1 = "81ea96aab6799623bd22f796a7c4a6f4661b2472"
12231224
uuid = "961ee093-0014-501f-94e3-6117800e7a78"
1224-
version = "9.78.0"
1225+
version = "9.73.0"
12251226

12261227
[deps.ModelingToolkit.extensions]
12271228
MTKBifurcationKitExt = "BifurcationKit"
@@ -1420,9 +1421,9 @@ version = "1.8.1"
14201421

14211422
[[deps.OrdinaryDiffEqBDF]]
14221423
deps = ["ADTypes", "ArrayInterface", "DiffEqBase", "FastBroadcast", "LinearAlgebra", "MacroTools", "MuladdMacro", "OrdinaryDiffEqCore", "OrdinaryDiffEqDifferentiation", "OrdinaryDiffEqNonlinearSolve", "OrdinaryDiffEqSDIRK", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "SciMLBase", "StaticArrays", "TruncatedStacktraces"]
1423-
git-tree-sha1 = "3890acc80d814e45234d18b592f5db5d1a75f84a"
1424+
git-tree-sha1 = "ce8db53fd1e4e41c020fd53961e7314f75e4c21c"
14241425
uuid = "6ad6398a-0878-4a85-9266-38940aa047c8"
1425-
version = "1.9.0"
1426+
version = "1.10.1"
14261427

14271428
[[deps.OrdinaryDiffEqCore]]
14281429
deps = ["ADTypes", "Accessors", "Adapt", "ArrayInterface", "DataStructures", "DiffEqBase", "DocStringExtensions", "EnumX", "FastBroadcast", "FastClosures", "FastPower", "FillArrays", "FunctionWrappersWrappers", "InteractiveUtils", "LinearAlgebra", "Logging", "MacroTools", "MuladdMacro", "Polyester", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "SciMLStructures", "SimpleUnPack", "Static", "StaticArrayInterface", "StaticArraysCore", "SymbolicIndexingInterface", "TruncatedStacktraces"]
@@ -1439,22 +1440,26 @@ version = "1.30.0"
14391440
Mooncake = "da2b9cff-9c12-43a0-ae48-6db2b0edb7d6"
14401441

14411442
[[deps.OrdinaryDiffEqDifferentiation]]
1442-
deps = ["ADTypes", "ArrayInterface", "ConcreteStructs", "ConstructionBase", "DiffEqBase", "DifferentiationInterface", "FastBroadcast", "FiniteDiff", "ForwardDiff", "FunctionWrappersWrappers", "LinearAlgebra", "LinearSolve", "OrdinaryDiffEqCore", "SciMLBase", "SciMLOperators", "SparseArrays", "SparseMatrixColorings", "StaticArrayInterface", "StaticArrays"]
1443-
git-tree-sha1 = "906da94c9b81054b974e97590d24b092369026b8"
1443+
deps = ["ADTypes", "ArrayInterface", "ConcreteStructs", "ConstructionBase", "DiffEqBase", "DifferentiationInterface", "FastBroadcast", "FiniteDiff", "ForwardDiff", "FunctionWrappersWrappers", "LinearAlgebra", "LinearSolve", "OrdinaryDiffEqCore", "SciMLBase", "SciMLOperators", "SparseMatrixColorings", "StaticArrayInterface", "StaticArrays"]
1444+
git-tree-sha1 = "320b5f3e4e61ca0ad863c63c803f69973ba6efce"
14441445
uuid = "4302a76b-040a-498a-8c04-15b101fed76b"
1445-
version = "1.11.0"
1446+
version = "1.16.1"
1447+
weakdeps = ["SparseArrays"]
1448+
1449+
[deps.OrdinaryDiffEqDifferentiation.extensions]
1450+
OrdinaryDiffEqDifferentiationSparseArraysExt = "SparseArrays"
14461451

14471452
[[deps.OrdinaryDiffEqNonlinearSolve]]
14481453
deps = ["ADTypes", "ArrayInterface", "DiffEqBase", "FastBroadcast", "FastClosures", "ForwardDiff", "LinearAlgebra", "LinearSolve", "MuladdMacro", "NonlinearSolve", "OrdinaryDiffEqCore", "OrdinaryDiffEqDifferentiation", "PreallocationTools", "RecursiveArrayTools", "SciMLBase", "SciMLOperators", "SciMLStructures", "SimpleNonlinearSolve", "StaticArrays"]
1449-
git-tree-sha1 = "4afa7ffda353163eb7ba7f3241668ad50bdcde0f"
1454+
git-tree-sha1 = "b05226afc8fa6b8fc6f2258a89987b4f5bd0db4e"
14501455
uuid = "127b3ac7-2247-4354-8eb6-78cf4e7c58e8"
1451-
version = "1.13.0"
1456+
version = "1.14.1"
14521457

14531458
[[deps.OrdinaryDiffEqSDIRK]]
14541459
deps = ["ADTypes", "DiffEqBase", "FastBroadcast", "LinearAlgebra", "MacroTools", "MuladdMacro", "OrdinaryDiffEqCore", "OrdinaryDiffEqDifferentiation", "OrdinaryDiffEqNonlinearSolve", "RecursiveArrayTools", "Reexport", "SciMLBase", "TruncatedStacktraces"]
1455-
git-tree-sha1 = "6b941dba1c669f8dbb24faf951e5ec8665ff5019"
1460+
git-tree-sha1 = "20caa72c004414435fb5769fadb711e96ed5bcd4"
14561461
uuid = "2d112036-d095-4a1e-ab9a-08536f3ecdbf"
1457-
version = "1.6.0"
1462+
version = "1.7.0"
14581463

14591464
[[deps.PDMats]]
14601465
deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse"]
@@ -2022,6 +2027,12 @@ git-tree-sha1 = "91db7ed92c66f81435fe880947171f1212936b14"
20222027
uuid = "fb77eaff-e24c-56d4-86b1-d163f2edb164"
20232028
version = "5.2.3+0"
20242029

2030+
[[deps.Suppressor]]
2031+
deps = ["Logging"]
2032+
git-tree-sha1 = "6dbb5b635c5437c68c28c2ac9e39b87138f37c0a"
2033+
uuid = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
2034+
version = "0.2.8"
2035+
20252036
[[deps.SymbolicIndexingInterface]]
20262037
deps = ["Accessors", "ArrayInterface", "RuntimeGeneratedFunctions", "StaticArraysCore"]
20272038
git-tree-sha1 = "b19cf024a2b11d72bef7c74ac3d1cbe86ec9e4ed"
@@ -2041,10 +2052,10 @@ uuid = "19f23fe9-fdab-4a78-91af-e7b7767979c3"
20412052
version = "0.2.3"
20422053

20432054
[[deps.SymbolicUtils]]
2044-
deps = ["AbstractTrees", "ArrayInterface", "Bijections", "ChainRulesCore", "Combinatorics", "ConstructionBase", "DataStructures", "DocStringExtensions", "DynamicPolynomials", "ExproniconLite", "LinearAlgebra", "MultivariatePolynomials", "NaNMath", "Setfield", "SparseArrays", "SpecialFunctions", "StaticArrays", "SymbolicIndexingInterface", "TaskLocalValues", "TermInterface", "TimerOutputs", "Unityper"]
2045-
git-tree-sha1 = "a85b4262a55dbd1af39bb6facf621d79ca6a322d"
2055+
deps = ["AbstractTrees", "ArrayInterface", "Bijections", "ChainRulesCore", "Combinatorics", "ConstructionBase", "DataStructures", "DocStringExtensions", "DynamicPolynomials", "ExproniconLite", "LinearAlgebra", "MultivariatePolynomials", "NaNMath", "Setfield", "SparseArrays", "SpecialFunctions", "StaticArrays", "SymbolicIndexingInterface", "TaskLocalValues", "TermInterface", "TimerOutputs", "Unityper", "WeakValueDicts"]
2056+
git-tree-sha1 = "ca5929df933a8b7272bc7f01dcd14b2d976c56e2"
20462057
uuid = "d1185830-fcd6-423d-90d6-eec64667417b"
2047-
version = "3.32.0"
2058+
version = "3.25.1"
20482059

20492060
[deps.SymbolicUtils.extensions]
20502061
SymbolicUtilsLabelledArraysExt = "LabelledArrays"
@@ -2168,6 +2179,11 @@ git-tree-sha1 = "fe7046d2b5bc1d31cde8fd19fad7c5506e3960b4"
21682179
uuid = "21f18d07-b854-4dab-86f0-c15a3821819a"
21692180
version = "0.1.5"
21702181

2182+
[[deps.Tokenize]]
2183+
git-tree-sha1 = "468b4685af4abe0e9fd4d7bf495a6554a6276e75"
2184+
uuid = "0796e94c-ce3b-5d07-9a54-7f471281c624"
2185+
version = "0.5.29"
2186+
21712187
[[deps.TranscodingStreams]]
21722188
git-tree-sha1 = "0c45878dcfdcfa8480052b6ab162cdd138781742"
21732189
uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
@@ -2241,6 +2257,11 @@ git-tree-sha1 = "b1be2855ed9ed8eac54e5caff2afcdb442d52c23"
22412257
uuid = "ea10d353-3f73-51f8-a26c-33c1cb351aa5"
22422258
version = "1.4.2"
22432259

2260+
[[deps.WeakValueDicts]]
2261+
git-tree-sha1 = "98528c2610a5479f091d470967a25becfd83edd0"
2262+
uuid = "897b6980-f191-5a31-bcb0-bf3c4585e0c1"
2263+
version = "0.1.0"
2264+
22442265
[[deps.WinchModels]]
22452266
deps = ["DiscretePIDs", "KiteUtils", "Parameters"]
22462267
git-tree-sha1 = "7d301a671e812d9a7d3d7163ea5dce2d9e7e5dc4"

0 commit comments

Comments
 (0)