remove a reference to the $MED_ROOT_DIR in the Makefile.in wich is useless

[modules/med.git] / src / MEDMEM / MEDMEM_CellModel.hxx

diff --git a/src/MEDMEM/MEDMEM_CellModel.hxx b/src/MEDMEM/MEDMEM_CellModel.hxx
index 97b905e4daabe778eaf7e8809551edebb7439a9a..ff458ad6cb2735bfd4368e8d11a185362b2a4821 100644 (file)
--- a/src/MEDMEM/MEDMEM_CellModel.hxx
+++ b/src/MEDMEM/MEDMEM_CellModel.hxx
@@ -14,7 +14,6 @@
 #include "MEDMEM_define.hxx"
 
 using namespace std ;
-using namespace MED_EN;
 
 /*!
   This class is an internal class and should not be used by the end-user.
@@ -29,11 +28,11 @@ class CELLMODEL
 {
 
 private:
-                       /*! private method : /n
+                       /*! private method : \n
                            used by constructor and operator= */
   void init(const CELLMODEL &m);
 
-                       /*! private method : /n */
+                       /*! private method : \n */
   void clean();
 
 
@@ -41,7 +40,7 @@ private:
                        /*! explicit name (as MED_POINT1)           */
   string             _name;
                        /*! type of cell (cf define.h)              */
-  medGeometryElement _type;
+  MED_EN::medGeometryElement _type;
                         /*! Cell dimension (not space dimension)    */
   int               _dimension;
                         /*! number of nodes forming this type of a cell    */
@@ -64,14 +63,14 @@ private:
                              this dimension\n
                            - third vector : list of local nodes    */
   int***               _constituents ;
-  medGeometryElement**         _constituentsType ;
+  MED_EN::medGeometryElement**         _constituentsType ;
 
 public :
 
                        /*! Constructor. */
   inline CELLMODEL();
                        /*! Constructor. */
-  CELLMODEL(medGeometryElement t);
+  CELLMODEL(MED_EN::medGeometryElement t);
                        /*! Copy constructor. */
   inline CELLMODEL(const CELLMODEL &m);
                        /*! Destructor. */
@@ -93,13 +92,13 @@ public :
                        /*! returns number of nodes forming this type of cell    */
   inline int                   getNumberOfNodes()    const;
 
-                       /*! returns the dimension of this type of cell./n
+                       /*! returns the dimension of this type of cell.\n
                            it can be different from mesh dimension              */
   inline int                   getDimension()        const;
 
                        /*! returns the geometric type of the cell. \n
                            see med.h (in med/include) */
-  inline medGeometryElement     getType()             const;
+  inline MED_EN::medGeometryElement     getType()             const;
 
                        /*! returns all constituents which dimension is _dimension-dim.*/
   int** getConstituents(int dim) const;
@@ -117,11 +116,11 @@ public :
 
                        /*! returns types of each constituents which dimension 
                            is _dimension-dim.*/
-  medGeometryElement*  getConstituentsType(int dim) const;
+  MED_EN::medGeometryElement*  getConstituentsType(int dim) const;
 
                        /*! returns type of num-th constituent which dimension 
                            is _dimension-dim.*/
-  medGeometryElement getConstituentType(int dim,int num) const;
+  MED_EN::medGeometryElement getConstituentType(int dim,int num) const;
 
                        /*! returns number of constituents type 
                            (which dimension is _dimension-1).*/
@@ -129,23 +128,21 @@ public :
 
                        /*! returns all types of constituents which dimension 
                            is (_dimension-1).*/
-  set<medGeometryElement>  getAllConstituentsType() const;
+  set<MED_EN::medGeometryElement>  getAllConstituentsType() const;
 
                        /*! returns number of constituents foreach type (which dimension 
                            is _dimension-1).*/
-  map<medGeometryElement,int>  getNumberOfConstituentsForeachType() const;
+  map<MED_EN::medGeometryElement,int>  getNumberOfConstituentsForeachType() const;
 
 
-};
 };
 
 // ------------------------------------------
 //     Methodes Inline
 // ------------------------------------------
 
-using namespace MEDMEM;
 inline CELLMODEL::CELLMODEL():
-    _type(MED_NONE),
+    _type(MED_EN::MED_NONE),
     _dimension(0),
     _numberOfNodes(0),
     _numberOfVertexes(0),
@@ -153,7 +150,7 @@ inline CELLMODEL::CELLMODEL():
     _numberOfConstituents((int*)NULL),
     _numberOfNodeOfEachConstituent((int**)NULL),
     _constituents((int***)NULL),
-    _constituentsType((medGeometryElement**)NULL)
+    _constituentsType((MED_EN::medGeometryElement**)NULL)
 {
 }
 inline CELLMODEL::CELLMODEL(const CELLMODEL &m)
@@ -162,7 +159,7 @@ inline CELLMODEL::CELLMODEL(const CELLMODEL &m)
 }
 inline CELLMODEL::~CELLMODEL() 
 {
-  MESSAGE("CELLMODEL::~CELLMODEL() destroying the cell");
+  //  MESSAGE("CELLMODEL::~CELLMODEL() destroying the cell");
   clean() ;
 };
 inline CELLMODEL & CELLMODEL::operator=(const CELLMODEL &m) 
@@ -187,7 +184,7 @@ inline int CELLMODEL::getDimension() const
 {
   return _dimension;
 }
-inline medGeometryElement CELLMODEL::getType() const
+inline MED_EN::medGeometryElement CELLMODEL::getType() const
 {
   return _type;
 }
@@ -207,13 +204,15 @@ inline int CELLMODEL::getNodeConstituent(int dim,int num,int nodesNumber) const
 {
   return _constituents[dim-1][num-1][nodesNumber-1] ;
 }
-inline medGeometryElement* CELLMODEL::getConstituentsType(int dim) const
+inline MED_EN::medGeometryElement* CELLMODEL::getConstituentsType(int dim) const
 {
   return _constituentsType[dim-1];
 }
-inline medGeometryElement CELLMODEL::getConstituentType(int dim,int num) const
+inline MED_EN::medGeometryElement CELLMODEL::getConstituentType(int dim,int num) const
 {
   return _constituentsType[dim-1][num-1];
 }
 
+}//End of namespace MEDMEM
+
 #endif /* CELLMODEL_HXX */