Skip to content

Commit d9fa12b

Browse files
authored
Merge pull request #1290 from DLR-AMR/fix-remove_deprecated
Remove code duplication
2 parents 1296cfb + e8054de commit d9fa12b

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

src/t8_schemes/t8_default/t8_default_tet/t8_dtet_connectivity.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,6 @@ const int t8_dtet_face_child_id_by_type[6][4][4] = {
135135
{ { 3, 5, 6, 7 }, { 0, 4, 6, 7 }, { 0, 2, 3, 7 }, { 0, 1, 3, 6 } } /* type 5 */
136136
};
137137

138-
const int t8_dtet_face_corner[4][3] = { { 1, 3, 2 }, { 0, 2, 3 }, { 0, 3, 1 }, { 0, 1, 2 } };
139-
140138
const int t8_dtet_parent_type_type_to_face[6][6] = {
141139
{ -1, 0, 2, -1, 1, 3 },
142140
{ 0, -1, 3, 1, -1, 2 },

src/t8_schemes/t8_default/t8_default_tet/t8_dtet_connectivity.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#define T8_DTET_CONNECTIVITY_H
2929

3030
#include <t8.h>
31+
#include <t8_eclass.h>
3132

3233
T8_EXTERN_C_BEGIN ();
3334

@@ -91,7 +92,7 @@ extern const int t8_dtet_face_child_id_by_type[6][4][4];
9192
* The other 2 corner are given in counterclockwise order as seen from
9293
* outside of the tet.
9394
*/
94-
extern const int t8_dtet_face_corner[4][3];
95+
#define t8_dtet_face_corner t8_face_vertex_to_tree_vertex[T8_ECLASS_TET]
9596

9697
/** For each combination parent_type, type with parent_type != type,
9798
* provide the face number of the face of a tet that lies within a face of

src/t8_schemes/t8_default/t8_default_tri/t8_dtri_connectivity.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@ const int t8_dtri_parenttype_Iloc_to_cid[2][4] = {
7979
{ 0, 1, 1, 3 },
8080
{ 0, 2, 2, 3 } };
8181

82-
const int t8_dtri_face_corner[3][2] = {
83-
{ 1, 2 },
84-
{ 0, 2 },
85-
{ 0, 1 } };
86-
8782
const int t8_dtri_corner_face[3][2] = {
8883
{ 1, 2 },
8984
{ 0, 2 },

src/t8_schemes/t8_default/t8_default_tri/t8_dtri_connectivity.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#define T8_DTRI_CONNECTIVITY_H
2828

2929
#include <t8_schemes/t8_default/t8_default_tri/t8_dtri.h>
30+
#include <t8_eclass.h>
3031

3132
T8_EXTERN_C_BEGIN ();
3233

@@ -69,7 +70,7 @@ extern const int t8_dtri_parenttype_Iloc_to_type[2][4];
6970
extern const int t8_dtri_parenttype_Iloc_to_cid[2][4];
7071

7172
/** Store the indices of the corner of each face of a triangle. */
72-
extern const int t8_dtri_face_corner[3][2];
73+
#define t8_dtri_face_corner t8_face_vertex_to_tree_vertex[T8_ECLASS_TRIANGLE]
7374

7475
/** Store the indices of the faces of each corner of a triangle. */
7576
extern const int t8_dtri_corner_face[3][2];

0 commit comments

Comments
 (0)