Skip to content

Use internals less in DSS #1944

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

Merged
charleskawczynski merged 1 commit into from
Aug 20, 2024
Merged

Use internals less in DSS #1944

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 11 additions & 8 deletions src/Topologies/dss.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,8 +396,9 @@ function dss_transform!(
p∂x∂ξ = parent(∂x∂ξ)
p∂ξ∂x = parent(∂ξ∂x)
pperimeter_data = parent(perimeter_data)
(nlevels, _, nfid, nelems) = size(pperimeter_data)
nmetric = cld(length(p∂ξ∂x), prod(size(∂ξ∂x)))
(nlevels, _, nfid, nelems) = DataLayouts.farray_size(perimeter_data)

nmetric = cld(prod(DataLayouts.farray_size(∂ξ∂x)), prod(size(∂ξ∂x)))
sizet_data = (nlevels, Nq, Nq, nfid, nelems)
sizet_wt = (Nq, Nq, 1, nelems)
sizet_metric = (nlevels, Nq, Nq, nmetric, nelems)
Expand Down Expand Up @@ -575,8 +576,8 @@ function dss_untransform!(
p∂x∂ξ = parent(∂x∂ξ)
p∂ξ∂x = parent(∂ξ∂x)
pperimeter_data = parent(perimeter_data)
(nlevels, _, nfid, nelems) = size(pperimeter_data)
nmetric = cld(length(p∂ξ∂x), prod(size(∂ξ∂x)))
(nlevels, _, nfid, nelems) = DataLayouts.farray_size(perimeter_data)
nmetric = cld(prod(DataLayouts.farray_size(∂ξ∂x)), prod(size(∂ξ∂x)))
sizet_data = (nlevels, Nq, Nq, nfid, nelems)
sizet_metric = (nlevels, Nq, Nq, nmetric, nelems)

Expand Down Expand Up @@ -703,9 +704,10 @@ function dss_load_perimeter_data!(
data::Union{DataLayouts.IJFH, DataLayouts.VIJFH},
perimeter::Perimeter2D{Nq},
) where {Nq}
pperimeter_data = parent(dss_buffer.perimeter_data)
(; perimeter_data) = dss_buffer
pperimeter_data = parent(perimeter_data)
pdata = parent(data)
(nlevels, _, nfid, nelems) = size(pperimeter_data)
(nlevels, _, nfid, nelems) = DataLayouts.farray_size(perimeter_data)
sizet = (nlevels, Nq, Nq, nfid, nelems)
for elem in 1:nelems, (p, (ip, jp)) in enumerate(perimeter)
for fidx in 1:nfid, level in 1:nlevels
Expand All @@ -722,9 +724,10 @@ function dss_unload_perimeter_data!(
dss_buffer::DSSBuffer,
perimeter::Perimeter2D{Nq},
) where {Nq}
pperimeter_data = parent(dss_buffer.perimeter_data)
(; perimeter_data) = dss_buffer
pperimeter_data = parent(perimeter_data)
pdata = parent(data)
(nlevels, _, nfid, nelems) = size(pperimeter_data)
(nlevels, _, nfid, nelems) = DataLayouts.farray_size(perimeter_data)
sizet = (nlevels, Nq, Nq, nfid, nelems)
for elem in 1:nelems, (p, (ip, jp)) in enumerate(perimeter)
for fidx in 1:nfid, level in 1:nlevels
Expand Down