From 05d5d16e2e7975798a0419fad3730042c4481e64 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 18 Jun 2012 12:38:12 +0000
Subject: [PATCH] cleanup
---
Mesh/QuadTriExtruded2D.cpp | 2 +-
Mesh/QuadTriExtruded3D.cpp | 28 +++++++++++++++-------------
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/Mesh/QuadTriExtruded2D.cpp b/Mesh/QuadTriExtruded2D.cpp
index d74fce116b..a84bf0ba14 100644
--- a/Mesh/QuadTriExtruded2D.cpp
+++ b/Mesh/QuadTriExtruded2D.cpp
@@ -555,7 +555,7 @@ int MeshQuadToTriTopSurface( GFace *from, GFace *to, std::set<MVertex*,
ExtrudeParams *ep_src = root_source->meshAttributes.extrude;
bool struct_root = false;
if( root_source &&
- ( ep_src && ep_src->mesh.ExtrudeMesh && ep_src->geo.Mode == EXTRUDED_ENTITY ||
+ ( (ep_src && ep_src->mesh.ExtrudeMesh && ep_src->geo.Mode == EXTRUDED_ENTITY) ||
root_source->meshAttributes.Method == MESH_TRANSFINITE ) )
struct_root = true;
diff --git a/Mesh/QuadTriExtruded3D.cpp b/Mesh/QuadTriExtruded3D.cpp
index bb563361e2..f74c59b8ca 100644
--- a/Mesh/QuadTriExtruded3D.cpp
+++ b/Mesh/QuadTriExtruded3D.cpp
@@ -769,17 +769,17 @@ static void bruteForceEdgeQuadToTriPrism( GRegion *gr, MElement *elem,
// choose lowest vertex for t < 3, any vertex for t == 3
else if( (t >= 1 && t < 3 && nadj1[p] >= 0) ||
(t == 2 && free_flag[p]) ){
- if( verts[p] < verts[(p+1)%3] &&
- verts[p] < verts[p+3] ||
- verts[(p+1)%3+3] < verts[(p+1)%3] &&
- verts[(p+1)%3+3] < verts[p+3] ){
+ if( (verts[p] < verts[(p+1)%3] &&
+ verts[p] < verts[p+3]) ||
+ (verts[(p+1)%3+3] < verts[(p+1)%3] &&
+ verts[(p+1)%3+3] < verts[p+3]) ){
n1[p] = p; n2[p] = (p+1)%3+3;
}
else{
n1[p] = p+3; n2[p] = (p+1)%3;
}
}
- else if( (t==3 && (nadj1[p] >= 0) || free_flag[p]) )
+ else if( (t==3 && (nadj1[p] >= 0)) || free_flag[p] )
face_is_free[p] = true;
}
@@ -1673,15 +1673,15 @@ static void addEdgesForQuadToTriFullHexa( GRegion *gr, MElement *elem, ExtrudePa
}
// if these two faces do not work for opposite aligned diagonals, continue
- if( n1[p1] < 0 && !face_is_free[p1] ||
- n1[p2] < 0 && !face_is_free[p2] )
+ if( (n1[p1] < 0 && !face_is_free[p1]) ||
+ (n1[p2] < 0 && !face_is_free[p2]) )
continue;
if( n1[p1] >= 0 && n1[p2] >= 0 ){
if( p1 < 4 ){
- if( ( n1[p1] == p1 || n2[p1] == p1 ) &&
- n1[p2] != p2+4 && n2[p2] != p2+4 ||
- ( n1[p1] == p1+4 || n2[p1] == p1+4 ) &&
- n1[p2] != p2 && n2[p2] != p2 )
+ if( ( ( n1[p1] == p1 || n2[p1] == p1 ) &&
+ n1[p2] != p2+4 && n2[p2] != p2+4 ) ||
+ ( ( n1[p1] == p1+4 || n2[p1] == p1+4 ) &&
+ n1[p2] != p2 && n2[p2] != p2 ) )
continue;
}
else{
@@ -5285,8 +5285,10 @@ static inline void QuadToTriHexPri(std::vector<MVertex*> &v, GRegion *to, int j,
// Divide by double layer extrusion method?
- if( is_dbl && ( found_diags || j > j_second_from_top || j==j_second_from_top && k >= k_second_from_top || m==1 ) ){
- if( j==0 && k==0 || j==j_second_from_top && k==k_second_from_top && ( !bnd_elem || !found_diags ) && m != 1 )
+ if( is_dbl && ( found_diags || j > j_second_from_top ||
+ (j==j_second_from_top && k >= k_second_from_top) || m==1 ) ){
+ if( (j==0 && k==0) ||
+ (j==j_second_from_top && k==k_second_from_top && ( !bnd_elem || !found_diags ) && m != 1) )
MeshWithFaceCenteredVertex( to, source, v, n1, n2, 0, 1, pos );
else if( j == ep->mesh.NbLayer-1 && k == ep->mesh.NbElmLayer[j]-1 )
MeshWithFaceCenteredVertex( to, source, v, n1, n2, 1, 0, pos );
--
GitLab