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

Fix quad handling bugs #123

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix quad handling bugs #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12d3b85
-Remove debug cout.
dsteinmo Jul 16, 2023
cc76efa
Get rid of a weird block that is probably wrong.
dsteinmo Jul 16, 2023
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
9 changes: 5 additions & 4 deletions include/VtkOutputter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,11 @@ namespace blitzdg {
++nodeId;
}

if (cellTypes[Np] == VTK_QUAD) {
std::swap(nodes[1], nodes[3]);
std::swap(nodes[1], nodes[2]);
}
// This seems to make a mess of things in paraview (for N==1?). Probably don't want it.
//if (cellTypes[Np] == VTK_QUAD) {
// std::swap(nodes[1], nodes[3]);
// std::swap(nodes[1], nodes[2]);
//}

unstructuredGrid->InsertNextCell(cellTypes[Np], Np, nodes.data());
}
Expand Down
23 changes: 17 additions & 6 deletions src/MeshManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ namespace blitzdg {


for (index_type k=0; k < NumElements; ++k) {
std::cout << k << ", " << E2V(NumFaces*k) << "\n";
// Enforce counter-clockwise ordering of vertices in EToV table.
real_type ax = Vref(E2V(NumFaces*k)*Dim), ay = Vref(E2V(NumFaces*k)*Dim+1);
real_type bx = Vref(E2V(NumFaces*k+1)*Dim), by = Vref(E2V(NumFaces*k+1)*Dim+1);
Expand All @@ -110,8 +109,16 @@ namespace blitzdg {
real_type det = (ax-cx)*(by-cy) - (bx-cx)*(ay-cy);

if (det < 0) {
using std::swap;
swap(E2V(NumFaces*k+1), E2V(NumFaces*k+2));
// Flip the ordering.
index_type tmp = E2V(NumFaces*k+1);
if (NumFaces == 3) {
E2V(NumFaces*k+1) = E2V(NumFaces*k+2);
E2V(NumFaces*k+2) = tmp;
} else if (NumFaces == 4) {
E2V(NumFaces*k+1) = E2V(NumFaces*k+2);
E2V(NumFaces*k+2) = E2V(NumFaces*k+3);
E2V(NumFaces*k+3) = tmp;
}
}
}

Expand Down Expand Up @@ -300,12 +307,16 @@ namespace blitzdg {
if (det < 0) {
// Flip the ordering.
index_type tmp = E2V(NumFaces*k+1);
E2V(NumFaces*k+1) = E2V(NumFaces*k+2);
E2V(NumFaces*k+2) = tmp;
if (NumFaces == 3) {
E2V(NumFaces*k+1) = E2V(NumFaces*k+2);
E2V(NumFaces*k+2) = tmp;
} else if (NumFaces == 4) {
E2V(NumFaces*k+1) = E2V(NumFaces*k+3);
E2V(NumFaces*k+3) = tmp;
}
}
}


buildConnectivity();

// calling this with 'lines' seems to be broken.
Expand Down
4 changes: 2 additions & 2 deletions src/QuadNodesProvisioner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ namespace blitzdg {

index_type count = 0;

index_matrix_type counter(N+1,N+1);
index_matrix_type counter(N+1, N+1);
counter = -1; // -1 == 'No Value'

for (index_type n=0; n < N+1; ++n) {
Expand All @@ -754,7 +754,7 @@ namespace blitzdg {
for (index_type n=0; n < N; ++n) {
for (index_type m=0; m < N; ++m) {
index_type v1 = counter(n,m), v2 = counter(n,m+1),
v3 = counter(n+1, m), v4 = counter(n+1,m+1);
v3 = counter(n+1, m+1), v4 = counter(n+1,m);

index_vector_type quad1234(4);
quad1234 = v1,v2,v3,v4;
Expand Down