cleanup

Fltk/statisticsWindow.cpp

@@ -146,9 +146,9 @@ statisticsWindow::statisticsWindow(int deltaFontSize)
       for(int i = 0; i < 4; i++){
         int ww = 3 * FL_NORMAL_SIZE;
         new Fl_Box
-          (FL_NO_BOX, width - 3 * ww - 2 * WB, 2 * WB + (13 + i) * BH, ww, BH, "Plot:");
+          (FL_NO_BOX, width - 3 * ww - 2 * WB, 2 * WB + (13 + i) * BH, ww, BH, "Plot");
         butt[2 * i] = new Fl_Button
-          (width - 2 * ww - 2 * WB, 2 * WB + (13 + i) * BH, ww, BH, "2D");
+          (width - 2 * ww - 2 * WB, 2 * WB + (13 + i) * BH, ww, BH, "X-Y");
         butt[2 * i + 1] = new Fl_Button
           (width - ww - 2 * WB, 2 * WB + (13 + i) * BH, ww, BH, "3D");
       }
@@ -234,7 +234,7 @@ void statisticsWindow::compute(bool elementQuality)
     std::map<MVertex*, int > vert2Deg;
     for(unsigned int i = 0; i < entities.size(); i++){
       if(entities[i]->dim() < 2 ) continue;
-      //      if(entities[i]->tag() < 100) continue;
+      // if(entities[i]->tag() < 100) continue;
       for(unsigned int j = 0; j < entities[i]->getNumMeshElements(); j++){
 	MElement *e =  entities[i]->getMeshElement(j);
 	for(unsigned int k = 0; k < e->getNumEdges(); k++){

Mesh/meshGRegion.cpp

@@ -71,12 +71,12 @@ void printVoronoi(GRegion *gr,  std::set<SPoint3> &candidates)
 
   //print voronoi poles
   FILE *outfile;
-  smooth_normals *snorm = gr->model()->normals;
+  //smooth_normals *snorm = gr->model()->normals;
   outfile = fopen("nodes.pos", "w");
   fprintf(outfile, "View \"Voronoi poles\" {\n");
   std::map<MVertex*, std::set<MTetrahedron*> >::iterator itmap = node2Tet.begin();
   for(; itmap != node2Tet.end(); itmap++){
-    MVertex *v = itmap->first;
+    //MVertex *v = itmap->first;
     std::set<MTetrahedron*>  allTets = itmap->second;
     std::set<MTetrahedron*>::const_iterator it = allTets.begin();
     MTetrahedron *poleTet = *it;
@@ -98,7 +98,7 @@ void printVoronoi(GRegion *gr,  std::set<SPoint3> &candidates)
       double x[3] = {pc.x(), pc.y(), pc.z()};
       double uvw[3];
       poleTet->xyz2uvw(x, uvw);
-      bool inside = poleTet->isInside(uvw[0], uvw[1], uvw[2]);
+      //bool inside = poleTet->isInside(uvw[0], uvw[1], uvw[2]);
       //if (inside){
 	fprintf(outfile,"SP(%g,%g,%g)  {%g};\n",
 		pc.x(), pc.y(), pc.z(), maxRadius);
@@ -520,13 +520,12 @@ void MeshDelaunayVolume(std::vector<GRegion*> &regions)
     std::vector<MVertex*> numberedV;
     char opts[128];
     buildTetgenStructure(gr, in, numberedV);
-    //if (Msg::GetVerbosity() == 20) sprintf(opts, "peVvS0");
     if(CTX::instance()->mesh.algo3d == ALGO_3D_FRONTAL_DEL ||
        CTX::instance()->mesh.algo3d == ALGO_3D_FRONTAL_HEX ||
        CTX::instance()->mesh.algo3d == ALGO_3D_MMG3D ||
        CTX::instance()->mesh.algo2d == ALGO_2D_FRONTAL_QUAD ||
        CTX::instance()->mesh.algo2d == ALGO_2D_BAMG){
-      sprintf(opts, "-q1.5pY",  (Msg::GetVerbosity() < 3) ? 'Q':
+      sprintf(opts, "-q1.5pY%c",  (Msg::GetVerbosity() < 3) ? 'Q':
 	      (Msg::GetVerbosity() > 6) ? 'V': '\0');
     }
     else {

Solver/laplaceTerm.h

@@ -8,19 +8,19 @@
 
 #include "helmholtzTerm.h"
 
-// \nabla \cdot k \nabla U 
+// \nabla \cdot k \nabla U
 class laplaceTerm : public helmholtzTerm<double> {
  protected:
- std::map<MVertex*, SPoint3> *_coordView;
   const int _iField;
+  std::map<MVertex*, SPoint3> *_coordView;
  public:
- laplaceTerm(GModel *gm, int iField, simpleFunction<double> *k,  
+ laplaceTerm(GModel *gm, int iField, simpleFunction<double> *k,
 	     std::map<MVertex*, SPoint3> *coord=NULL)
    : helmholtzTerm<double>(gm, iField, iField, k, 0), _iField(iField), _coordView(coord) {}
  void elementVector(SElement *se, fullVector<double> &m) const
   {
     MElement *e = se->getMeshElement();
-    int nbSF = e->getNumShapeFunctions(); 
+    int nbSF = e->getNumShapeFunctions();
 
     fullMatrix<double> *mat;
     mat = new fullMatrix<double>(nbSF, nbSF);
@@ -42,7 +42,7 @@ class laplaceTerm : public helmholtzTerm<double> {
   }
 };
 
-// a \nabla U 
+// a \nabla U
 class massTerm : public helmholtzTerm<double> {
  public:
   massTerm(GModel *gm, int iField, simpleFunction<double> *a)

doc/VERSIONS.txt

@@ -7,7 +7,7 @@ field export; new experimental stereo+camera visualization mode; experimental
 BAMG & MMG3D support for anisotropic mesh generation; new OCC cut&merge
 algorithm imported from Salome; new ability to connect extruded meshes to
 tetrahedral grids using pyramids; new homology solver; Abaqus (INP) mesh export;
-various bug fixes and improvements.
+bug fixes and small improvements all over the place.
 
 2.5.0 (Oct 15, 2010): new compound geometrical entities (for remeshing and/or
 trans-patch meshing); improved mesh reclassification tool; new client/server