Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use Kronecker.KroneckerProduct only at higher N in 3D #178

Merged
merged 2 commits into from
Jul 26, 2024
Merged

use Kronecker.KroneckerProduct only at higher N in 3D #178

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ae6977
use Kronecker.KroneckerProduct more sparingly
jlchan Jul 26, 2024
4da9c88
adjust threshhold
jlchan Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions src/RefElemData_polynomial.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,11 +345,11 @@ function RefElemData(elem::Quad,
M1D = Vq1D' * diagm(wq1D) * Vq1D

# form kronecker products of multidimensional matrices to invert/multiply
VDM = kronecker(VDM_1D, VDM_1D)
invVDM = kronecker(invVDM_1D, invVDM_1D)
invM = kronecker(invM_1D, invM_1D)
VDM = kron(VDM_1D, VDM_1D)
invVDM = kron(invVDM_1D, invVDM_1D)
invM = kron(invM_1D, invM_1D)

M = kronecker(M1D, M1D)
M = kron(M1D, M1D)

_, Vr, Vs = basis(elem, N, r, s)
Dr, Ds = (A -> A * invVDM).((Vr, Vs))
Expand All @@ -363,7 +363,7 @@ function RefElemData(elem::Quad,

# quadrature nodes - build from 1D nodes.
rq, sq, wq = tensor_product_quadrature(elem, approximation_type.data.quad_rule_1D...)
Vq = kronecker(Vq1D, Vq1D) # vandermonde(elem, N, rq, sq, tq) * invVDM
Vq = kron(Vq1D, Vq1D) # vandermonde(elem, N, rq, sq, tq) * invVDM
Pq = invM * (Vq' * diagm(wq))

Vf = vandermonde(elem, N, rf, sf) * invVDM
Expand All @@ -372,7 +372,7 @@ function RefElemData(elem::Quad,
# plotting nodes
rp1D = LinRange(-1, 1, Nplot + 1)
Vp1D = vandermonde(Line(), N, rp1D) / VDM_1D
Vp = kronecker(Vp1D, Vp1D)
Vp = kron(Vp1D, Vp1D)
rp, sp = vec.(StartUpDG.NodesAndModes.meshgrid(rp1D, rp1D))

return RefElemData(elem, approximation_type, N, fv, V1,
Expand Down Expand Up @@ -406,11 +406,15 @@ function RefElemData(elem::Hex,
M1D = Vq1D' * diagm(wq1D) * Vq1D

# form kronecker products of multidimensional matrices to invert/multiply
VDM = kronecker(VDM_1D, VDM_1D, VDM_1D)
invVDM = kronecker(invVDM_1D, invVDM_1D, invVDM_1D)
invM = kronecker(invM_1D, invM_1D, invM_1D)
# use dense matrix "kron" if N is small.
# use memory-saving "kronecker" if N is large.
build_kronecker_product = (N < 8) ? kron : kronecker

M = kronecker(M1D, M1D, M1D)
VDM = build_kronecker_product(VDM_1D, VDM_1D, VDM_1D)
invVDM = build_kronecker_product(invVDM_1D, invVDM_1D, invVDM_1D)
invM = build_kronecker_product(invM_1D, invM_1D, invM_1D)

M = build_kronecker_product(M1D, M1D, M1D)

_, Vr, Vs, Vt = basis(elem, N, r, s, t)
Dr, Ds, Dt = (A -> A * invVDM).((Vr, Vs, Vt))
Expand All @@ -424,7 +428,7 @@ function RefElemData(elem::Hex,

# quadrature nodes - build from 1D nodes.
rq, sq, tq, wq = tensor_product_quadrature(elem, approximation_type.data.quad_rule_1D...)
Vq = kronecker(Vq1D, Vq1D, Vq1D) # vandermonde(elem, N, rq, sq, tq) * invVDM
Vq = build_kronecker_product(Vq1D, Vq1D, Vq1D) # vandermonde(elem, N, rq, sq, tq) * invVDM
Pq = invM * (Vq' * diagm(wq))

Vf = vandermonde(elem, N, rf, sf, tf) * invVDM
Expand All @@ -433,7 +437,7 @@ function RefElemData(elem::Hex,
# plotting nodes
rp1D = LinRange(-1, 1, Nplot + 1)
Vp1D = vandermonde(Line(), N, rp1D) / VDM_1D
Vp = kronecker(Vp1D, Vp1D, Vp1D)
Vp = build_kronecker_product(Vp1D, Vp1D, Vp1D)
rp, sp, tp = vec.(StartUpDG.NodesAndModes.meshgrid(rp1D, rp1D, rp1D))

return RefElemData(elem, approximation_type, N, fv, V1,
Expand Down
Loading