From: eap <eap@opencascade.com>
Date: Fri, 25 Feb 2022 11:44:14 +0000 (+0300)
Subject: bos #29143 [CEA] Compute takes too much time in polyhedron per solid use case
X-Git-Tag: V9_9_0a1~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f85bc0ab6f009a118105bdcc1b04364ef4dbc298;p=modules%2Fsmesh.git

bos #29143 [CEA] Compute takes too much time in polyhedron per solid use case

  more optimization: don't fill in uniDimAlgoShapes if no multi-dimensional
  algo assigned
---

diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx
index 06c47d8c0..db0010287 100644
--- a/src/SMESH/SMESH_Gen.cxx
+++ b/src/SMESH/SMESH_Gen.cxx
@@ -332,32 +332,6 @@ bool SMESH_Gen::Compute(SMESH_Mesh &                aMesh,
       else
         smWithAlgoSupportingSubmeshes[0].push_front( shDim2smIt->second );
 
-    // gather sub-shapes with local uni-dimensional algos (bos #29143)
-    // ----------------------------------------------------------------
-    TopTools_MapOfShape uniDimAlgoShapes;
-    ShapeToHypothesis::Iterator s2hyps( aMesh.GetMeshDS()->GetHypotheses() );
-    for ( ; s2hyps.More(); s2hyps.Next() )
-    {
-      const TopoDS_Shape& s = s2hyps.Key();
-      if ( s.IsSame( aMesh.GetShapeToMesh() ))
-        continue;
-      for ( auto & hyp : s2hyps.Value() )
-      {
-        if ( const SMESH_Algo* algo = dynamic_cast< const SMESH_Algo*>( hyp ))
-          if ( algo->NeedDiscreteBoundary() )
-          {
-            TopAbs_ShapeEnum sType;
-            switch ( algo->GetDim() ) {
-            case 3:  sType = TopAbs_SOLID; break;
-            case 2:  sType = TopAbs_FACE; break;
-            default: sType = TopAbs_EDGE; break;
-            }
-            for ( TopExp_Explorer ex( s2hyps.Key(), sType ); ex.More(); ex.Next() )
-              uniDimAlgoShapes.Add( ex.Current() );
-          }
-      }
-    }
-
     // ======================================================
     // Apply all-dimensional algorithms supporing sub-meshes
     // ======================================================
@@ -367,6 +341,36 @@ bool SMESH_Gen::Compute(SMESH_Mesh &                aMesh,
       smVec.insert( smVec.end(),
                     smWithAlgoSupportingSubmeshes[aShapeDim].begin(),
                     smWithAlgoSupportingSubmeshes[aShapeDim].end() );
+
+    // gather sub-shapes with local uni-dimensional algos (bos #29143)
+    // ----------------------------------------------------------------
+    TopTools_MapOfShape uniDimAlgoShapes;
+    if ( !smVec.empty() )
+    {
+      ShapeToHypothesis::Iterator s2hyps( aMesh.GetMeshDS()->GetHypotheses() );
+      for ( ; s2hyps.More(); s2hyps.Next() )
+      {
+        const TopoDS_Shape& s = s2hyps.Key();
+        if ( s.IsSame( aMesh.GetShapeToMesh() ))
+          continue;
+        for ( auto & hyp : s2hyps.Value() )
+        {
+          if ( const SMESH_Algo* algo = dynamic_cast< const SMESH_Algo*>( hyp ))
+            if ( algo->NeedDiscreteBoundary() )
+            {
+              TopAbs_ShapeEnum sType;
+              switch ( algo->GetDim() ) {
+              case 3:  sType = TopAbs_SOLID; break;
+              case 2:  sType = TopAbs_FACE; break;
+              default: sType = TopAbs_EDGE; break;
+              }
+              for ( TopExp_Explorer ex( s2hyps.Key(), sType ); ex.More(); ex.Next() )
+                uniDimAlgoShapes.Add( ex.Current() );
+            }
+        }
+      }
+    }
+
     {
       // ------------------------------------------------
       // sort list of sub-meshes according to mesh order