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.

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

Kernel PA Q5Q4 #180

Merged
merged 1 commit into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions laghos_assembly.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,7 @@ static void ForceMult(const int DIM, const int D1D, const int Q1D,
{0x234,&ForceMult2D<2,3,4,2>},
{0x246,&ForceMult2D<2,4,6,3>},
{0x258,&ForceMult2D<2,5,8,4>},
{0x26A,&ForceMult2D<2,6,10,5>},
// 3D
{0x334,&ForceMult3D<3,3,4,2>},
{0x346,&ForceMult3D<3,4,6,3>},
Expand Down Expand Up @@ -944,6 +945,7 @@ static void ForceMultTranspose(const int DIM, const int D1D, const int Q1D,
{0x234,&ForceMultTranspose2D<2,3,4,2>},
{0x246,&ForceMultTranspose2D<2,4,6,3>},
{0x258,&ForceMultTranspose2D<2,5,8,4>},
{0x26A,&ForceMultTranspose2D<2,6,10,5>},
{0x334,&ForceMultTranspose3D<3,3,4,2>},
{0x346,&ForceMultTranspose3D<3,4,6,3>},
{0x358,&ForceMultTranspose3D<3,5,8,4>}
Expand Down
5 changes: 4 additions & 1 deletion laghos_solver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1318,7 +1318,10 @@ void QUpdate::UpdateQuadratureData(const Vector &S, QuadratureData &qdata)
Vector &dt_est, DenseTensor &stressJinvT);
static std::unordered_map<int, fQKernel> qupdate =
{
{0x24,&QKernel<2,4>}, {0x26,&QKernel<2,6>}, {0x28,&QKernel<2,8>},
// 2D.
{0x24,&QKernel<2,4>}, {0x26,&QKernel<2,6>},
{0x28,&QKernel<2,8>}, {0x2A,&QKernel<2,10>},
// 3D.
{0x34,&QKernel<3,4>}, {0x36,&QKernel<3,6>}, {0x38,&QKernel<3,8>}
};
if (!qupdate[id])
Expand Down
Loading