From 55e9d0fc61304f49ec3ca7d2efe8d7e9e82f4177 Mon Sep 17 00:00:00 2001 From: Ashton Bradley Date: Tue, 30 Apr 2024 10:27:47 +1200 Subject: [PATCH 1/5] update deps --- Manifest.toml | 396 ++++++++++++++++++++++++----------------- Project.toml | 2 +- test/creations_test.jl | 19 +- 3 files changed, 249 insertions(+), 168 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index ecbd996..a70cd80 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -1,24 +1,25 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.9.3" +julia_version = "1.10.2" manifest_format = "2.0" -project_hash = "2f1f589f0a8fd912dd3de3959a5ccbb618a55c35" +project_hash = "17bedc7c2c277895f1208abe6a6ac33f8d90dcd2" [[deps.AbstractFFTs]] deps = ["LinearAlgebra"] -git-tree-sha1 = "16b6dbc4cf7caee4e1e75c49485ec67b667098a0" +git-tree-sha1 = "d92ad398961a3ed262d8bf04a1a2b8340f915fef" uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" -version = "1.3.1" -weakdeps = ["ChainRulesCore"] +version = "1.5.0" +weakdeps = ["ChainRulesCore", "Test"] [deps.AbstractFFTs.extensions] AbstractFFTsChainRulesCoreExt = "ChainRulesCore" + AbstractFFTsTestExt = "Test" [[deps.Adapt]] deps = ["LinearAlgebra", "Requires"] -git-tree-sha1 = "76289dc51920fdc6e0013c872ba9551d54961c24" +git-tree-sha1 = "6a55b747d1812e699320963ffde36f1ebdda4099" uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" -version = "3.6.2" +version = "4.0.4" weakdeps = ["StaticArrays"] [deps.Adapt.extensions] @@ -50,9 +51,9 @@ version = "1.0.1" [[deps.BangBang]] deps = ["Compat", "ConstructionBase", "InitialValues", "LinearAlgebra", "Requires", "Setfield", "Tables"] -git-tree-sha1 = "54b00d1b93791f8e19e31584bd30f2cb6004614b" +git-tree-sha1 = "7aa7ad1682f3d5754e3491bb59b8103cae28e3a3" uuid = "198e06fe-97b7-11e9-32a5-e1d131e6ad66" -version = "0.3.38" +version = "0.3.40" [deps.BangBang.extensions] BangBangChainRulesCoreExt = "ChainRulesCore" @@ -77,27 +78,31 @@ uuid = "9718e550-a3fa-408a-8086-8db961cd8217" version = "0.1.1" [[deps.BitFlags]] -git-tree-sha1 = "43b1a4a8f797c1cddadf60499a8a077d4af2cd2d" +git-tree-sha1 = "2dc09997850d68179b69dafb58ae806167a32b1b" uuid = "d1d4a3ce-64b1-5f1a-9ba4-7e7e69966f35" -version = "0.1.7" +version = "0.1.8" [[deps.ChainRulesCore]] -deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "e30f2f4e20f7f186dc36529910beaedc60cfa644" +deps = ["Compat", "LinearAlgebra"] +git-tree-sha1 = "575cd02e080939a33b6df6c5853d14924c08e35b" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "1.16.0" +version = "1.23.0" +weakdeps = ["SparseArrays"] + + [deps.ChainRulesCore.extensions] + ChainRulesCoreSparseArraysExt = "SparseArrays" [[deps.CodecZlib]] deps = ["TranscodingStreams", "Zlib_jll"] -git-tree-sha1 = "9c209fb7536406834aa938fb149964b985de6c83" +git-tree-sha1 = "59939d8a997469ee05c4b4944560a820f9ba0d73" uuid = "944b1d66-785c-5afd-91f1-9de20f533193" -version = "0.7.1" +version = "0.7.4" [[deps.Compat]] -deps = ["UUIDs"] -git-tree-sha1 = "7a60c856b9fa189eb34f5f8a6f6b5529b7942957" +deps = ["TOML", "UUIDs"] +git-tree-sha1 = "c955881e3c981181362ae4088b35995446298b80" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "4.6.1" +version = "4.14.0" weakdeps = ["Dates", "LinearAlgebra"] [deps.Compat.extensions] @@ -106,7 +111,7 @@ weakdeps = ["Dates", "LinearAlgebra"] [[deps.CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" -version = "1.0.5+0" +version = "1.1.0+0" [[deps.CompositionsBase]] git-tree-sha1 = "802bb88cd69dfd1509f6670416bd4434015693ad" @@ -121,21 +126,21 @@ version = "0.1.2" [[deps.ConcurrentUtilities]] deps = ["Serialization", "Sockets"] -git-tree-sha1 = "96d823b94ba8d187a6d8f0826e731195a74b90e9" +git-tree-sha1 = "6cbbd4d241d7e6579ab354737f4dd95ca43946e1" uuid = "f0e56b4a-5159-44fe-b623-3e5288b988bb" -version = "2.2.0" +version = "2.4.1" [[deps.Conda]] deps = ["Downloads", "JSON", "VersionParsing"] -git-tree-sha1 = "e32a90da027ca45d84678b826fffd3110bb3fc90" +git-tree-sha1 = "51cab8e982c5b598eea9c8ceaced4b58d9dd37c9" uuid = "8f4d0f93-b110-5947-807f-2305c1781a2d" -version = "1.8.0" +version = "1.10.0" [[deps.ConstructionBase]] deps = ["LinearAlgebra"] -git-tree-sha1 = "738fec4d684a9a6ee9598a8bfee305b26831f28c" +git-tree-sha1 = "260fd2400ed2dab602a7c15cf10c1933c59930a2" uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9" -version = "1.5.2" +version = "1.5.5" [deps.ConstructionBase.extensions] ConstructionBaseIntervalSetsExt = "IntervalSets" @@ -169,26 +174,26 @@ version = "4.1.1" [[deps.DSP]] deps = ["Compat", "FFTW", "IterTools", "LinearAlgebra", "Polynomials", "Random", "Reexport", "SpecialFunctions", "Statistics"] -git-tree-sha1 = "da8b06f89fce9996443010ef92572b193f8dca1f" +git-tree-sha1 = "f7f4319567fe769debfcf7f8c03d8da1dd4e2fb0" uuid = "717857b8-e6f2-59f4-9121-6e50c889abd2" -version = "0.7.8" +version = "0.7.9" [[deps.DataAPI]] -git-tree-sha1 = "8da84edb865b0b5b0100c0666a9bc9a0b71c553c" +git-tree-sha1 = "abe83f3a2f1b857aac70ef8b269080af17764bbe" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" -version = "1.15.0" +version = "1.16.0" [[deps.DataFrames]] -deps = ["Compat", "DataAPI", "Future", "InlineStrings", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "Markdown", "Missings", "PooledArrays", "PrettyTables", "Printf", "REPL", "Random", "Reexport", "SentinelArrays", "SnoopPrecompile", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"] -git-tree-sha1 = "aa51303df86f8626a962fccb878430cdb0a97eee" +deps = ["Compat", "DataAPI", "DataStructures", "Future", "InlineStrings", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "Markdown", "Missings", "PooledArrays", "PrecompileTools", "PrettyTables", "Printf", "REPL", "Random", "Reexport", "SentinelArrays", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"] +git-tree-sha1 = "04c738083f29f86e62c8afc341f0967d8717bdb8" uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" -version = "1.5.0" +version = "1.6.1" [[deps.DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] -git-tree-sha1 = "d1fff3a548102f48987a52a2e0d114fa97d730f0" +git-tree-sha1 = "1d0a14036acb104d9e89698bd408f63ab58cdc82" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.18.13" +version = "0.18.20" [[deps.DataValueInterfaces]] git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6" @@ -205,10 +210,15 @@ uuid = "244e2a9f-e319-4986-a169-4d1fe445cd52" version = "0.1.2" [[deps.Distances]] -deps = ["LinearAlgebra", "SparseArrays", "Statistics", "StatsAPI"] -git-tree-sha1 = "49eba9ad9f7ead780bfb7ee319f962c811c6d3b2" +deps = ["LinearAlgebra", "Statistics", "StatsAPI"] +git-tree-sha1 = "66c4c81f259586e8f002eacebc177e1fb06363b0" uuid = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7" -version = "0.10.8" +version = "0.10.11" +weakdeps = ["ChainRulesCore", "SparseArrays"] + + [deps.Distances.extensions] + DistancesChainRulesCoreExt = "ChainRulesCore" + DistancesSparseArraysExt = "SparseArrays" [[deps.Distributed]] deps = ["Random", "Serialization", "Sockets"] @@ -225,11 +235,17 @@ deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"] uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" version = "1.6.0" +[[deps.ExceptionUnwrapping]] +deps = ["Test"] +git-tree-sha1 = "dcb08a0d93ec0b1cdc4af184b26b591e9695423a" +uuid = "460bff9d-24e4-43bc-9d9f-a8973cb893f4" +version = "0.1.10" + [[deps.FFTW]] deps = ["AbstractFFTs", "FFTW_jll", "LinearAlgebra", "MKL_jll", "Preferences", "Reexport"] -git-tree-sha1 = "f9818144ce7c8c41edf5c4c179c684d92aa4d9fe" +git-tree-sha1 = "4820348781ae578893311153d69049a93d05f39d" uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" -version = "1.6.0" +version = "1.8.0" [[deps.FFTW_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -251,18 +267,28 @@ version = "0.1.1" [[deps.FileIO]] deps = ["Pkg", "Requires", "UUIDs"] -git-tree-sha1 = "299dc33549f68299137e51e6d49a13b5b1da9673" +git-tree-sha1 = "82d8afa92ecf4b52d78d869f038ebfb881267322" uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -version = "1.16.1" +version = "1.16.3" [[deps.FileWatching]] uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" -[[deps.Formatting]] -deps = ["Printf"] -git-tree-sha1 = "8339d61043228fdd3eb658d86c926cb282ae72a8" -uuid = "59287772-0a20-5a39-b81b-1366585eb4c0" -version = "0.4.2" +[[deps.FillArrays]] +deps = ["LinearAlgebra"] +git-tree-sha1 = "57f08d5665e76397e96b168f9acc12ab17c84a68" +uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" +version = "1.10.2" + + [deps.FillArrays.extensions] + FillArraysPDMatsExt = "PDMats" + FillArraysSparseArraysExt = "SparseArrays" + FillArraysStatisticsExt = "Statistics" + + [deps.FillArrays.weakdeps] + PDMats = "90014a1f-27ba-587c-ab20-58faa44d9150" + SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" + Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" [[deps.Future]] deps = ["Random"] @@ -270,20 +296,20 @@ uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" [[deps.Graphs]] deps = ["ArnoldiMethod", "Compat", "DataStructures", "Distributed", "Inflate", "LinearAlgebra", "Random", "SharedArrays", "SimpleTraits", "SparseArrays", "Statistics"] -git-tree-sha1 = "1cf1d7dcb4bc32d7b4a5add4232db3750c27ecb4" +git-tree-sha1 = "899050ace26649433ef1af25bc17a815b3db52b7" uuid = "86223c79-3864-5bf0-83f7-82e725a168b6" -version = "1.8.0" +version = "1.9.0" [[deps.HTTP]] -deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"] -git-tree-sha1 = "ba9eca9f8bdb787c6f3cf52cb4a404c0e349a0d1" +deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"] +git-tree-sha1 = "2c3ec1f90bb4a8f7beafb0cffea8a4c3f4e636ab" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "1.9.5" +version = "1.10.6" [[deps.Inflate]] -git-tree-sha1 = "5cd07aab533df5170988219191dfad0519391428" +git-tree-sha1 = "ea8031dea4aff6bd41f1df8f2fdfb25b33626381" uuid = "d25df0c9-e2be-5dd7-82c8-3ad0b3e990b9" -version = "0.1.3" +version = "0.1.4" [[deps.InitialValues]] git-tree-sha1 = "4da0f88e9a39111c2fa3add390ab15f3a44f3ca3" @@ -297,10 +323,10 @@ uuid = "842dd82b-1e85-43dc-bf29-5d0ee9dffc48" version = "1.4.0" [[deps.IntelOpenMP_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "0cb9352ef2e01574eeebdb102948a58740dcaf83" +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "be50fe8df3acbffa0274a744f1a99d29c45a57f4" uuid = "1d5cc7b8-4909-519e-a0f8-d0f5ad9712d0" -version = "2023.1.0+0" +version = "2024.1.0+0" [[deps.InteractiveUtils]] deps = ["Markdown"] @@ -323,9 +349,9 @@ uuid = "92d709cd-6900-40b7-9082-c6be49f344b6" version = "0.2.2" [[deps.IterTools]] -git-tree-sha1 = "fa6287a4469f5e048d763df38279ee729fbd44e5" +git-tree-sha1 = "42d5f897009e7ff2cf88db414a389e5ed1bdd023" uuid = "c8e1da08-722c-5040-9ed9-7db0dc04731e" -version = "1.4.0" +version = "1.10.0" [[deps.IteratorInterfaceExtensions]] git-tree-sha1 = "a3f24677c21f5bbe9d2a714f95dcd58337fb2856" @@ -333,16 +359,16 @@ uuid = "82899510-4779-5014-852e-03e436cf321d" version = "1.0.0" [[deps.JLD2]] -deps = ["FileIO", "MacroTools", "Mmap", "OrderedCollections", "Pkg", "Printf", "Reexport", "Requires", "TranscodingStreams", "UUIDs"] -git-tree-sha1 = "42c17b18ced77ff0be65957a591d34f4ed57c631" +deps = ["FileIO", "MacroTools", "Mmap", "OrderedCollections", "Pkg", "PrecompileTools", "Printf", "Reexport", "Requires", "TranscodingStreams", "UUIDs"] +git-tree-sha1 = "5ea6acdd53a51d897672edb694e3cc2912f3f8a7" uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819" -version = "0.4.31" +version = "0.4.46" [[deps.JLLWrappers]] -deps = ["Preferences"] -git-tree-sha1 = "abc9885a7ca2052a736a600f7fa66209f96506e1" +deps = ["Artifacts", "Preferences"] +git-tree-sha1 = "7e5d6779a1e09a36db2a7b6cff50942a0a7d0fca" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" -version = "1.4.1" +version = "1.5.0" [[deps.JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] @@ -357,9 +383,9 @@ uuid = "b14d175d-62b4-44ba-8fb7-3064adc8c3ec" version = "0.2.4" [[deps.LaTeXStrings]] -git-tree-sha1 = "f2355693d6778a178ade15952b7ac47a4ff97996" +git-tree-sha1 = "50901ebc375ed41dbf8058da26f9de442febbbec" uuid = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" -version = "1.3.0" +version = "1.3.1" [[deps.LazyArtifacts]] deps = ["Artifacts", "Pkg"] @@ -368,21 +394,26 @@ uuid = "4af54fe1-eca0-43a8-85a7-787d91b784e3" [[deps.LibCURL]] deps = ["LibCURL_jll", "MozillaCACerts_jll"] uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21" -version = "0.6.3" +version = "0.6.4" [[deps.LibCURL_jll]] deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"] uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" -version = "7.84.0+0" +version = "8.4.0+0" [[deps.LibGit2]] -deps = ["Base64", "NetworkOptions", "Printf", "SHA"] +deps = ["Base64", "LibGit2_jll", "NetworkOptions", "Printf", "SHA"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" +[[deps.LibGit2_jll]] +deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"] +uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" +version = "1.6.4+0" + [[deps.LibSSH2_jll]] deps = ["Artifacts", "Libdl", "MbedTLS_jll"] uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" -version = "1.10.2+0" +version = "1.11.0+1" [[deps.Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" @@ -399,9 +430,9 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" [[deps.LogExpFunctions]] deps = ["DocStringExtensions", "IrrationalConstants", "LinearAlgebra"] -git-tree-sha1 = "0a1b7c2863e44523180fdb3146534e265a91870b" +git-tree-sha1 = "18144f3e9cbe9b15b070288eef858f71b291ce37" uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688" -version = "0.3.23" +version = "0.3.27" [deps.LogExpFunctions.extensions] LogExpFunctionsChainRulesCoreExt = "ChainRulesCore" @@ -418,15 +449,15 @@ uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" [[deps.LoggingExtras]] deps = ["Dates", "Logging"] -git-tree-sha1 = "cedb76b37bc5a6c702ade66be44f831fa23c681e" +git-tree-sha1 = "c1dd6d7978c12545b4179fb6153b9250c96b0075" uuid = "e6f89c97-d47a-5376-807f-9c37f3926c36" -version = "1.0.0" +version = "1.0.3" [[deps.MKL_jll]] -deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "Pkg"] -git-tree-sha1 = "2ce8695e1e699b68702c03402672a69f54b8aca9" +deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "oneTBB_jll"] +git-tree-sha1 = "80b2833b56d466b3858d565adcd16a4a05f2089b" uuid = "856f044c-d86e-5d09-b602-aeab76dc8ba7" -version = "2022.2.0+0" +version = "2024.1.0+0" [[deps.MLStyle]] git-tree-sha1 = "bc38dff0548128765760c79eb7388a4b37fae2c8" @@ -435,24 +466,24 @@ version = "0.4.17" [[deps.MacroTools]] deps = ["Markdown", "Random"] -git-tree-sha1 = "42324d08725e200c23d4dfb549e0d5d89dede2d2" +git-tree-sha1 = "2fa9ee3e63fd3a4f7a9a4f4744a52f4856de82df" uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" -version = "0.5.10" +version = "0.5.13" [[deps.Markdown]] deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" [[deps.MbedTLS]] -deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "Random", "Sockets"] -git-tree-sha1 = "03a9b9718f5682ecb107ac9f7308991db4ce395b" +deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "NetworkOptions", "Random", "Sockets"] +git-tree-sha1 = "c067a280ddc25f196b5e7df3877c6b226d390aaf" uuid = "739be429-bea8-5141-9913-cc70e7f3736d" -version = "1.1.7" +version = "1.1.9" [[deps.MbedTLS_jll]] deps = ["Artifacts", "Libdl"] uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" -version = "2.28.2+0" +version = "2.28.2+1" [[deps.MicroCollections]] deps = ["BangBang", "InitialValues", "Setfield"] @@ -462,16 +493,16 @@ version = "0.1.4" [[deps.Missings]] deps = ["DataAPI"] -git-tree-sha1 = "f66bdc5de519e8f8ae43bdc598782d35a25b1272" +git-tree-sha1 = "ec4f7fbeab05d7747bdf98eb74d130a2a2ed298d" uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28" -version = "1.1.0" +version = "1.2.0" [[deps.Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" [[deps.MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" -version = "2022.10.11" +version = "2023.1.10" [[deps.NameResolution]] deps = ["PrettyPrint"] @@ -481,41 +512,44 @@ version = "0.1.5" [[deps.NearestNeighbors]] deps = ["Distances", "StaticArrays"] -git-tree-sha1 = "2c3726ceb3388917602169bed973dbc97f1b51a8" +git-tree-sha1 = "ded64ff6d4fdd1cb68dfcbb818c69e144a5b2e4c" uuid = "b8a86587-4115-5ab1-83bc-aa920d37bbce" -version = "0.4.13" +version = "0.4.16" [[deps.NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" version = "1.2.0" [[deps.OffsetArrays]] -deps = ["Adapt"] -git-tree-sha1 = "82d7c9e310fe55aa54996e6f7f94674e2a38fcb4" +git-tree-sha1 = "e64b4f5ea6b7389f6f046d13d4896a8f9c1ba71e" uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" -version = "1.12.9" +version = "1.14.0" +weakdeps = ["Adapt"] + + [deps.OffsetArrays.extensions] + OffsetArraysAdaptExt = "Adapt" [[deps.OpenBLAS_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] uuid = "4536629a-c528-5b80-bd46-f80d51c5b363" -version = "0.3.21+4" +version = "0.3.23+4" [[deps.OpenLibm_jll]] deps = ["Artifacts", "Libdl"] uuid = "05823500-19ac-5b8b-9628-191a04bc5112" -version = "0.8.1+0" +version = "0.8.1+2" [[deps.OpenSSL]] deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "OpenSSL_jll", "Sockets"] -git-tree-sha1 = "51901a49222b09e3743c65b8847687ae5fc78eb2" +git-tree-sha1 = "38cb508d080d21dc1128f7fb04f20387ed4c0af4" uuid = "4d8831e6-92b7-49fb-bdf8-b643e874388c" -version = "1.4.1" +version = "1.4.3" [[deps.OpenSSL_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "6cc6366a14dbe47e5fc8f3cbe2816b1185ef5fc4" +git-tree-sha1 = "3da7367955dcc5c54c1ba4d402ccdc09a1a3e046" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "3.0.8+0" +version = "3.0.13+1" [[deps.OpenSpecFun_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] @@ -524,9 +558,9 @@ uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" version = "0.5.5+0" [[deps.OrderedCollections]] -git-tree-sha1 = "d321bf2de576bf25ec4d3e4360faca399afca282" +git-tree-sha1 = "dfdf5519f235516220579f949664f1bf44e741c5" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" -version = "1.6.0" +version = "1.6.3" [[deps.Parameters]] deps = ["OrderedCollections", "UnPack"] @@ -536,48 +570,50 @@ version = "0.12.3" [[deps.Parsers]] deps = ["Dates", "PrecompileTools", "UUIDs"] -git-tree-sha1 = "a5aef8d4a6e8d81f171b2bd4be5265b01384c74c" +git-tree-sha1 = "8489905bcdbcfac64d1daa51ca07c0d8f0283821" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "2.5.10" +version = "2.8.1" [[deps.Pkg]] deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" -version = "1.9.2" +version = "1.10.0" [[deps.Polynomials]] -deps = ["LinearAlgebra", "RecipesBase"] -git-tree-sha1 = "3aa2bb4982e575acd7583f01531f241af077b163" +deps = ["LinearAlgebra", "RecipesBase", "Setfield", "SparseArrays"] +git-tree-sha1 = "89620a0b5458dca4bf9ea96174fa6422b3adf6f9" uuid = "f27b6e38-b328-58d1-80ce-0feddd5e7a45" -version = "3.2.13" +version = "4.0.8" [deps.Polynomials.extensions] PolynomialsChainRulesCoreExt = "ChainRulesCore" + PolynomialsFFTWExt = "FFTW" PolynomialsMakieCoreExt = "MakieCore" PolynomialsMutableArithmeticsExt = "MutableArithmetics" [deps.Polynomials.weakdeps] ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" + FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" MakieCore = "20f20a25-4f0e-4fdf-b5d1-57303727442b" MutableArithmetics = "d8a4904e-b15c-11e9-3269-09a3773c0cb0" [[deps.PooledArrays]] deps = ["DataAPI", "Future"] -git-tree-sha1 = "a6062fe4063cdafe78f4a0a81cfffb89721b30e7" +git-tree-sha1 = "36d8b4b899628fb92c2749eb488d884a926614d3" uuid = "2dfb63ee-cc39-5dd5-95bd-886bf059d720" -version = "1.4.2" +version = "1.4.3" [[deps.PrecompileTools]] deps = ["Preferences"] -git-tree-sha1 = "259e206946c293698122f63e2b513a7c99a244e8" +git-tree-sha1 = "5aa36f7049a63a1528fe8f7c3f2113413ffd4e1f" uuid = "aea7be01-6a6a-4083-8856-8a6e6704d82a" -version = "1.1.1" +version = "1.2.1" [[deps.Preferences]] deps = ["TOML"] -git-tree-sha1 = "7eb1686b4f04b82f96ed7a4ea5890a4f0c7a09f1" +git-tree-sha1 = "9306f6085165d270f7e3db02af26a400d580f5c6" uuid = "21216c6a-2e73-6563-6e65-726566657250" -version = "1.4.0" +version = "1.4.3" [[deps.PrettyPrint]] git-tree-sha1 = "632eb4abab3449ab30c5e1afaa874f0b98b586e4" @@ -585,10 +621,10 @@ uuid = "8162dcfd-2161-5ef2-ae6c-7681170c5f98" version = "0.2.0" [[deps.PrettyTables]] -deps = ["Crayons", "Formatting", "LaTeXStrings", "Markdown", "Reexport", "StringManipulation", "Tables"] -git-tree-sha1 = "213579618ec1f42dea7dd637a42785a608b1ea9c" +deps = ["Crayons", "LaTeXStrings", "Markdown", "PrecompileTools", "Printf", "Reexport", "StringManipulation", "Tables"] +git-tree-sha1 = "88b895d13d53b5577fd53379d913b9ab9ac82660" uuid = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" -version = "2.2.4" +version = "2.3.1" [[deps.Printf]] deps = ["Unicode"] @@ -596,29 +632,29 @@ uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" [[deps.ProgressMeter]] deps = ["Distributed", "Printf"] -git-tree-sha1 = "d7a7aef8f8f2d537104f170139553b14dfe39fe9" +git-tree-sha1 = "763a8ceb07833dd51bb9e3bbca372de32c0605ad" uuid = "92933f4c-e287-5a05-a399-4b506db050ca" -version = "1.7.2" +version = "1.10.0" [[deps.PyCall]] deps = ["Conda", "Dates", "Libdl", "LinearAlgebra", "MacroTools", "Serialization", "VersionParsing"] -git-tree-sha1 = "62f417f6ad727987c755549e9cd88c46578da562" +git-tree-sha1 = "9816a3826b0ebf49ab4926e2b18842ad8b5c8f04" uuid = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0" -version = "1.95.1" +version = "1.96.4" [[deps.REPL]] deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" [[deps.Random]] -deps = ["SHA", "Serialization"] +deps = ["SHA"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" [[deps.Ratios]] deps = ["Requires"] -git-tree-sha1 = "6d7bb727e76147ba18eed998700998e17b8e4911" +git-tree-sha1 = "1342a47bf3260ee108163042310d26f2be5ec90b" uuid = "c84ed2f1-dad5-54f0-aa8e-dbefe2724439" -version = "0.4.4" +version = "0.4.5" [deps.Ratios.extensions] RatiosFixedPointNumbersExt = "FixedPointNumbers" @@ -661,9 +697,9 @@ version = "0.5.0" [[deps.SentinelArrays]] deps = ["Dates", "Random"] -git-tree-sha1 = "77d3c4726515dca71f6d80fbb5e251088defe305" +git-tree-sha1 = "0e7508ff27ba32f26cd459474ca2ede1bc10991f" uuid = "91c51154-3ec4-41a3-a24f-3f23e20d615c" -version = "1.3.18" +version = "1.4.1" [[deps.Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" @@ -695,30 +731,25 @@ git-tree-sha1 = "4b33e0e081a825dbfaf314decf58fa47e53d6acb" uuid = "47aef6b3-ad0c-573a-a1e2-d07658019622" version = "1.4.0" -[[deps.SnoopPrecompile]] -deps = ["Preferences"] -git-tree-sha1 = "e760a70afdcd461cf01a575947738d359234665c" -uuid = "66db9d55-30c0-4569-8b51-7e840670fc0c" -version = "1.0.3" - [[deps.Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" [[deps.SortingAlgorithms]] deps = ["DataStructures"] -git-tree-sha1 = "a4ada03f999bd01b3a25dcaa30b2d929fe537e00" +git-tree-sha1 = "66e0a8e672a0bdfca2c3f5937efb8538b9ddc085" uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c" -version = "1.1.0" +version = "1.2.1" [[deps.SparseArrays]] deps = ["Libdl", "LinearAlgebra", "Random", "Serialization", "SuiteSparse_jll"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" +version = "1.10.0" [[deps.SpecialFunctions]] deps = ["IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"] -git-tree-sha1 = "ef28127915f4229c971eb43f3fc075dd3fe91880" +git-tree-sha1 = "e2cfc4012a19088254b3950b85c3c1d8882d864d" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "2.2.0" +version = "2.3.1" weakdeps = ["ChainRulesCore"] [deps.SpecialFunctions.extensions] @@ -731,26 +762,31 @@ uuid = "171d559e-b47b-412a-8079-5efa626c420e" version = "0.1.15" [[deps.StaticArrays]] -deps = ["LinearAlgebra", "Random", "StaticArraysCore", "Statistics"] -git-tree-sha1 = "8982b3607a212b070a5e46eea83eb62b4744ae12" +deps = ["LinearAlgebra", "PrecompileTools", "Random", "StaticArraysCore"] +git-tree-sha1 = "bf074c045d3d5ffd956fa0a461da38a44685d6b2" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.5.25" +version = "1.9.3" +weakdeps = ["ChainRulesCore", "Statistics"] + + [deps.StaticArrays.extensions] + StaticArraysChainRulesCoreExt = "ChainRulesCore" + StaticArraysStatisticsExt = "Statistics" [[deps.StaticArraysCore]] -git-tree-sha1 = "6b7ba252635a5eff6a0b0664a41ee140a1c9e72a" +git-tree-sha1 = "36b3d696ce6366023a0ea192b4cd442268995a0d" uuid = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" -version = "1.4.0" +version = "1.4.2" [[deps.Statistics]] deps = ["LinearAlgebra", "SparseArrays"] uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" -version = "1.9.0" +version = "1.10.0" [[deps.StatsAPI]] deps = ["LinearAlgebra"] -git-tree-sha1 = "45a7769a04a3cf80da1c1c7c60caf932e6f4c9f7" +git-tree-sha1 = "1ff449ad350c9c4cbc756624d6f8a8c3ef56d3ed" uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0" -version = "1.6.0" +version = "1.7.0" [[deps.StatsBase]] deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] @@ -759,14 +795,15 @@ uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" version = "0.33.21" [[deps.StringManipulation]] -git-tree-sha1 = "46da2434b41f41ac3594ee9816ce5541c6096123" +deps = ["PrecompileTools"] +git-tree-sha1 = "a04cabe79c5f01f4d723cc6704070ada0b9d46d5" uuid = "892a3eda-7b42-436c-8928-eab12a02cf0e" -version = "0.3.0" +version = "0.3.4" [[deps.SuiteSparse_jll]] -deps = ["Artifacts", "Libdl", "Pkg", "libblastrampoline_jll"] +deps = ["Artifacts", "Libdl", "libblastrampoline_jll"] uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c" -version = "5.10.1+6" +version = "7.2.1+1" [[deps.TOML]] deps = ["Dates"] @@ -780,10 +817,10 @@ uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c" version = "1.0.1" [[deps.Tables]] -deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "OrderedCollections", "TableTraits", "Test"] -git-tree-sha1 = "1544b926975372da01227b382066ab70e574a3ec" +deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "OrderedCollections", "TableTraits"] +git-tree-sha1 = "cb76cf677714c095e535e3501ac7954732aeea2d" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.10.1" +version = "1.11.1" [[deps.Tar]] deps = ["ArgTools", "SHA"] @@ -795,27 +832,48 @@ deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [[deps.ToeplitzMatrices]] -deps = ["AbstractFFTs", "DSP", "LinearAlgebra", "StatsBase"] -git-tree-sha1 = "5a3eae2c89fbe7c91ca596b961f65bd106167504" +deps = ["AbstractFFTs", "DSP", "FillArrays", "LinearAlgebra"] +git-tree-sha1 = "df4e499f6321e72f801aab45336ba76ed06e97db" uuid = "c751599d-da0a-543b-9d20-d0a503d91d24" -version = "0.8.0" +version = "0.8.3" +weakdeps = ["StatsBase"] + + [deps.ToeplitzMatrices.extensions] + ToeplitzMatricesStatsBaseExt = "StatsBase" [[deps.TranscodingStreams]] -deps = ["Random", "Test"] -git-tree-sha1 = "9a6ae7ed916312b41236fcef7e0af564ef934769" +git-tree-sha1 = "71509f04d045ec714c4748c785a59045c3736349" uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa" -version = "0.9.13" +version = "0.10.7" +weakdeps = ["Random", "Test"] + + [deps.TranscodingStreams.extensions] + TestExt = ["Test", "Random"] [[deps.Transducers]] -deps = ["Adapt", "ArgCheck", "BangBang", "Baselet", "CompositionsBase", "DefineSingletons", "Distributed", "InitialValues", "Logging", "Markdown", "MicroCollections", "Requires", "Setfield", "SplittablesBase", "Tables"] -git-tree-sha1 = "25358a5f2384c490e98abd565ed321ffae2cbb37" +deps = ["Adapt", "ArgCheck", "BangBang", "Baselet", "CompositionsBase", "ConstructionBase", "DefineSingletons", "Distributed", "InitialValues", "Logging", "Markdown", "MicroCollections", "Requires", "Setfield", "SplittablesBase", "Tables"] +git-tree-sha1 = "3064e780dbb8a9296ebb3af8f440f787bb5332af" uuid = "28d57a85-8fef-5791-bfe6-a80928e7c999" -version = "0.4.76" +version = "0.4.80" + + [deps.Transducers.extensions] + TransducersBlockArraysExt = "BlockArrays" + TransducersDataFramesExt = "DataFrames" + TransducersLazyArraysExt = "LazyArrays" + TransducersOnlineStatsBaseExt = "OnlineStatsBase" + TransducersReferenceablesExt = "Referenceables" + + [deps.Transducers.weakdeps] + BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e" + DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" + LazyArrays = "5078a376-72f3-5289-bfd5-ec5146d43c02" + OnlineStatsBase = "925886fa-5bf2-5e8e-b522-a9147a512338" + Referenceables = "42d2dcc6-99eb-4e98-b66c-637b7d73030e" [[deps.URIs]] -git-tree-sha1 = "074f993b0ca030848b897beff716d93aca60f06a" +git-tree-sha1 = "67db6cc7b3821e19ebe75791a9dd19c9b1188f2b" uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4" -version = "1.4.2" +version = "1.5.1" [[deps.UUIDs]] deps = ["Random", "SHA"] @@ -836,26 +894,32 @@ version = "1.3.0" [[deps.WoodburyMatrices]] deps = ["LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "de67fa59e33ad156a590055375a30b23c40299d3" +git-tree-sha1 = "5f24e158cf4cee437052371455fe361f526da062" uuid = "efce3f68-66dc-5838-9240-27a6d6f5f9b6" -version = "0.5.5" +version = "0.5.6" [[deps.Zlib_jll]] deps = ["Libdl"] uuid = "83775a58-1f1d-513f-b197-d71354ab007a" -version = "1.2.13+0" +version = "1.2.13+1" [[deps.libblastrampoline_jll]] deps = ["Artifacts", "Libdl"] uuid = "8e850b90-86db-534c-a0d3-1478176c7d93" -version = "5.8.0+0" +version = "5.8.0+1" [[deps.nghttp2_jll]] deps = ["Artifacts", "Libdl"] uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" -version = "1.48.0+0" +version = "1.52.0+1" + +[[deps.oneTBB_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "7d0ea0f4895ef2f5cb83645fa689e52cb55cf493" +uuid = "1317d2d5-d96f-522e-a858-c73665f53c3e" +version = "2021.12.0+0" [[deps.p7zip_jll]] deps = ["Artifacts", "Libdl"] uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" -version = "17.4.0+0" +version = "17.4.0+2" diff --git a/Project.toml b/Project.toml index dfc9dca..ae3327b 100644 --- a/Project.toml +++ b/Project.toml @@ -29,7 +29,7 @@ Distances = "~0.10" FFTW = "1.6,1.7" FLoops = "~0.2" FileIO = "1, 1.8, 1.9" -Interpolations = "~0.13" +Interpolations = "~0.13,~0.14,~0.15" JLD2 = "~0.4" LightGraphs = "1, 1.3" NearestNeighbors = "~0.4" diff --git a/test/creations_test.jl b/test/creations_test.jl index aa23e6b..f665ff3 100644 --- a/test/creations_test.jl +++ b/test/creations_test.jl @@ -9,4 +9,21 @@ y = f.(x) @test f.(3,4) == f(5) y, ψ, res = VortexDistributions.gpecore_exact(1,2,100) -@test length(y) == 100 \ No newline at end of file +@test length(y) == 100 + +# create exact core +N = 100 +L = 100 +dx = L/N +x = LinRange(-L / 2, L / 2-dx, N); y = x +psi0 = one.(x*y') |> complex +psi = Torus(psi0,x,y) + +# make a point vortex +pv = PointVortex(10.0,10.0,1) +nv = PointVortex(-10.0,-10.0,-1) +# make a scalar GPE vortex with exact core +spv = ScalarVortex(pv) +snv = ScalarVortex(nv) +vortex!(psi,spv) +vortex!(psi,snv) \ No newline at end of file From b5cda1566f0a26ada450cdc3108e5ce8c604dc6e Mon Sep 17 00:00:00 2001 From: Ashton Bradley Date: Tue, 30 Apr 2024 12:14:55 +1200 Subject: [PATCH 2/5] fix types;add core remake script --- .github/workflows/CI.yml | 2 +- Manifest.toml | 12 ++- src/cores.jld2 | Bin 9568 -> 8734 bytes src/create_exact_core.jl | 155 +++++++++++++++++++++++++++++++++++++++ src/creation.jl | 28 ++++--- src/types.jl | 4 +- 6 files changed, 180 insertions(+), 21 deletions(-) create mode 100644 src/create_exact_core.jl diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 83f9fe4..81eff29 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -11,7 +11,7 @@ jobs: matrix: version: # - '1.6' - - '1.8' + - '1.10' os: - ubuntu-latest arch: diff --git a/Manifest.toml b/Manifest.toml index a70cd80..6ea9045 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -333,10 +333,16 @@ deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" [[deps.Interpolations]] -deps = ["AxisAlgorithms", "ChainRulesCore", "LinearAlgebra", "OffsetArrays", "Random", "Ratios", "Requires", "SharedArrays", "SparseArrays", "StaticArrays", "WoodburyMatrices"] -git-tree-sha1 = "b7bc05649af456efc75d178846f47006c2c4c3c7" +deps = ["Adapt", "AxisAlgorithms", "ChainRulesCore", "LinearAlgebra", "OffsetArrays", "Random", "Ratios", "Requires", "SharedArrays", "SparseArrays", "StaticArrays", "WoodburyMatrices"] +git-tree-sha1 = "88a101217d7cb38a7b481ccd50d21876e1d1b0e0" uuid = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59" -version = "0.13.6" +version = "0.15.1" + + [deps.Interpolations.extensions] + InterpolationsUnitfulExt = "Unitful" + + [deps.Interpolations.weakdeps] + Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d" [[deps.InvertedIndices]] git-tree-sha1 = "0dc7b50b8d436461be01300fd8cd45aa0274b038" diff --git a/src/cores.jld2 b/src/cores.jld2 index da92d9577a089559941d2b6acf3b514beb1f12bb..8ce84fa9e4a20a50d047e3eb691584b24abc017d 100644 GIT binary patch delta 1116 zcmZ{jYc$(;7{~wrB!aEBQq{RsXi`00Hj~tPT#h|X%d{Aq%T|}N64OK4QN*Ry|Ejlb zrXe{_OIJl@3`c{onO0kCMOj_Oq)I1JcadM*#-W;}OZT$Ro6qw+=X{>?y!pz#i#&4o zQdkc5>{{nGTtKoiwcdgKSA3d|`szMR=s@Z*($mdYP)Y(frhY5A8OK4`OQGRY_4AZT zqr5K-gpW=3<9b4?Ei}sILjPbPZpN&S+hR_p&u`PYjh8%3{SSBqknqpRdL#@Z8{(TV zjD%x2M_^$?WsornW>bG>yH?Q&YQpBhnBMCZLZ^^ly@t8*N*m}-OlZ1Sq87ROfUk34 z*3F+IfHBp6toC3$@NPJ9yF*eyHuQq!_2@LDv3q|vBAo{xu}DVE$_A=SB!50R4=4wm zsv3&&0Sgl}9(OMUMoL{CFZ??A+R3bIGfIKGl(m9g6an#>>n@(SzXJSgtA$Z9)lhDV zUyt7|hUy{x$P{KBuxN_7j>8fl)RnDC4UN!#0;{{QrwK|)lHcfq%^QGUk#j!@Itj>k z^!E0vdjt~_Dvg-!22D|>y&tU?7>jef)!;v&BhpyZU(g4|la3)1GyTvRf2Z5x-~g=N zF!;qoB7?CBRJrZFK^XryHij;K0-UnQTU{^=-^cXi20VER8DcadIXwcy`@XVN90R`Rlx^(H7}okv#{$*Wo2Q< zEUZ~Yk(NW1z}+2}Gx}5s>)=6jjMCYtBq!?buymYE8o@72>)92G2P{&+K> zLIsj8R(isy3L5y+{6u2}<>%PDzja2CxbqA#5{e*vA;XBzLvU;`X=h#z0`7cq;_YGt zCWqQ0q+$eP1Ba%e1;LV~-{XRZ2#yE*>heJ!f0SoIHrl7;LZ`6_~arJTa@H3Ye9`aPSUBS54! zE^`CH&`DV-#CHN?0-CFpm*&e#UQn$)+^St`{aQ&Z0b6az= vHl{CYRpUPJmq56eG5k*8s~c1k48u3$)X3!YgqWlyYvEM}n^ODt*)#tFw6W^` delta 1128 zcmb8uYfMuI6bJBods`G|K@_UUn+6wF$8(U1TaF1h5TPiK35D?xi3HdNQ(g|}KsTJw zwcQOWn012dD6mO+Zxq?WC=3wFD?A*8mY1{zE(8Wd!LD1guO>TRekUjYoNs@jkHVkt ziFrD?)_HZIxE8fCjdei&ogsU@Q5p{i+=VoVAH%5oL(@}J5_Iqw?=aPX9?kVz!bXYXqcJ=MggX;Od->IZ8fZr}0Hz+6q$}pR^eq8{5BW^WK z!V=&}i<&<^QwCAR)q;$u@1QGp*t+gU1sL4U-9`#Uz&ZTVHbXKh28=7hFDLv6@9*Ce zCR<6MGXRT8XVk-0%5+lihmG)wx2WSeS8+HM)t`I;sf3cEoS8GY8IxCb;{>{~y4)5ifO z)7zg_-w(!qT5FC*4ksnqPAr=taDS@G*a;hkJ1A8&S~>!0AubV%>QQKT)G9xIZVc+H zu@;}kaaj9RU48WAByhLl66lg=(B;f-8-OXeKita?el`u86!lDF-VE>);w@%N6wq=x zeAzHn2{m~|IlBRzSt#rP(wl1dK(-Qk=4}ml%!#YZdNuIQ zomkRe>}5FJlE_s~FGC3TQO|aFg&^L8+FL6efu()|q1aWZXte0P-?^?z+yR9fop}_W#8I75k_bm5jc&<3 zA^3D#XZX%+z@E-xadW0t=ZSA~xBs!Kw((v30*%2au+SG}%35#Gj1~Dc?fO4W{4XoF gGRMfZf?_7VX*-2_<3o04Bu{%h!p@B>yTp(A8?P?ve*gdg diff --git a/src/create_exact_core.jl b/src/create_exact_core.jl new file mode 100644 index 0000000..62004a6 --- /dev/null +++ b/src/create_exact_core.jl @@ -0,0 +1,155 @@ +## upgrade of Interpolations or JLD2 may necessitate rerunning +# to rebuild interpolation in new package environment +# Make this a build script? + +using Interpolations, JLD2, LinearAlgebra, ToeplitzMatrices +Λ = 0.8249 + +#Chebyshev methods +function gpecore_exact(K,L=2,N=100,R = K) + #currently r does nothing! + #N = 100 + #L = 2 + #Κ = 1 + #R = 2 # Stretching coordinate. R ~ kappa seems to be a good ballpark + + # Convert Chebyshev grid to [0,L] from [1 -1]; + z,Dz = getChebDMatrix(N) + blank,D2z = getChebD2Matrix(N) + z = vec(reverse(z,dims=2)) + z = (z)*L./2 + Dz = -2*Dz./L + D2z = 4*D2z./L.^2 + + # y is the physical coordinate, range [0 infinity] (i.e y = r) + y = @. R*(1+z)/(1-z) + + #initial guess based on ansatz + ψ = @. y/hypot(1/Λ,y) + ψ[1] = 0 + ψ[end] = 1 + ψ0 = vec(ψ) + + Q = vec(z.^2 .- 2*z .+ 1) + Qmat = repeat(Q,1,N) + Zmat = repeat(2*(z .-1),1,N) + Ymat = repeat(1 ./y,1,N); + + # Second Derivative + residuals = -0.5*( (Q.*(D2z*ψ) + 2*(z .-1).*(Dz*ψ) ).*Q/(4*R^2) + + (Q/(2*R) ./y).*(Dz*ψ) )+ 0.5*K^2 *ψ ./y.^2 + ψ.^3 .- ψ + residuals[1] = 0; residuals[end] =0 + + while sum(abs.(residuals).^2) > 1e-12 + # Second Derivative + residuals = -0.5*( (Q.*(D2z*ψ) + 2*(z .-1).*(Dz*ψ) ).*Q/(4*R^2) + + (Q/(2*R) ./y).*(Dz*ψ) )+ 0.5*K^2 *ψ ./y.^2 + ψ.^3 .- ψ + residuals[1] = 0; residuals[end] =0 + + Jacobi = -0.5*( (Qmat.*(D2z) + Zmat.*(Dz) ).*(Qmat/(4*R^2)) + + (Qmat/(2*R).*Ymat).*(Dz) ) + diagm(0 => 0.5*K^2 ./y.^2)+ diagm(0 => 3*ψ.^2 .- 1) + + + Jacobi[1,:] = [1 zeros(1,N-1)] + Jacobi[N,:] = [zeros(1,N-1) 1] + + + Δ = vec(-4/7*(Jacobi\residuals)) + + ψ = ψ + Δ + ψ[1] = 0 + ψ[end] =1 + end + res = norm(residuals)^2 + return y,ψ,res +end + +""" +`x, DM = chebdif(N,M)` + +computes the differentiation matrices `D1, D2, ..., DM` on Chebyshev nodes. + +Input: + +`N` Size of differentiation matrix. + +`M` Number of derivatives required (integer). + +Note `0 < M <= N-1`. + +Output: + +DM `DM(1:N,1:N,ell)` contains ell-th derivative matrix, ell=1..M. + +The code implements two strategies for enhanced +accuracy suggested by W. Don and S. Solomonoff in +SIAM J. Sci. Comp. Vol. 6, pp. 1253--1268 (1994). +The two strategies are (a) the use of trigonometric +identities to avoid the computation of differences +x(k)-x(j) and (b) the use of the "flipping trick" +which is necessary since sin t can be computed to high +relative precision when t is small whereas sin (pi-t) cannot. +Note added May 2003: It may, in fact, be slightly better not to +implement the strategies (a) and (b). Please consult the following +paper for details: "Spectral Differencing with a Twist", by +R. Baltensperger and M.R. Trummer, to appear in SIAM J. Sci. Comp. + +J.A.C. Weideman, S.C. Reddy 1998. Help notes modified by +JACW, May 2003.""" +function chebdif(N, M) + @assert 0 Int,ceil(N/2)|> Int) # Indices used for flipping trick. + + k = collect(0.0:N-1)' # Compute theta vector. + th = k*π/(N-1) + + x = sin.(π*collect(N-1:-2:1-N)'./(2*(N-1))) # Compute Chebyshev points. + + T = repeat(th/2,N,1)' + DX = 2*sin.(T'.+T).*sin.(T'.-T) # Trigonometric identity. + DX = [DX[1:n1,:]; -reverse(reverse(DX[1:n2,:],dims=2),dims=1)] # Flipping trick. + DX[diagind(DX)] .= 1 # Put 1's on the main diagonal of DX. + + C = Matrix(Toeplitz((-1).^k',(-1).^k')) # C is the matrix with + C[1,:] = C[1,:]*2; + C[N,:] = C[N,:]*2 # entries c(k)/c(j) + C[:,1] = C[:,1]/2; + C[:,N] = C[:,N]/2; + + Z = 1 ./DX # Z contains entries 1/(x(k)-x(j)) + Z[diagind(Z)] .= 0 # with zeros on the diagonal. + + D = Matrix{Float64}(I, N, N) # D contains diff. matrices. + + DM = zeros(N,N,M) + + for ell = 1:M + D = ell*Z.*(C.*repeat(diag(D),1,N) - D) # Off-diagonals + D[diagind(D)] = -sum(D',dims=1) # Correct main diagonal of D + DM[:,:,ell] = D # Store current D in DM + end + + return x, DM +end + +function getChebDMatrix(n) + z, M = chebdif(n, 1) + Dz = M[:,:,1] + return z, Dz +end + +function getChebD2Matrix(n) + z, M = chebdif(n, 2) + D2z = M[:,:,2] + return z, D2z +end + +y,ψ,res = gpecore_exact(1) +ψi = interpolate((y,),ψ,Gridded(Linear())) + +## ansatz core +scalar_ansatz(x) = sqrt(x^2/(1+x^2)) +ψa = interpolate((y,),scalar_ansatz.(y),Gridded(Linear())) + +@save joinpath(@__DIR__,"cores.jld2") ψi ψa \ No newline at end of file diff --git a/src/creation.jl b/src/creation.jl index fbdc008..301be66 100644 --- a/src/creation.jl +++ b/src/creation.jl @@ -213,22 +213,7 @@ function periodic_dipole!(psi::F,dip::Vector{ScalarVortex{T}}) where {T <: CoreS @pack! psi = ψ end - - - -# TODO: dispatch on dipole type -# function periodic_dipole!(psi::F,dip::Dipole) where F <: Field -# @unpack ψ,x,y = psi -# rp = vortex_array(dip.vp)[1:2] -# rn = vortex_array(dip.vn)[1:2] -# @. ψ *= abs(dip.vp(x,y')*dip.vn(x,y')) -# ψ .*= exp.(im*dipole_phase(x,y,rp...,rn...)) -# @pack! psi = ψ -# end - - #Chebyshev methods - function gpecore_exact(K,L=2,N=100,R = K) #currently r does nothing! #N = 100 @@ -367,3 +352,16 @@ function getChebD2Matrix(n) D2z = M[:,:,2] return z, D2z end + + +# TODO: dispatch on dipole type +# function periodic_dipole!(psi::F,dip::Dipole) where F <: Field +# @unpack ψ,x,y = psi +# rp = vortex_array(dip.vp)[1:2] +# rn = vortex_array(dip.vn)[1:2] +# @. ψ *= abs(dip.vp(x,y')*dip.vn(x,y')) +# ψ .*= exp.(im*dipole_phase(x,y,rp...,rn...)) +# @pack! psi = ψ +# end + + diff --git a/src/types.jl b/src/types.jl index e1a7014..4bba8f7 100644 --- a/src/types.jl +++ b/src/types.jl @@ -46,13 +46,13 @@ mutable struct PointVortex <: Vortex end struct Ansatz <: CoreShape - f::Interpolations.GriddedInterpolation{Float64, 1, Float64, Gridded{Linear{Throw{OnGrid}}}, Tuple{Vector{Float64}}} + f::Interpolations.GriddedInterpolation{Float64, 1, Vector{Float64}, Gridded{Linear{Throw{OnGrid}}}, Tuple{Vector{Float64}}} ξ::Float64 Λ::Float64 end struct Exact <: CoreShape - f::Interpolations.GriddedInterpolation{Float64, 1, Float64, Gridded{Linear{Throw{OnGrid}}}, Tuple{Vector{Float64}}} + f::Interpolations.GriddedInterpolation{Float64, 1, Vector{Float64}, Gridded{Linear{Throw{OnGrid}}}, Tuple{Vector{Float64}}} ξ::Float64 end From 7e6176039e35ae1d4c7253d400af4fe2d061bbfa Mon Sep 17 00:00:00 2001 From: Ashton Bradley Date: Tue, 30 Apr 2024 12:21:25 +1200 Subject: [PATCH 3/5] make it 64 bit --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 81eff29..9db0bea 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -15,8 +15,8 @@ jobs: os: - ubuntu-latest arch: - # - x64 - - x86 + - x64 + # - x86 steps: - uses: actions/checkout@v2 - uses: julia-actions/setup-julia@v1 From 69a02e67f651c5761f124a69d19431acc65b6310 Mon Sep 17 00:00:00 2001 From: Ashton Bradley Date: Tue, 30 Apr 2024 12:30:44 +1200 Subject: [PATCH 4/5] bump version --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index ae3327b..f0dfee7 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "VortexDistributions" uuid = "b688e990-d167-11e8-1f13-43a2532b2fa8" authors = ["Ashton Bradley "] -version = "0.3.5" +version = "0.3.6" [deps] Coverage = "a2441757-f6aa-5fb2-8edb-039e3f45d037" From 293757722e1f5c07e02ed0a55577a8c95352b00d Mon Sep 17 00:00:00 2001 From: Ashton Bradley Date: Tue, 30 Apr 2024 12:33:03 +1200 Subject: [PATCH 5/5] @JuliaRegistrator register() --- Manifest.toml | 2 +- Project.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 6ea9045..b2b551b 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.10.2" manifest_format = "2.0" -project_hash = "17bedc7c2c277895f1208abe6a6ac33f8d90dcd2" +project_hash = "1d8dc06d243a76e86ce69ae348939805867f89ad" [[deps.AbstractFFTs]] deps = ["LinearAlgebra"] diff --git a/Project.toml b/Project.toml index f0dfee7..fb1464e 100644 --- a/Project.toml +++ b/Project.toml @@ -29,7 +29,7 @@ Distances = "~0.10" FFTW = "1.6,1.7" FLoops = "~0.2" FileIO = "1, 1.8, 1.9" -Interpolations = "~0.13,~0.14,~0.15" +Interpolations = "~0.15" JLD2 = "~0.4" LightGraphs = "1, 1.3" NearestNeighbors = "~0.4" @@ -40,7 +40,7 @@ SimpleWeightedGraphs = "1, 1.1" SpecialFunctions = "~1,~2" ToeplitzMatrices = "~0.8" UnPack = "1" -julia = "1.7,1.8,1.9" +julia = "1.9,1.10" [extras] SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"