From: enk <enk@opencascade.com>
Date: Thu, 27 Jan 2005 11:52:38 +0000 (+0000)
Subject: CEA DEN - PAL/SALOME 2005 - L1.4.1 - Polyhedral elements
X-Git-Tag: V2_2_0b1~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5e1a522fa0bb8f1a570f9ee3973a23b5eadd2984;p=modules%2Fkernel.git

CEA DEN - PAL/SALOME 2005 - L1.4.1 - Polyhedral elements
---

diff --git a/src/MEDWrapper/Base/MED_Algorithm.cxx b/src/MEDWrapper/Base/MED_Algorithm.cxx
index a1a42ed96..128dfa2ea 100644
--- a/src/MEDWrapper/Base/MED_Algorithm.cxx
+++ b/src/MEDWrapper/Base/MED_Algorithm.cxx
@@ -60,23 +60,12 @@ namespace MED{
 	  {
 	    PPolygoneInfo aPolygoneInfo = theWrapper.GetPPolygoneInfo(theMeshInfo,anEntity,aGeo);
 	    aElemSet.insert(aPolygoneInfo);
-	    TElemNum aConn  = aPolygoneInfo->GetConnectivite();
-	    TElemNum aIndex = aPolygoneInfo->GetIndex();
-	    TInt aNbIndex = aIndex.size();
-	    TInt aIndex0 = aIndex[0];
-	    INITMSG(MYDEBUG,"aGeo = "<<aGeo<<"; aNbElem = "<<aNbIndex-1<<": ");
-	    for(TInt iElem = 1; iElem < aNbIndex; iElem++){
-	      for (TInt i = aIndex0; i < aIndex[iElem];i++)
-		ADDMSG(MYVALUEDEBUG,aConn[i-1]<<",");
-	      ADDMSG(MYDEBUG," ");
-	      aIndex0 = aIndex[iElem];
-	    }
-	    ADDMSG(MYDEBUG,endl);
-	    ADDMSG(MYDEBUG,"           Indexes :");
-	    for(TInt iElem = 0; iElem < aIndex.size(); iElem++){
-	      ADDMSG(MYVALUEDEBUG,aIndex[iElem]<<",");
-	    }
-	    ADDMSG(MYDEBUG,endl);
+	    break;
+	  }
+	case ePOLYEDRE:
+	  {
+	    PPolyedreInfo aPolyedreInfo = theWrapper.GetPPolyedreInfo(theMeshInfo,anEntity,aGeo);
+	    aElemSet.insert(aPolyedreInfo);
 	    break;
 	  }
 	default:
diff --git a/src/MEDWrapper/Base/MED_Structures.cxx b/src/MEDWrapper/Base/MED_Structures.cxx
index b96bf7523..c193acce8 100644
--- a/src/MEDWrapper/Base/MED_Structures.cxx
+++ b/src/MEDWrapper/Base/MED_Structures.cxx
@@ -145,6 +145,18 @@ TInt TPolygoneInfo::GetNbConn(TInt theElemId) const {
   return ret;
 }
 
+//---------------------------------------------------------------
+TInt TPolyedreInfo::GetNbConn(TInt theElemId) const {
+  TInt ind1 = GETINDEX(myIndex,theElemId);
+  TInt ind2 = GETINDEX(myIndex,theElemId+1);
+
+  TInt inf1 = GETINDEX(myFacesIndex,ind1-1);
+  TInt inf2 = GETINDEX(myFacesIndex,ind2-1);
+
+  TInt ret = inf2-inf1;
+  return ret;
+}
+
 //---------------------------------------------------------------
 TFloat TTimeStampVal::GetVal(EGeometrieElement theGeom, TInt theId, 
 			     TInt theComp, TInt theGauss) const {
diff --git a/src/MEDWrapper/Base/MED_Structures.hxx b/src/MEDWrapper/Base/MED_Structures.hxx
index 12e131bdd..560410eeb 100644
--- a/src/MEDWrapper/Base/MED_Structures.hxx
+++ b/src/MEDWrapper/Base/MED_Structures.hxx
@@ -238,6 +238,7 @@ namespace MED{
     
     TElemNum myIndex; // Table de indexes
     TElemNum GetIndex() {return myIndex;}
+    TInt GetNbConn(TInt theElemId) const;
   };
 
   //---------------------------------------------------------------
diff --git a/src/MEDWrapper/Base/MED_Wrapper.cxx b/src/MEDWrapper/Base/MED_Wrapper.cxx
index f536162c7..38024b8b9 100644
--- a/src/MEDWrapper/Base/MED_Wrapper.cxx
+++ b/src/MEDWrapper/Base/MED_Wrapper.cxx
@@ -104,6 +104,25 @@ namespace MED{
     TInt aNbConn = GetNbPolygoneConn(*theMeshInfo,theEntity,theGeom,theConn);
     PPolygoneInfo anInfo = CrPolygoneInfo(theMeshInfo,aNbElem,aNbConn,theEntity,theGeom,theConn);
     GetPolygoneInfo(*anInfo);
+#ifdef _DEBUG_
+    TElemNum aConn  = anInfo->GetConnectivite();
+    TElemNum aIndex = anInfo->GetIndex();
+    TInt aNbIndex = aIndex.size();
+    TInt aIndex0 = aIndex[0];
+    INITMSG(MYDEBUG,"theGeom = "<<theGeom<<"; aNbElem = "<<aNbIndex-1<<": ");
+    for(TInt iElem = 1; iElem < aNbIndex; iElem++){
+      for (TInt i = aIndex0; i < aIndex[iElem];i++)
+	ADDMSG(MYVALUEDEBUG,aConn[i-1]<<",");
+      ADDMSG(MYDEBUG," ");
+      aIndex0 = aIndex[iElem];
+    }
+    ADDMSG(MYDEBUG,endl);
+    ADDMSG(MYDEBUG,"           Indexes :");
+    for(TInt iElem = 0; iElem < aIndex.size(); iElem++){
+      ADDMSG(MYVALUEDEBUG,aIndex[iElem]<<",");
+    }
+    ADDMSG(MYDEBUG,endl);
+#endif
     return anInfo;
   }
   
@@ -119,6 +138,28 @@ namespace MED{
     GetNbPolyedreConnF(*theMeshInfo,theConn,aNbFaces,aNbConn);
     PPolyedreInfo anInfo = CrPolyedreInfo(theMeshInfo,aNbElem,aNbConn,aNbFaces,theEntity,theGeom,theConn);
     GetPolyedreInfo(*anInfo);
+#ifdef _DEBUG_
+    TElemNum aConn        = anInfo->GetConnectivite();
+    TElemNum aFacesIndex  = anInfo->GetFacesIndex();
+    TElemNum aIndex       = anInfo->GetIndex();
+    
+    TInt aNbIndex      = aIndex.size();
+    
+    for (int aNp = 0; aNp < aNbIndex-1;aNp++){
+      if (anInfo->IsElemNames())
+	ADDMSG(MYDEBUG,anInfo->GetElemName(aNp)<<endl);
+      else 
+	ADDMSG(MYDEBUG,"POLYEDRE "<<aNp+1<<endl);
+      
+      for (int aNf = aIndex[aNp]-1;aNf < aIndex[aNp+1]-1;aNf++){
+	ADDMSG(MYDEBUG,"Face "<<aNf-aIndex[aNp]+2<<": [");
+	for (int aNc = aFacesIndex[aNf]-1; aNc < aFacesIndex[aNf+1]-1;aNc++){
+	  ADDMSG(MYDEBUG," "<<aConn[aNc]);
+	}
+	ADDMSG(MYDEBUG," ]"<<endl;);
+      }
+    }
+#endif
     return anInfo;
   }
   
diff --git a/src/MEDWrapper/Base/MED_Wrapper.hxx b/src/MEDWrapper/Base/MED_Wrapper.hxx
index 4865a156e..fccf3406f 100644
--- a/src/MEDWrapper/Base/MED_Wrapper.hxx
+++ b/src/MEDWrapper/Base/MED_Wrapper.hxx
@@ -123,6 +123,57 @@ namespace MED{
 		   TInt theId,
 		   TErr* theErr = NULL);
     
+    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    virtual
+    void
+    GetNames(TElemInfo& theInfo,
+	     TInt nb,
+	     EEntiteMaillage theTEntity, 
+	     EGeometrieElement theTGeom,
+	     TErr* theErr = NULL)
+    {}
+
+    virtual
+    void
+    GetNumeration(TElemInfo& theInfo,
+		  TInt nb,
+		  EEntiteMaillage theTEntity, 
+		  EGeometrieElement theTGeom,
+		  TErr* theErr = NULL)
+    {}
+
+    virtual
+    void
+    GetFamilies(TElemInfo& theInfo,
+		TInt nb,
+		EEntiteMaillage theTEntity, 
+		EGeometrieElement theTGeom,
+		TErr* theErr = NULL)
+    {}
+
+    virtual
+    void
+    SetNames(const TElemInfo& theInfo,
+	     EEntiteMaillage theTEntity, 
+	     EGeometrieElement theTGeom,
+	     TErr* theErr = NULL)
+    {}
+
+    virtual
+    void
+    SetNumeration(const TElemInfo& theInfo,
+		  EEntiteMaillage theTEntity, 
+		  EGeometrieElement theTGeom,
+		  TErr* theErr = NULL)
+    {}
+
+    virtual
+    void
+    SetFamilies(const TElemInfo& theInfo,
+		EEntiteMaillage theTEntity, 
+		EGeometrieElement theTGeom,
+		TErr* theErr = NULL)
+    {}
 
     //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     virtual
diff --git a/src/MEDWrapper/Factory/MED_Test.cxx b/src/MEDWrapper/Factory/MED_Test.cxx
index 2167c17cb..39d0ed316 100644
--- a/src/MEDWrapper/Factory/MED_Test.cxx
+++ b/src/MEDWrapper/Factory/MED_Test.cxx
@@ -36,9 +36,9 @@ static int MYDEBUG = 1;
 static int MYDEBUG = 0;
 #endif
 
-static int MYVALUEDEBUG = 1;
+static int MYVALUEDEBUG = 0;
 
-static int MYWRITEDEBUG = 1;
+static int MYWRITEDEBUG = 0;
 
 using namespace MED;
 
diff --git a/src/MEDWrapper/V2_1/MED_V2_1_Wrapper.cxx b/src/MEDWrapper/V2_1/MED_V2_1_Wrapper.cxx
index bb7adae42..c68a9aed7 100644
--- a/src/MEDWrapper/V2_1/MED_V2_1_Wrapper.cxx
+++ b/src/MEDWrapper/V2_1/MED_V2_1_Wrapper.cxx
@@ -618,8 +618,8 @@ namespace MED{
     
     
     void TVWrapper::SetFieldInfo(const MED::TFieldInfo& theInfo,
-				EModeAcces theMode,
-				TErr* theErr)
+				 EModeAcces theMode,
+				 TErr* theErr)
     {
       TFileWrapper aFileWrapper(myFile,theMode,theErr);
       
@@ -665,10 +665,10 @@ namespace MED{
     
     
     TInt TVWrapper::GetNbTimeStamps(const MED::TFieldInfo& theInfo, 
-				   const MED::TEntityInfo& theEntityInfo,
-				   EEntiteMaillage& theEntity,
-				   TGeom& theGeom,
-				   TErr* theErr)
+				    const MED::TEntityInfo& theEntityInfo,
+				    EEntiteMaillage& theEntity,
+				    TGeom& theGeom,
+				    TErr* theErr)
     {
       TFileWrapper aFileWrapper(myFile,eLECT,theErr);
       
diff --git a/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx b/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx
index 60d40d48e..6a9234202 100644
--- a/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx
+++ b/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.cxx
@@ -322,7 +322,219 @@ namespace MED{
 	SetFamilyInfo(theInfo,eLECTURE_AJOUT,theErr);
     }
     
+    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    void TVWrapper::GetNames(TElemInfo& theInfo,
+			     TInt nb,
+			     EEntiteMaillage theTEntity, 
+			     EGeometrieElement theTGeom,
+			     TErr* theErr)
+    {
+      TFileWrapper aFileWrapper(myFile,eLECTURE,theErr);
+      
+      if(theErr && !*theErr)
+	return;
+      
+      MED::TMeshInfo& aMeshInfo = *theInfo.myMeshInfo;
+
+      med_entite_maillage& anEntity = static_cast<med_entite_maillage>(theTEntity);
+      med_geometrie_element& aGeom = static_cast<med_geometrie_element>(theTGeom);
+
+      TErr aRet = MEDnomLire(myFile->Id(),
+			     &aMeshInfo.myName[0],
+			     &theInfo.myElemNames[0],
+			     nb,
+			     anEntity,
+			     aGeom);
+
+      theInfo.myIsElemNames = (theInfo.myElemNames).empty()? EBooleen(0) : EBooleen(1) ;
+
+      if(theErr) 
+	*theErr = aRet;
+      else if(aRet < 0)
+	EXCEPTION(runtime_error,"GetNames - MEDnomLire(...)");
+    }
+
+    void TVWrapper::GetNumeration(TElemInfo& theInfo,
+				  TInt nb,
+				  EEntiteMaillage theTEntity, 
+				  EGeometrieElement theTGeom,
+				  TErr* theErr)
+    {
+      TFileWrapper aFileWrapper(myFile,eLECTURE,theErr);
+      
+      if(theErr && !*theErr)
+	return;
+      
+      MED::TMeshInfo& aMeshInfo = *theInfo.myMeshInfo;
+      
+      med_entite_maillage& anEntity = static_cast<med_entite_maillage>(theTEntity);
+      med_geometrie_element& aGeom = static_cast<med_geometrie_element>(theTGeom);
+
+      TErr aRet = MEDnumLire(myFile->Id(),
+			     &aMeshInfo.myName[0],
+			     &theInfo.myElemNum[0],
+			     nb,
+			     anEntity,
+			     aGeom);
+
+      theInfo.myIsElemNum = (theInfo.myElemNum).empty()? EBooleen(0) : EBooleen(1) ;
+
+      if(theErr) 
+	*theErr = aRet;
+      else if(aRet < 0)
+	EXCEPTION(runtime_error,"GetNumeration - MEDnumLire(...)");
+    }
+
+    void TVWrapper::GetFamilies(TElemInfo& theInfo,
+				TInt nb,
+				EEntiteMaillage theTEntity, 
+				EGeometrieElement theTGeom,
+				TErr* theErr)
+    {
+      TFileWrapper aFileWrapper(myFile,eLECTURE,theErr);
+      
+      if(theErr && !*theErr)
+	return;
+      
+      MED::TMeshInfo& aMeshInfo = *theInfo.myMeshInfo;
+      
+      med_entite_maillage& anEntity = static_cast<med_entite_maillage>(theTEntity);
+      med_geometrie_element& aGeom = static_cast<med_geometrie_element>(theTGeom);
+
+      TErr aRet = MEDfamLire(myFile->Id(),
+			     &aMeshInfo.myName[0],
+			     &theInfo.myFamNum[0],
+			     nb,
+			     anEntity,
+			     aGeom);
+
+      if(theErr) 
+	*theErr = aRet;
+      else if(aRet < 0)
+	EXCEPTION(runtime_error,"GetFamilies - MEDfamLire(...)");
+    }
+
+    void TVWrapper::SetNames(const TElemInfo& theInfo,
+			     EEntiteMaillage theTEntity, 
+			     EGeometrieElement theTGeom,
+			     TErr* theErr)
+    { 
+      SetNames(theInfo,eLECTURE_ECRITURE,theTEntity,theTGeom,theErr);
+    }
+
+    void TVWrapper::SetNames(const TElemInfo& theInfo,
+			     EModeAcces theMode,
+			     EEntiteMaillage theTEntity, 
+			     EGeometrieElement theTGeom,
+			     TErr* theErr)
+    {
+      TFileWrapper aFileWrapper(myFile,theMode,theErr);
+      
+      if(theErr && !*theErr)
+	return;
+
+      MED::TElemInfo& anInfo = const_cast<MED::TElemInfo&>(theInfo);
+      MED::TMeshInfo& aMeshInfo = *anInfo.myMeshInfo;
+
+      med_booleen& anIsElemNames = static_cast<med_booleen>(theInfo.myIsElemNames);
+      med_entite_maillage& anEntity = static_cast<med_entite_maillage>(theTEntity);
+      med_geometrie_element& aGeom = static_cast<med_geometrie_element>(theTGeom);
+      
+      TErr aRet = 0;
+      if (anIsElemNames){
+	aRet  = MEDnomEcr(myFile->Id(),
+			  &aMeshInfo.myName[0],
+			  &anInfo.myElemNames[0],
+			  anInfo.myElemNames.size(),
+			  anEntity,
+			  aGeom);
+	if(theErr) 
+	  *theErr = aRet;
+	else if(aRet < 0)
+	  EXCEPTION(runtime_error,"SetNames - MEDnomEcr(...)");
+      }
+    }
+
+    void TVWrapper::SetNumeration(const TElemInfo& theInfo,
+				  EEntiteMaillage theTEntity, 
+				  EGeometrieElement theTGeom,
+				  TErr* theErr)
+    { 
+      SetNumeration(theInfo,eLECTURE_ECRITURE,theTEntity,theTGeom,theErr);
+    }
+
+    void TVWrapper::SetNumeration(const TElemInfo& theInfo,
+				  EModeAcces theMode,
+				  EEntiteMaillage theTEntity, 
+				  EGeometrieElement theTGeom,
+				  TErr* theErr)
+    {
+      TFileWrapper aFileWrapper(myFile,theMode,theErr);
+      
+      if(theErr && !*theErr)
+	return;
+
+      MED::TElemInfo& anInfo = const_cast<MED::TElemInfo&>(theInfo);
+      MED::TMeshInfo& aMeshInfo = *anInfo.myMeshInfo;
+
+      med_booleen& anIsElemNum = static_cast<med_booleen>(theInfo.myIsElemNum);
+      med_entite_maillage& anEntity = static_cast<med_entite_maillage>(theTEntity);
+      med_geometrie_element& aGeom = static_cast<med_geometrie_element>(theTGeom);
+      
+      TErr aRet = 0;
+      if (anIsElemNum){
+	aRet  = MEDnumEcr(myFile->Id(),
+			  &aMeshInfo.myName[0],
+			  &anInfo.myElemNum[0],
+			  anInfo.myElemNum.size(),
+			  anEntity,
+			  aGeom);
+	if(theErr) 
+	  *theErr = aRet;
+	else if(aRet < 0)
+	  EXCEPTION(runtime_error,"SetNumeration - MEDnumEcr(...)");
+      }
+    }
+
+    void TVWrapper::SetFamilies(const TElemInfo& theInfo,
+				EEntiteMaillage theTEntity, 
+				EGeometrieElement theTGeom,
+				TErr* theErr)
+    { 
+      SetFamilies(theInfo,eLECTURE_ECRITURE,theTEntity,theTGeom,theErr);
+    }
+
+    void TVWrapper::SetFamilies(const TElemInfo& theInfo,
+				EModeAcces theMode,
+				EEntiteMaillage theTEntity, 
+				EGeometrieElement theTGeom,
+				TErr* theErr)
+    {
+      TFileWrapper aFileWrapper(myFile,theMode,theErr);
+      
+      if(theErr && !*theErr)
+	return;
+
+      MED::TElemInfo& anInfo = const_cast<MED::TElemInfo&>(theInfo);
+      MED::TMeshInfo& aMeshInfo = *anInfo.myMeshInfo;
+
+      med_entite_maillage& anEntity = static_cast<med_entite_maillage>(theTEntity);
+      med_geometrie_element& aGeom = static_cast<med_geometrie_element>(theTGeom);
+      
+      TErr aRet = MEDfamEcr(myFile->Id(),
+			    &aMeshInfo.myName[0],
+			    &anInfo.myFamNum[0],
+			    anInfo.myFamNum.size(),
+			    anEntity,
+			    aGeom);
+      
+      if(theErr) 
+	*theErr = aRet;
+      else if(aRet < 0)
+	EXCEPTION(runtime_error,"SetFamilies - MEDfamEcr(...)");
+    }
     
+    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     TInt TVWrapper::GetNbNodes(const MED::TMeshInfo& theMeshInfo,
 			      TErr* theErr)
     {
@@ -452,6 +664,19 @@ namespace MED{
 	*theErr = aRet;
       else if(aRet < 0)
 	EXCEPTION(runtime_error,"GetPolygoneInfo - MEDpolygoneInfo(...)");
+
+
+      GetNames(theInfo,aNbElem,theInfo.myTEntity,ePOLYGONE,&aRet);
+      if(theErr) 
+	*theErr = aRet;
+
+      GetNumeration(theInfo,aNbElem,theInfo.myTEntity,ePOLYGONE,&aRet);
+      if(theErr) 
+	*theErr = aRet;
+
+      GetFamilies(theInfo,aNbElem,theInfo.myTEntity,ePOLYGONE,&aRet);
+      if(theErr) 
+	*theErr = aRet;
     }
     
     void TVWrapper::SetPolygoneInfo(const MED::TPolygoneInfo& theInfo,
@@ -472,8 +697,6 @@ namespace MED{
       MED::TPolygoneInfo& anInfo = const_cast<MED::TPolygoneInfo&>(theInfo);
       MED::TMeshInfo& aMeshInfo = *anInfo.myMeshInfo;
 
-      med_booleen& anIsElemNames = static_cast<med_booleen>(theInfo.myIsElemNames);
-      med_booleen& anIsElemNum = static_cast<med_booleen>(theInfo.myIsElemNum);
       med_entite_maillage& anEntity = static_cast<med_entite_maillage>(theInfo.myTEntity);
       med_connectivite& aConn = static_cast<med_connectivite>(theInfo.myTConn);
       
@@ -490,43 +713,17 @@ namespace MED{
       else if(aRet < 0)
 	EXCEPTION(runtime_error,"SetPolygoneInfo - MEDpolygoneConnEcr(...)");
       
-      if (anIsElemNames){
-	aRet  = MEDnomEcr(myFile->Id(),
-			  &aMeshInfo.myName[0],
-			  &anInfo.myElemNames[0],
-			  anInfo.myElemNames.size(),
-			  anEntity,
-			  MED_POLYGONE);
-	if(theErr) 
-	  *theErr = aRet;
-	else if(aRet < 0)
-	  EXCEPTION(runtime_error,"SetPolygoneInfo - MEDnomEcr(...)");
-      }
-      
-      if (anIsElemNum){
-	aRet  = MEDnumEcr(myFile->Id(),
-			  &aMeshInfo.myName[0],
-			  &anInfo.myElemNum[0],
-			  anInfo.myElemNum.size(),
-			  anEntity,
-			  MED_POLYGONE);
-	if(theErr) 
-	  *theErr = aRet;
-	else if(aRet < 0)
-	  EXCEPTION(runtime_error,"SetPolygoneInfo - MEDnumEcr(...)");
-      }
+      SetNames(anInfo,theInfo.myTEntity,ePOLYGONE,&aRet);
+      if(theErr) 
+	*theErr = aRet;
       
-      aRet = MEDfamEcr(myFile->Id(),
-		       &aMeshInfo.myName[0],
-		       &anInfo.myFamNum[0],
-		       anInfo.myFamNum.size(),
-		       anEntity,
-		       MED_POLYGONE);
+      SetNumeration(anInfo,theInfo.myTEntity,ePOLYGONE,&aRet);
+      if(theErr) 
+	*theErr = aRet;
       
+      SetFamilies(anInfo,theInfo.myTEntity,ePOLYGONE,&aRet);
       if(theErr) 
 	*theErr = aRet;
-      else if(aRet < 0)
-	EXCEPTION(runtime_error,"SetPolygoneInfo - MEDfamEcr(...)");
     }
 
     TInt TVWrapper::GetNbPolygones(const MED::TMeshInfo& theMeshInfo, 
@@ -598,6 +795,18 @@ namespace MED{
 	*theErr = aRet;
       else if(aRet < 0)
 	EXCEPTION(runtime_error,"GetPolygoneInfo - MEDpolyedreConnLire(...)");
+
+      GetNames(theInfo,aNbElem,theInfo.myTEntity,ePOLYEDRE,&aRet);
+      if(theErr) 
+	*theErr = aRet;
+
+      GetNumeration(theInfo,aNbElem,theInfo.myTEntity,ePOLYEDRE,&aRet);
+      if(theErr) 
+	*theErr = aRet;
+
+      GetFamilies(theInfo,aNbElem,theInfo.myTEntity,ePOLYEDRE,&aRet);
+      if(theErr) 
+	*theErr = aRet;
     }
 
     void TVWrapper::SetPolyedreInfo(const TPolyedreInfo& theInfo,
@@ -948,8 +1157,9 @@ namespace MED{
 				   TGeom& theGeom,
 				   TErr* theErr)
     {
+      theEntity = EEntiteMaillage(-1);
       TFileWrapper aFileWrapper(myFile,eLECTURE,theErr);
-      
+
       if(theErr){
 	*theErr &= !theEntityInfo.empty();
 	if(!*theErr)
@@ -971,9 +1181,12 @@ namespace MED{
 	  const med_geometrie_element& aGeom = static_cast<const med_geometrie_element>(anGeomIter->first);
 	  TInt aTmp = MEDnPasdetemps(myFile->Id(),&anInfo.myName[0],anEntity,aGeom);
 	  aNbTimeStamps = max(aTmp,aNbTimeStamps);
+	  if (aNbTimeStamps<1)
+	    continue;
 	  BEGMSG(MYDEBUG,"GetNbTimeStamps aNbTimeStamps="<<aTmp<<"; aGeom="<<aGeom<<"; anEntity="<<anEntity<<"\n");
 	  if(aTmp){
 	    theEntity = EEntiteMaillage(anEntity);
+	    ADDMSG(MYDEBUG,"theEntity="<<theEntity<<"\n");
 	    theGeom[EGeometrieElement(aGeom)] = anGeomIter->second;
 	  }
 	}
@@ -1102,8 +1315,9 @@ namespace MED{
 	  if(aRet >= 0) 
 	    for(TInt i = 0; i < iEnd; i++) {
 	      aValue[i] = anArray[i];
-	      MSG(MYDEBUG," "<<anArray[i]);
+	      ADDMSG(MYDEBUG," "<<anArray[i]);
 	    }
+	  ADDMSG(MYDEBUG,endl);
 	  break;
 	}
 	default: {
diff --git a/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.hxx b/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.hxx
index 6adcab87c..9b20a1c57 100644
--- a/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.hxx
+++ b/src/MEDWrapper/V2_2/MED_V2_2_Wrapper.hxx
@@ -121,6 +121,71 @@ namespace MED{
 		    TErr* theErr = NULL);
       
       
+      //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+      virtual
+      void
+      GetNames(TElemInfo& theInfo,
+	       TInt nb,
+	       EEntiteMaillage theTEntity, 
+	       EGeometrieElement theTGeom,
+	       TErr* theErr = NULL);
+
+      virtual
+      void
+      GetNumeration(TElemInfo& theInfo,
+		    TInt nb,
+		    EEntiteMaillage theTEntity, 
+		    EGeometrieElement theTGeom,
+		    TErr* theErr = NULL);
+
+      virtual
+      void
+      GetFamilies(TElemInfo& theInfo,
+		  TInt nb,
+		  EEntiteMaillage theTEntity, 
+		  EGeometrieElement theTGeom,
+		  TErr* theErr = NULL);
+
+      virtual
+      void
+      SetNames(const TElemInfo& theInfo,
+	       EEntiteMaillage theTEntity, 
+	       EGeometrieElement theTGeom,
+	       TErr* theErr = NULL);
+
+      void
+      SetNames(const TElemInfo& theInfo,
+	       EModeAcces theMode,
+	       EEntiteMaillage theTEntity, 
+	       EGeometrieElement theTGeom,
+	       TErr* theErr = NULL);
+      
+      virtual
+      void
+      SetNumeration(const TElemInfo& theInfo,
+		    EEntiteMaillage theTEntity, 
+		    EGeometrieElement theTGeom,
+		    TErr* theErr = NULL);
+      void
+      SetNumeration(const TElemInfo& theInfo,
+		    EModeAcces theMode,
+		    EEntiteMaillage theTEntity, 
+		    EGeometrieElement theTGeom,
+		    TErr* theErr = NULL);
+      
+      virtual
+      void
+      SetFamilies(const TElemInfo& theInfo,
+		  EEntiteMaillage theTEntity, 
+		  EGeometrieElement theTGeom,
+		  TErr* theErr = NULL);
+      void
+      SetFamilies(const TElemInfo& theInfo,
+		  EModeAcces theMode,
+		  EEntiteMaillage theTEntity, 
+		  EGeometrieElement theTGeom,
+		  TErr* theErr = NULL);
+
       //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       virtual
       TInt