52457: Addition of hypotheses is 8 time longer than meshing.

[modules/smesh.git] / src / DriverMED / DriverMED_W_SMESHDS_Mesh.cxx

diff --git a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
index 47fa68b5d35e9bb2f258ce007489ef72eb4bf1ad..aec74adc9d00b70e7c3a62ffdc8ceae7ed079313 100644 (file)
--- a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
+++ b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
@@ -101,7 +101,7 @@ void DriverMED_W_SMESHDS_Mesh::AddAllSubMeshes()
 
 void DriverMED_W_SMESHDS_Mesh::AddSubMesh(SMESHDS_SubMesh* theSubMesh, int theID)
 {
 
 void DriverMED_W_SMESHDS_Mesh::AddSubMesh(SMESHDS_SubMesh* theSubMesh, int theID)
 {

-  mySubMeshes[theID] = theSubMesh;
+  mySubMeshes.push_back( theSubMesh );

 }
 
 void DriverMED_W_SMESHDS_Mesh::AddGroupOfNodes()
 }
 
 void DriverMED_W_SMESHDS_Mesh::AddGroupOfNodes()


@@ -292,6 +292,20 @@ namespace
 //       return elem_famNum->second;
     return aDefaultFamilyId;
   }
 //       return elem_famNum->second;
     return aDefaultFamilyId;
   }

+
+  //================================================================================
+  /*!
+   * \brief Returns iterator on sub-meshes
+   */
+  //================================================================================
+
+  SMESHDS_SubMeshIteratorPtr getIterator( std::vector<SMESHDS_SubMesh*>& mySubMeshes )
+  {
+    return SMESHDS_SubMeshIteratorPtr
+      ( new SMDS_SetIterator
+        < const SMESHDS_SubMesh*, std::vector< SMESHDS_SubMesh* >::iterator >( mySubMeshes.begin(),
+                                                                               mySubMeshes.end() ));
+  }

 }
 
 Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
 }
 
 Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()


@@ -435,7 +449,7 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
          myDoGroupOfBalls   && nbBalls);
     } else {
       aFamilies = DriverMED_Family::MakeFamilies
          myDoGroupOfBalls   && nbBalls);
     } else {
       aFamilies = DriverMED_Family::MakeFamilies

-        (mySubMeshes, myGroups,
+        (getIterator( mySubMeshes ), myGroups,

          myDoGroupOfNodes   && nbNodes,
          myDoGroupOfEdges   && nbEdges,
          myDoGroupOfFaces   && nbFaces,
          myDoGroupOfNodes   && nbNodes,
          myDoGroupOfEdges   && nbEdges,
          myDoGroupOfFaces   && nbFaces,