diff --git a/Fltk/menuWindow.cpp b/Fltk/menuWindow.cpp
index cf71f677591b9a70fde23dd85913d8908db5860b..c4c7db394f457527cb1262ed4baa568ca902dd41 100644
--- a/Fltk/menuWindow.cpp
+++ b/Fltk/menuWindow.cpp
@@ -2616,9 +2616,9 @@ contextItem menu_mesh[] = {
#if defined(HAVE_METIS) || defined(HAVE_CHACO)
{"Partition", (Fl_Callback *)mesh_partition_cb} ,
#endif
- {"Reclassify", (Fl_Callback *)mesh_classify_cb} ,
+ {"Reclassify 2D", (Fl_Callback *)mesh_classify_cb} ,
#if defined(HAVE_FOURIER_MODEL)
- {"Reparameterize", (Fl_Callback *)mesh_parameterize_cb} ,
+ {"Reparameterize 2D", (Fl_Callback *)mesh_parameterize_cb} ,
#endif
{"Delete", (Fl_Callback *)mesh_delete_cb} ,
{"Save", (Fl_Callback *)mesh_save_cb} ,
diff --git a/Fltk/visibilityWindow.cpp b/Fltk/visibilityWindow.cpp
index df0e0bf60a68a89d1a3ad8977c14e9c880f03416..ad8d2fb551ee59c4a9d7ab6643a7d98c532304f9 100644
--- a/Fltk/visibilityWindow.cpp
+++ b/Fltk/visibilityWindow.cpp
@@ -707,6 +707,8 @@ void visibility_cb(Fl_Widget *w, void *data)
static void visibility_save_cb(Fl_Widget *w, void *data)
{
+ Msg::StatusBar(2, true, "Appending visibility info to '%s'...",
+ GModel::current()->getFileName());
// get the whole visibility information in geo format
std::vector<int> state[4][2];
GModel *m = GModel::current();
@@ -757,6 +759,7 @@ static void visibility_save_cb(Fl_Widget *w, void *data)
}
str += "}\n";
add_infile(str, GModel::current()->getFileName());
+ Msg::StatusBar(2, true, "Done appending visibility info");
}
static void _set_visibility_by_number(int what, int num, char val, bool recursive)
diff --git a/Geo/GFace.cpp b/Geo/GFace.cpp
index 6600a4bb6789d2607cba8ad76396e57b9befc71f..f020352fc39cffe7b0b16613f0c5a8f6b3a338ec 100644
--- a/Geo/GFace.cpp
+++ b/Geo/GFace.cpp
@@ -502,7 +502,7 @@ end:
tag(), meanPlane.a, meanPlane.b, meanPlane.c, meanPlane.d);
Msg::Error("Control point %d = (%g,%g,%g), val=%g",
v->tag(), v->x(), v->y(), v->z(), d);
- return;
+ break;
}
}
}
@@ -878,11 +878,8 @@ GPoint GFace::closestPoint(const SPoint3 & queryPoint, const double initialGuess
bool GFace::containsParam(const SPoint2 &pt) const
{
-
Range<double> uu = parBounds(0);
Range<double> vv = parBounds(1);
- //printf("p =%g %g uu.low=%g uu.high=%g vv.low=%g vv.high=%g\n", pt.x(), pt.y(), uu.low(), uu.high(), vv.low(), vv.high());
-
if((pt.x() >= uu.low() && pt.x() <= uu.high()) &&
(pt.y() >= vv.low() && pt.y() <= vv.high()))
return true;
@@ -1053,7 +1050,7 @@ bool GFace::fillVertexArray(bool force)
}
// by default we assume that straight lines are geodesics
-SPoint2 GFace::geodesic(const SPoint2 &pt1 , const SPoint2 &pt2 , double t)
+SPoint2 GFace::geodesic(const SPoint2 &pt1, const SPoint2 &pt2, double t)
{
if(CTX::instance()->mesh.secondOrderExperimental && geomType() != GEntity::Plane ){
// FIXME: this is buggy -- remove the CTX option once we do it in
diff --git a/Geo/gmshFace.cpp b/Geo/gmshFace.cpp
index 0450472a95eda5b045fb1132c86af279cfdc39f5..0b152f8df40a812c09316564e220c3e40ddb07f0 100644
--- a/Geo/gmshFace.cpp
+++ b/Geo/gmshFace.cpp
@@ -23,7 +23,6 @@ gmshFace::gmshFace(GModel *m, Surface *face)
setMeshMaster(s->meshMaster);
edgeCounterparts = s->edgeCounterparts;
- // printf("surface %d master %d\n",tag(),meshMaster());
std::list<GEdge*> l_wire;
GVertex *first = 0;
@@ -34,9 +33,9 @@ gmshFace::gmshFace(GModel *m, Surface *face)
if(e){
GVertex *start = (c->Num > 0) ? e->getBeginVertex() : e->getEndVertex();
GVertex *next = (c->Num > 0) ? e->getEndVertex() : e->getBeginVertex();
- if ( ! first ) first = start;
+ if (!first) first = start;
l_wire.push_back(e);
- if ( next == first ){
+ if (next == first){
edgeLoops.push_back(GEdgeLoop(l_wire));
l_wire.clear();
first = 0;
@@ -81,7 +80,6 @@ gmshFace::gmshFace(GModel *m, Surface *face)
}
}
isSphere = iSRuledSurfaceASphere(s, center, radius);
-
}
double gmshFace::getMetricEigenvalue(const SPoint2 &pt)
@@ -128,7 +126,7 @@ Range<double> gmshFace::parBounds(int i) const
SVector3 gmshFace::normal(const SPoint2 ¶m) const
{
- if(geomType() != Plane){
+ if(s->Typ != MSH_SURF_PLAN){
Vertex vu = InterpolateSurface(s, param[0], param[1], 1, 1);
Vertex vv = InterpolateSurface(s, param[0], param[1], 1, 2);
Vertex n = vu % vv;
@@ -169,7 +167,7 @@ SVector3 gmshFace::normal(const SPoint2 ¶m) const
}
}
-Pair<SVector3,SVector3> gmshFace::firstDer(const SPoint2 ¶m) const
+Pair<SVector3, SVector3> gmshFace::firstDer(const SPoint2 ¶m) const
{
if(s->Typ == MSH_SURF_PLAN && !s->geometry){
double x, y, z, VX[3], VY[3];
@@ -189,9 +187,9 @@ void gmshFace::secondDer(const SPoint2 ¶m,
SVector3 *dudu, SVector3 *dvdv, SVector3 *dudv) const
{
if(s->Typ == MSH_SURF_PLAN && !s->geometry){
- *dudu = SVector3(0.,0.,0.);
- *dvdv = SVector3(0.,0.,0.);
- *dudv = SVector3(0.,0.,0.);
+ *dudu = SVector3(0., 0., 0.);
+ *dvdv = SVector3(0., 0., 0.);
+ *dudv = SVector3(0., 0., 0.);
}
else{
Vertex vuu = InterpolateSurface(s, param[0], param[1], 2, 1);
@@ -297,7 +295,7 @@ GEntity::GeomType gmshFace::geomType() const
bool gmshFace::containsPoint(const SPoint3 &pt) const
{
- if(geomType() == Plane){
+ if(s->Typ == MSH_SURF_PLAN){
// OK to use the normal from the mean plane here: we compensate
// for the (possibly wrong) orientation at the end
double n[3] = {meanPlane.a, meanPlane.b, meanPlane.c};
@@ -327,8 +325,8 @@ bool gmshFace::containsPoint(const SPoint3 &pt) const
return false;
}
-bool gmshFace::buildSTLTriangulation(bool force){
-
+bool gmshFace::buildSTLTriangulation(bool force)
+{
return false;
/*
if(va_geom_triangles){
diff --git a/Mesh/meshGFaceBDS.cpp b/Mesh/meshGFaceBDS.cpp
index 66a1339928bb1cb070fcf1421de10f026bb782c6..b4e0ed943ebda7e24300aa5dd8d4bfb8e16bc13a 100644
--- a/Mesh/meshGFaceBDS.cpp
+++ b/Mesh/meshGFaceBDS.cpp
@@ -524,10 +524,10 @@ void splitEdgePass(GFace *gf, BDS_Mesh &m, double MAXE_, int &nb_split)
mid->v = V;
if (backgroundMesh::current()){
mid->lc() = mid->lcBGM() =
- backgroundMesh::current()->operator() (
- (coord * e->p1->u + (1 - coord) * e->p2->u)*m.scalingU,
- (coord * e->p1->v + (1 - coord) * e->p2->v)*m.scalingV,
- 0.0);
+ backgroundMesh::current()->operator()
+ ((coord * e->p1->u + (1 - coord) * e->p2->u)*m.scalingU,
+ (coord * e->p1->v + (1 - coord) * e->p2->v)*m.scalingV,
+ 0.0);
}
else {
mid->lcBGM() = BGM_MeshSize
diff --git a/Mesh/meshGFaceDelaunayInsertion.cpp b/Mesh/meshGFaceDelaunayInsertion.cpp
index c2678cdc70eaac4f1c2413eb559d7dea5e252c17..44452b2c8003123f334cfdb2661ad5ffadd88864 100644
--- a/Mesh/meshGFaceDelaunayInsertion.cpp
+++ b/Mesh/meshGFaceDelaunayInsertion.cpp
@@ -676,7 +676,8 @@ static void insertManyPoints(GFace *gf,
for (; it != AllTris.end() ; ++it){
int found = inCircumCircleAniso(gf, (*it)->tri(), pa, metric, Us, Vs);
if (found){
- insertAPoint(gf, it, pa, metric, Us, Vs, vSizes, vSizesBGM, vMetricsBGM, AllTris, ActiveTris);
+ insertAPoint(gf, it, pa, metric, Us, Vs, vSizes, vSizesBGM, vMetricsBGM,
+ AllTris, ActiveTris);
break;
}
}
@@ -911,4 +912,3 @@ void addBoundaryLayers(GFace *gf) {
// connect everybody with delaunay
}
-
diff --git a/Mesh/meshGRegion.cpp b/Mesh/meshGRegion.cpp
index 4224df3fd80512491d0fae64e173278642a1b6fd..a14b8b59cbdf57b0f03ea4f92ad5b30ff0922dbb 100644
--- a/Mesh/meshGRegion.cpp
+++ b/Mesh/meshGRegion.cpp
@@ -345,7 +345,8 @@ void TransferTetgenMesh(GRegion *gr, tetgenio &in, tetgenio &out,
//implement here the 1D mesh ...
}
- bool needParam = (CTX::instance()->mesh.order > 1 && CTX::instance()->mesh.secondOrderExperimental);
+ bool needParam = (CTX::instance()->mesh.order > 1 &&
+ CTX::instance()->mesh.secondOrderExperimental);
// re-create the triangular meshes FIXME: this can lead to hanging
// nodes for non manifold geometries (single surface connected to
// volume)
@@ -427,7 +428,7 @@ void TransferTetgenMesh(GRegion *gr, tetgenio &in, tetgenio &out,
v[j] = v1b;
}
}
- MTriangle *t = new MTriangle(v[0], v[1], v[2]);
+ MTriangle *t = new MTriangle(v[0], v[1], v[2]);
gf->triangles.push_back(t);
}
@@ -439,8 +440,6 @@ void TransferTetgenMesh(GRegion *gr, tetgenio &in, tetgenio &out,
MTetrahedron *t = new MTetrahedron(v1, v2, v3, v4);
gr->tetrahedra.push_back(t);
}
-
-
}
#endif
@@ -479,7 +478,8 @@ void MeshDelaunayVolume(std::vector<GRegion*> ®ions)
char opts[128];
buildTetgenStructure(gr, in, numberedV);
//if (Msg::GetVerbosity() == 20) sprintf(opts, "peVvS0");
- sprintf(opts, "pe%c", (Msg::GetVerbosity() < 3) ? 'Q': (Msg::GetVerbosity() > 6)? 'V': '\0');
+ sprintf(opts, "pe%c", (Msg::GetVerbosity() < 3) ? 'Q':
+ (Msg::GetVerbosity() > 6) ? 'V': '\0');
try{
tetrahedralize(opts, &in, &out);
}
@@ -535,8 +535,6 @@ void MeshDelaunayVolume(std::vector<GRegion*> ®ions)
// now do insertion of points
insertVerticesInRegion(gr);
-
-
#endif
}
diff --git a/Solver/linearSystemCSR.cpp b/Solver/linearSystemCSR.cpp
index 8fe68f52e0100438cf26f2a64a676ad4fad440a4..8b00158f197f95fc80365faf3ca531260177e074 100644
--- a/Solver/linearSystemCSR.cpp
+++ b/Solver/linearSystemCSR.cpp
@@ -74,7 +74,7 @@ static void CSRList_Delete(CSRList_T *liste)
}
}
-void CSRList_Add(CSRList_T *liste,const void *data)
+void CSRList_Add(CSRList_T *liste, const void *data)
{
liste->n++;
CSRList_Realloc(liste, liste->n);
@@ -245,12 +245,8 @@ static void _sort2_xkws(unsigned long n, double arr[], INDEX_TYPE ai[], INDEX_TY
}
template <class scalar>
-void sortColumns_(int NbLines,
- int nnz,
- INDEX_TYPE *ptr,
- INDEX_TYPE *jptr,
- INDEX_TYPE *ai,
- scalar *a)
+void sortColumns_(int NbLines, int nnz, INDEX_TYPE *ptr, INDEX_TYPE *jptr,
+ INDEX_TYPE *ai, scalar *a)
{
// replace pointers by lines
int *count = new int[NbLines];
@@ -283,20 +279,16 @@ void sortColumns_(int NbLines,
}
template<>
- void linearSystemCSR<double>::getMatrix(INDEX_TYPE*& jptr,INDEX_TYPE*& ai,double*& a)
- {
- jptr = (INDEX_TYPE*) _jptr->array;
- ai = (INDEX_TYPE*) _ai->array;
- a = ( double * ) _a->array;
- if (!sorted)
- sortColumns_(_b->size(),
- CSRList_Nbr(_a),
- (INDEX_TYPE *) _ptr->array,
- jptr,
- ai,
- a);
- sorted = true;
- }
+void linearSystemCSR<double>::getMatrix(INDEX_TYPE*& jptr,INDEX_TYPE*& ai,double*& a)
+{
+ jptr = (INDEX_TYPE*) _jptr->array;
+ ai = (INDEX_TYPE*) _ai->array;
+ a = ( double * ) _a->array;
+ if (!sorted)
+ sortColumns_(_b->size(), CSRList_Nbr(_a), (INDEX_TYPE *) _ptr->array, jptr,
+ ai, a);
+ sorted = true;
+}
#include "Bindings.h"