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

diff --git a/src/MEDWrapper/Base/MED_Common.hxx b/src/MEDWrapper/Base/MED_Common.hxx
index 5cac8fbd1650ccb8422caca31b1d92fb5729a622..02f992ea12b5892dbad99eb16c902429079764ca 100644 (file)
--- a/src/MEDWrapper/Base/MED_Common.hxx
+++ b/src/MEDWrapper/Base/MED_Common.hxx
@@ -29,8 +29,10 @@
 #ifndef MED_Common_HeaderFile
 #define MED_Common_HeaderFile
 
-#include <string>
+#include <stdexcept>
+#include <valarray>
 #include <vector>
+#include <string>
 #include <set>
 #include <map>
 
@@ -42,16 +44,19 @@ extern "C"{
 
 namespace MED{
 
-  template<class T> class shared_ptr: public boost::shared_ptr<T>
+  enum EVersion {eVUnknown = -1, eV2_1, eV2_2};
+  
+
+  template<class T> class SharedPtr: public boost::shared_ptr<T>
   {
   public:
-    shared_ptr() {}
+    SharedPtr() {}
 
     template<class Y>
-    explicit shared_ptr(Y * p): boost::shared_ptr<T>(p) {}
+    explicit SharedPtr(Y * p): boost::shared_ptr<T>(p) {}
 
     template<class Y>
-    shared_ptr(shared_ptr<Y> const & r): boost::shared_ptr<T>(r) {}
+    SharedPtr(SharedPtr<Y> const & r): boost::shared_ptr<T>(r) {}
 
     operator const T& () const { return *get();}
 
@@ -59,6 +64,66 @@ namespace MED{
   };
 
 
+  template<class TContainer> 
+  class ConstSliceArray
+  {
+    const TContainer& myConstContainer;
+    std::slice mySlice;
+  protected:
+    size_t GetID(size_t theId) const
+    {
+      if(theId < mySlice.size()){
+       size_t anId = mySlice.start() + theId*mySlice.stride();
+       if(anId < myConstContainer.size())
+         return anId;
+      }
+      throw std::out_of_range();
+      return -1;
+    }
+    
+  public:
+    typedef typename TContainer::value_type TValue;
+
+    ConstSliceArray(const TContainer& theContainer,
+                   const std::slice& theSlice): 
+      myConstContainer(theContainer),
+      mySlice(theSlice)
+    {
+    }
+    
+    const TValue& operator[](size_t theId) const
+    {
+      return myConstContainer[GetID(theId)];
+    }
+    
+    size_t size() const
+    {
+      return mySlice.size();
+    }
+  };
+  
+
+  template<class TContainer> 
+  class SliceArray: public ConstSliceArray<TContainer>
+  {
+    TContainer& myContainer;
+    
+  public:
+    typedef ConstSliceArray<TContainer> TSupperClass;
+    SliceArray(TContainer& theContainer,
+              const std::slice& theSlice): 
+      TSupperClass(theContainer,theSlice),
+      myContainer(theContainer)
+    {
+    }
+    
+    typename TSupperClass::TValue& operator[](size_t theId)
+    {
+      return myContainer[GetID(theId)];
+    }
+  };
+  
+
   typedef enum {eFAUX, eVRAI} EBooleen ; 
   typedef double TFloat;
   typedef int TInt;
@@ -97,10 +162,6 @@ namespace MED{
 
   const TEntity2GeomSet& GetEntity2GeomSet();
 
-  enum EVersion {eVUnknown = -1, eV2_1, eV2_2};
-  
-  TInt GetNbConnectivities(EGeometrieElement typmai);
-
   template<int EVersion>
   TInt GetNbConn(EGeometrieElement typmai,
                 TInt mdim);
@@ -113,41 +174,43 @@ namespace MED{
   TInt GetNbConn<eV2_2>(EGeometrieElement typmai,
                        TInt mdim);
 
+  TInt GetNbConnectivities(EGeometrieElement typmai);
+
   struct TNameInfo;
-  typedef MED::shared_ptr<TNameInfo> PNameInfo;
+  typedef SharedPtr<TNameInfo> PNameInfo;
   
   struct TMeshInfo;
-  typedef MED::shared_ptr<TMeshInfo> PMeshInfo;
+  typedef SharedPtr<TMeshInfo> PMeshInfo;
   
   struct TFamilyInfo;
-  typedef MED::shared_ptr<TFamilyInfo> PFamilyInfo;
+  typedef SharedPtr<TFamilyInfo> PFamilyInfo;
 
   struct TElemInfo;
-  typedef MED::shared_ptr<TElemInfo> PElemInfo;
+  typedef SharedPtr<TElemInfo> PElemInfo;
 
   struct TNodeInfo;
-  typedef MED::shared_ptr<TNodeInfo> PNodeInfo;
+  typedef SharedPtr<TNodeInfo> PNodeInfo;
 
   struct TPolygoneInfo;
-  typedef MED::shared_ptr<TPolygoneInfo> PPolygoneInfo;
+  typedef SharedPtr<TPolygoneInfo> PPolygoneInfo;
 
   struct TPolyedreInfo;
-  typedef MED::shared_ptr<TPolyedreInfo> PPolyedreInfo;
+  typedef SharedPtr<TPolyedreInfo> PPolyedreInfo;
 
   struct TCellInfo;
-  typedef MED::shared_ptr<TCellInfo> PCellInfo;
+  typedef SharedPtr<TCellInfo> PCellInfo;
 
   struct TFieldInfo;
-  typedef MED::shared_ptr<TFieldInfo> PFieldInfo;
+  typedef SharedPtr<TFieldInfo> PFieldInfo;
 
   struct TTimeStampInfo;
-  typedef MED::shared_ptr<TTimeStampInfo> PTimeStampInfo;
+  typedef SharedPtr<TTimeStampInfo> PTimeStampInfo;
   
   struct TTimeStampVal;
-  typedef MED::shared_ptr<TTimeStampVal> PTimeStampVal;
+  typedef SharedPtr<TTimeStampVal> PTimeStampVal;
 
   class TWrapper;
-  typedef MED::shared_ptr<TWrapper> PWrapper;
+  typedef SharedPtr<TWrapper> PWrapper;
 };
 
 

diff --git a/src/MEDWrapper/Base/MED_Structures.cxx b/src/MEDWrapper/Base/MED_Structures.cxx
index 3ec5eece456b553ab04f07c4c730406e343f1ae7..24185816fa74f228e0b50e13a7d7be6b91cae7e1 100644 (file)
--- a/src/MEDWrapper/Base/MED_Structures.cxx
+++ b/src/MEDWrapper/Base/MED_Structures.cxx
@@ -123,6 +123,19 @@ TInt TCellInfo::GetConn(TInt theElemId, TInt theConnId) const {
 void TCellInfo::SetConn(TInt theElemId, TInt theConnId, TInt theVal){
   GETINDEX(myConn,GetConnDim()*theElemId + theConnId) = theVal;
 }
+
+TConstConnSlice 
+TCellInfo::GetConnSlice(TInt theElemId) const
+{
+  return TConstConnSlice(myConn,std::slice(GetConnDim()*theElemId,GetNbConnectivities(myTGeom),1));
+}
+
+TConnSlice 
+TCellInfo::GetConnSlice(TInt theElemId)
+{
+  return TConnSlice(myConn,std::slice(GetConnDim()*theElemId,GetNbConnectivities(myTGeom),1));
+}
+
 //---------------------------------------------------------------
 TInt TPolygoneInfo::GetNbConn(TInt theElemId) const {
   TInt i1 = GETINDEX(myIndex,theElemId);

diff --git a/src/MEDWrapper/Base/MED_Structures.hxx b/src/MEDWrapper/Base/MED_Structures.hxx
index 888c3aeb103c0ffa1adc2c302abcae169cd59809..12e131bdd16a698831258b76b99d64d75bef696f 100644 (file)
--- a/src/MEDWrapper/Base/MED_Structures.hxx
+++ b/src/MEDWrapper/Base/MED_Structures.hxx
@@ -165,6 +165,9 @@ namespace MED{
 
 
   //---------------------------------------------------------------
+  typedef SliceArray<TElemNum> TConnSlice;
+  typedef ConstSliceArray<TElemNum> TConstConnSlice;
+
   struct TCellInfo: virtual TElemInfo
   {
     EEntiteMaillage myTEntity;
@@ -179,6 +182,9 @@ namespace MED{
     virtual TInt GetConnDim() const = 0;
 
     TElemNum myConn;
+    TConstConnSlice GetConnSlice(TInt theElemId) const;
+    TConnSlice GetConnSlice(TInt theElemId);
+
     TInt GetConn(TInt theElemId, TInt theConnId) const;
     void SetConn(TInt theElemId, TInt theConnId, TInt theVal);
   };