cleanup

Geo/MLine.cpp

@@ -42,10 +42,5 @@ void MLine::getIntegrationPoints(int pOrder, int *npts, IntPt **pts)
 
 double MLine::getInnerRadius()
 {
-#if defined(HAVE_MESH)
-  double dist = _v[0]->distance(_v[1]);
-  return dist;
-#else
-  return 0.;
-#endif
+  return _v[0]->distance(_v[1]);
 }

Geo/MQuadrangle.cpp

@@ -3,11 +3,12 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
 
+#include "GmshConfig.h"
 #include "MQuadrangle.h"
 #include "GaussLegendre1D.h"
 #include "Context.h"
 #include "qualityMeasures.h"
-#include <Numeric.h>
+#include "Numeric.h"
 
 #if defined(HAVE_MESH)
 #include "qualityMeasures.h"
@@ -189,7 +190,6 @@ double MQuadrangle::angleShapeMeasure()
 
 double MQuadrangle::getInnerRadius()
 {
-#if defined(HAVE_MESH)
   // get the coordinates (x, y, z) of the 4 points defining the Quad
   double x[4] = {_v[0]->x(), _v[1]->x(), _v[2]->x(), _v[3]->x()};
   double y[4] = {_v[0]->y(), _v[1]->y(), _v[2]->y(), _v[3]->y()};
@@ -260,7 +260,4 @@ double MQuadrangle::getInnerRadius()
     }
   }
   return R;
-#else
-  return 0.;
-#endif
 }

Geo/MTetrahedron.cpp

@@ -3,6 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
 
+#include "GmshConfig.h"
 #include "MTetrahedron.h"
 #include "Numeric.h"
 #include "Context.h"
@@ -48,7 +49,6 @@ double MTetrahedronN::distoShapeMeasure()
 
 double MTetrahedron::getInnerRadius()
 {
-#if defined(HAVE_MESH)
   double dist[3], face_area = 0.;
   double vol = getVolume();
   for(int i = 0; i < 4; i++){  
@@ -63,9 +63,6 @@ double MTetrahedron::getInnerRadius()
                              (dist[0] + dist[1] - dist[2]));
   }
   return 3 * vol / face_area;
-#else
-  return 0.;
-#endif
 }
 
 double MTetrahedron::gammaShapeMeasure()

Geo/MTriangle.cpp

@@ -3,6 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
 
+#include "GmshConfig.h"
 #include "MTriangle.h"
 #include "Numeric.h"
 #include "Context.h"
@@ -36,7 +37,6 @@ double MTriangle::distoShapeMeasure()
 
 double MTriangle::getInnerRadius()
 {
-#if defined(HAVE_MESH)
   double dist[3], k = 0.;
   for (int i = 0; i < 3; i++){
     MEdge e = getEdge(i);
@@ -44,9 +44,6 @@ double MTriangle::getInnerRadius()
     k += 0.5 * dist[i];
   }
   return sqrt(k * (k - dist[0]) * (k - dist[1]) * (k - dist[2])) / k;
-#else
-  return 0.;
-#endif
 }
 
 double MTriangle::angleShapeMeasure()