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

fix compile

parent 0d91d692
No related branches found
No related tags found
No related merge requests found
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
# bugs and problems to the public mailing list <gmsh@geuz.org>. # bugs and problems to the public mailing list <gmsh@geuz.org>.
set(SRC set(SRC
filterElements.cpp
Generator.cpp Generator.cpp
meshGEdge.cpp meshGEdge.cpp
meshGEdgeExtruded.cpp meshGEdgeExtruded.cpp
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include "multiscalePartition.h" #include "multiscalePartition.h"
#include "meshGFaceLloyd.h" #include "meshGFaceLloyd.h"
#include "boundaryLayersData.h" #include "boundaryLayersData.h"
#include "filterElements.h" //#include "filterElements.h"
inline double myAngle(const SVector3 &a, const SVector3 &b, const SVector3 &d) inline double myAngle(const SVector3 &a, const SVector3 &b, const SVector3 &d)
{ {
...@@ -710,8 +710,7 @@ void modifyInitialMeshForTakingIntoAccountBoundaryLayers(GFace *gf) ...@@ -710,8 +710,7 @@ void modifyInitialMeshForTakingIntoAccountBoundaryLayers(GFace *gf)
fprintf(ff2,"};\n"); fprintf(ff2,"};\n");
fclose(ff2); fclose(ff2);
//filterOverlappingElements (blTris,blQuads,_columns->_elemColumns,_columns->_toFirst);
filterOverlappingElements (blTris,blQuads,_columns->_elemColumns,_columns->_toFirst);
for (unsigned int i = 0; i < blQuads.size();i++){ for (unsigned int i = 0; i < blQuads.size();i++){
addOrRemove(blQuads[i]->getVertex(0),blQuads[i]->getVertex(1),bedges); addOrRemove(blQuads[i]->getVertex(0),blQuads[i]->getVertex(1),bedges);
...@@ -765,6 +764,7 @@ bool meshGenerator(GFace *gf, int RECUR_ITER, ...@@ -765,6 +764,7 @@ bool meshGenerator(GFace *gf, int RECUR_ITER,
bool debug, bool debug,
std::list<GEdge*> *replacement_edges) std::list<GEdge*> *replacement_edges)
{ {
//onlyInitialMesh=true;
BDS_GeomEntity CLASS_F(1, 2); BDS_GeomEntity CLASS_F(1, 2);
BDS_GeomEntity CLASS_EXTERIOR(1, 3); BDS_GeomEntity CLASS_EXTERIOR(1, 3);
std::map<BDS_Point*, MVertex*> recoverMap; std::map<BDS_Point*, MVertex*> recoverMap;
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "Levy3D.h" #include "Levy3D.h"
#include "directions3D.h" #include "directions3D.h"
#include "discreteFace.h" #include "discreteFace.h"
#include "filterElements.h" //#include "filterElements.h"
#if defined(HAVE_ANN) #if defined(HAVE_ANN)
#include "ANN/ANN.h" #include "ANN/ANN.h"
...@@ -908,7 +908,7 @@ static bool modifyInitialMeshForTakingIntoAccountBoundaryLayers(GRegion *gr) ...@@ -908,7 +908,7 @@ static bool modifyInitialMeshForTakingIntoAccountBoundaryLayers(GRegion *gr)
++ite; ++ite;
} }
filterOverlappingElements (blPrisms,blHexes,_columns->_elemColumns,_columns->_toFirst); //filterOverlappingElements (blPrisms,blHexes,_columns->_elemColumns,_columns->_toFirst);
{ {
FILE *ff2 = fopen ("tato3D.pos","w"); FILE *ff2 = fopen ("tato3D.pos","w");
fprintf(ff2,"View \" \"{\n"); fprintf(ff2,"View \" \"{\n");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment