Skip to content

Commit af7fbac

Browse files
Move from using GaussQuadrature to FastGaussQuadrature.jl
1 parent 9f4a732 commit af7fbac

File tree

5 files changed

+72
-71
lines changed

5 files changed

+72
-71
lines changed

.buildkite/Manifest.toml

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

33
julia_version = "1.10.8"
44
manifest_format = "2.0"
5-
project_hash = "6ab89829ea190189b0319a6f8e22b3515e5283c2"
5+
project_hash = "08a56a97851a386e63bd497ee2d35065349e6442"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "e2478490447631aedba0823d4d7a80b2cc8cdb32"
@@ -327,10 +327,10 @@ weakdeps = ["CUDA", "MPI"]
327327
ClimaCommsMPIExt = "MPI"
328328

329329
[[deps.ClimaCore]]
330-
deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaComms", "CubedSphere", "DataStructures", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "UnrolledUtilities"]
330+
deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaComms", "CubedSphere", "DataStructures", "FastGaussQuadrature", "ForwardDiff", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "UnrolledUtilities"]
331331
path = ".."
332332
uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
333-
version = "0.14.27"
333+
version = "0.14.29"
334334
weakdeps = ["CUDA", "Krylov"]
335335

336336
[deps.ClimaCore.extensions]
@@ -744,6 +744,12 @@ git-tree-sha1 = "acebe244d53ee1b461970f8910c235b259e772ef"
744744
uuid = "9aa1b823-49e4-5ca5-8b0f-3971ec8bab6a"
745745
version = "0.3.2"
746746

747+
[[deps.FastGaussQuadrature]]
748+
deps = ["LinearAlgebra", "SpecialFunctions", "StaticArrays"]
749+
git-tree-sha1 = "fd923962364b645f3719855c88f7074413a6ad92"
750+
uuid = "442a2c76-b920-505d-bb47-c5924d526838"
751+
version = "1.0.2"
752+
747753
[[deps.FastPower]]
748754
git-tree-sha1 = "58c3431137131577a7c379d00fea00be524338fb"
749755
uuid = "a4df4552-cc26-4903-aec0-212e50a0e84b"
@@ -896,12 +902,6 @@ git-tree-sha1 = "9cb62849057df859575fc1dda1e91b82f8609709"
896902
uuid = "d2c73de3-f751-5644-a686-071e5b155ba9"
897903
version = "0.73.13+0"
898904

899-
[[deps.GaussQuadrature]]
900-
deps = ["SpecialFunctions"]
901-
git-tree-sha1 = "eb6f1f48aa994f3018cbd029a17863c6535a266d"
902-
uuid = "d54b0c1a-921d-58e0-8e36-89d8069c0969"
903-
version = "0.5.8"
904-
905905
[[deps.Gettext_jll]]
906906
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "XML2_jll"]
907907
git-tree-sha1 = "9b02998aba7bf074d14de89f9d37ca24a1a0b046"

.buildkite/Project.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def"
2121
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
2222
FastBroadcast = "7034ab61-46d4-4ed7-9d0f-46aef9175898"
2323
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
24-
GaussQuadrature = "d54b0c1a-921d-58e0-8e36-89d8069c0969"
2524
GilbertCurves = "88fa7841-ef32-4516-bb70-c6ec135699d9"
2625
IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
2726
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
1010
ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
1111
CubedSphere = "7445602f-e544-4518-8976-18f8e8ae6cdb"
1212
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
13+
FastGaussQuadrature = "442a2c76-b920-505d-bb47-c5924d526838"
1314
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
14-
GaussQuadrature = "d54b0c1a-921d-58e0-8e36-89d8069c0969"
1515
GilbertCurves = "88fa7841-ef32-4516-bb70-c6ec135699d9"
1616
HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
1717
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
@@ -51,8 +51,8 @@ CubedSphere = "0.2, 0.3"
5151
DataStructures = "0.18.13"
5252
Dates = "1"
5353
FastBroadcast = "0.3.1"
54+
FastGaussQuadrature = "1.0.2"
5455
ForwardDiff = "0.10.15"
55-
GaussQuadrature = "0.5.8"
5656
GilbertCurves = "0.1"
5757
HDF5 = "0.16.16, 0.17"
5858
InteractiveUtils = "1"

benchmarks/bickleyjet/Manifest.toml

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ version = "0.1.42"
4444

