Salome HOME
NRI : Merge from V1_2.
[modules/med.git] / src / MEDMEM / MEDMEM_CellModel.cxx
index d4c66f95816e1b993209d1256ad99d6c1260706d..9ea2b3aecf3966d670e7cc9fafaf34f95b8d5dad 100644 (file)
@@ -1,3 +1,29 @@
+//  MED MEDMEM : MED files in memory
+//
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// 
+//  This library is free software; you can redistribute it and/or 
+//  modify it under the terms of the GNU Lesser General Public 
+//  License as published by the Free Software Foundation; either 
+//  version 2.1 of the License. 
+// 
+//  This library is distributed in the hope that it will be useful, 
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//  Lesser General Public License for more details. 
+// 
+//  You should have received a copy of the GNU Lesser General Public 
+//  License along with this library; if not, write to the Free Software 
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+// 
+//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : MEDMEM_CellModel.cxx
+//  Module : MED
+
 using namespace std;
 /*
  File MEDMEM_CellModel.cxx
@@ -39,11 +65,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _numberOfVertexes=2;
       _numberOfNodes=2;
       // constituent are POINT1 and we have no need to define _constituents vector
-//       vector<medGeometryElement> vector_type(2,MED_POINT1) ;
-//       vector<medGeometryElement> __constituents_type[]={vector_type};
-//       vector< vector<medGeometryElement> > _constituents_type(__constituents_type,__constituents_type+1) ;
-//       _constituentsType = _constituents_type ;
-      //_constituentsType[2][1]={{MED_POINT1,MED_POINT1}} ;
       _numberOfConstituentsDimension=1 ;
       _numberOfConstituents=new int[1] ;
       _numberOfConstituents[0]=2 ;
@@ -73,10 +94,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _numberOfVertexes=2;
       _numberOfNodes=3;
       // constituent are POINT1 and we have no need to define _constituents vector
-//       vector<medGeometryElement> vector_type(3,MED_POINT1) ;
-//       vector<medGeometryElement> __constituents_type[]={vector_type};
-//       vector< vector<medGeometryElement> > _constituents_type(__constituents_type,__constituents_type+1) ;
-//       _constituentsType = _constituents_type ;
       _numberOfConstituentsDimension=1 ;
       _numberOfConstituents=new int[1] ;
       _numberOfConstituents[0]=3 ;
@@ -139,13 +156,14 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       tmpConstituentsType1[0] = MED_SEG2 ;
       tmpConstituentsType1[1] = MED_SEG2 ;
       tmpConstituentsType1[2] = MED_SEG2 ;
-      medGeometryElement * tmpConstituentsType2 = new medGeometryElement[3] ;
-      tmpConstituentsType2[0] = MED_POINT1 ;
-      tmpConstituentsType2[1] = MED_POINT1 ;
-      tmpConstituentsType2[2] = MED_POINT1 ;
-      _constituentsType = new medGeometryElement*[2] ;
+//        medGeometryElement * tmpConstituentsType2 = new medGeometryElement[3] ;
+//        tmpConstituentsType2[0] = MED_POINT1 ;
+//        tmpConstituentsType2[1] = MED_POINT1 ;
+//        tmpConstituentsType2[2] = MED_POINT1 ;
+//        _constituentsType = new medGeometryElement*[2] ;
+      _constituentsType = new medGeometryElement*[1] ;
       _constituentsType[0]=tmpConstituentsType1 ;
-      _constituentsType[1]=tmpConstituentsType2 ;
+//        _constituentsType[1]=tmpConstituentsType2 ;
       // Well, point are defined, but could not be acces because we have 
       // only 1 numberOfConstituentsDimension !
 
@@ -157,17 +175,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _dimension=2;
       _numberOfVertexes=3;
       _numberOfNodes=6;
-//       int _edge1[]={1,2,4} ;
-//       int _edge2[]={2,3,5} ;
-//       int _edge3[]={3,1,6} ;
-//       vector<int> edge1(_edge1,_edge1+3) ;
-//       vector<int> edge2(_edge2,_edge2+3) ;
-//       vector<int> edge3(_edge3,_edge3+3) ;
-//       vector<int> _vector_edge[]={edge1,edge2,edge3};
-//       vector< vector<int> > vector_edge(_vector_edge,_vector_edge+3) ;
-//       vector< vector<int> > __constituents__[]={vector_edge};
-//       vector< vector< vector<int> > > _constituents_(__constituents__,__constituents__+1) ;
-//       _constituents = _constituents_ ;
       _numberOfConstituentsDimension=1 ;
       _numberOfConstituents=new int[1] ;
       _numberOfConstituents[0]=3 ;
@@ -195,26 +202,21 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       tmpConstituents1[2]=_edge3 ;
       _constituents = new int**[1] ;
       _constituents[0]=tmpConstituents1 ;
-//       vector<medGeometryElement> vector_edge_type(3,MED_SEG3) ;
-//       vector<medGeometryElement> vector_type(6,MED_POINT1) ;
-//       vector<medGeometryElement> __constituents_type[]={vector_edge_type,vector_type};
-//       vector< vector<medGeometryElement> > _constituents_type(__constituents_type,__constituents_type+2) ;
-//       _constituentsType = _constituents_type ;
-      //_constituentsType={{MED_SEG3,MED_SEG3,MED_SEG3},{MED_POINT1,MED_POINT1,MED_POINT1,MED_POINT1,MED_POINT1,MED_POINT1}} ;      
       medGeometryElement * tmpConstituentsType1 = new medGeometryElement[3] ;
       tmpConstituentsType1[0] = MED_SEG3 ;
       tmpConstituentsType1[1] = MED_SEG3 ;
       tmpConstituentsType1[2] = MED_SEG3 ;
-      medGeometryElement * tmpConstituentsType2 = new medGeometryElement[6] ;
-      tmpConstituentsType2[0] = MED_POINT1 ;
-      tmpConstituentsType2[1] = MED_POINT1 ;
-      tmpConstituentsType2[2] = MED_POINT1 ;
-      tmpConstituentsType2[3] = MED_POINT1 ;
-      tmpConstituentsType2[4] = MED_POINT1 ;
-      tmpConstituentsType2[5] = MED_POINT1 ;
-      _constituentsType = new medGeometryElement*[2] ;
+//        medGeometryElement * tmpConstituentsType2 = new medGeometryElement[6] ;
+//        tmpConstituentsType2[0] = MED_POINT1 ;
+//        tmpConstituentsType2[1] = MED_POINT1 ;
+//        tmpConstituentsType2[2] = MED_POINT1 ;
+//        tmpConstituentsType2[3] = MED_POINT1 ;
+//        tmpConstituentsType2[4] = MED_POINT1 ;
+//        tmpConstituentsType2[5] = MED_POINT1 ;
+//        _constituentsType = new medGeometryElement*[2] ;
+      _constituentsType = new medGeometryElement*[1] ;
       _constituentsType[0]=tmpConstituentsType1 ;
-      _constituentsType[1]=tmpConstituentsType2 ;
+//        _constituentsType[1]=tmpConstituentsType2 ;
       // Well, point are defined, but could not be acces because we have 
       // only 1 numberOfConstituentsDimension !
 
@@ -226,20 +228,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _dimension=2;
       _numberOfVertexes=4;
       _numberOfNodes=4;
-//       int _edge1[]={1,2} ;
-//       int _edge2[]={2,3} ;
-//       int _edge3[]={3,4} ;
-//       int _edge4[]={4,1} ;
-//       vector<int> edge1(_edge1,_edge1+2) ;
-//       vector<int> edge2(_edge2,_edge2+2) ;
-//       vector<int> edge3(_edge3,_edge3+2) ;
-//       vector<int> edge4(_edge4,_edge4+2) ;
-//       vector<int> _vector_edge[]={edge1,edge2,edge3,edge4};
-//       vector< vector<int> > vector_edge(_vector_edge,_vector_edge+4) ;
-//       vector< vector<int> > __constituents__[]={vector_edge};
-//       vector< vector< vector<int> > > _constituents_(__constituents__,__constituents__+1) ;
-//       _constituents = _constituents_ ;
-      //_constituents={{{1,2},{2,3},{3,4},{4,1}}} ;
       _numberOfConstituentsDimension=1 ;
       _numberOfConstituents=new int[1] ;
       _numberOfConstituents[0]=4 ;
@@ -269,25 +257,20 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       tmpConstituents1[3]=_edge4 ;
       _constituents = new int**[1] ;
       _constituents[0]=tmpConstituents1 ;
-//       vector<medGeometryElement> vector_edge_type(4,MED_SEG2) ;
-//       vector<medGeometryElement> vector_type(4,MED_POINT1) ;
-//       vector<medGeometryElement> __constituents_type[]={vector_edge_type,vector_type};
-//       vector< vector<medGeometryElement> > _constituents_type(__constituents_type,__constituents_type+2) ;
-//       _constituentsType = _constituents_type ;
-      //_constituentsType={{MED_SEG2,MED_SEG2,MED_SEG2,MED_SEG2},{MED_POINT1,MED_POINT1,MED_POINT1,MED_POINT1}} ;      
       medGeometryElement * tmpConstituentsType1 = new medGeometryElement[4] ;
       tmpConstituentsType1[0] = MED_SEG2 ;
       tmpConstituentsType1[1] = MED_SEG2 ;
       tmpConstituentsType1[2] = MED_SEG2 ;
       tmpConstituentsType1[3] = MED_SEG2 ;
-      medGeometryElement * tmpConstituentsType2 = new medGeometryElement[4] ;
-      tmpConstituentsType2[0] = MED_POINT1 ;
-      tmpConstituentsType2[1] = MED_POINT1 ;
-      tmpConstituentsType2[2] = MED_POINT1 ;
-      tmpConstituentsType2[3] = MED_POINT1 ;
-      _constituentsType = new medGeometryElement*[2] ;
+//        medGeometryElement * tmpConstituentsType2 = new medGeometryElement[4] ;
+//        tmpConstituentsType2[0] = MED_POINT1 ;
+//        tmpConstituentsType2[1] = MED_POINT1 ;
+//        tmpConstituentsType2[2] = MED_POINT1 ;
+//        tmpConstituentsType2[3] = MED_POINT1 ;
+//        _constituentsType = new medGeometryElement*[2] ;
+      _constituentsType = new medGeometryElement*[1] ;
       _constituentsType[0]=tmpConstituentsType1 ;
-      _constituentsType[1]=tmpConstituentsType2 ;
+//        _constituentsType[1]=tmpConstituentsType2 ;
       // Well, point are defined, but could not be acces because we have 
       // only 1 numberOfConstituentsDimension !
 
@@ -299,20 +282,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _dimension=2;
       _numberOfVertexes=4;
       _numberOfNodes=8;
-//       int _edge1[]={1,2,5} ;
-//       int _edge2[]={2,3,6} ;
-//       int _edge3[]={3,4,7} ;
-//       int _edge4[]={4,1,8} ;
-//       vector<int> edge1(_edge1,_edge1+3) ;
-//       vector<int> edge2(_edge2,_edge2+3) ;
-//       vector<int> edge3(_edge3,_edge3+3) ;
-//       vector<int> edge4(_edge4,_edge4+3) ;
-//       vector<int> _vector_edge[]={edge1,edge2,edge3,edge4};
-//       vector< vector<int> > vector_edge(_vector_edge,_vector_edge+4) ;
-//       vector< vector<int> > __constituents__[]={vector_edge};
-//       vector< vector< vector<int> > > _constituents_(__constituents__,__constituents__+1) ;
-//       _constituents = _constituents_ ;
-      //_constituents={{{1,2,5},{2,3,6},{3,4,7},{4,1,8}}} ;
       _numberOfConstituentsDimension=1 ;
       _numberOfConstituents=new int[1] ;
       _numberOfConstituents[0]=4 ;
@@ -346,29 +315,24 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       tmpConstituents1[3]=_edge4 ;
       _constituents = new int**[1] ;
       _constituents[0]=tmpConstituents1 ;
-//       vector<medGeometryElement> vector_edge_type(4,MED_SEG3) ;
-//       vector<medGeometryElement> vector_type(8,MED_POINT1) ;
-//       vector<medGeometryElement> __constituents_type[]={vector_edge_type,vector_type};
-//       vector< vector<medGeometryElement> > _constituents_type(__constituents_type,__constituents_type+2) ;
-//       _constituentsType = _constituents_type ;
-      //_constituentsType={{MED_SEG3,MED_SEG3,MED_SEG3,MED_SEG3},{MED_POINT1,MED_POINT1,MED_POINT1,MED_POINT1,MED_POINT1,MED_POINT1,MED_POINT1,MED_POINT1} ;
       medGeometryElement * tmpConstituentsType1 = new medGeometryElement[4] ;
       tmpConstituentsType1[0] = MED_SEG3 ;
       tmpConstituentsType1[1] = MED_SEG3 ;
       tmpConstituentsType1[2] = MED_SEG3 ;
       tmpConstituentsType1[3] = MED_SEG3 ;
-      medGeometryElement * tmpConstituentsType2 = new medGeometryElement[4] ;
-      tmpConstituentsType2[0] = MED_POINT1 ;
-      tmpConstituentsType2[1] = MED_POINT1 ;
-      tmpConstituentsType2[2] = MED_POINT1 ;
-      tmpConstituentsType2[3] = MED_POINT1 ;
-      tmpConstituentsType2[4] = MED_POINT1 ;
-      tmpConstituentsType2[5] = MED_POINT1 ;
-      tmpConstituentsType2[6] = MED_POINT1 ;
-      tmpConstituentsType2[7] = MED_POINT1 ;
-      _constituentsType = new medGeometryElement*[2] ;
+//        medGeometryElement * tmpConstituentsType2 = new medGeometryElement[8] ;
+//        tmpConstituentsType2[0] = MED_POINT1 ;
+//        tmpConstituentsType2[1] = MED_POINT1 ;
+//        tmpConstituentsType2[2] = MED_POINT1 ;
+//        tmpConstituentsType2[3] = MED_POINT1 ;
+//        tmpConstituentsType2[4] = MED_POINT1 ;
+//        tmpConstituentsType2[5] = MED_POINT1 ;
+//        tmpConstituentsType2[6] = MED_POINT1 ;
+//        tmpConstituentsType2[7] = MED_POINT1 ;
+//        _constituentsType = new medGeometryElement*[2] ;
+      _constituentsType = new medGeometryElement*[1] ;
       _constituentsType[0]=tmpConstituentsType1 ;
-      _constituentsType[1]=tmpConstituentsType2 ;
+//        _constituentsType[1]=tmpConstituentsType2 ;
       // Well, point are defined, but could not be acces because we have 
       // only 1 numberOfConstituentsDimension !
 
@@ -380,34 +344,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _dimension=3;
       _numberOfVertexes=4;
       _numberOfNodes=4;
-//       int _edge1[]={1,2} ;
-//       int _edge2[]={2,3} ;
-//       int _edge3[]={3,1} ;
-//       int _edge4[]={1,4} ;
-//       int _edge5[]={2,4} ;
-//       int _edge6[]={3,4} ;
-//       vector<int> edge1(_edge1,_edge1+2) ;
-//       vector<int> edge2(_edge2,_edge2+2) ;
-//       vector<int> edge3(_edge3,_edge3+2) ;
-//       vector<int> edge4(_edge4,_edge4+2) ;
-//       vector<int> edge5(_edge5,_edge5+2) ;
-//       vector<int> edge6(_edge6,_edge6+2) ;
-//       vector<int> _vector_edge[]={edge1,edge2,edge3,edge4,edge5,edge6};
-//       vector< vector<int> > vector_edge(_vector_edge,_vector_edge+6) ;
-//       int _face1[]={1,2,3} ;
-//       int _face2[]={1,4,2} ;
-//       int _face3[]={2,4,3} ;
-//       int _face4[]={3,4,1} ;
-//       vector<int> face1(_face1,_face1+3) ;
-//       vector<int> face2(_face2,_face2+3) ;
-//       vector<int> face3(_face3,_face3+3) ;
-//       vector<int> face4(_face4,_face4+3) ;
-//       vector<int> _vector_face[] = {face1,face2,face3,face4} ;
-//       vector< vector<int> > vector_face(_vector_face,_vector_face+4) ;
-//       vector< vector<int> > __constituents__[]={vector_face,vector_edge};
-//       vector< vector< vector<int> > > _constituents_(__constituents__,__constituents__+2) ;
-//       _constituents = _constituents_ ;
-      //_constituents={{{1,2,3},{1,4,2},{2,4,3},{3,4,1}},{{1,2},{2,3},{3,1},{1,4},{2,4},{3,4}}} ;
       _numberOfConstituentsDimension=2 ;
       _numberOfConstituents=new int[2] ;
       _numberOfConstituents[0]=4 ;
@@ -475,12 +411,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _constituents = new int**[2] ;
       _constituents[0]=tmpConstituents1 ;
       _constituents[1]=tmpConstituents2 ;
-//       vector<medGeometryElement> vector_edge_type(6,MED_SEG2) ;
-//       vector<medGeometryElement> vector_face_type(4,MED_TRIA3) ;
-//       vector<medGeometryElement> __constituents_type[]={vector_face_type,vector_edge_type};
-//       vector< vector<medGeometryElement> > _constituents_type(__constituents_type,__constituents_type+2) ;
-//       _constituentsType = _constituents_type ;
-      //_constituentsType={{MED_TRIA3,MED_TRIA3,MED_TRIA3,MED_TRIA3}{MED_SEG2,MED_SEG2,MED_SEG2,MED_SEG2,MED_SEG2,MED_SEG2}} ;
       medGeometryElement * tmpConstituentsType1 = new medGeometryElement[4] ;
       tmpConstituentsType1[0] = MED_TRIA3 ;
       tmpConstituentsType1[1] = MED_TRIA3 ;
@@ -504,34 +434,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _dimension=3;
       _numberOfVertexes=4;
       _numberOfNodes=10;
-//       int _edge1[]={1,2,5} ;
-//       int _edge2[]={2,3,6} ;
-//       int _edge3[]={3,1,7} ;
-//       int _edge4[]={1,4,8} ;
-//       int _edge5[]={2,4,9} ;
-//       int _edge6[]={3,4,10} ;
-//       vector<int> edge1(_edge1,_edge1+3) ;
-//       vector<int> edge2(_edge2,_edge2+3) ;
-//       vector<int> edge3(_edge3,_edge3+3) ;
-//       vector<int> edge4(_edge4,_edge4+3) ;
-//       vector<int> edge5(_edge5,_edge5+3) ;
-//       vector<int> edge6(_edge6,_edge6+3) ;
-//       vector<int> _vector_edge[]={edge1,edge2,edge3,edge4,edge5,edge6};
-//       vector< vector<int> > vector_edge(_vector_edge,_vector_edge+6) ;
-//       int _face1[]={1,2,3,5,6,7} ;
-//       int _face2[]={1,4,2,8,9,5} ;
-//       int _face3[]={2,4,3,9,10,6} ;
-//       int _face4[]={3,4,1,10,8,7} ;
-//       vector<int> face1(_face1,_face1+6) ;
-//       vector<int> face2(_face2,_face2+6) ;
-//       vector<int> face3(_face3,_face3+6) ;
-//       vector<int> face4(_face4,_face4+6) ;
-//       vector<int> _vector_face[] = {face1,face2,face3,face4} ;
-//       vector< vector<int> > vector_face(_vector_face,_vector_face+4) ;
-//       vector< vector<int> > __constituents__[]={vector_face,vector_edge};
-//       vector< vector< vector<int> > > _constituents_(__constituents__,__constituents__+2) ;
-//       _constituents = _constituents_ ;
-      //_constituents={{{1,2,3,5,6,7},{1,4,2,8,9,5},{2,4,3,9,10,6},{3,4,1,10,8,7}},{{1,2,5},{2,3,6},{3,1,7},{1,4,8},{2,4,9},{3,4,10}}} ;
       _numberOfConstituentsDimension=2 ;
       _numberOfConstituents=new int[2] ;
       _numberOfConstituents[0]=4 ;
@@ -617,12 +519,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _constituents = new int**[2] ;
       _constituents[0]=tmpConstituents1 ;
       _constituents[1]=tmpConstituents2 ;
-//       vector<medGeometryElement> vector_edge_type(6,MED_SEG3) ;
-//       vector<medGeometryElement> vector_face_type(4,MED_TRIA6) ;
-//       vector<medGeometryElement> __constituents_type[]={vector_face_type,vector_edge_type};
-//       vector< vector<medGeometryElement> > _constituents_type(__constituents_type,__constituents_type+2) ;
-//       _constituentsType = _constituents_type ;
-      //_constituentsType={{MED_TRIA6,MED_TRIA6,MED_TRIA6,MED_TRIA6}{MED_SEG3,MED_SEG3,MED_SEG3,MED_SEG3,MED_SEG3,MED_SEG3}} ;
       medGeometryElement * tmpConstituentsType1 = new medGeometryElement[4] ;
       tmpConstituentsType1[0] = MED_TRIA6 ;
       tmpConstituentsType1[1] = MED_TRIA6 ;
@@ -646,32 +542,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _dimension=3;
       _numberOfVertexes=8;
       _numberOfNodes=8;
-//       int _edge1[]={1,2} ;
-//       int _edge2[]={2,3} ;
-//       int _edge3[]={3,4} ;
-//       int _edge4[]={4,1} ;
-//       int _edge5[]={5,6} ;
-//       int _edge6[]={6,7} ;
-//       int _edge7[]={7,8} ;
-//       int _edge8[]={8,5} ;
-//       int _edge9[]={1,5} ;
-//       int _edge10[]={2,6} ;
-//       int _edge11[]={3,7} ;
-//       int _edge12[]={4,8} ;
-//       vector<int> edge1(_edge1,_edge1+2) ;
-//       vector<int> edge2(_edge2,_edge2+2) ;
-//       vector<int> edge3(_edge3,_edge3+2) ;
-//       vector<int> edge4(_edge4,_edge4+2) ;
-//       vector<int> edge5(_edge5,_edge5+2) ;
-//       vector<int> edge6(_edge6,_edge6+2) ;
-//       vector<int> edge7(_edge7,_edge7+2) ;
-//       vector<int> edge8(_edge8,_edge8+2) ;
-//       vector<int> edge9(_edge9,_edge9+2) ;
-//       vector<int> edge10(_edge10,_edge10+2) ;
-//       vector<int> edge11(_edge11,_edge11+2) ;
-//       vector<int> edge12(_edge12,_edge12+2) ;
-//       vector<int> _vector_edge[]={edge1,edge2,edge3,edge4,edge5,edge6,edge7,edge8,edge9,edge10,edge11,edge12};
-//       vector< vector<int> > vector_edge(_vector_edge,_vector_edge+12) ;
       _numberOfConstituentsDimension=2 ;
       _numberOfConstituents=new int[2] ;
       _numberOfConstituents[0]=6 ;
@@ -734,23 +604,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       int* _edge12=new int[2];
       _edge12[0]=4;
       _edge12[1]=8;
-//       int _face1[]={1,2,3,4} ;
-//       int _face2[]={5,8,7,6} ;
-//       int _face3[]={1,5,6,2} ;
-//       int _face4[]={2,6,7,3} ;
-//       int _face5[]={3,7,8,4} ;
-//       int _face6[]={4,8,5,1} ;
-//       vector<int> face1(_face1,_face1+4) ;
-//       vector<int> face2(_face2,_face2+4) ;
-//       vector<int> face3(_face3,_face3+4) ;
-//       vector<int> face4(_face4,_face4+4) ;
-//       vector<int> face5(_face5,_face5+4) ;
-//       vector<int> face6(_face6,_face6+4) ;
-//       vector<int> _vector_face[] = {face1,face2,face3,face4,face5,face6} ;
-//       vector< vector<int> > vector_face(_vector_face,_vector_face+6) ;
-//       vector< vector<int> > __constituents__[]={vector_face,vector_edge};
-//       vector< vector< vector<int> > > _constituents_(__constituents__,__constituents__+2) ;
-//       _constituents = _constituents_ ;
       int* _face1=new int[4];
       _face1[0]=1;
       _face1[1]=2;
@@ -804,11 +657,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _constituents = new int**[2] ;
       _constituents[0]=tmpConstituents1 ;
       _constituents[1]=tmpConstituents2 ;
-//       vector<medGeometryElement> vector_edge_type(12,MED_SEG2) ;
-//       vector<medGeometryElement> vector_face_type(6,MED_QUAD4) ;
-//       vector<medGeometryElement> __constituents_type[]={vector_face_type,vector_edge_type};
-//       vector< vector<medGeometryElement> > _constituents_type(__constituents_type,__constituents_type+2);
-//       _constituentsType = _constituents_type ;
       medGeometryElement * tmpConstituentsType1 = new medGeometryElement[6] ;
       tmpConstituentsType1[0] = MED_QUAD4 ;
       tmpConstituentsType1[1] = MED_QUAD4 ;
@@ -840,53 +688,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _dimension=3;
       _numberOfVertexes=8;
       _numberOfNodes=20;
-
-//       int _edge1[]={1,2,9} ;
-//       int _edge2[]={2,3,10} ;
-//       int _edge3[]={3,4,11} ;
-//       int _edge4[]={4,1,12} ;
-//       int _edge5[]={5,6,13} ;
-//       int _edge6[]={6,7,14};
-//       int _edge7[]={7,8,15} ; 
-//       int _edge8[]={8,5,16} ;
-//       int _edge9[]={1,5,17} ;
-//       int _edge10[]={2,6,18} ;
-//       int _edge11[]={3,7,19} ;
-//       int _edge12[]={4,8,20} ;
-
-//       vector<int> edge1(_edge1,_edge1+3) ;
-//       vector<int> edge2(_edge2,_edge2+3) ;
-//       vector<int> edge3(_edge3,_edge3+3) ;
-//       vector<int> edge4(_edge4,_edge4+3) ;
-//       vector<int> edge5(_edge5,_edge5+3) ;
-//       vector<int> edge6(_edge6,_edge6+3) ;
-//       vector<int> edge7(_edge7,_edge7+3) ;
-//       vector<int> edge8(_edge8,_edge8+3) ;
-//       vector<int> edge9(_edge9,_edge9+3) ;
-//       vector<int> edge10(_edge10,_edge10+3) ;
-//       vector<int> edge11(_edge11,_edge11+3) ;
-//       vector<int> edge12(_edge12,_edge12+3) ;       
-//       vector<int> _vector_edge[]={edge1,edge2,edge3,edge4,edge5,edge6,edge7,edge8,edge9,edge10, edge11,edge12};
-//       vector< vector<int> > vector_edge(_vector_edge,_vector_edge+12) ;
-
-//       int _face1[]={1,2,3,4,9,10,11,12} ;
-//       int _face2[]={5,8,7,6,16,15,14,13} ;
-//       int _face3[]={1,5,6,2,17,13,18,9} ;
-//       int _face4[]={2,6,7,3,18,14,19,10} ;
-//       int _face5[]={3,7,8,4,19,15,20,11} ;
-//       int _face6[]={4,8,5,1,20,16,17,12} ;
-//       vector<int> face1(_face1,_face1+8);
-//       vector<int> face2(_face2,_face2+8);
-//       vector<int> face3(_face3,_face3+8);
-//       vector<int> face4(_face4,_face4+8);
-//       vector<int> face5(_face5,_face5+8);
-//       vector<int> face6(_face6,_face6+8);
-//       vector<int> _vector_face[]= {face1,face2,face3,face4,face5,face6} ;
-//       vector< vector<int> > vector_face(_vector_face,_vector_face+6);
-
-//       vector< vector<int> > __constituents__[]={vector_face,vector_edge};
-//       vector< vector< vector<int> > > _constituents_(__constituents__,__constituents__+2) ; 
-//       _constituents = _constituents_ ;
       _numberOfConstituentsDimension=2 ;
       _numberOfConstituents=new int[2] ;
       _numberOfConstituents[0]=6 ;
@@ -916,11 +717,11 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       int* _edge1=new int[3];
       _edge1[0]=1;
       _edge1[1]=2;
-      _edge1[1]=9;
+      _edge1[2]=9;
       int* _edge2=new int[3];
       _edge2[0]=2;
       _edge2[1]=3;
-      _edge2[1]=10;
+      _edge2[2]=10;
       int* _edge3=new int[3];
       _edge3[0]=3;
       _edge3[1]=4;
@@ -1038,11 +839,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _constituents = new int**[2] ;
       _constituents[0]=tmpConstituents1 ;
       _constituents[1]=tmpConstituents2 ;
-//       vector<medGeometryElement> vector_edge_type(12,MED_SEG3) ;
-//       vector<medGeometryElement> vector_face_type(6,MED_QUAD8) ;
-//       vector<medGeometryElement> __constituents_type[]={vector_face_type,vector_edge_type};
-//       vector< vector<medGeometryElement> > _constituents_type(__constituents_type,__constituents_type+2) ;
-//       _constituentsType = _constituents_type ;
       medGeometryElement * tmpConstituentsType1 = new medGeometryElement[6] ;
       tmpConstituentsType1[0] = MED_QUAD8 ;
       tmpConstituentsType1[1] = MED_QUAD8 ;
@@ -1075,44 +871,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _numberOfVertexes=6;
       _numberOfNodes=6;
 
-//       int _edge1[]= {1,2} ;
-//       int _edge2[]= {2,3} ;
-//       int _edge3[]= {3,1} ;
-//       int _edge4[]= {4,5} ;
-//       int _edge5[]= {5,6} ;
-//       int _edge6[]= {6,4} ;
-//       int _edge7[]= {1,4} ;
-//       int _edge8[]= {2,5} ;
-//       int _edge9[]= {3,6} ;
-
-//       vector<int> edge1(_edge1,_edge1+2) ;
-//       vector<int> edge2(_edge2,_edge2+2) ;
-//       vector<int> edge3(_edge3,_edge3+2) ;
-//       vector<int> edge4(_edge4,_edge4+2) ;
-//       vector<int> edge5(_edge5,_edge5+2) ;
-//       vector<int> edge6(_edge6,_edge6+2) ;
-//       vector<int> edge7(_edge7,_edge7+2) ;
-//       vector<int> edge8(_edge8,_edge8+2) ;
-//       vector<int> edge9(_edge9,_edge9+2) ;    
-//       vector<int> _vector_edge[]={edge1,edge2,edge3,edge4,edge5,edge6,edge7,edge8,edge9};
-//       vector< vector<int> > vector_edge(_vector_edge,_vector_edge+9) ;
-
-//       int _face1[]={1,2,3};
-//       int _face2[]={4,6,5};
-//       int _face3[]={1,4,5,2};
-//       int _face4[]={2,5,6,3};
-//       int _face5[]={3,6,4,1};
-//       vector<int> face1(_face1,_face1+3);
-//       vector<int> face2(_face2,_face2+3);
-//       vector<int> face3(_face3,_face3+4);
-//       vector<int> face4(_face4,_face4+4);
-//       vector<int> face5(_face5,_face5+4);
-//       vector<int> _vector_face[]= {face1,face2,face3,face4,face5} ;
-//       vector< vector<int> > vector_face(_vector_face,_vector_face+5);
-//       vector< vector<int> > __constituents__[]={vector_face,vector_edge};
-//       vector< vector< vector<int> > > _constituents_(__constituents__,__constituents__+2) ;
-//       _constituents = _constituents_ ;
       _numberOfConstituentsDimension=2 ;
       _numberOfConstituents=new int[2] ;
       _numberOfConstituents[0]=5 ;
@@ -1204,13 +962,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _constituents = new int**[2] ;
       _constituents[0]=tmpConstituents1 ;
       _constituents[1]=tmpConstituents2 ;
-//       vector<medGeometryElement> vector_edge_type(9,MED_SEG2) ;
-//       vector<medGeometryElement> vector_face_type(5,MED_QUAD4) ;
-//       vector_face_type[0]=MED_TRIA3 ;
-//       vector_face_type[1]=MED_TRIA3 ;
-//       vector<medGeometryElement> __constituents_type[]={vector_face_type,vector_edge_type};
-//       vector< vector<medGeometryElement> > _constituents_type(__constituents_type,__constituents_type+2) ;
-//       _constituentsType = _constituents_type ;
       medGeometryElement * tmpConstituentsType1 = new medGeometryElement[5] ;
       tmpConstituentsType1[0] = MED_TRIA3 ;
       tmpConstituentsType1[1] = MED_TRIA3 ;
@@ -1238,44 +989,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _dimension=3;
       _numberOfVertexes=6;
       _numberOfNodes=15;
-//       int _edge1[]={1,2,7} ;
-//       int _edge2[]={2,3,8} ;
-//       int _edge3[]={3,1,9} ;
-//       int _edge4[]={4,5,10} ;
-//       int _edge5[]={5,6,11} ;
-//       int _edge6[]={6,4,12} ;
-//       int _edge7[]={1,4,13} ;
-//       int _edge8[]={2,5,14} ;
-//       int _edge9[]={3,6,15} ;
-
-//       vector<int> edge1(_edge1,_edge1+3) ;
-//       vector<int> edge2(_edge2,_edge2+3) ;
-//       vector<int> edge3(_edge3,_edge3+3) ;
-//       vector<int> edge4(_edge4,_edge4+3) ;
-//       vector<int> edge5(_edge5,_edge5+3) ;
-//       vector<int> edge6(_edge6,_edge6+3) ;
-//       vector<int> edge7(_edge7,_edge7+3) ;
-//       vector<int> edge8(_edge8,_edge8+3) ;
-//       vector<int> edge9(_edge9,_edge9+3) ;    
-//      vector<int> _vector_edge[]={edge1,edge2,edge3,edge4,edge5,edge6,edge7,edge8,edge9};
-//       vector< vector<int> > vector_edge(_vector_edge,_vector_edge+9) ;
-
-//       int _face1[]={1,2,3,7,8,9};
-//       int _face2[]={4,6,5,12,11,10};
-//       int _face3[]={1,4,5,2,13,10,14,7};
-//       int _face4[]={2,5,6,3,14,11,15,8};
-//       int _face5[]={3,6,4,1,15,12,13,9};
-//       vector<int> face1(_face1,_face1+6);
-//       vector<int> face2(_face2,_face2+6);
-//       vector<int> face3(_face3,_face3+8);
-//       vector<int> face4(_face4,_face4+8);
-//       vector<int> face5(_face5,_face5+8);
-//       vector<int> _vector_face[]= {face1,face2,face3,face4,face5} ;
-//       vector< vector<int> > vector_face(_vector_face,_vector_face+5);
-
-//       vector< vector<int> > __constituents__[]={vector_face,vector_edge};
-//       vector< vector< vector<int> > > _constituents_(__constituents__,__constituents__+2) ;
-//       _constituents = _constituents_ ;
       _numberOfConstituentsDimension=2 ;
       _numberOfConstituents=new int[2] ;
       _numberOfConstituents[0]=5 ;
@@ -1394,13 +1107,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _constituents = new (int**)[2] ;
       _constituents[0]=tmpConstituents1 ;
       _constituents[1]=tmpConstituents2 ;
-//       vector<medGeometryElement> vector_edge_type(9,MED_SEG3) ;
-//       vector<medGeometryElement> vector_face_type(5,MED_QUAD8) ;
-//       vector_face_type[0]=MED_TRIA6 ;
-//       vector_face_type[1]=MED_TRIA6 ;
-//       vector<medGeometryElement> __constituents_type[]={vector_face_type,vector_edge_type};
-//       vector< vector<medGeometryElement> > _constituents_type(__constituents_type,__constituents_type+2) ;
-//       _constituentsType = _constituents_type ;
       medGeometryElement * tmpConstituentsType1 = new medGeometryElement[5] ;
       tmpConstituentsType1[0] = MED_TRIA6 ;
       tmpConstituentsType1[1] = MED_TRIA6 ;
@@ -1428,42 +1134,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _dimension=3;
       _numberOfVertexes=5;
       _numberOfNodes=5;
-//       int _edge1[]={1,2} ;
-//       int _edge2[]={2,3} ;
-//       int _edge3[]={3,4} ;
-//       int _edge4[]={4,1} ;
-//       int _edge5[]={1,5} ;
-//       int _edge6[]={2,5} ;
-//       int _edge7[]={3,5} ;
-//       int _edge8[]={4,5} ;
-
-//       vector<int> edge1(_edge1,_edge1+2) ;
-//       vector<int> edge2(_edge2,_edge2+2) ;
-//       vector<int> edge3(_edge3,_edge3+2) ;
-//       vector<int> edge4(_edge4,_edge4+2) ;
-//       vector<int> edge5(_edge5,_edge5+2) ;
-//       vector<int> edge6(_edge6,_edge6+2) ;
-//       vector<int> edge7(_edge7,_edge7+2) ;
-//       vector<int> edge8(_edge8,_edge8+2) ;
-//      vector<int> _vector_edge[]={edge1,edge2,edge3,edge4,edge5,edge6,edge7,edge8};
-//       vector< vector<int> > vector_edge(_vector_edge,_vector_edge+8) ;
-
-//       int _face1[]={1,2,3,4} ;
-//       int _face2[]={1,5,2} ;
-//       int _face3[]={2,5,3} ;
-//       int _face4[]={3,5,4} ;
-//       int _face5[]={4,5,1} ;
-//       vector<int> face1(_face1,_face1+4);
-//       vector<int> face2(_face2,_face2+3);
-//       vector<int> face3(_face3,_face3+3);
-//       vector<int> face4(_face4,_face4+3);
-//       vector<int> face5(_face5,_face5+3);
-//       vector<int> _vector_face[]= {face1,face2,face3,face4,face5} ;
-//       vector< vector<int> > vector_face(_vector_face,_vector_face+5);
-
-//       vector< vector<int> > __constituents__[]={vector_face,vector_edge};
-//       vector< vector< vector<int> > > _constituents_(__constituents__,__constituents__+2) ;
-//       _constituents = _constituents_ ;
       _numberOfConstituentsDimension=2 ;
       _numberOfConstituents=new int[2] ;
       _numberOfConstituents[0]=5 ;
@@ -1548,12 +1218,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _constituents = new int**[2] ;
       _constituents[0]=tmpConstituents1 ;
       _constituents[1]=tmpConstituents2 ;
-//       vector<medGeometryElement> vector_edge_type(8,MED_SEG2) ;
-//       vector<medGeometryElement> vector_face_type(5,MED_TRIA3) ;
-//       vector_face_type[0]=MED_QUAD4 ;
-//     vector<medGeometryElement> __constituents_type[]={vector_face_type,vector_edge_type};
-//       vector< vector<medGeometryElement> > _constituents_type(__constituents_type,__constituents_type+2) ;
-//       _constituentsType = _constituents_type ;
       medGeometryElement * tmpConstituentsType1 = new medGeometryElement[5] ;
       tmpConstituentsType1[0] = MED_QUAD4 ;
       tmpConstituentsType1[1] = MED_TRIA3 ;
@@ -1580,45 +1244,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _dimension=3;
       _numberOfVertexes=5;
       _numberOfNodes=13;
-//       int _edge1[]={1,2,6} ;
-//       int _edge2[]={2,3,7} ;
-//       int _edge3[]={3,4,8} ;
-//       int _edge4[]={4,1,9} ;
-//       int _edge5[]={1,5,10} ;
-//       int _edge6[]={2,5,11} ;
-//       int _edge7[]={3,5,12} ;
-//       int _edge8[]={4,5,13} ;
-
-//       vector<int> edge1(_edge1,_edge1+3) ;
-//       vector<int> edge2(_edge2,_edge2+3) ;
-//       vector<int> edge3(_edge3,_edge3+3) ;
-//       vector<int> edge4(_edge4,_edge4+3) ;
-//       vector<int> edge5(_edge5,_edge5+3) ;
-//       vector<int> edge6(_edge6,_edge6+3) ;
-//       vector<int> edge7(_edge7,_edge7+3) ;
-//       vector<int> edge8(_edge8,_edge8+3) ;
-
-
-//       vector<int> _vector_edge[]={edge1,edge2,edge3,edge4,edge5,edge6,edge7,edge8};
-//       vector< vector<int> > vector_edge(_vector_edge,_vector_edge+8) ;
-
-//       int _face1[]={1,2,3,4,6,7,8,9} ;
-//       int _face2[]={1,5,2,10,11,6} ;
-//       int _face3[]={2,5,3,11,12,7} ;
-//       int _face4[]={3,5,4,12,13,8} ;
-//       int _face5[]={4,5,1,13,10,9} ;
-//       vector<int> face1(_face1,_face1+8);
-//       vector<int> face2(_face2,_face2+6);
-//       vector<int> face3(_face3,_face3+6);
-//       vector<int> face4(_face4,_face4+6);
-//       vector<int> face5(_face5,_face5+6);
-//       vector<int> _vector_face[]= {face1,face2,face3,face4,face5} ;
-//       vector< vector<int> > vector_face(_vector_face,_vector_face+5);
-
-
-//       vector< vector<int> > __constituents__[]={vector_face,vector_edge};
-//       vector< vector< vector<int> > > _constituents_(__constituents__,__constituents__+2) ;
-//       _constituents = _constituents_ ;
       _numberOfConstituentsDimension=2 ;
       _numberOfConstituents=new int[2] ;
       _numberOfConstituents[0]=5 ;
@@ -1727,13 +1352,6 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
       _constituents = new int**[2] ;
       _constituents[0]=tmpConstituents1 ;
       _constituents[1]=tmpConstituents2 ;
-//       vector<medGeometryElement> vector_edge_type(8,MED_SEG3) ;
-//       vector<medGeometryElement> vector_face_type(5,MED_TRIA6) ;
-//       vector_face_type[0]=MED_QUAD8 ;
-//      vector<medGeometryElement> __constituents_type[]={vector_face_type,vector_edge_type};
-//       vector< vector<medGeometryElement> > _constituents_type(__constituents_type,__constituents_type+2) ;
-
-//       _constituentsType = _constituents_type ;
       medGeometryElement * tmpConstituentsType1 = new medGeometryElement[5] ;
       tmpConstituentsType1[0] = MED_QUAD8 ;
       tmpConstituentsType1[1] = MED_TRIA6 ;