Skip to content

Build D to the be the correct shape rather than transposing #520

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
mscroggs merged 4 commits into from
May 25, 2022
Merged

Build D to the be the correct shape rather than transposing #520

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8eb99be
build D to the be the correct shape rather than building then transpo…
mscroggs May 24, 2022
2030406
Merge branch 'main' into mscroggs/dual-transpose
mscroggs May 25, 2022
a22f1a2
Merge branch 'main' into mscroggs/dual-transpose
chrisrichardson May 25, 2022
177cc24
Merge branch 'main' into mscroggs/dual-transpose
mscroggs May 25, 2022
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
10 changes: 3 additions & 7 deletions cpp/basix/finite-element.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ compute_dual_matrix(cell::type cell_type, const xt::xtensor<double, 2>& B,
}

std::size_t pdim = polyset::dim(cell_type, degree);
xt::xtensor<double, 3> D = xt::zeros<double>({num_dofs, vs, pdim});
xt::xtensor<double, 2> D = xt::zeros<double>({vs * pdim, num_dofs});

// Loop over different dimensions
std::size_t dof_index = 0;
Expand All @@ -135,17 +135,13 @@ compute_dual_matrix(cell::type cell_type, const xt::xtensor<double, 2>& B,
for (std::size_t k = 0; k < Me.shape(2); ++k) // Point
for (std::size_t l = 0; l < Me.shape(3); ++l) // Derivative
for (std::size_t m = 0; m < P.shape(1); ++m) // Polynomial term
D(dof_index + i, j, m) += Me(i, j, k, l) * P(l, m, k);
D(j * pdim + m, dof_index + i) += Me(i, j, k, l) * P(l, m, k);

dof_index += M[d][e].shape(0);
}
}

/// Flatten D and take transpose
xt::xtensor<double, 2> Dt_flat = xt::transpose(
xt::reshape_view(D, {D.shape(0), D.shape(1) * D.shape(2)}));

return math::dot(B, Dt_flat);
return math::dot(B, D);
}
//-----------------------------------------------------------------------------
} // namespace
Expand Down