-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
#include <StdMeshers_LengthFromEdges.hxx>
#include <StdMeshers_MaxElementArea.hxx>
#include <StdMeshers_QuadranglePreference.hxx>
+#include <StdMeshers_ViscousLayers2D.hxx>
#include <Precision.hxx>
#include <Standard_ErrorHandler.hxx>
#include <meshing.hpp>
//#include <meshtype.hpp>
namespace netgen {
+#ifdef NETGEN_V5
+ extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, MeshingParameters&, int, int);
+#else
extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*);
+#endif
extern MeshingParameters mparam;
}
_compatibleHypothesis.push_back("LengthFromEdges");
_compatibleHypothesis.push_back("QuadranglePreference");
_compatibleHypothesis.push_back("NETGEN_Parameters_2D");
+ _compatibleHypothesis.push_back("ViscousLayers2D");
_hypMaxElementArea = 0;
_hypLengthFromEdges = 0;
_hypMaxElementArea = 0;
_hypLengthFromEdges = 0;
_hypQuadranglePreference = 0;
+ _progressByTic = -1;
const list<const SMESHDS_Hypothesis*>& hyps = GetUsedHypothesis(aMesh, aShape, false);
_hypQuadranglePreference = static_cast<const StdMeshers_QuadranglePreference*>(hyp);
else if ( hypName == "NETGEN_Parameters_2D" )
_hypParameters = static_cast<const NETGENPlugin_Hypothesis_2D*>(hyp);
+ else if ( hypName == StdMeshers_ViscousLayers2D::GetHypType() )
+ continue;
else {
aStatus = HYP_INCOMPATIBLE;
return false;
int nbHyps = bool(_hypMaxElementArea) + bool(_hypLengthFromEdges) + bool(_hypParameters );
if ( nbHyps > 1 )
aStatus = HYP_CONCURENT;
- else if ( nbHyps == 1)
+ else
aStatus = HYP_OK;
return ( aStatus == HYP_OK );
}
-//================================================================================
-/*!
- * \brief Fill netgen mesh with segments
- * \retval SMESH_ComputeErrorPtr - error description
- */
-//================================================================================
-
-static TError addSegmentsToMesh(netgen::Mesh& ngMesh,
- OCCGeometry& geom,
- const TSideVector& wires,
- SMESH_MesherHelper& helper,
- vector< const SMDS_MeshNode* > & nodeVec)
-{
- // ----------------------------
- // Check wires and count nodes
- // ----------------------------
- int nbNodes = 0;
- double totalLength = 0;
- for ( int iW = 0; iW < wires.size(); ++iW )
- {
- StdMeshers_FaceSidePtr wire = wires[ iW ];
- if ( wire->MissVertexNode() )
- {
- // Commented for issue 0020960. It worked for the case, let's wait for case where it doesn't.
- // It seems that there is no reason for this limitation
-// return TError
-// (new SMESH_ComputeError(COMPERR_BAD_INPUT_MESH, "Missing nodes on vertices"));
- if (getenv("USER") && string("eap")==getenv("USER"))
- cout << "Warning: NETGENPlugin_NETGEN_2D_ONLY : try to work with missing nodes on vertices"<<endl;
- }
- const vector<UVPtStruct>& uvPtVec = wire->GetUVPtStruct();
- if ( uvPtVec.size() != wire->NbPoints() )
- return TError
- (new SMESH_ComputeError(COMPERR_BAD_INPUT_MESH,
- SMESH_Comment("Unexpected nb of points on wire ") << iW
- << ": " << uvPtVec.size()<<" != "<<wire->NbPoints()));
- nbNodes += wire->NbPoints();
- totalLength += wire->Length();
- }
- nodeVec.reserve( nbNodes );
-
- // -----------------
- // Fill netgen mesh
- // -----------------
-
-// netgen::Box<3> bb = geom.GetBoundingBox();
-// bb.Increase (bb.Diam()/10);
-// ngMesh.SetLocalH (bb.PMin(), bb.PMax(), 0.5); // set grading
-
- // map for nodes on vertices since they can be shared between wires
- // ( issue 0020676, face_int_box.brep)
- map<const SMDS_MeshNode*, int > node2ngID;
-
- const int faceID = 1, solidID = 0;
- if ( ngMesh.GetNFD() < 1 )
- ngMesh.AddFaceDescriptor (FaceDescriptor(faceID, solidID, solidID, 0));
-
- for ( int iW = 0; iW < wires.size(); ++iW )
- {
- StdMeshers_FaceSidePtr wire = wires[ iW ];
- const vector<UVPtStruct>& uvPtVec = wire->GetUVPtStruct();
- const int nbSegments = wire->NbPoints() - 1;
-
- // compute length of every segment
- vector<double> segLen( nbSegments );
- for ( int i = 0; i < nbSegments; ++i )
- segLen[i] = SMESH_TNodeXYZ( uvPtVec[ i ].node ).Distance( uvPtVec[ i+1 ].node );
-
- int edgeID = 1, posID = -2;
- bool isInternalWire = false;
- for ( int i = 0; i < nbSegments; ++i ) // loop on segments
- {
- // Add the first point of a segment
- const SMDS_MeshNode * n = uvPtVec[ i ].node;
- const int posShapeID = n->getshapeId();
- bool onVertex = ( n->GetPosition()->GetTypeOfPosition() == SMDS_TOP_VERTEX );
-
- // skip nodes on degenerated edges
- if ( helper.IsDegenShape( posShapeID ) &&
- helper.IsDegenShape( uvPtVec[ i+1 ].node->getshapeId() ))
- continue;
-
- int ngID1 = ngMesh.GetNP() + 1, ngID2 = ngID1+1;
- if ( onVertex )
- ngID1 = node2ngID.insert( make_pair( n, ngID1 )).first->second;
- if ( ngID1 > ngMesh.GetNP() )
- {
- MeshPoint mp( Point<3> (n->X(), n->Y(), n->Z()) );
- ngMesh.AddPoint ( mp, 1, EDGEPOINT );
- nodeVec.push_back( n );
- }
- else
- {
- ngID2 = ngMesh.GetNP() + 1;
- if ( i > 0 ) // prev segment belongs to same wire
- {
- Segment& prevSeg = ngMesh.LineSegment( ngMesh.GetNSeg() );
- prevSeg[1] = ngID1;
- }
- }
-
- // Add the segment
- Segment seg;
-
- seg[0] = ngID1; // ng node id
- seg[1] = ngID2; // ng node id
-
- seg.edgenr = ngMesh.GetNSeg() + 1;// segment id
- seg.si = faceID; // = geom.fmap.FindIndex (face);
-
- for ( int iEnd = 0; iEnd < 2; ++iEnd)
- {
- const UVPtStruct& pnt = uvPtVec[ i + iEnd ];
-
- seg.epgeominfo[ iEnd ].dist = pnt.param; // param on curve
- seg.epgeominfo[ iEnd ].u = pnt.u;
- seg.epgeominfo[ iEnd ].v = pnt.v;
-
- // find out edge id and node parameter on edge
- onVertex = ( pnt.node->GetPosition()->GetTypeOfPosition() == SMDS_TOP_VERTEX );
- if ( onVertex || posShapeID != posID )
- {
- // get edge id
- double normParam = pnt.normParam;
- if ( onVertex )
- normParam = 0.5 * ( uvPtVec[ i ].normParam + uvPtVec[ i+1 ].normParam );
- const TopoDS_Edge& edge = wire->Edge( wire->EdgeIndex( normParam ));
- edgeID = geom.emap.FindIndex( edge );
- posID = posShapeID;
- isInternalWire = ( edge.Orientation() == TopAbs_INTERNAL );
- // if ( onVertex ) // param on curve is different on each of two edges
- // seg.epgeominfo[ iEnd ].dist = helper.GetNodeU( edge, pnt.node );
- }
- seg.epgeominfo[ iEnd ].edgenr = edgeID; // = geom.emap.FindIndex(edge);
- }
-
- ngMesh.AddSegment (seg);
- {
- // restrict size of elements near the segment
- SMESH_TNodeXYZ np1( n ), np2( uvPtVec[ i+1 ].node );
- // get an average size of adjacent segments to avoid sharp change of
- // element size (regression on issue 0020452, note 0010898)
- int iPrev = SMESH_MesherHelper::WrapIndex( i-1, nbSegments );
- int iNext = SMESH_MesherHelper::WrapIndex( i+1, nbSegments );
- double avgH = ( segLen[ iPrev ] + segLen[ i ] + segLen[ iNext ]) / 3;
-
- NETGENPlugin_Mesher::RestrictLocalSize( ngMesh, 0.5*(np1+np2), avgH );
- }
-#ifdef DUMP_SEGMENTS
- cout << "Segment: " << seg.edgenr << endl
- << "\tp1: " << seg[0] << endl
- << "\tp2: " << seg[1] << endl
- << "\tp0 param: " << seg.epgeominfo[ 0 ].dist << endl
- << "\tp0 uv: " << seg.epgeominfo[ 0 ].u <<", "<< seg.epgeominfo[ 0 ].v << endl
- << "\tp0 edge: " << seg.epgeominfo[ 0 ].edgenr << endl
- << "\tp1 param: " << seg.epgeominfo[ 1 ].dist << endl
- << "\tp1 uv: " << seg.epgeominfo[ 1 ].u <<", "<< seg.epgeominfo[ 1 ].v << endl
- << "\tp1 edge: " << seg.epgeominfo[ 1 ].edgenr << endl;
-#endif
- if ( isInternalWire )
- {
- swap (seg[0], seg[1]);
- swap( seg.epgeominfo[0], seg.epgeominfo[1] );
- seg.edgenr = ngMesh.GetNSeg() + 1; // segment id
- ngMesh.AddSegment (seg);
-#ifdef DUMP_SEGMENTS
- cout << "Segment: " << seg.edgenr << endl << "\tis REVRESE of the previous one" << endl;
-#endif
- }
- } // loop on segments on a wire
-
- // close chain of segments
- if ( nbSegments > 0 )
- {
- Segment& lastSeg = ngMesh.LineSegment( ngMesh.GetNSeg() - int( isInternalWire));
- const SMDS_MeshNode * lastNode = uvPtVec.back().node;
- lastSeg[1] = node2ngID.insert( make_pair( lastNode, lastSeg[1] )).first->second;
- if ( lastSeg[1] > ngMesh.GetNP() )
- {
- MeshPoint mp( Point<3> (lastNode->X(), lastNode->Y(), lastNode->Z()) );
- ngMesh.AddPoint ( mp, 1, EDGEPOINT );
- nodeVec.push_back( lastNode );
- }
- if ( isInternalWire )
- {
- Segment& realLastSeg = ngMesh.LineSegment( ngMesh.GetNSeg() );
- realLastSeg[0] = lastSeg[1];
- }
- }
-
- } // loop on wires of a face
-
- // add a segment instead of internal vertex
- NETGENPlugin_Internals intShapes( *helper.GetMesh(), helper.GetSubShape(), /*is3D=*/false );
- NETGENPlugin_Mesher::addIntVerticesInFaces( geom, ngMesh, nodeVec, intShapes );
-
- ngMesh.CalcSurfacesOfNode();
-
- return TError();
-}
-
//=============================================================================
/*!
*Here we are going to use the NETGEN mesher
bool NETGENPlugin_NETGEN_2D_ONLY::Compute(SMESH_Mesh& aMesh,
const TopoDS_Shape& aShape)
{
-#ifdef WITH_SMESH_CANCEL_COMPUTE
netgen::multithread.terminate = 0;
-#endif
- MESSAGE("NETGENPlugin_NETGEN_2D_ONLY::Compute()");
+ netgen::multithread.task = "Surface meshing";
SMESHDS_Mesh* meshDS = aMesh.GetMeshDS();
int faceID = meshDS->ShapeToIndex( aShape );
_quadraticMesh = helper.IsQuadraticSubMesh(aShape);
helper.SetElementsOnShape( true );
const bool ignoreMediumNodes = _quadraticMesh;
-
+
+ // build viscous layers if required
+ TopoDS_Face F = TopoDS::Face( aShape/*.Oriented( TopAbs_FORWARD )*/);
+ if ( F.Orientation() != TopAbs_FORWARD &&
+ F.Orientation() != TopAbs_REVERSED )
+ F.Orientation( TopAbs_FORWARD ); // avoid pb with TopAbs_INTERNAL
+ SMESH_ProxyMesh::Ptr proxyMesh = StdMeshers_ViscousLayers2D::Compute( aMesh, F );
+ if ( !proxyMesh )
+ return false;
+
// ------------------------
// get all edges of a face
// ------------------------
- const TopoDS_Face F = TopoDS::Face( aShape.Oriented( TopAbs_FORWARD ));
TError problem;
- TSideVector wires = StdMeshers_FaceSide::GetFaceWires( F, aMesh, ignoreMediumNodes, problem );
+ TSideVector wires =
+ StdMeshers_FaceSide::GetFaceWires( F, aMesh, ignoreMediumNodes, problem, proxyMesh );
if ( problem && !problem->IsOK() )
return error( problem );
int nbWires = wires.size();
else
{
double edgeLength = 0;
- if (_hypLengthFromEdges || (!_hypLengthFromEdges && !_hypMaxElementArea))
+ if (_hypLengthFromEdges /*|| (!_hypLengthFromEdges && !_hypMaxElementArea)*/)
{
int nbSegments = 0;
for ( int iW = 0; iW < nbWires; ++iW )
netgen::mparam.maxh = edgeLength;
netgen::mparam.minh = aMesher.GetDefaultMinSize( aShape, netgen::mparam.maxh );
netgen::mparam.quad = _hypQuadranglePreference ? 1 : 0;
- netgen::mparam.grading = 0.7; // very coarse mesh by default
+ netgen::mparam.grading = 0.5; // coarse mesh by default
}
-#ifdef NETGEN_NEW
occgeo.face_maxh = netgen::mparam.maxh;
-#endif
// -------------------------
// Make input netgen mesh
// -------------------------
- NETGENPlugin_NetgenLibWrapper ngLib;
- netgen::Mesh * ngMesh = (netgen::Mesh*) ngLib._ngMesh;
+ // MESHCONST_ANALYSE step may lead to a failure, so we make an attempt
+ // w/o MESHCONST_ANALYSE at the second loop
+ int err = 1;
+ for ( int iLoop = 0; iLoop < 2; iLoop++ )
+ {
+ bool isMESHCONST_ANALYSE = false;
+ InitComputeError();
- Box<3> bb = occgeo.GetBoundingBox();
- bb.Increase (bb.Diam()/10);
- ngMesh->SetLocalH (bb.PMin(), bb.PMax(), netgen::mparam.grading);
- ngMesh->SetGlobalH (netgen::mparam.maxh);
+ NETGENPlugin_NetgenLibWrapper ngLib;
+ netgen::Mesh * ngMesh = (netgen::Mesh*) ngLib._ngMesh;
+ ngLib._isComputeOk = false;
- vector< const SMDS_MeshNode* > nodeVec;
- problem = addSegmentsToMesh( *ngMesh, occgeo, wires, helper, nodeVec );
- if ( problem && !problem->IsOK() )
- return error( problem );
+#ifndef NETGEN_V5
+ char *optstr = 0;
+#endif
+ int startWith = MESHCONST_ANALYSE;
+ int endWith = MESHCONST_ANALYSE;
- // -------------------------
- // Generate surface mesh
- // -------------------------
+ if ( !_hypLengthFromEdges && !_hypMaxElementArea && !iLoop == 1 )
+ {
+ isMESHCONST_ANALYSE = true;
+#ifdef NETGEN_V5
+ err = netgen::OCCGenerateMesh(occgeo, ngMesh, netgen::mparam, startWith, endWith);
+#else
+ err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr);
+#endif
+ ngLib._ngMesh = 0;
+ ngLib.setMesh(( nglib::Ng_Mesh*) ngMesh );
+ }
+ else
+ {
+ Box<3> bb = occgeo.GetBoundingBox();
+ bb.Increase (bb.Diam()/10);
+ ngMesh->SetLocalH (bb.PMin(), bb.PMax(), netgen::mparam.grading);
+ ngMesh->SetGlobalH (netgen::mparam.maxh);
+ }
- char *optstr = 0;
- int startWith = MESHCONST_MESHSURFACE;
- int endWith = MESHCONST_OPTSURFACE;
- int err = 1;
+ vector< const SMDS_MeshNode* > nodeVec;
+ problem = aMesher.AddSegmentsToMesh( *ngMesh, occgeo, wires, helper, nodeVec );
+ if ( problem && !problem->IsOK() )
+ return error( problem );
- try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
- OCC_CATCH_SIGNALS;
-#endif
- err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr);
-#ifdef WITH_SMESH_CANCEL_COMPUTE
- if(netgen::multithread.terminate)
- return false;
-#endif
- if ( err )
- error(SMESH_Comment("Error in netgen::OCCGenerateMesh() at ") << netgen::multithread.task);
- }
- catch (Standard_Failure& ex)
- {
- SMESH_Comment str("Exception in netgen::OCCGenerateMesh()");
- str << " at " << netgen::multithread.task
- << ": " << ex.DynamicType()->Name();
- if ( ex.GetMessageString() && strlen( ex.GetMessageString() ))
- str << ": " << ex.GetMessageString();
- error(str);
- }
- catch (...) {
- SMESH_Comment str("Exception in netgen::OCCGenerateMesh()");
- str << " at " << netgen::multithread.task;
- error(str);
- }
+ // limit element size near existing segments
+ TopTools_IndexedMapOfShape edgeMap, faceMap;
+ TopExp::MapShapes( aMesh.GetShapeToMesh(), TopAbs_EDGE, edgeMap );
+ for ( int iE = 1; iE <= edgeMap.Extent(); ++iE )
+ {
+ const TopoDS_Shape& edge = edgeMap( iE );
+ if ( SMESH_Algo::isDegenerated( TopoDS::Edge( edge )) ||
+ helper.IsSubShape( edge, aShape ))
+ continue;
+ SMESHDS_SubMesh* smDS = aMesh.GetMeshDS()->MeshElements( edge );
+ if ( !smDS ) continue;
+ SMDS_ElemIteratorPtr segIt = smDS->GetElements();
+ while ( segIt->more() )
+ {
+ const SMDS_MeshElement* seg = segIt->next();
+ SMESH_TNodeXYZ n1 = seg->GetNode(0);
+ SMESH_TNodeXYZ n2 = seg->GetNode(1);
+ gp_XYZ p = 0.5 * ( n1 + n2 );
+ netgen::Point3d pi(p.X(), p.Y(), p.Z());
+ ngMesh->RestrictLocalH( pi, Max(( n1 - n2 ).Modulus(), netgen::mparam.minh ));
+ }
+ }
- // ----------------------------------------------------
- // Fill the SMESHDS with the generated nodes and faces
- // ----------------------------------------------------
+ // -------------------------
+ // Generate surface mesh
+ // -------------------------
- int nbNodes = ngMesh->GetNP();
- int nbFaces = ngMesh->GetNSE();
+ startWith = MESHCONST_MESHSURFACE;
+ endWith = MESHCONST_OPTSURFACE;
- int nbInputNodes = nodeVec.size();
- nodeVec.resize( nbNodes, 0 );
+ try {
+ OCC_CATCH_SIGNALS;
- // add nodes
- for ( int i = nbInputNodes + 1; i <= nbNodes; ++i )
- {
- const MeshPoint& ngPoint = ngMesh->Point(i);
-#ifdef NETGEN_NEW
- SMDS_MeshNode * node = meshDS->AddNode(ngPoint(0), ngPoint(1), ngPoint(2));
+#ifdef NETGEN_V5
+ err = netgen::OCCGenerateMesh(occgeo, ngMesh, netgen::mparam, startWith, endWith);
#else
- SMDS_MeshNode * node = meshDS->AddNode(ngPoint.X(), ngPoint.Y(), ngPoint.Z());
+ err = netgen::OCCGenerateMesh(occgeo, ngMesh, startWith, endWith, optstr);
#endif
- nodeVec[ i-1 ] = node;
- }
+ if(netgen::multithread.terminate)
+ return false;
+ if ( err )
+ error(SMESH_Comment("Error in netgen::OCCGenerateMesh() at ") << netgen::multithread.task);
+ }
+ catch (Standard_Failure& ex)
+ {
+ SMESH_Comment str("Exception in netgen::OCCGenerateMesh()");
+ str << " at " << netgen::multithread.task
+ << ": " << ex.DynamicType()->Name();
+ if ( ex.GetMessageString() && strlen( ex.GetMessageString() ))
+ str << ": " << ex.GetMessageString();
+ error(str);
+ err = 1;
+ }
+ catch (...) {
+ SMESH_Comment str("Exception in netgen::OCCGenerateMesh()");
+ str << " at " << netgen::multithread.task;
+ error(str);
+ err = 1;
+ }
+ if ( err && isMESHCONST_ANALYSE )
+ continue;
- // create faces
- bool reverse = ( aShape.Orientation() == TopAbs_REVERSED );
- int i,j;
- for ( i = 1; i <= nbFaces ; ++i )
- {
- const Element2d& elem = ngMesh->SurfaceElement(i);
- vector<const SMDS_MeshNode*> nodes( elem.GetNP() );
- for (j=1; j <= elem.GetNP(); ++j)
+ // ----------------------------------------------------
+ // Fill the SMESHDS with the generated nodes and faces
+ // ----------------------------------------------------
+
+ int nbNodes = ngMesh->GetNP();
+ int nbFaces = ngMesh->GetNSE();
+
+ int nbInputNodes = nodeVec.size()-1;
+ nodeVec.resize( nbNodes+1, 0 );
+
+ // add nodes
+ for ( int ngID = nbInputNodes + 1; ngID <= nbNodes; ++ngID )
{
- int pind = elem.PNum(j);
- if ( pind-1 < 0 )
- break;
- const SMDS_MeshNode* node = nodeVec.at(pind-1);
- if ( reverse )
- nodes[ nodes.size()-j ] = node;
- else
- nodes[ j-1 ] = node;
- if ( node->GetPosition()->GetTypeOfPosition() == SMDS_TOP_3DSPACE )
- {
- const PointGeomInfo& pgi = elem.GeomInfoPi(j);
- meshDS->SetNodeOnFace((SMDS_MeshNode*)node, faceID, pgi.u, pgi.v);
- }
+ const MeshPoint& ngPoint = ngMesh->Point( ngID );
+ SMDS_MeshNode * node = meshDS->AddNode(ngPoint(0), ngPoint(1), ngPoint(2));
+ nodeVec[ ngID ] = node;
}
- if ( j > elem.GetNP() )
+
+ // create faces
+ const bool reverse = false; //( aShape.Orientation() == TopAbs_REVERSED );
+ int i,j;
+ for ( i = 1; i <= nbFaces ; ++i )
{
- SMDS_MeshFace* face = 0;
- if ( elem.GetType() == TRIG )
- face = helper.AddFace(nodes[0],nodes[1],nodes[2]);
- else
- face = helper.AddFace(nodes[0],nodes[1],nodes[2],nodes[3]);
+ const Element2d& elem = ngMesh->SurfaceElement(i);
+ vector<const SMDS_MeshNode*> nodes( elem.GetNP() );
+ for (j=1; j <= elem.GetNP(); ++j)
+ {
+ int pind = elem.PNum(j);
+ if ( pind < 1 )
+ break;
+ const SMDS_MeshNode* node = nodeVec[ pind ];
+ if ( reverse )
+ nodes[ nodes.size()-j ] = node;
+ else
+ nodes[ j-1 ] = node;
+ if ( node->GetPosition()->GetTypeOfPosition() == SMDS_TOP_3DSPACE )
+ {
+ const PointGeomInfo& pgi = elem.GeomInfoPi(j);
+ meshDS->SetNodeOnFace((SMDS_MeshNode*)node, faceID, pgi.u, pgi.v);
+ }
+ }
+ if ( j > elem.GetNP() )
+ {
+ SMDS_MeshFace* face = 0;
+ if ( elem.GetType() == TRIG )
+ face = helper.AddFace(nodes[0],nodes[1],nodes[2]);
+ else
+ face = helper.AddFace(nodes[0],nodes[1],nodes[2],nodes[3]);
+ }
}
- }
+
+ ngLib._isComputeOk = !err;
+ break;
+
+ } // two attempts
return !err;
}
-#ifdef WITH_SMESH_CANCEL_COMPUTE
void NETGENPlugin_NETGEN_2D_ONLY::CancelCompute()
{
SMESH_Algo::CancelCompute();
netgen::multithread.terminate = 1;
}
-#endif
+
+//================================================================================
+/*!
+ * \brief Return progress of Compute() [0.,1]
+ */
+//================================================================================
+
+double NETGENPlugin_NETGEN_2D_ONLY::GetProgress() const
+{
+ const char* task1 = "Surface meshing";
+ //const char* task2 = "Optimizing surface";
+ double& progress = const_cast<NETGENPlugin_NETGEN_2D_ONLY*>( this )->_progress;
+ if ( _progressByTic < 0. &&
+ strncmp( netgen::multithread.task, task1, 3 ) == 0 )
+ {
+ progress = Min( 0.25, SMESH_Algo::GetProgressByTic() ); // [0, 0.25]
+ }
+ else //if ( strncmp( netgen::multithread.task, task2, 3 ) == 0)
+ {
+ if ( _progressByTic < 0 )
+ {
+ NETGENPlugin_NETGEN_2D_ONLY* me = (NETGENPlugin_NETGEN_2D_ONLY*) this;
+ me->_progressByTic = 0.25 / (_progressTic+1);
+ }
+ const_cast<NETGENPlugin_NETGEN_2D_ONLY*>( this )->_progressTic++;
+ progress = Max( progress, _progressByTic * _progressTic );
+ }
+ //cout << netgen::multithread.task << " " << _progressTic << endl;
+ return Min( progress, 0.99 );
+}
//=============================================================================
/*!
