diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c0e056389c03ff10355c74e56f845681fb7acf5..73546bf8040bc46b75a8bb768532e4460ef7b5aa 100644
--- a/CMakeLists.txt
+++ b/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)
diff --git a/Mesh/meshGFaceDelaunayInsertion.cpp b/Mesh/meshGFaceDelaunayInsertion.cpp
index 6379ccd2dc1c403df41b96517ecb60196b1ed6bf..c45149f2150e1dd462a1dc0c70a1678531e6f7f8 100644
--- a/Mesh/meshGFaceDelaunayInsertion.cpp
+++ b/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;
}
@@ -91,9 +90,9 @@ void circumCenterMetricXYZ(double *p1, double *p2, double *p3, SMetric3 & metric
double resP[2];
gmshMatrix<double> T(3,3);
- for (int i=0;i<3;i++)T(0,i) = vx[i];
- for (int i=0;i<3;i++)T(1,i) = vy[i];
- for (int i=0;i<3;i++)T(2,i) = vz[i];
+ for (int i = 0; i < 3; i++)T(0,i) = vx[i];
+ for (int i = 0; i < 3; i++)T(1,i) = vy[i];
+ for (int i = 0; i < 3; i++)T(2,i) = vz[i];
SMetric3 tra = metric.transform(T);
double mm[3] = {tra(0,0),tra(0,1),tra(1,1)};
@@ -142,24 +141,24 @@ void buildMetric(GFace *gf, double *uv, SMetric3 & m, double *metric)
{
Pair<SVector3, SVector3> der = gf->firstDer(SPoint2(uv[0], uv[1]));
- SVector3 x1 (m(0,0) * der.first().x() +
- m(1,0) * der.first().y() +
- m(2,0) * der.first().z(),
- m(0,1) * der.first().x() +
- m(1,1) * der.first().y() +
- m(2,1) * der.first().z(),
- m(0,2) * der.first().x() +
- m(1,2) * der.first().y() +
- m(2,2) * der.first().z());
- SVector3 x2 (m(0,0) * der.second().x() +
- m(1,0) * der.second().y() +
- m(2,0) * der.second().z(),
- m(0,1) * der.second().x() +
- m(1,1) * der.second().y() +
- m(2,1) * der.second().z(),
- m(0,2) * der.second().x() +
- m(1,2) * der.second().y() +
- m(2,2) * der.second().z());
+ SVector3 x1(m(0,0) * der.first().x() +
+ m(1,0) * der.first().y() +
+ m(2,0) * der.first().z(),
+ m(0,1) * der.first().x() +
+ m(1,1) * der.first().y() +
+ m(2,1) * der.first().z(),
+ m(0,2) * der.first().x() +
+ m(1,2) * der.first().y() +
+ m(2,2) * der.first().z());
+ SVector3 x2(m(0,0) * der.second().x() +
+ m(1,0) * der.second().y() +
+ m(2,0) * der.second().z(),
+ m(0,1) * der.second().x() +
+ m(1,1) * der.second().y() +
+ m(2,1) * der.second().z(),
+ m(0,2) * der.second().x() +
+ m(1,2) * der.second().y() +
+ m(2,2) * der.second().z());
metric[0] = dot(x1, der.first());
metric[1] = dot(x2, der.first());
@@ -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){
+ std::set<MTri3*,compareTri3Ptr> *ActiveTris = 0,
+ MTri3 *worst = 0)
+{
if (worst){
it = AllTris.find(worst);
if (worst != *it){
@@ -622,18 +619,18 @@ static void insertAPoint(GFace *gf,
double lc1 = ((1. - uv[0] - uv[1]) * vSizes[ptin->tri()->getVertex(0)->getIndex()] +
uv[0] * vSizes[ptin->tri()->getVertex(1)->getIndex()] +
uv[1] * vSizes[ptin->tri()->getVertex(2)->getIndex()]);
- double lc = BGM_MeshSize(gf,center[0],center[1],p.x(),p.y(),p.z());
- //SMetric3 metr = BGM_MeshMetric(gf,center[0],center[1],p.x(),p.y(),p.z());
- // vMetricsBGM.push_back(metr);
+ double lc = BGM_MeshSize(gf, center[0], center[1], p.x(), p.y(), p.z());
+ //SMetric3 metr = BGM_MeshMetric(gf, center[0], center[1], p.x(), p.y(), p.z());
+ // vMetricsBGM.push_back(metr);
vSizesBGM.push_back(lc);
vSizes.push_back(lc1);
Us.push_back(center[0]);
Vs.push_back(center[1]);
- if (!p.succeeded() || !insertVertex
- (gf, v, center, worst, AllTris,ActiveTris, vSizes, vSizesBGM,vMetricsBGM,
- Us, Vs, metric) ) {
- // Msg::Debug("2D Delaunay : a cavity is not star shaped");
+ if(!p.succeeded() || !insertVertex
+ (gf, v, center, worst, AllTris,ActiveTris, vSizes, vSizesBGM,vMetricsBGM,
+ Us, Vs, metric) ) {
+ // Msg::Debug("2D Delaunay : a cavity is not star shaped");
AllTris.erase(it);
worst->forceRadius(-1);
AllTris.insert(worst);
@@ -803,7 +800,7 @@ void gmshBowyerWatsonFrontal(GFace *gf)
if (!ActiveTris.size())break;
MTri3 *worst = (*ActiveTris.begin());
ActiveTris.erase(ActiveTris.begin());
- // printf("active_tris.size = %d\n",ActiveTris.size());
+ // printf("active_tris.size = %d\n",ActiveTris.size());
if (!worst->isDeleted() && isActive(worst, LIMIT_, active_edge) &&
worst->getRadius() > LIMIT_){
diff --git a/Mesh/meshGFaceDelaunayInsertion.h b/Mesh/meshGFaceDelaunayInsertion.h
index be88382ff45f4e9e313a7f79039b3b0ae05c82d2..0eb582fd135167ebe41290843a8f2d2fbf1f452c 100644
--- a/Mesh/meshGFaceDelaunayInsertion.h
+++ b/Mesh/meshGFaceDelaunayInsertion.h
@@ -44,10 +44,9 @@ 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; }
+ bool isDeleted() const { return deleted; }
+ void forceRadius(double r) { circum_radius = r; }
+ double getRadius() const { return circum_radius; }
MTri3(MTriangle *t, double lc, SMetric3 *m = 0);
inline MTriangle *tri() const { return base; }
@@ -63,29 +62,29 @@ class MTri3
{
return inCircumCircle(v->x(), v->y());
}
- inline void setDeleted (bool d){ deleted = d; }
+ inline void setDeleted(bool d){ deleted = d; }
inline bool assertNeigh() const
{
- if (deleted) return true;
- for (int i = 0; i < 3; i++)
- if (neigh[i] && (neigh[i]->isNeigh(this) == false)) return false;
+ if(deleted) return true;
+ for(int i = 0; i < 3; i++)
+ if(neigh[i] && (neigh[i]->isNeigh(this) == false)) return false;
return true;
}
inline bool isNeigh(const MTri3 *t) const
{
- for (int i = 0; i < 3; i++)
- if (neigh[i] == t) return true;
+ for(int i = 0; i < 3; i++)
+ if(neigh[i] == t) return true;
return false;
}
};
class compareTri3Ptr
{
-public:
+ public:
inline bool operator () (const MTri3 *a, const MTri3 *b) const
{
- if (a->getRadius() > b->getRadius()) return true;
- if (a->getRadius() < b->getRadius()) return false;
+ if(a->getRadius() > b->getRadius()) return true;
+ if(a->getRadius() < b->getRadius()) return false;
return a<b;
}
};
@@ -109,9 +108,9 @@ struct edgeXface
}
inline bool operator < ( const edgeXface &other) const
{
- if (v[0] < other.v[0]) return true;
- if (v[0] > other.v[0]) return false;
- if (v[1] < other.v[1]) return true;
+ if(v[0] < other.v[0]) return true;
+ if(v[0] > other.v[0]) return false;
+ if(v[1] < other.v[1]) return true;
return false;
}
};