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 a1a42ed965a6a711f4042e18eb1dfc8a01aa3b67..128dfa2eadf3501038b042acaa2a25d9f36cbc1f 100644 (file)
--- 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 b96bf75230d83a3b42fd67443d1da275b8219449..c193acce820dfea8a4bf93733c4c0c2acfbe7947 100644 (file)
--- 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 12e131bdd16a698831258b76b99d64d75bef696f..560410eeb3d1b24f700c8dc7782912e4af6d97d7 100644 (file)
--- 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 f536162c712c922e9a193ca25a62e6e364bda12a..38024b8b9d23796ab526c78f70b448aaede02702 100644 (file)
--- 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 4865a156e37fa658217567021815c0ba7309d0b1..fccf3406f46c9af995baa86a2bb48bc02290458c 100644 (file)
--- 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 2167c17cb8a6c92327f4dc46dd841f7c635209fa..39d0ed31667d7b869cfe818b1e30de61027bb6ac 100644 (file)
--- 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 bb7adae425ec969908d7bd428c0aa52db16410b7..c68a9aed7e027c193db417ee8ad59981278cf67c 100644 (file)
--- 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 60d40d48ee5e7689ed081f2cee612faf05419ae4..6a923420212a96fc0645764f21135cecf84cce2d 100644 (file)
--- 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 6adcab87c2ad9e9c5f3f8ab48c212224367fd35d..9b20a1c57810c6728669c66c1d385c3eaa00a83b 100644 (file)
--- 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