Ooops: Reverting back Numeric and Geo

Geo/MElement.h

@@ -347,7 +347,6 @@ class MElement
   // info for specific IO formats (returning 0 means that the element
   // is not implemented in that format)
   virtual int getTypeForMSH() const { return 0; }
-  virtual int getLowOrderTypeForMSH() const { return 0; }
   virtual int getTypeForUNV() const { return 0; }
   virtual int getTypeForVTK() const { return 0; }
   virtual const char *getStringForPOS() const { return 0; }

Geo/MLine.h

@@ -65,7 +65,6 @@ class MLine : public MElement {
   virtual void getFaceRep(int num, double *x, double *y, double *z, SVector3 *n){}
   virtual int getType() const { return TYPE_LIN; }
   virtual int getTypeForMSH() const { return MSH_LIN_2; }
-  virtual int getLowOrderTypeForMSH() const { return MSH_LIN_2; }
   virtual int getTypeForUNV() const { return 21; } // linear beam
   virtual int getTypeForVTK() const { return 3; }
   virtual const char *getStringForPOS() const { return "SL"; }

Geo/MQuadrangle.h

@@ -111,7 +111,6 @@ class MQuadrangle : public MElement {
   }
   virtual int getType() const { return TYPE_QUA; }
   virtual int getTypeForMSH() const { return MSH_QUA_4; }
-  virtual int getLowOrderTypeForMSH() const { return MSH_QUA_4; }
   virtual int getTypeForUNV() const { return 94; } // thin shell linear quadrilateral
   virtual int getTypeForVTK() const { return 9; }
   virtual const char *getStringForPOS() const { return "SQ"; }

Geo/MTetrahedron.h

@@ -100,7 +100,6 @@ class MTetrahedron : public MElement {
   }
   virtual int getType() const { return TYPE_TET; }
   virtual int getTypeForMSH() const { return MSH_TET_4; }
-  virtual int getLowOrderTypeForMSH() const { return MSH_TET_4; }
   virtual int getTypeForUNV() const { return 111; } // solid linear tetrahedron
   virtual int getTypeForVTK() const { return 10; }
   virtual const char *getStringForPOS() const { return "SS"; }

Geo/MTriangle.h

@@ -114,7 +114,6 @@ class MTriangle : public MElement {
   }
   virtual int getType() const { return TYPE_TRI; }
   virtual int getTypeForMSH() const { return MSH_TRI_3; }
-  virtual int getLowOrderTypeForMSH() const { return MSH_TRI_3; }
   virtual int getTypeForUNV() const { return 91; } // thin shell linear triangle
   virtual int getTypeForVTK() const { return 5; }
   virtual const char *getStringForPOS() const { return "ST"; }

Numeric/BasisFactory.cpp

@@ -46,17 +46,9 @@ const nodalBasis* BasisFactory::getNodalBasis(int tag)
   }
 
   // FIXME: check if already exists to deallocate if necessary
-  std::pair<std::map<int, nodalBasis*>::const_iterator, bool> inserted;
+  fs.insert(std::make_pair(tag, F));
 
-  #pragma omp critical
-    {
-      inserted = fs.insert(std::make_pair(tag, F));
-
-      if (!inserted.second)
-        delete F;
-    }
-
-  return inserted.first->second;
+  return F;
 }
 
 const JacobianBasis* BasisFactory::getJacobianBasis(int tag)

Numeric/fullMatrix.h

@@ -745,25 +745,6 @@ class fullMatrix
     printf("};\n");
   }
 
-
-  void printMatlab(const std::string name = "A") const
-  {
-    int ni = size1();
-    int nj = size2();
-
-    printf("%s = [", name.c_str());
-
-    for(int I = 0; I < ni; I++){
-      for(int J = 0; J < nj; J++){
-        printf("%+e,", (*this)(I, J));
-      }
-
-      printf(";");
-    }
-
-    printf("]\n");
-  }
-
   // specific functions for dgshell
   void mult_naiveBlock(const fullMatrix<scalar> &b, const int ncol, const int fcol,
                        const int alpha, const int beta, fullVector<scalar> &c,