Skip to content
Snippets Groups Projects
Commit 05b602cd authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix warnings

parent ab383e0c
No related branches found
No related tags found
No related merge requests found
...@@ -491,7 +491,7 @@ void TransferTetgenMesh(GRegion *gr, tetgenio &in, tetgenio &out, ...@@ -491,7 +491,7 @@ void TransferTetgenMesh(GRegion *gr, tetgenio &in, tetgenio &out,
static void modifyInitialMeshForTakingIntoAccountBoundaryLayers(GRegion *gr) static void modifyInitialMeshForTakingIntoAccountBoundaryLayers(GRegion *gr)
{ {
BoundaryLayerColumns *_columns = buildAdditionalPoints3D (gr); buildAdditionalPoints3D (gr);
} }
...@@ -596,7 +596,7 @@ void MeshDelaunayVolume(std::vector<GRegion*> &regions) ...@@ -596,7 +596,7 @@ void MeshDelaunayVolume(std::vector<GRegion*> &regions)
skeletonFromVoronoi(gr, candidates); skeletonFromVoronoi(gr, candidates);
} }
modifyInitialMeshForTakingIntoAccountBoundaryLayers(gr); modifyInitialMeshForTakingIntoAccountBoundaryLayers(gr);
// now do insertion of points // now do insertion of points
if(CTX::instance()->mesh.algo3d == ALGO_3D_FRONTAL_DEL) if(CTX::instance()->mesh.algo3d == ALGO_3D_FRONTAL_DEL)
......
...@@ -12,20 +12,22 @@ ...@@ -12,20 +12,22 @@
#include "Field.h" #include "Field.h"
// /*
// ^ ni ^ ni
// | |
// | |
// +-----------------+ +-----------------+
// bi / bi /
// bj / bj /
// /\ /\
// / \ nj / \ nj
// / Z / Z
// + +
*/
static double solidAngle (SVector3 &ni, SVector3 &nj, static double solidAngle (SVector3 &ni, SVector3 &nj,
SPoint3 &bi, SPoint3 &bj) { SPoint3 &bi, SPoint3 &bj)
{
double cosa = dot (ni, nj); double cosa = dot (ni, nj);
SVector3 bibj = bj - bi; SVector3 bibj = bj - bi;
SVector3 sina = crossprod ( ni , nj ); SVector3 sina = crossprod ( ni , nj );
...@@ -34,11 +36,11 @@ static double solidAngle (SVector3 &ni, SVector3 &nj, ...@@ -34,11 +36,11 @@ static double solidAngle (SVector3 &ni, SVector3 &nj,
return sign > 0 ? fabs (a) : -fabs(a); 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) BoundaryLayerColumns* buildAdditionalPoints3D (GRegion *gr)
{ {
#if !defined(HAVE_ANN) #if !defined(HAVE_ANN)
...@@ -65,7 +67,8 @@ BoundaryLayerColumns* buildAdditionalPoints3D (GRegion *gr) ...@@ -65,7 +67,8 @@ BoundaryLayerColumns* buildAdditionalPoints3D (GRegion *gr)
// filter vertices : belong to BL and are classified on FACES // filter vertices : belong to BL and are classified on FACES
while(itf != faces.end()){ while(itf != faces.end()){
if (blf->isFaceBL((*itf)->tag())){ 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 i = 0; i< (*itf)->triangles.size(); i++)
for(unsigned int j = 0; j< 3; j++){ for(unsigned int j = 0; j< 3; j++){
if ((*itf)->triangles[i]->getVertex(j)->onWhat()->dim() != 3){ if ((*itf)->triangles[i]->getVertex(j)->onWhat()->dim() != 3){
...@@ -77,7 +80,7 @@ BoundaryLayerColumns* buildAdditionalPoints3D (GRegion *gr) ...@@ -77,7 +80,7 @@ BoundaryLayerColumns* buildAdditionalPoints3D (GRegion *gr)
} }
++itf; ++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 // assume that the initial mesh has been created i.e. that there exist
// tetrahedra inside the domain. Tetrahedra are used to define // tetrahedra inside the domain. Tetrahedra are used to define
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment