pp

CMakeLists.txt

@@ -784,13 +784,13 @@ endif(TEXI2PDF)
 if(MAKEINFO AND TEXI2PDF)
   add_custom_target(doc COMMAND ${CMAKE_COMMAND} -E tar zcf 
                     ${CMAKE_BINARY_DIR}/gmsh-${GMSH_VERSION}-doc.tgz
-                    CREDITS.txt FAQ.txt LICENSE.txt VERSIONS.txt gmsh.1
-                    texinfo/gmsh.html texinfo/gmsh.info texinfo/gmsh.pdf
-                    texinfo/gmsh.txt
+                    doc/CREDITS.txt doc/FAQ.txt doc/LICENSE.txt doc/VERSIONS.txt
+                    doc/gmsh.1 doc/texinfo/gmsh.html doc/texinfo/gmsh.info 
+                    doc/texinfo/gmsh.pdf doc/texinfo/gmsh.txt
                     COMMAND ${CMAKE_COMMAND} -E remove ${TEX_OBJ}
                     DEPENDS ${TEX_DIR}/gmsh.info ${TEX_DIR}/gmsh.txt 
                     ${TEX_DIR}/gmsh.html ${TEX_DIR}/gmsh.pdf
-                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/doc)
+                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 endif(MAKEINFO AND TEXI2PDF)
 
 if(MAKEINFO OR TEXI2PDF)

Mesh/meshGFaceDelaunayInsertion.cpp

@@ -27,7 +27,6 @@ static bool isActive(MTri3 *t, double limit_, int &active)
   for (active = 0; active < 3; active++){
     MTri3 *neigh = t->getNeigh(active);
     if (!neigh || neigh->getRadius() < limit_) return true;
-    //if (!neigh || neigh->done) return true;
   }
   return false;
 }
@@ -208,7 +207,7 @@ int inCircumCircleAniso(GFace *gf, MTriangle *base,
 }
 
 MTri3::MTri3(MTriangle *t, double lc, SMetric3 *metric) 
-  : deleted(false), base(t)//,done(0)
+  : deleted(false), base(t)
 {
   neigh[0] = neigh[1] = neigh[2] = 0;
   double center[3];
@@ -308,8 +307,8 @@ void recurFindCavity(std::list<edgeXface> &shell, std::list<MTri3*> &cavity,
                      std::vector<double> &Us, std::vector<double> &Vs)
 {
   t->setDeleted(true);
-  // the cavity that has to be removed
-  // because it violates delaunay criterion
+  // the cavity that has to be removed because it violates delaunay
+  // criterion
   cavity.push_back(t);
 
   for (int i = 0; i < 3; i++){
@@ -332,8 +331,8 @@ void recurFindCavityAniso(GFace *gf,
                           std::vector<double> &Us, std::vector<double> &Vs)
 {
   t->setDeleted(true);
-  // the cavity that has to be removed
-  // because it violates delaunay criterion
+  // the cavity that has to be removed because it violates delaunay
+  // criterion
   cavity.push_back(t);
 
   for (int i = 0; i < 3; i++){
@@ -573,18 +572,16 @@ void _printTris(char *name, std::set<MTri3*, compareTri3Ptr> &AllTris,
   fclose (ff);
 }
 
-static void insertAPoint(GFace *gf,
-                         std::set<MTri3*,compareTri3Ptr>::iterator it, 
-                         double center[2],
-                         double metric[3], 
-                         std::vector<double> &Us, 
-                         std::vector<double> &Vs,
+static void insertAPoint(GFace *gf, std::set<MTri3*,compareTri3Ptr>::iterator it,
+                         double center[2], double metric[3], 
+                         std::vector<double> &Us, std::vector<double> &Vs,
                          std::vector<double> &vSizes, 
                          std::vector<double> &vSizesBGM,
                          std::vector<SMetric3> &vMetricsBGM,
                          std::set<MTri3*,compareTri3Ptr> &AllTris,
                          std::set<MTri3*,compareTri3Ptr> *ActiveTris = 0,
-                         MTri3 *worst = 0){
+                         MTri3 *worst = 0)
+{
   if (worst){
     it = AllTris.find(worst);
     if (worst != *it){

Mesh/meshGFaceDelaunayInsertion.h

@@ -44,7 +44,6 @@ class MTri3
   MTri3 *neigh[3];
 
  public :
-  //  char done;
   bool isDeleted() const { return deleted; }
   void forceRadius(double r) { circum_radius = r; }
   double getRadius() const { return circum_radius; }