4545
[[deps.Adapt]]
4646
deps = ["LinearAlgebra", "Requires"]
47-
git-tree-sha1 = "cd8b948862abee8f3d3e9b73a102a9ca924debb0"
47+
git-tree-sha1 = "f7817e2e585aa6d924fd714df1e2a84be7896c60"
4848
uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
49-
version = "4.2.0"
49+
version = "4.3.0"
5050
weakdeps = ["SparseArrays", "StaticArrays"]
5151

5252
[deps.Adapt.extensions]
@@ -127,16 +127,16 @@ version = "1.1.1"
127127
oneAPI = "8f75cd03-7ff8-4ecb-9b8f-daf728133b1b"
128128

129129
[[deps.BFloat16s]]
130-
deps = ["LinearAlgebra", "Printf", "Random", "Test"]
131-
git-tree-sha1 = "2c7cc21e8678eff479978a0a2ef5ce2f51b63dff"
130+
deps = ["LinearAlgebra", "Printf", "Random"]
131+
git-tree-sha1 = "3b642331600250f592719140c60cf12372b82d66"
132132
uuid = "ab4f0b2a-ad5b-11e8-123f-65d77653426b"
133-
version = "0.5.0"
133+
version = "0.5.1"
134134

135135
[[deps.BandedMatrices]]
136136
deps = ["ArrayLayouts", "FillArrays", "LinearAlgebra", "PrecompileTools"]
137-
git-tree-sha1 = "4a591da886b61415e2c0dea130d28da1e9077cfb"
137+
git-tree-sha1 = "614c6aba1d562191d9832df2af24f594aa7ebf61"
138138
uuid = "aae01518-5342-5314-be14-df237901396f"
139-
version = "1.9.2"
139+
version = "1.9.3"
140140
weakdeps = ["SparseArrays"]
141141

142142
[deps.BandedMatrices.extensions]
@@ -158,12 +158,13 @@ version = "0.1.9"
158158

159159
[[deps.BlockArrays]]
160160
deps = ["ArrayLayouts", "FillArrays", "LinearAlgebra"]
161-
git-tree-sha1 = "1ded9033f6067573314b27cd4b9ff01a1ba92cff"
161+
git-tree-sha1 = "c633e7cea8a6eb9bed5d67e8fb184df5789b82e6"
162162
uuid = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
163-
version = "1.4.0"
164-
weakdeps = ["BandedMatrices"]
163+
version = "1.5.0"
164+
weakdeps = ["Adapt", "BandedMatrices"]
165165

166166
[deps.BlockArrays.extensions]
167+
BlockArraysAdaptExt = "Adapt"
167168
BlockArraysBandedMatricesExt = "BandedMatrices"
168169

169170
[[deps.Bzip2_jll]]
@@ -178,10 +179,10 @@ uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82"
178179
version = "0.5.0"
179180

180181
[[deps.CUDA]]
181-
deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CUDA_Driver_jll", "CUDA_Runtime_Discovery", "CUDA_Runtime_jll", "Crayons", "DataFrames", "ExprTools", "GPUArrays", "GPUCompiler", "KernelAbstractions", "LLVM", "LLVMLoopInfo", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "NVTX", "Preferences", "PrettyTables", "Printf", "Random", "Random123", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "StaticArrays", "Statistics", "demumble_jll"]
182-
git-tree-sha1 = "7be665c420b5d16059b1ba00b1dbb4e85012fa65"
182+
deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CUDA_Driver_jll", "CUDA_Runtime_Discovery", "CUDA_Runtime_jll", "Crayons", "DataFrames", "ExprTools", "GPUArrays", "GPUCompiler", "GPUToolbox", "KernelAbstractions", "LLVM", "LLVMLoopInfo", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "NVTX", "Preferences", "PrettyTables", "Printf", "Random", "Random123", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "StaticArrays", "Statistics", "demumble_jll"]
183+
git-tree-sha1 = "049d804a037ed39300722bcad4b7a538eabe1e47"
183184
uuid = "052768ef-5323-5732-b1bb-66c8b64840ba"
184-
version = "5.6.1"
185+
version = "5.7.1"
185186

186187
[deps.CUDA.extensions]
187188
ChainRulesCoreExt = "ChainRulesCore"
@@ -195,9 +196,9 @@ version = "5.6.1"
195196

196197
[[deps.CUDA_Driver_jll]]
197198
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
198-
git-tree-sha1 = "14996d716a2eaaeccfc8d7bc854dd87fde720ac1"
199+
git-tree-sha1 = "f69205592dbd3721a156245b6dd837206786a848"
199200
uuid = "4ee394cb-3365-5eb0-8335-949819d2adfc"
200-
version = "0.10.4+0"
201+
version = "0.12.1+1"
201202

