Skip to content

Commit 49ae680

Browse files
committed
Merge remote-tracking branch 'origin/main' into smooth
2 parents 3e4e1db + 49f7e34 commit 49ae680

17 files changed

Lines changed: 640 additions & 166 deletions

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,6 @@ data/ram_air_kite/ram_air_kite_foil_cd_polar.csv
3737
data/ram_air_kite/ram_air_kite_foil_cm_polar.csv
3838
output/
3939
output_cairo/
40+
examples_cp/.CondaPkg/
41+
test/.CondaPkg/
42+
LocalPreferences.toml

CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
# Changelog
22

3+
## VortexStepMethod v3.3.4 2026-05-31
4+
5+
### Added
6+
- `PlotBackend`, `MakieBackend`, `ControlPlotsBackend`, and
7+
`set_plot_backend!` so applications can explicitly choose which plotting
8+
extension the backend-agnostic plotting API should use
9+
- `PythonCall` added as a weak dependency to support the `ControlPlots`
10+
backend with PythonPlot
11+
12+
### Changed
13+
- backend-agnostic plotting wrappers now route through the active plotting
14+
backend, and each plotting extension initializes itself as the default only
15+
when no backend has been selected yet
16+
- relaxed `ControlPlots` compatibility to include both `0.2.5` and `0.3`
17+
- improved `bin/install` and `bin/install_controlplots` scripts
18+
19+
### Fixed
20+
- corrected projection onto core radius in `velocity_3D_bound_vortex!` and
21+
semi-infinite trailing vortex projection so that the radial direction is
22+
always measured from the filament axis, not from the origin (#241)
23+
- fixed 0-based subplot indexing in `ControlPlotsExt` for PythonPlot
24+
compatibility (`plot_distribution` no longer errors with PythonPlot backend)
25+
- fixed missing initialization of `damp` in `solver.jl`
26+
327
## VortexStepMethod v3.3.3 2026-05-21
428

529
### Fixed

Manifest-v1.11.toml.default

Lines changed: 36 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
julia_version = "1.11.9"
44
manifest_format = "2.0"
5-
project_hash = "1ad349ec1b7d8858e1bce3c1d99302d12b82e8e6"
5+
project_hash = "3afeaa867282214c3057ab37347a1bbb8af6fe92"
66

77
[[deps.ADTypes]]
8-
git-tree-sha1 = "bbc22a9a08a0ef6460041086d8a7b27940ed4ffd"
8+
git-tree-sha1 = "f7304359109c768cf32dc5fa2d371565bb63b68a"
99
uuid = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
10-
version = "1.22.0"
10+
version = "1.21.0"
1111
weakdeps = ["ChainRulesCore", "ConstructionBase", "EnzymeCore"]
1212

1313
[deps.ADTypes.extensions]
@@ -229,9 +229,9 @@ version = "1.15.1"
229229

230230
[[deps.DifferentiationInterface]]
231231
deps = ["ADTypes", "LinearAlgebra"]
232-
git-tree-sha1 = "2147a95a217cc8a78ec96ee03581adf129468e49"
232+
git-tree-sha1 = "7ae99144ea44715402c6c882bfef2adbeadbc4ce"
233233
uuid = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
234-
version = "0.7.18"
234+
version = "0.7.16"
235235

236236
[deps.DifferentiationInterface.extensions]
237237
DifferentiationInterfaceChainRulesCoreExt = "ChainRulesCore"
@@ -241,9 +241,8 @@ version = "0.7.18"
241241
DifferentiationInterfaceFiniteDiffExt = "FiniteDiff"
242242
DifferentiationInterfaceFiniteDifferencesExt = "FiniteDifferences"
243243
DifferentiationInterfaceForwardDiffExt = ["ForwardDiff", "DiffResults"]
244-
DifferentiationInterfaceGPUArraysCoreExt = ["GPUArraysCore", "Adapt"]
244+
DifferentiationInterfaceGPUArraysCoreExt = "GPUArraysCore"
245245
DifferentiationInterfaceGTPSAExt = "GTPSA"
246-
DifferentiationInterfaceHyperHessiansExt = "HyperHessians"
247246
DifferentiationInterfaceMooncakeExt = "Mooncake"
248247
DifferentiationInterfacePolyesterForwardDiffExt = ["PolyesterForwardDiff", "ForwardDiff", "DiffResults"]
249248
DifferentiationInterfaceReverseDiffExt = ["ReverseDiff", "DiffResults"]
@@ -256,7 +255,6 @@ version = "0.7.18"
256255
DifferentiationInterfaceZygoteExt = ["Zygote", "ForwardDiff"]
257256

258257
[deps.DifferentiationInterface.weakdeps]
259-
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
260258
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
261259
DiffResults = "163ba53b-c6d8-5494-b064-1a9d43ac40c5"
262260
Diffractor = "9f5e2b26-1114-432f-b630-d3fe2085c51c"
@@ -268,7 +266,6 @@ version = "0.7.18"
268266
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
269267
GPUArraysCore = "46192b85-c4d5-4398-a991-12ede77f4527"
270268
GTPSA = "b27dd330-f138-47c5-815b-40db9dd9b6e8"
271-
HyperHessians = "06b494a0-c8e0-40cc-ad32-d99506a00a6c"
272269
Mooncake = "da2b9cff-9c12-43a0-ae48-6db2b0edb7d6"
273270
PolyesterForwardDiff = "98d1487c-24ca-40b6-b7ab-df2af84e126b"
274271
ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
@@ -301,9 +298,9 @@ uuid = "4e289a0a-7415-4d19-859d-a7e5c4648b56"
301298
version = "1.0.7"
302299

303300
[[deps.EnzymeCore]]
304-
git-tree-sha1 = "c6ee69ee502060982d12dbaaf3d8fcb4e835a0d1"
301+
git-tree-sha1 = "24bbb6fc8fb87eb71c1f8d00184a60fc22c63903"
305302
uuid = "f151be2c-9106-41f4-ab19-57ee4f262869"
306-
version = "0.8.20"
303+
version = "0.8.19"
307304
weakdeps = ["Adapt", "ChainRulesCore"]
308305

309306
[deps.EnzymeCore.extensions]
@@ -326,9 +323,9 @@ version = "1.11.0"
326323

327324
[[deps.FiniteDiff]]
328325
deps = ["ArrayInterface", "LinearAlgebra", "Setfield"]
329-
git-tree-sha1 = "f7017a4f337f8df189fcce98e32b67a1298a2115"
326+
git-tree-sha1 = "73e879af0e767bd6dfade7c5b09d7b05657a8284"
330327
uuid = "6a86dc24-6348-571c-b903-95158fe2bd41"
331-
version = "2.31.0"
328+
version = "2.30.0"
332329

333330
[deps.FiniteDiff.extensions]
334331
FiniteDiffBandedMatricesExt = "BandedMatrices"
@@ -365,9 +362,9 @@ version = "1.1.3"
365362

366363
[[deps.FunctionWrappersWrappers]]
367364
deps = ["FunctionWrappers", "PrecompileTools", "TruncatedStacktraces"]
368-
git-tree-sha1 = "c1b0c3a166a2a393257aa888787ca817532e14ce"
365+
git-tree-sha1 = "ce6762f8f0e7542534f01523ae051e625cbf0468"
369366
uuid = "77dc65aa-8811-40c2-897b-53d922fa7daf"
370-
version = "1.8.0"
367+
version = "1.5.0"
371368

372369
[deps.FunctionWrappersWrappers.extensions]
373370
FunctionWrappersWrappersEnzymeExt = ["Enzyme", "EnzymeCore"]
@@ -439,9 +436,9 @@ version = "1.0.0"
439436

440437
[[deps.JLLWrappers]]
441438
deps = ["Artifacts", "Preferences"]
442-
git-tree-sha1 = "7204148362dafe5fe6a273f855b8ccbe4df8173e"
439+
git-tree-sha1 = "0533e564aae234aff59ab625543145446d8b6ec2"
443440
uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
444-
version = "1.8.0"
441+
version = "1.7.1"
445442

446443
[[deps.Krylov]]
447444
deps = ["LinearAlgebra", "Printf", "SparseArrays"]
@@ -496,9 +493,9 @@ version = "1.18.0+0"
496493

497494
[[deps.LineSearch]]
498495
deps = ["ADTypes", "CommonSolve", "ConcreteStructs", "FastClosures", "LinearAlgebra", "MaybeInplace", "PrecompileTools", "SciMLBase", "SciMLJacobianOperators", "StaticArraysCore"]
499-
git-tree-sha1 = "fd58a77c92e7c8f1db25c9839127d52943a49349"
496+
git-tree-sha1 = "69da095e4c24ed3c4a168bb76dc9c620a6d7239c"
500497
uuid = "87fe0de2-c867-4266-b59a-2f0a94fc965b"
501-
version = "0.1.9"
498+
version = "0.1.7"
502499

503500
[deps.LineSearch.extensions]
504501
LineSearchLineSearchesExt = "LineSearches"
@@ -513,9 +510,9 @@ version = "1.11.0"
513510

514511
[[deps.LinearSolve]]
515512
deps = ["ArrayInterface", "ConcreteStructs", "DocStringExtensions", "EnumX", "GPUArraysCore", "InteractiveUtils", "Krylov", "Libdl", "LinearAlgebra", "MKL_jll", "Markdown", "OpenBLAS_jll", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLLogging", "SciMLOperators", "Setfield", "StaticArraysCore"]
516-
git-tree-sha1 = "04940e970234c6ac650eec9adfc62677cca2328d"
513+
git-tree-sha1 = "42b5cb44317e89ef75dd841c9c8eba9045bf9ff0"
517514
uuid = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
518-
version = "3.76.0"
515+
version = "3.75.0"
519516

520517
[deps.LinearSolve.extensions]
521518
LinearSolveAMDGPUExt = "AMDGPU"
@@ -540,12 +537,12 @@ version = "3.76.0"
540537
LinearSolveKrylovKitExt = "KrylovKit"
541538
LinearSolveMetalExt = "Metal"
542539
LinearSolveMooncakeExt = "Mooncake"
543-
LinearSolvePETScExt = ["PETSc", "SparseArrays", "SparseMatricesCSR"]
540+
LinearSolvePETScCSRExt = ["PETSc", "SparseArrays", "SparseMatricesCSR"]
541+
LinearSolvePETScExt = ["PETSc", "SparseArrays"]
544542
LinearSolvePETScMPIExt = ["PETSc", "PartitionedArrays", "SparseArrays", "SparseMatricesCSR"]
545543
LinearSolveParUExt = ["ParU_jll", "SparseArrays"]
546544
LinearSolvePardisoExt = ["Pardiso", "SparseArrays"]
547545
LinearSolveRecursiveFactorizationExt = "RecursiveFactorization"
548-
LinearSolveSTRUMPACKExt = ["SparseArrays", "STRUMPACK_jll"]
549546
LinearSolveSparseArraysExt = "SparseArrays"
550547
LinearSolveSparspakExt = ["SparseArrays", "Sparspak"]
551548

@@ -577,7 +574,6 @@ version = "3.76.0"
577574
Pardiso = "46dd5b70-b6fb-5a00-ae2d-e8fea33afaf2"
578575
PartitionedArrays = "5a9dfac6-5c52-46f7-8278-5e2210713be9"
579576
RecursiveFactorization = "f2c3362d-daeb-58d1-803e-2bc74f2840b4"
580-
STRUMPACK_jll = "86fbd0b9-476f-557c-b766-62c724b42d8c"
581577
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
582578
SparseMatricesCSR = "a0a7dd2c-ebf4-11e9-1f05-cf50bc540ca1"
583579
Sparspak = "e56a9233-b9d6-4f03-8d0f-1825330902ac"
@@ -665,9 +661,9 @@ version = "1.2.0"
665661

666662
[[deps.NonlinearSolve]]
667663
deps = ["ADTypes", "ArrayInterface", "BracketingNonlinearSolve", "CommonSolve", "ConcreteStructs", "DifferentiationInterface", "FastClosures", "FiniteDiff", "ForwardDiff", "LineSearch", "LinearAlgebra", "LinearSolve", "NonlinearSolveBase", "NonlinearSolveFirstOrder", "NonlinearSolveQuasiNewton", "NonlinearSolveSpectralMethods", "PrecompileTools", "Preferences", "Reexport", "SciMLBase", "SciMLLogging", "Setfield", "SimpleNonlinearSolve", "StaticArraysCore", "SymbolicIndexingInterface"]
668-
git-tree-sha1 = "ae0b0f875e4dfda538ab6977ec7939126ee9a1fe"
664+
git-tree-sha1 = "e88921859836899abe94d08ea0fd42137067280e"
669665
uuid = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
670-
version = "4.19.0"
666+
version = "4.17.1"
671667

672668
[deps.NonlinearSolve.extensions]
673669
NonlinearSolveFastLevenbergMarquardtExt = "FastLevenbergMarquardt"
@@ -857,9 +853,9 @@ version = "1.3.4"
857853

858854
[[deps.RecursiveArrayTools]]
859855
deps = ["Adapt", "ArrayInterface", "DocStringExtensions", "GPUArraysCore", "LinearAlgebra", "PrecompileTools", "RecipesBase", "StaticArraysCore", "SymbolicIndexingInterface"]
860-
git-tree-sha1 = "57b6fb3932fc8d1fc911f840d2c9de5fe3ba5008"
856+
git-tree-sha1 = "79a5a1a5b6294c54602d18a59026ec0b07471054"
861857
uuid = "731186ca-8d62-57ce-b412-fbd966d074cd"
862-
version = "4.3.0"
858+
version = "4.2.0"
863859

864860
[deps.RecursiveArrayTools.extensions]
865861
RecursiveArrayToolsCUDAExt = "CUDA"
@@ -916,16 +912,11 @@ version = "0.5.18"
916912
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
917913
version = "0.7.0"
918914

919-
[[deps.SafeTestsets]]
920-
git-tree-sha1 = "81ec49d645af090901120a1542e67ecbbe044db3"
921-
uuid = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
922-
version = "0.1.0"
923-
924915
[[deps.SciMLBase]]
925916
deps = ["ADTypes", "Accessors", "Adapt", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PreallocationTools", "PrecompileTools", "Preferences", "Printf", "Random", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLLogging", "SciMLOperators", "SciMLPublic", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface"]
926-
git-tree-sha1 = "fed3c3d9781685d982256f94ac85ad4ddf8ee78f"
917+
git-tree-sha1 = "4fdad3606c60fbbd52424737c31ec4141672c809"
927918
uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
928-
version = "3.10.0"
919+
version = "3.3.0"
929920

930921
[deps.SciMLBase.extensions]
931922
SciMLBaseChainRulesCoreExt = "ChainRulesCore"
@@ -972,9 +963,9 @@ version = "0.1.13"
972963

973964
[[deps.SciMLLogging]]
974965
deps = ["Logging", "LoggingExtras", "Preferences"]
975-
git-tree-sha1 = "35bdd8e578af78030d98b262461e8eedc045d943"
966+
git-tree-sha1 = "0161be062570af4042cf6f69e3d5d0b0555b6927"
976967
uuid = "a6db7da4-7206-11f0-1eab-35f2a5dbe1d1"
977-
version = "1.10.0"
968+
version = "1.9.1"
978969

979970
[deps.SciMLLogging.extensions]
980971
SciMLLoggingTracyExt = "Tracy"
@@ -983,21 +974,16 @@ version = "1.10.0"
983974
Tracy = "e689c965-62c8-4b79-b2c5-8359227902fd"
984975

985976
[[deps.SciMLOperators]]
986-
deps = ["Accessors", "Adapt", "ArrayInterface", "DocStringExtensions", "LinearAlgebra", "SafeTestsets"]
987-
git-tree-sha1 = "ef54b9bcfc6694b11aea8458619d1416885bec1e"
977+
deps = ["Accessors", "ArrayInterface", "DocStringExtensions", "LinearAlgebra"]
978+
git-tree-sha1 = "234869cf9fee9258a95464b7a7065cc7be84db00"
988979
uuid = "c0aeaf25-5076-4817-a8d5-81caf7dfa961"
989-
version = "1.20.0"
980+
version = "1.16.0"
981+
weakdeps = ["SparseArrays", "StaticArraysCore"]
990982

991983
[deps.SciMLOperators.extensions]
992-
SciMLOperatorsLoopVectorizationExt = "LoopVectorization"
993984
SciMLOperatorsSparseArraysExt = "SparseArrays"
994985
SciMLOperatorsStaticArraysCoreExt = "StaticArraysCore"
995986

996-
[deps.SciMLOperators.weakdeps]
997-
LoopVectorization = "bdcacae8-1622-11e9-2a5c-532679323890"
998-
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
999-
StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
1000-
1001987
[[deps.SciMLPublic]]
1002988
git-tree-sha1 = "0ba076dbdce87ba230fff48ca9bca62e1f345c9b"
1003989
uuid = "431bcebd-1456-4ced-9d72-93c2757fff0b"
@@ -1103,9 +1089,9 @@ version = "7.7.0+0"
11031089

11041090
[[deps.SymbolicIndexingInterface]]
11051091
deps = ["Accessors", "ArrayInterface", "RuntimeGeneratedFunctions", "StaticArraysCore"]
1106-
git-tree-sha1 = "173ecfe5f7c5a36043b5f2b8cecaa30a4fc958ef"
1092+
git-tree-sha1 = "94c58884e013efff548002e8dc2fdd1cb74dfce5"
11071093
uuid = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
1108-
version = "0.3.47"
1094+
version = "0.3.46"
11091095

11101096
[deps.SymbolicIndexingInterface.extensions]
11111097
SymbolicIndexingInterfacePrettyTablesExt = "PrettyTables"
@@ -1196,9 +1182,9 @@ version = "1.59.0+0"
11961182

11971183
[[deps.oneTBB_jll]]
11981184
deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl"]
1199-
git-tree-sha1 = "da8c1f6eee04831f14edcfa5dae611d309807e57"
1185+
git-tree-sha1 = "1350188a69a6e46f799d3945beef36435ed7262f"
12001186
uuid = "1317d2d5-d96f-522e-a858-c73665f53c3e"
1201-
version = "2022.3.0+0"
1187+
version = "2022.0.0+1"
12021188

12031189
[[deps.p7zip_jll]]
12041190
deps = ["Artifacts", "Libdl"]

0 commit comments

Comments
 (0)