Skip to content

Commit 2fd0b6a

Browse files
committed
fix type access
1 parent d0ad701 commit 2fd0b6a

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

src/t8_schemes/t8_standalone/t8_standalone_implementation.hxx

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ struct t8_standalone_scheme
154154
static constexpr void
155155
set_typebit (u_int8_t *type, u_int8_t pos, u_int8_t bit)
156156
{
157-
*type &= !(1 << pos);
157+
*type &= ~(1 << pos);
158158
set_typebit_from_zero (type, pos, bit);
159159
}
160160

@@ -2204,8 +2204,8 @@ struct t8_standalone_scheme
22042204
if constexpr (T8_ELEMENT_DIM[TFaceEclass] >= T8_ELEMENT_DIM[TEclass]) {
22052205
return;
22062206
}
2207-
22082207
else {
2208+
boundary->type = 0;
22092209
boundary->level = el->level;
22102210
/* Delete the coordinate orthogonal to the given face and combine the remaining coordinates*/
22112211
for (int idim = 0; idim < T8_ELEMENT_DIM[TEclass]; idim++) {
@@ -2230,7 +2230,7 @@ struct t8_standalone_scheme
22302230
for (int ieq = 0; ieq < T8_ELEMENT_NUM_EQUATIONS[TEclass]; ieq++) {
22312231
const int ifaceeq = t8_standalone_lut_rootface_eq_to_faceeq<TEclass>[root_face][ieq];
22322232
if (ifaceeq != -1) {
2233-
set_typebit_from_zero (&boundary->type, ifaceeq, get_typebit (el->type, ieq));
2233+
set_typebit (&boundary->type, ifaceeq, get_typebit (el->type, ieq));
22342234
}
22352235
}
22362236
T8_ASSERT (t8_standalone_scheme<TFaceEclass>::element_is_valid ((t8_element_t *) boundary));
@@ -2303,19 +2303,17 @@ struct t8_standalone_scheme
23032303
for (int ieq = 0; ieq < T8_ELEMENT_NUM_EQUATIONS[TEclass]; ieq++) {
23042304
const int ifaceeq = t8_standalone_lut_rootface_eq_to_faceeq<TEclass>[root_face][ieq];
23052305
if (ifaceeq != -1) {
2306-
set_typebit_from_zero (&el->type, ieq, get_typebit (face->type, ifaceeq));
2306+
set_typebit (&el->type, ieq, get_typebit (face->type, ifaceeq));
23072307
}
23082308
}
23092309
/** Set those typebits, that are connected to the face_normaldim of root_face*/
23102310
for (int ieq = 0; ieq < T8_ELEMENT_NUM_EQUATIONS[TEclass]; ieq++) {
23112311
const int facenormal_dim = t8_standalone_lut_type_face_to_facenormal_dim<TEclass>[root_type][root_face];
23122312
if (t8_type_edge_equations<TEclass>[ieq][0] == facenormal_dim) {
2313-
set_typebit_from_zero (&el->type, ieq,
2314-
!t8_standalone_lut_type_face_to_is_1_boundary<TEclass>[root_type][root_face]);
2313+
set_typebit (&el->type, ieq, !t8_standalone_lut_type_face_to_is_1_boundary<TEclass>[root_type][root_face]);
23152314
}
23162315
else if (t8_type_edge_equations<TEclass>[ieq][1] == facenormal_dim) {
2317-
set_typebit_from_zero (&el->type, ieq,
2318-
t8_standalone_lut_type_face_to_is_1_boundary<TEclass>[root_type][root_face]);
2316+
set_typebit (&el->type, ieq, t8_standalone_lut_type_face_to_is_1_boundary<TEclass>[root_type][root_face]);
23192317
}
23202318
}
23212319
return t8_standalone_lut_type_rootface_to_face<TEclass>[el->type][root_face];
@@ -2382,7 +2380,7 @@ struct t8_standalone_scheme
23822380
coord_v1 = (coord_v1 << level) & ((1 << T8_ELEMENT_MAXLEVEL[TEclass]) - 1);
23832381

23842382
if (coord_v0 == coord_v1) {
2385-
set_typebit_from_zero (&type, e, get_typebit (el->type, e) | get_typebit (type, e));
2383+
set_typebit (&type, e, get_typebit (el->type, e) | get_typebit (type, e));
23862384
}
23872385
else if (coord_v0 < coord_v1) {
23882386
type |= (1 << e);

0 commit comments

Comments
 (0)