0020526: [CEA] Disk meshing fails

1) in PrepareOCCgeometry(), map all subshapes in meshedSM is not provided
2) untabify

diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
index 32eb55bfae64a0c5504b4e209bf5149d9c888d66..db2d2662f18f6fb55d02575359b25732cbf7a0b1 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
@@ -47,9 +47,11 @@
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <NCollection_Map.hxx>
+#include <OSD_Path.hxx>
 #include <OSD_File.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopTools_DataMapOfShapeInteger.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_ProgramError.hxx>
 
@@ -254,7 +256,7 @@ void NETGENPlugin_Mesher::PrepareOCCgeometry(netgen::OCCGeometry&     occgeo,
     TopExp::MapShapes(root->GetSubShape(), subShapes);
     while ( smIt->more() ) {
       SMESH_subMesh* sm = smIt->next();
-      if ( sm->IsEmpty() ) {
+      if ( !meshedSM || sm->IsEmpty() ) {
         TopoDS_Shape shape = sm->GetSubShape();
         if ( shape.ShapeType() != TopAbs_VERTEX )
           shape = subShapes( subShapes.FindIndex( shape ));// - shape->index->oriented shape
@@ -619,18 +621,25 @@ bool NETGENPlugin_Mesher::Compute()
         else {
           // length from edges
           double length = 0;
+          TopTools_MapOfShape tmpMap;
           for ( TopExp_Explorer exp( _shape, TopAbs_EDGE ); exp.More(); exp.Next() )
-            length += SMESH_Algo::EdgeLength( TopoDS::Edge( exp.Current() ));
-          if ( ngMesh->GetNSeg() )
-            mparams.maxh = length / ngMesh->GetNSeg();
+            if( tmpMap.Add(exp.Current()) )
+              length += SMESH_Algo::EdgeLength( TopoDS::Edge( exp.Current() ));
+
+          if ( ngMesh->GetNSeg() ) {
+            // we have to multiply length by 2 since for each TopoDS_Edge there
+            // are double set of NETGEN edges or, in other words, we have to
+            // divide ngMesh->GetNSeg() on 2.
+            mparams.maxh = 2*length / ngMesh->GetNSeg();
+          }
           else
             mparams.maxh = 1000;
           mparams.grading = 0.2; // slow size growth
         }
         mparams.maxh = min( mparams.maxh, occgeo.boundingbox.Diam()/2 );
         ngMesh->SetGlobalH (mparams.maxh);
-       netgen::Box<3> bb = occgeo.GetBoundingBox();
-       bb.Increase (bb.Diam()/20);
+        netgen::Box<3> bb = occgeo.GetBoundingBox();
+        bb.Increase (bb.Diam()/20);
         ngMesh->SetLocalH (bb.PMin(), bb.PMax(), mparams.grading);
       }
       // let netgen compute 2D mesh
@@ -665,10 +674,10 @@ bool NETGENPlugin_Mesher::Compute()
           // length from faces
           mparams.maxh = ngMesh->AverageH();
         }
-//     netgen::ARRAY<double> maxhdom;
-//     maxhdom.SetSize (occgeo.NrSolids());
-//     maxhdom = mparams.maxh;
-//     ngMesh->SetMaxHDomain (maxhdom);
+//      netgen::ARRAY<double> maxhdom;
+//      maxhdom.SetSize (occgeo.NrSolids());
+//      maxhdom = mparams.maxh;
+//      ngMesh->SetMaxHDomain (maxhdom);
         ngMesh->SetGlobalH (mparams.maxh);
         mparams.grading = 0.4;
         ngMesh->CalcLocalH();