Merge from BR_V5_DEV 16Feb09

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

diff --git a/src/MEDMEM/MEDMEM_CellModel.cxx b/src/MEDMEM/MEDMEM_CellModel.cxx
index 7b339360942b5bc96a68ce29a14a4d390ca01b58..16a40b90478ad36f51bbbcff14b9c260506957c4 100644 (file)
--- a/src/MEDMEM/MEDMEM_CellModel.cxx
+++ b/src/MEDMEM/MEDMEM_CellModel.cxx
@@ -1,21 +1,23 @@
-// Copyright (C) 2005  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.
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// 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
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 /*
  File MEDMEM_CellModel.cxx
@@ -28,6 +30,19 @@ using namespace std;
 using namespace MEDMEM;
 using namespace MED_EN;
 
+CELLMODEL_Map *CELLMODEL_Map::_singleton=0;
+
+const MEDMEM::CELLMODEL& CELLMODEL_Map::retrieveCellModel(MED_EN::medGeometryElement type)
+{
+  return CELLMODEL_Map::getInstance()->getCellModel(type);
+}
+
+CELLMODEL_Map *CELLMODEL_Map::getInstance()
+{
+  if(!_singleton) _singleton=new CELLMODEL_Map;
+  return _singleton;
+}
+
 CELLMODEL::CELLMODEL(medGeometryElement t)
 {
   // init first all to nothing
@@ -41,7 +56,7 @@ CELLMODEL::CELLMODEL(medGeometryElement t)
   //_numberOfonstituentsType=(int*)NULL ;
   _constituentsType=(medGeometryElement**)NULL ;
   
-  MESSAGE("CELLMODEL : constructeur pour le type " << t);
+  MESSAGE_MED("CELLMODEL : constructeur pour le type " << t);
   switch (t)
     {
     case MED_POINT1  : {