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

Jump to bottom

Fix pyramid face corner #863

Merged
merged 16 commits into from
Feb 7, 2024
Merged

Fix pyramid face corner #863

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d33c515
possible fix
lukasdreyer Nov 21, 2023
b0627ad
second try
lukasdreyer Nov 21, 2023
41fab36
Add test for face_normal
lukasdreyer Nov 22, 2023
7f28d35
Skip t8_forest_element_face_normal computation for ghost neighbors in…
lukasdreyer Nov 22, 2023
1e4e0ba
Improve documentation
lukasdreyer Nov 22, 2023
c61ad0d
Apply suggestions from code review
lukasdreyer Nov 22, 2023
171b671
apply review suggestions
lukasdreyer Nov 22, 2023
238f935
Merge branch 'fix_pyramid-face-corner' of github.com:DLR-AMR/t8code i…
lukasdreyer Nov 22, 2023
2955130
Introduce extended leaf_face_neighbor, that also returns the global i…
lukasdreyer Jan 3, 2024
52463bf
Introduce forest function that takes a global id and turns it into th…
lukasdreyer Jan 3, 2024
a02f2be
Do not skip ghost elements anymore
lukasdreyer Jan 3, 2024
fb85bcc
Fix indentation
lukasdreyer Jan 3, 2024
83b9e91
Merge branch 'main' into fix_pyramid-face-corner
lukasdreyer Jan 30, 2024
93f3551
indent
lukasdreyer Jan 30, 2024
6137f54
Merge branch 'main' into fix_pyramid-face-corner
lukasdreyer Feb 7, 2024
e05cba3
correct leafs to leaves
lukasdreyer Feb 7, 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
2 changes: 1 addition & 1 deletion src/t8_schemes/t8_default/t8_default_pyramid/t8_dpyramid_bits.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1401,7 +1401,7 @@ t8_dpyramid_get_face_corner (const t8_dpyramid_t *pyra, int face, int corner)
return t8_dtet_face_corner[face][corner];
}
else {
int corner_number = t8_dpyramid_face_corner[face][corner];
int corner_number = t8_dpyramid_face_corner[pyra->pyramid.type-6][face][corner];
lukasdreyer marked this conversation as resolved.
Show resolved Hide resolved
T8_ASSERT (0 <= corner_number && corner_number < T8_DPYRAMID_FACES);
return corner_number;
}
Expand Down
20 changes: 18 additions & 2 deletions src/t8_schemes/t8_default/t8_default_pyramid/t8_dpyramid_connectivity.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,26 @@ const int t8_dpyramid_tritype_rootface_to_face[2][4] = {
{ 2, 0, 2, 0 },
{ 1, 0, 1, 0 } };

const int t8_dpyramid_face_corner[5][4] = {
const int t8_dpyramid_face_corner[2][5][4] = {
{
{ 0, 2, 4, -1 },
{ 1, 3, 4, -1 },
{ 0, 1, 4, -1 },
{ 2, 3, 4, -1 },
{ 0, 1, 2, 3 } };
{ 0, 1, 2, 3 }
},{
{ 2, 3, 4, -1 },
{ 0, 1, 4, -1 },
{ 1, 3, 4, -1 },
{ 0, 2, 4, -1 },
{ 0, 1, 2, 3 }
/*
{ 1, 3, 4, -1 },
{ 0, 2, 4, -1 },
{ 2, 3, 4, -1 },
{ 0, 1, 4, -1 },
{ 0, 1, 2, 3 }
*/
}
};
/* clang-format on */
2 changes: 1 addition & 1 deletion src/t8_schemes/t8_default/t8_default_pyramid/t8_dpyramid_connectivity.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,6 @@ extern const int t8_dtet_type_cid_to_pyramid_parenttype[6][8];
/** The corner numbers of the face of a pyramid
* corner_number = A(face, corner_number_at_face)
holke marked this conversation as resolved.
Show resolved Hide resolved
*/
extern const int t8_dpyramid_face_corner[5][4];
extern const int t8_dpyramid_face_corner[2][5][4];

#endif // T8_DPYRAMID_CONNECTIVITY_H
Loading