[EDF23738] : multi geometric type in a single mesh having structure elements on each...

diff --git a/src/MEDLoader/MEDFileMeshSupport.cxx b/src/MEDLoader/MEDFileMeshSupport.cxx
index 36258715b6f2f5db5e002dd630aba1b91aedda1b..a1b0545939d9eebba076981efcb00769196b2e75 100644 (file)
--- a/src/MEDLoader/MEDFileMeshSupport.cxx
+++ b/src/MEDLoader/MEDFileMeshSupport.cxx
@@ -120,7 +120,7 @@ const MEDFileUMesh *MEDFileMeshSupports::getSupMeshWithName(const std::string& n
   throw INTERP_KERNEL::Exception(oss.str());
 }
 
   throw INTERP_KERNEL::Exception(oss.str());
 }
 

-mcIdType MEDFileMeshSupports::getNumberOfNodesInConnOf(TypeOfField entity, const std::string& name) const
+mcIdType MEDFileMeshSupports::getNumberOfNodesInConnOf(TypeOfField entity, INTERP_KERNEL::NormalizedCellType gt, const std::string& name) const

 {
   const MEDFileUMesh *sup(getSupMeshWithName(name));
   switch(entity)
 {
   const MEDFileUMesh *sup(getSupMeshWithName(name));
   switch(entity)


@@ -129,11 +129,11 @@ mcIdType MEDFileMeshSupports::getNumberOfNodesInConnOf(TypeOfField entity, const
       return sup->getNumberOfNodes();
     case ON_CELLS:
       {
       return sup->getNumberOfNodes();
     case ON_CELLS:
       {

-        std::vector<INTERP_KERNEL::NormalizedCellType> gt(sup->getAllGeoTypes());
-        if(gt.size()!=1)
-          throw INTERP_KERNEL::Exception("MEDFileMeshSupports::getNumberOfNodesInConnOf : on cells only one geometric type allowed !");
-        const INTERP_KERNEL::CellModel& cm(INTERP_KERNEL::CellModel::GetCellModel(gt[0]));
-        return sup->getNumberOfCellsAtLevel(0)*cm.getNumberOfNodes();
+        std::vector<INTERP_KERNEL::NormalizedCellType> gts(sup->getAllGeoTypes());
+        if(std::find(gts.begin(),gts.end(),gt) == gts.end())
+          throw INTERP_KERNEL::Exception("MEDFileMeshSupports::getNumberOfNodesInConnOf : specified geometric type not found !");
+        const INTERP_KERNEL::CellModel& cm(INTERP_KERNEL::CellModel::GetCellModel(gt));
+        return sup->getNumberOfCellsWithType(gt)*cm.getNumberOfNodes();

       }
     default:
       throw INTERP_KERNEL::Exception("MEDFileMeshSupports::getNumberOfNodesInConnOf : not recognized entity type !");
       }
     default:
       throw INTERP_KERNEL::Exception("MEDFileMeshSupports::getNumberOfNodesInConnOf : not recognized entity type !");

diff --git a/src/MEDLoader/MEDFileMeshSupport.hxx b/src/MEDLoader/MEDFileMeshSupport.hxx
index 8d81c4e78d6790682b3f72fac19f9519139e0b93..584f906c4785e20ccb96a1d2d53da7494da0ad0d 100644 (file)
--- a/src/MEDLoader/MEDFileMeshSupport.hxx
+++ b/src/MEDLoader/MEDFileMeshSupport.hxx
@@ -42,7 +42,7 @@ namespace MEDCoupling
     MEDLOADER_EXPORT void writeLL(med_idt fid) const;
     MEDLOADER_EXPORT std::vector<std::string> getSupMeshNames() const;
     MEDLOADER_EXPORT const MEDFileUMesh *getSupMeshWithName(const std::string& name) const;
     MEDLOADER_EXPORT void writeLL(med_idt fid) const;
     MEDLOADER_EXPORT std::vector<std::string> getSupMeshNames() const;
     MEDLOADER_EXPORT const MEDFileUMesh *getSupMeshWithName(const std::string& name) const;

-    MEDLOADER_EXPORT mcIdType getNumberOfNodesInConnOf(TypeOfField entity, const std::string& name) const;
+    MEDLOADER_EXPORT mcIdType getNumberOfNodesInConnOf(TypeOfField entity, INTERP_KERNEL::NormalizedCellType gt, const std::string& name) const;

   private:
     MEDFileMeshSupports(med_idt fid);
     MEDFileMeshSupports();
   private:
     MEDFileMeshSupports(med_idt fid);
     MEDFileMeshSupports();

diff --git a/src/MEDLoader/MEDFileStructureElement.cxx b/src/MEDLoader/MEDFileStructureElement.cxx
index 107b5ffbdc42fb653c3cf5078d8e6f78de0a9c7c..3a5b92b835350a4a41cb53598d6e88617e9b9d31 100644 (file)
--- a/src/MEDLoader/MEDFileStructureElement.cxx
+++ b/src/MEDLoader/MEDFileStructureElement.cxx
@@ -383,7 +383,7 @@ mcIdType MEDFileStructureElements::getNumberOfNodesPerSE(const std::string& seNa
     return 1;
   const MEDFileStructureElement *se(getSEWithName(seName));
   std::string meshName(se->getMeshName());
     return 1;
   const MEDFileStructureElement *se(getSEWithName(seName));
   std::string meshName(se->getMeshName());

-  return _sup->getNumberOfNodesInConnOf(se->getEntity(),meshName);
+  return _sup->getNumberOfNodesInConnOf(se->getEntity(),se->getGeoType(),meshName);

 }
 
 const MEDFileStructureElement *MEDFileStructureElements::getSEWithName(const std::string& seName) const
 }
 
 const MEDFileStructureElement *MEDFileStructureElements::getSEWithName(const std::string& seName) const

diff --git a/src/MEDLoader/MEDFileStructureElement.hxx b/src/MEDLoader/MEDFileStructureElement.hxx
index 384f056c16c4b7ffb77cff6a6d7cd5bf873d7222..8cd799e205dad3562b0c135ce6ba1600bbee6473 100644 (file)
--- a/src/MEDLoader/MEDFileStructureElement.hxx
+++ b/src/MEDLoader/MEDFileStructureElement.hxx
@@ -95,6 +95,7 @@ class MEDFileSEConstAtt : public RefCountObject, public MEDFileWritableStandAlon
     MEDLOADER_EXPORT std::vector<std::string> getVarAtts() const;
     MEDLOADER_EXPORT const MEDFileSEVarAtt *getVarAtt(const std::string& varName) const;
     MEDLOADER_EXPORT std::string getClassName() const override { return std::string("MEDFileStructureElement"); }
     MEDLOADER_EXPORT std::vector<std::string> getVarAtts() const;
     MEDLOADER_EXPORT const MEDFileSEVarAtt *getVarAtt(const std::string& varName) const;
     MEDLOADER_EXPORT std::string getClassName() const override { return std::string("MEDFileStructureElement"); }

+    MEDLOADER_EXPORT INTERP_KERNEL::NormalizedCellType getGeoType() const { return _geo_type; }

   public:
     std::vector<const BigMemoryObject *> getDirectChildrenWithNull() const;
     std::size_t getHeapMemorySizeWithoutChildren() const;
   public:
     std::vector<const BigMemoryObject *> getDirectChildrenWithNull() const;
     std::size_t getHeapMemorySizeWithoutChildren() const;