diff --git a/Mesh/HighOrder.cpp b/Mesh/HighOrder.cpp index 13b6fdcaf8d5beec13ad81a81eec5f2ed4af5199..04a4b5999cd1e65af31feebf14d5b1ce457b9764 100644 --- a/Mesh/HighOrder.cpp +++ b/Mesh/HighOrder.cpp @@ -1281,7 +1281,7 @@ static void setHighOrder(GRegion *gr, std::vector<MVertex*> &newHOVert, template<class T> static void setFirstOrder(GEntity *e, std::vector<T*> &elements, bool onlyVisible) { - if (onlyVisible && !e->getVisibility())return; + if (onlyVisible && !e->getVisibility()) return; std::vector<T*> elements1; for(unsigned int i = 0; i < elements.size(); i++){ T *ele = elements[i]; @@ -1300,7 +1300,7 @@ static void updateHighOrderVertices(GEntity *e, const std::vector<MVertex*> &newHOVert, bool onlyVisible) { - if (onlyVisible && !e->getVisibility())return; + if (onlyVisible && !e->getVisibility()) return; std::vector<MVertex*> v1; for(unsigned int i = 0; i < e->mesh_vertices.size(); i++){ if(e->mesh_vertices[i]->getPolynomialOrder() > 1) diff --git a/Mesh/meshGFace.cpp b/Mesh/meshGFace.cpp index 3d27ba5c8e0a801176b89160565c221987be5bb9..44a7412cb5a84f5124741de5c1ee64126a8698e5 100644 --- a/Mesh/meshGFace.cpp +++ b/Mesh/meshGFace.cpp @@ -324,7 +324,7 @@ static void copyMesh(GFace *source, GFace *target) for (unsigned it=0;it<get->mesh_vertices.size();it++,is+=orientation) { MVertex* vs = ges->mesh_vertices[is]; MVertex* vt = get->mesh_vertices[it]; - vs2vt[vs] = vt; + vs2vt[vs] = vt; target->correspondingVertices[vt] = vs; } } @@ -2375,7 +2375,8 @@ static bool meshGeneratorPeriodic(GFace *gf, bool debug = true) void deMeshGFace::operator() (GFace *gf) { - if(gf->geomType() == GEntity::DiscreteSurface && !CTX::instance()->meshDiscrete)return; + if(gf->geomType() == GEntity::DiscreteSurface && !CTX::instance()->meshDiscrete) + return; gf->deleteMesh(); gf->meshStatistics.status = GFace::PENDING; gf->meshStatistics.nbTriangle = gf->meshStatistics.nbEdge = 0; diff --git a/doc/texinfo/cmake_options.texi b/doc/texinfo/cmake_options.texi index 3c06cb3f7009282f574b1aebaffc807f5c01a069..8285d053e5b1f110cc89c551f4f7084e148793a3 100644 --- a/doc/texinfo/cmake_options.texi +++ b/doc/texinfo/cmake_options.texi @@ -37,6 +37,8 @@ Enable discrete integration (needed for levelsets) (default: ON) Enable FLTK graphical user interface (requires mesh/post) (default: ON) @item ENABLE_FOURIER_MODEL Enable Fourier geometrical models (experimental) (default: OFF) +@item ENABLE_GETDP +Enable GetDP solver (as a directly linked library) (default: ON) @item ENABLE_GMM Enable GMM linear solvers (simple alternative to PETSc) (default: ON) @item ENABLE_GMP @@ -113,8 +115,6 @@ Enable Taucs linear solver (default: ON) Enable libtcmalloc, a fast malloc implementation but that does not release memory (default: OFF) @item ENABLE_TETGEN Enable Tetgen 3D initial mesh generator (default: ON) -@item ENABLE_TETGEN_OLD -Enable older version of Tetgen (default: OFF) @item ENABLE_VORO3D Enable Voro3D (for hex meshing, experimental) (default: ON) @item ENABLE_WRAP_JAVA