NRI : Merge from V1_2.

diff --git a/src/MEDMEM/MEDMEM_Connectivity.cxx b/src/MEDMEM/MEDMEM_Connectivity.cxx
index ca443761f9267b2ebe124597ecdc43779ddefab7..72ac52e670256ccbfeeacf61de6b7dcb0fe5349b 100644 (file)
--- a/src/MEDMEM/MEDMEM_Connectivity.cxx
+++ b/src/MEDMEM/MEDMEM_Connectivity.cxx
@@ -336,11 +336,6 @@ void CONNECTIVITY::updateFamily(vector<FAMILY*> myFamilies)
       return;
     }
 
-    for(int i=0; i<numberOfFamilies; i++) {
-      FAMILY * myFamily = myFamilies[i] ;
-      MESSAGE(LOC<<"updating the family (BEGIN) : " << *myFamily);
-    }
-
     // well we could go !
     CONNECTIVITY * oldConstituent = _constituent;
 

diff --git a/src/MEDMEM/MEDMEM_Family.cxx b/src/MEDMEM/MEDMEM_Family.cxx
index a8f0a02e834a97f83ec8b9aecf7f0a86f619ad53..d85fa5ec5bd78f8ddf9c10687d6dd9f927613b7c 100644 (file)
--- a/src/MEDMEM/MEDMEM_Family.cxx
+++ b/src/MEDMEM/MEDMEM_Family.cxx
@@ -229,43 +229,6 @@ FAMILY::FAMILY(const SUPPORT & s):SUPPORT(s)
   _groupName= (string*) NULL;
 };
 
-FAMILY::FAMILY(FAMILY & m):SUPPORT(m)
-{
-  _identifier = m._identifier;
-  _numberOfAttribute = m._numberOfAttribute;
-  if (m._attributeIdentifier != NULL)
-    {
-      _attributeIdentifier = new int[m._numberOfAttribute];
-      memcpy(_attributeIdentifier,m._attributeIdentifier,m._numberOfAttribute*sizeof(int));
-    }
-  else
-    _attributeIdentifier = (int *) NULL;
-  if (m._attributeValue != NULL)
-    {
-      _attributeValue = new int[m._numberOfAttribute];
-      memcpy(_attributeValue,m._attributeValue,m._numberOfAttribute*sizeof(int));
-    }
-  else
-    _attributeValue = (int *) NULL;
-  if (m._attributeDescription != NULL)
-    {
-      _attributeDescription = new string[m._numberOfAttribute];
-      for (int i=0;i<m._numberOfAttribute;i++)
-       _attributeDescription[i] = m._attributeDescription[i];
-    }
-  else
-    _attributeDescription = (string *) NULL;
-  _numberOfGroup = m._numberOfGroup;
-  if (m._groupName != NULL)
-    {
-      _groupName = new string[m._numberOfGroup];
-      for (int i=0;i<m._numberOfGroup;i++)
-       _groupName[i]=m._groupName[i];
-    }
-  else
-    _groupName = (string *) NULL;
-};
-
 FAMILY::~FAMILY() 
 {
     MESSAGE("~FAMILY()");

diff --git a/src/MEDMEM/MEDMEM_GenDriver.cxx b/src/MEDMEM/MEDMEM_GenDriver.cxx
index fe62e39805c8291edb79057c3bf3623da7fd93c4..41b07769508af5945bce2d9c59573d8123cfd5c9 100644 (file)
--- a/src/MEDMEM/MEDMEM_GenDriver.cxx
+++ b/src/MEDMEM/MEDMEM_GenDriver.cxx
@@ -168,6 +168,4 @@ bool GENDRIVER::operator ==(const GENDRIVER &genDriver) const {
   return ( _id == genDriver._id )  &&
     ( _driverType == genDriver._driverType );
   
-  END_OF(LOC);
-  
 };

diff --git a/src/MEDMEM/MEDMEM_Mesh.cxx b/src/MEDMEM/MEDMEM_Mesh.cxx
index 94e9a0533bd47649ac9ef79ba699e0625670d2bc..0050168db3f8d49946900538690c646e866b0e1a 100644 (file)
--- a/src/MEDMEM/MEDMEM_Mesh.cxx
+++ b/src/MEDMEM/MEDMEM_Mesh.cxx
@@ -86,7 +86,7 @@ int MESH::addDriver(driverTypes driverType,
 }
 
 /*! Add an existing MESH driver. */
-int  MESH::addDriver(MED_MESH_DRIVER & driver) {
+int  MESH::addDriver(GENDRIVER & driver) {
   const char * LOC = "MESH::addDriver(GENDRIVER &) : ";
   BEGIN_OF(LOC);
 

diff --git a/src/MEDMEM/MEDMEM_Mesh.hxx b/src/MEDMEM/MEDMEM_Mesh.hxx
index 3791a074b0c3f3f2d8535dbc0d0ca1d7ab26315e..9fad12dfadba3b9e530d2648f933d2580c8caf44 100644 (file)
--- a/src/MEDMEM/MEDMEM_Mesh.hxx
+++ b/src/MEDMEM/MEDMEM_Mesh.hxx
@@ -156,7 +156,6 @@ public :
   // Add your personnal driver line (step 2)
   friend class MED_MESH_RDONLY_DRIVER;
   friend class MED_MESH_WRONLY_DRIVER;
-  friend class MED_MED_DRIVER;
 
   friend class MED_MED_RDONLY_DRIVER;
   friend class MED_MED_WRONLY_DRIVER;
@@ -329,25 +328,6 @@ inline void MESH::read(const MED_MED_DRIVER & genDriver)
 
 }
 
-// This method is MED specific : don't use it 
-// must be private. 
-inline void MESH::read(const MED_MED_DRIVER & genDriver) 
-{ 
-  const char * LOC = "MESH::read(const MED_MED_DRIVER & genDriver): ";
-  BEGIN_OF(LOC);
-
-  for (int index=0; index < _drivers.size(); index++ )
-    if ( *_drivers[index] == genDriver ) { 
-      _drivers[index]->open();   
-      _drivers[index]->read(); 
-      _drivers[index]->close();
-      // ? FINALEMENT PAS BESOIN DE L'EXCEPTION ?
-    }
-  
-  END_OF(LOC);
-  
-} 
-
 /*! Set the MESH name */
 inline void MESH::setName(string name)
 {