202203
[[deps.CUDA_Runtime_Discovery]]
203204
deps = ["Libdl"]
@@ -207,15 +208,15 @@ version = "0.3.5"
207208

208209
[[deps.CUDA_Runtime_jll]]
209210
deps = ["Artifacts", "CUDA_Driver_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"]
210-
git-tree-sha1 = "17f1536c600133f7c4113bae0a2d98dbf27c7ebc"
211+
git-tree-sha1 = "99f1c6b659c14bbb3492246791bb4928a40ceb84"
211212
uuid = "76a88914-d11a-5bdc-97e0-2f5a05c973a2"
212-
version = "0.15.5+0"
213+
version = "0.16.1+0"
213214

214215
[[deps.Cairo_jll]]
215216
deps = ["Artifacts", "Bzip2_jll", "CompilerSupportLibraries_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "JLLWrappers", "LZO_jll", "Libdl", "Pixman_jll", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"]
216-
git-tree-sha1 = "009060c9a6168704143100f36ab08f06c2af4642"
217+
git-tree-sha1 = "2ac646d71d0d24b44f3f8c84da8c9f4d70fb67df"
217218
uuid = "83423d85-b0ee-5818-9007-b63ccbeb887a"
218-
version = "1.18.2+1"
219+
version = "1.18.4+0"
219220

220221
[[deps.ClimaComms]]
221222
deps = ["Adapt", "Logging", "LoggingExtras"]
@@ -232,10 +233,10 @@ version = "0.6.6"
232233
MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
233234

234235
[[deps.ClimaCore]]
235-
deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaComms", "CubedSphere", "DataStructures", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "UnrolledUtilities"]
236+
deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaComms", "CubedSphere", "DataStructures", "FastGaussQuadrature", "ForwardDiff", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "UnrolledUtilities"]
236237
path = "../.."
237238
uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
238-
version = "0.14.26"
239+
version = "0.14.29"
239240

240241
[deps.ClimaCore.extensions]
241242
ClimaCoreCUDAExt = "CUDA"
@@ -361,9 +362,9 @@ version = "1.7.0"
361362

362363
[[deps.DataStructures]]
363364
deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
364-
git-tree-sha1 = "1d0a14036acb104d9e89698bd408f63ab58cdc82"
365+
git-tree-sha1 = "4e1fe97fdaed23e9dc21d4d664bea76b65fc50a0"
365366
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
366-
version = "0.18.20"
367+
version = "0.18.22"
367368

368369
[[deps.DataValueInterfaces]]
369370
git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6"
@@ -399,10 +400,9 @@ uuid = "b552c78f-8df3-52c6-915a-8e097449b14b"
399400
version = "1.15.1"
400401

401402
[[deps.DocStringExtensions]]
402-
deps = ["LibGit2"]
403-
git-tree-sha1 = "2fb1e02f2b635d0845df5d7c167fec4dd739b00d"
403+
git-tree-sha1 = "e7b7e6f178525d17c720ab9c081e4ef04429f860"
404404
uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
405-
version = "0.9.3"
405+
version = "0.9.4"
406406

407407
[[deps.Downloads]]
408408
deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
@@ -444,6 +444,12 @@ git-tree-sha1 = "466d45dc38e15794ec7d5d63ec03d776a9aff36e"
444444
uuid = "b22a6f82-2f65-5046-a5b2-351ab43fb4e5"
445445
version = "4.4.4+1"
446446

447+
[[deps.FastGaussQuadrature]]
448+
deps = ["LinearAlgebra", "SpecialFunctions", "StaticArrays"]
449+
git-tree-sha1 = "fd923962364b645f3719855c88f7074413a6ad92"
450+
uuid = "442a2c76-b920-505d-bb47-c5924d526838"
451+
version = "1.0.2"
452+
447453
[[deps.FileWatching]]
448454
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
449455

@@ -526,9 +532,14 @@ version = "0.2.0"
526532

