No commit message

No commit message

Geo/MElement.h

@@ -288,7 +288,7 @@ class MElement
   double integrate(double val[], int pOrder, int stride=1, int order=-1);
   // val[] must contain interpolation data for face/edge vertices of given edge/face
   double integrateCirc(double val[], int edge, int pOrder, int order=-1);
-  virtual double integrateFlux(double val[], int face, int pOrder, int order=-1);
+  double integrateFlux(double val[], int face, int pOrder, int order=-1);
 
   // IO routines
   virtual void writeMSH(FILE *fp, double version=1.0, bool binary=false,

Geo/MVertex.cpp

@@ -26,6 +26,12 @@ bool MVertexLessThanLexicographic::operator()(const MVertex *v1, const MVertex *
   return false;
 }
 
+bool MVertexLessThanNum::operator()(const MVertex *v1, const MVertex *v2) const
+{
+  if(v1->getNum() < v2->getNum()) return true;
+  return false;
+}
+
 double angle3Vertices(MVertex *p1, MVertex *p2, MVertex *p3)
 {
   SVector3 a(p1->x() - p2->x(), p1->y() - p2->y(), p1->z() - p2->z());

Geo/MVertex.h

@@ -23,6 +23,11 @@ class MVertexLessThanLexicographic{
   bool operator()(const MVertex *v1, const MVertex *v2) const;
 };
 
+class MVertexLessThanNum{
+ public:
+  bool operator()(const MVertex *v1, const MVertex *v2) const;
+};
+
 // A mesh vertex.
 class MVertex{
  protected: