From 05b602cd3834a434e8951211cdbfe9bcf0eba69b Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Fri, 13 Jul 2012 12:20:35 +0000 Subject: [PATCH] fix warnings --- Mesh/meshGRegion.cpp | 4 ++-- Mesh/meshGRegionBoundaryLayers.cpp | 37 ++++++++++++++++-------------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/Mesh/meshGRegion.cpp b/Mesh/meshGRegion.cpp index 4dfa37a6f9..afbb216a56 100644 --- a/Mesh/meshGRegion.cpp +++ b/Mesh/meshGRegion.cpp @@ -491,7 +491,7 @@ void TransferTetgenMesh(GRegion *gr, tetgenio &in, tetgenio &out, static void modifyInitialMeshForTakingIntoAccountBoundaryLayers(GRegion *gr) { - BoundaryLayerColumns *_columns = buildAdditionalPoints3D (gr); + buildAdditionalPoints3D (gr); } @@ -596,7 +596,7 @@ void MeshDelaunayVolume(std::vector<GRegion*> ®ions) skeletonFromVoronoi(gr, candidates); } - modifyInitialMeshForTakingIntoAccountBoundaryLayers(gr); + modifyInitialMeshForTakingIntoAccountBoundaryLayers(gr); // now do insertion of points if(CTX::instance()->mesh.algo3d == ALGO_3D_FRONTAL_DEL) diff --git a/Mesh/meshGRegionBoundaryLayers.cpp b/Mesh/meshGRegionBoundaryLayers.cpp index 5625d67ce1..ca92d5156c 100644 --- a/Mesh/meshGRegionBoundaryLayers.cpp +++ b/Mesh/meshGRegionBoundaryLayers.cpp @@ -12,20 +12,22 @@ #include "Field.h" -// -// ^ ni -// | -// | -// +-----------------+ -// bi / -// bj / -// /\ -// / \ nj -// / Z -// + +/* + ^ ni + | + | + +-----------------+ + bi / + bj / + /\ + / \ nj + / Z + + +*/ static double solidAngle (SVector3 &ni, SVector3 &nj, - SPoint3 &bi, SPoint3 &bj) { + SPoint3 &bi, SPoint3 &bj) +{ double cosa = dot (ni, nj); SVector3 bibj = bj - bi; SVector3 sina = crossprod ( ni , nj ); @@ -34,11 +36,11 @@ static double solidAngle (SVector3 &ni, SVector3 &nj, return sign > 0 ? fabs (a) : -fabs(a); } -BoundaryLayerColumns* buildAdditionalPoints3D_CAD_BASED (GRegion *gr) { +BoundaryLayerColumns* buildAdditionalPoints3D_CAD_BASED (GRegion *gr) +{ + return 0; } - - BoundaryLayerColumns* buildAdditionalPoints3D (GRegion *gr) { #if !defined(HAVE_ANN) @@ -65,7 +67,8 @@ BoundaryLayerColumns* buildAdditionalPoints3D (GRegion *gr) // filter vertices : belong to BL and are classified on FACES while(itf != faces.end()){ if (blf->isFaceBL((*itf)->tag())){ - printf("FACE %d is a boundary layer face %d triangles\n",(*itf)->tag(),(*itf)->triangles.size()); + printf("FACE %d is a boundary layer face %d triangles\n",(*itf)->tag(), + (int)(*itf)->triangles.size()); for(unsigned int i = 0; i< (*itf)->triangles.size(); i++) for(unsigned int j = 0; j< 3; j++){ if ((*itf)->triangles[i]->getVertex(j)->onWhat()->dim() != 3){ @@ -77,7 +80,7 @@ BoundaryLayerColumns* buildAdditionalPoints3D (GRegion *gr) } ++itf; } - printf("%d vertices \n",_vertices.size()); + printf("%d vertices \n", (int)_vertices.size()); // assume that the initial mesh has been created i.e. that there exist // tetrahedra inside the domain. Tetrahedra are used to define -- GitLab