527533
[[deps.GPUCompiler]]
528534
deps = ["ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "PrecompileTools", "Preferences", "Scratch", "Serialization", "TOML", "TimerOutputs", "UUIDs"]
529-
git-tree-sha1 = "199f213e40a7982e9138bc9edc3299419d510390"
535+
git-tree-sha1 = "b08c164134dd0dbc76ff54e45e016cf7f30e16a4"
530536
uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
531-
version = "1.2.0"
537+
version = "1.3.2"
538+
539+
[[deps.GPUToolbox]]
540+
git-tree-sha1 = "15d8b0f5a6dca9bf8c02eeaf6687660dafa638d0"
541+
uuid = "096a3bc2-3ced-46d0-87f4-dd12716f4bfc"
542+
version = "0.2.0"
532543

533544
[[deps.GR]]
534545
deps = ["Artifacts", "Base64", "DelimitedFiles", "Downloads", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Preferences", "Printf", "Qt6Wayland_jll", "Random", "Serialization", "Sockets", "TOML", "Tar", "Test", "p7zip_jll"]
@@ -542,12 +553,6 @@ git-tree-sha1 = "9cb62849057df859575fc1dda1e91b82f8609709"
542553
uuid = "d2c73de3-f751-5644-a686-071e5b155ba9"
543554
version = "0.73.13+0"
544555

545-
[[deps.GaussQuadrature]]
546-
deps = ["SpecialFunctions"]
547-
git-tree-sha1 = "eb6f1f48aa994f3018cbd029a17863c6535a266d"
548-
uuid = "d54b0c1a-921d-58e0-8e36-89d8069c0969"
549-
version = "0.5.8"
550-
551556
[[deps.Gettext_jll]]
552557
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "XML2_jll"]
553558
git-tree-sha1 = "9b02998aba7bf074d14de89f9d37ca24a1a0b046"
@@ -671,10 +676,10 @@ uuid = "82899510-4779-5014-852e-03e436cf321d"
671676
version = "1.0.0"
672677

673678
[[deps.JLFzf]]
674-
deps = ["Pipe", "REPL", "Random", "fzf_jll"]
675-
git-tree-sha1 = "71b48d857e86bf7a1838c4736545699974ce79a2"
679+
deps = ["REPL", "Random", "fzf_jll"]
680+
git-tree-sha1 = "1d4015b1eb6dc3be7e6c400fbd8042fe825a6bac"
676681
uuid = "1019f520-868f-41f5-a6de-eb00f4b6a39c"
677-
version = "0.1.9"
682+
version = "0.1.10"
678683

679684
[[deps.JLLWrappers]]
680685
deps = ["Artifacts", "Preferences"]
@@ -975,9 +980,9 @@ weakdeps = ["Adapt", "CUDA"]
975980

976981
[[deps.NVTX]]
977982
deps = ["Colors", "JuliaNVTXCallbacks_jll", "Libdl", "NVTX_jll"]
978-
git-tree-sha1 = "6a6f8bfaa91bb2e40ff562ab9f30dc827741daef"
983+
git-tree-sha1 = "1a24c3430fa2ef3317c4c97fa7e431ef45793bd2"
979984
uuid = "5da4648a-3479-48b8-97b9-01cb529c0a1f"
980-
version = "0.3.5"
985+
version = "1.0.0"
981986

982987
[[deps.NVTX_jll]]
983988
deps = ["Artifacts", "JLLWrappers", "Libdl"]
@@ -1069,16 +1074,11 @@ git-tree-sha1 = "8489905bcdbcfac64d1daa51ca07c0d8f0283821"
10691074
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
10701075
version = "2.8.1"
10711076

1072-
[[deps.Pipe]]
1073-
git-tree-sha1 = "6842804e7867b115ca9de748a0cf6b364523c16d"
1074-
uuid = "b98c9c47-44ae-5843-9183-064241ee97a0"
1075-
version = "1.3.0"
1076-
10771077
[[deps.Pixman_jll]]
10781078
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LLVMOpenMP_jll", "Libdl"]
1079-
git-tree-sha1 = "35621f10a7531bc8fa58f74610b1bfb70a3cfc6b"
1079+
git-tree-sha1 = "db76b1ecd5e9715f3d043cec13b2ec93ce015d53"
10801080
uuid = "30392449-352a-5448-841d-b1acce4e97dc"
1081-
version = "0.43.4+0"
1081+
version = "0.44.2+0"
10821082

10831083
[[deps.Pkg]]
10841084
deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
@@ -1105,9 +1105,9 @@ version = "1.4.3"
11051105

11061106
[[deps.Plots]]
11071107
deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "JLFzf", "JSON", "LaTeXStrings", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "Pkg", "PlotThemes", "PlotUtils", "PrecompileTools", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "RelocatableFolders", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "TOML", "UUIDs", "UnicodeFun", "UnitfulLatexify", "Unzip"]
1108-
git-tree-sha1 = "dae01f8c2e069a683d3a6e17bbae5070ab94786f"
1108+
git-tree-sha1 = "24be21541580495368c35a6ccef1454e7b5015be"
11091109
uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
1110-
version = "1.40.9"
1110+
version = "1.40.11"
11111111

11121112
[deps.Plots.extensions]
11131113
FileIOExt = "FileIO"
@@ -1218,9 +1218,9 @@ version = "0.6.12"
12181218

12191219
[[deps.RecursiveArrayTools]]
12201220
deps = ["Adapt", "ArrayInterface", "DocStringExtensions", "GPUArraysCore", "IteratorInterfaceExtensions", "LinearAlgebra", "RecipesBase", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables"]
1221-
git-tree-sha1 = "e96b644f7bfbf1015f8e42a7c7abfae2a48fafbf"
1221+
git-tree-sha1 = "112c876cee36a5784df19098b55db2b238afc36a"
12221222
uuid = "731186ca-8d62-57ce-b412-fbd966d074cd"
1223-
version = "3.31.0"
1223+
version = "3.31.2"
12241224

12251225
[deps.RecursiveArrayTools.extensions]
12261226
RecursiveArrayToolsFastBroadcastExt = "FastBroadcast"
@@ -1497,9 +1497,9 @@ uuid = "45397f5d-5981-4c77-b2b3-fc36d6e9b728"
14971497
version = "1.6.4"
14981498

14991499
[[deps.UnrolledUtilities]]
1500-
git-tree-sha1 = "6ada9151b27cd769bd4626e39d24f873d5794123"
1500+
git-tree-sha1 = "a9ebeb4308eaacfe49f71594c0fe38c0c655734f"
15011501
uuid = "0fe1646c-419e-43be-ac14-22321958931b"
1502-
version = "0.1.8"
1502+
version = "0.1.9"
15031503
weakdeps = ["StaticArrays"]
15041504

15051505
[deps.UnrolledUtilities.extensions]

src/Quadratures/Quadratures.jl

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
module Quadratures
33

4-
import GaussQuadrature
4+
import FastGaussQuadrature
55
import StaticArrays: SVector, SMatrix, MMatrix
66
import LinearAlgebra: Diagonal
77

@@ -53,6 +53,8 @@ function quadrature_points end
5353
GLL{Nq}()
5454
5555
Gauss-Legendre-Lobatto quadrature using `Nq` quadrature points.
56+
57+
https://mathworld.wolfram.com/LobattoQuadrature.html
5658
"""
5759
struct GLL{Nq} <: QuadratureStyle{Nq} end
5860

@@ -61,8 +63,8 @@ Base.show(io::IO, ::GLL{Nq}) where {Nq} =
6163

6264
unique_degrees_of_freedom(::GLL{Nq}) where {Nq} = Nq - 1
6365
@generated function quadrature_points(::Type{FT}, ::GLL{Nq}) where {FT, Nq}
64-
points, weights = GaussQuadrature.legendre(FT, Nq, GaussQuadrature.both)
65-
:($(SVector{Nq}(points)), $(SVector{Nq}(weights)))
66+
points, weights = FastGaussQuadrature.gausslobatto(Nq)
67+
:($(SVector{Nq, FT}(points)), $(SVector{Nq, FT}(weights)))
6668
end
6769

6870
"""
@@ -77,8 +79,8 @@ Base.show(io::IO, ::GL{Nq}) where {Nq} =
7779

7880
unique_degrees_of_freedom(::GL{Nq}) where {Nq} = Nq
7981
@generated function quadrature_points(::Type{FT}, ::GL{Nq}) where {FT, Nq}
80-
points, weights = GaussQuadrature.legendre(FT, Nq, GaussQuadrature.neither)
81-
:($(SVector{Nq}(points)), $(SVector{Nq}(weights)))
82+
points, weights = FastGaussQuadrature.gausslegendre(Nq)
83+
:($(SVector{Nq, FT}(points)), $(SVector{Nq, FT}(weights)))
8284
end
8385

8486
"""
@@ -220,7 +222,7 @@ end
220222
quadrature_points(FT, quadfrom())[1],
221223
)
222224
end
223-
225+
#=
224226
"""
225227
V = orthonormal_poly(points, quad)
226228
@@ -247,7 +249,7 @@ function spectral_filter_matrix(
247249
V = orthonormal_poly(points, quad)
248250
return V * Diagonal(Σ) / V
249251
end
250-
252+
=#
251253
function cutoff_filter_matrix(
252254
::Type{FT},
253255
quad::GLL{Nq},

0 commit comments

Comments
 (0)