OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0026365: Optimization of work of OSD_Parallel class members for GeomLib_CheckCurveOnSurface

Browse Source 
Removed workaround within GeomLib_CheckCurveOnSurface.
This commit is contained in:
kgv 2019-01-10 16:35:25 +03:00 committed by bugmaster
parent 793d165af6
commit 3738565abb
8 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/BOPAlgo/BOPAlgo_CheckerSI.cxx
View File

@ -90,7 +90,7 @@ class BOPAlgo_FaceSelfIntersect :
//
virtual void Perform() {
BOPAlgo_Algo::UserBreak();
IntTools_FaceFace::Perform(myF, myF);
IntTools_FaceFace::Perform (myF, myF, myRunParallel);
}
//
protected:
@ -428,6 +428,7 @@ void BOPAlgo_CheckerSI::CheckFaceSelfIntersection()
BOPAlgo_FaceSelfIntersect& aFaceSelfIntersect = aVFace.Appended();
//
aFaceSelfIntersect.SetRunParallel (myRunParallel);
aFaceSelfIntersect.SetIndex(i);
aFaceSelfIntersect.SetFace(aF);
aFaceSelfIntersect.SetTolF(aTolF);

3
src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx
View File

@ -180,7 +180,7 @@ class BOPAlgo_FaceFace :
myTrsf = aTrsf.Inverted();
}
IntTools_FaceFace::Perform (aF1, aF2);
IntTools_FaceFace::Perform (aF1, aF2, myRunParallel);
}
catch (Standard_Failure const&)
{
@ -292,6 +292,7 @@ void BOPAlgo_PaveFiller::PerformFF()
//
BOPAlgo_FaceFace& aFaceFace=aVFaceFace.Appended();
//
aFaceFace.SetRunParallel (myRunParallel);
aFaceFace.SetIndices(nF1, nF2);
aFaceFace.SetFaces(aF1, aF2);
aFaceFace.SetBoxes (myDS->ShapeInfo (nF1).Box(), myDS->ShapeInfo (nF2).Box());

2
src/BOPTest/BOPTest_BOPCommands.cxx
View File

@ -649,7 +649,7 @@ Standard_Integer bopcurves (Draw_Interpretor& di,
aFF.SetList(aListOfPnts);
aFF.SetFuzzyValue (BOPTest_Objects::FuzzyValue());
//
aFF.Perform (aF1, aF2);
aFF.Perform (aF1, aF2, BOPTest_Objects::RunParallel());
//
anIsDone=aFF.IsDone();
if (!anIsDone) {

10
src/GeomLib/GeomLib_CheckCurveOnSurface.cxx
View File

@ -390,19 +390,9 @@ void GeomLib_CheckCurveOnSurface::Init( const Handle(Geom_Curve)& theCurve,
//function : Perform
//purpose :
//=======================================================================
#ifndef HAVE_TBB
//After fixing bug # 26365, this fragment should be deleted
//(together the text "#ifdef HAVE_TBB")
void GeomLib_CheckCurveOnSurface::Perform(const Handle(Geom2d_Curve)& thePCurve,
const Standard_Boolean)
{
const Standard_Boolean isTheMTDisabled = Standard_True;
#else
void GeomLib_CheckCurveOnSurface::Perform(const Handle(Geom2d_Curve)& thePCurve,
const Standard_Boolean isTheMTDisabled)
{
#endif
if( myCurve.IsNull() ||
mySurface.IsNull() ||
thePCurve.IsNull())

12
src/IntTools/IntTools_FaceFace.cxx
View File

@ -356,8 +356,9 @@ static Standard_Boolean isTreatAnalityc(const BRepAdaptor_Surface& theBAS1,
//function : Perform
//purpose : intersect surfaces of the faces
//=======================================================================
void IntTools_FaceFace::Perform(const TopoDS_Face& aF1,
const TopoDS_Face& aF2)
void IntTools_FaceFace::Perform (const TopoDS_Face& aF1,
const TopoDS_Face& aF2,
const Standard_Boolean theToRunParallel)
{
if (myContext.IsNull()) {
myContext=new IntTools_Context;
@ -560,7 +561,7 @@ void IntTools_FaceFace::Perform(const TopoDS_Face& aF1,
MakeCurve(i, dom1, dom2, TolArc);
}
//
ComputeTolReached3d();
ComputeTolReached3d (theToRunParallel);
//
if (bReverse) {
Handle(Geom2d_Curve) aC2D1, aC2D2;
@ -624,7 +625,7 @@ void IntTools_FaceFace::Perform(const TopoDS_Face& aF1,
//function :ComputeTolReached3d
//purpose :
//=======================================================================
void IntTools_FaceFace::ComputeTolReached3d()
void IntTools_FaceFace::ComputeTolReached3d (const Standard_Boolean theToRunParallel)
{
Standard_Integer i, j, aNbLin = mySeqOfCurve.Length();
if (!aNbLin) {
@ -662,8 +663,7 @@ void IntTools_FaceFace::ComputeTolReached3d()
// Look for the maximal deviation between 3D and 2D curves
Standard_Real aD, aT;
const Handle(Geom_Surface)& aS = !j ? aS1 : aS2;
if (IntTools_Tools::ComputeTolerance
(aC3D, aC2D, aS, aFirst, aLast, aD, aT))
if (IntTools_Tools::ComputeTolerance (aC3D, aC2D, aS, aFirst, aLast, aD, aT, Precision::PConfusion(), theToRunParallel))
{
if (aD > aTolC)
{

6
src/IntTools/IntTools_FaceFace.hxx
View File

@ -48,7 +48,9 @@ public:
//! Intersects underliing surfaces of F1 and F2
//! Use sum of tolerance of F1 and F2 as intersection
//! criteria
Standard_EXPORT void Perform (const TopoDS_Face& F1, const TopoDS_Face& F2);
Standard_EXPORT void Perform (const TopoDS_Face& F1,
const TopoDS_Face& F2,
const Standard_Boolean theToRunParallel = Standard_False);
//! Returns True if the intersection was successful
@ -106,7 +108,7 @@ protected:
//! as a maximal deviation between 3D curve and 2D curves on faces.<br>
//! If there are no 2D curves the maximal deviation between 3D curves
//! and surfaces is computed.
Standard_EXPORT void ComputeTolReached3d();
Standard_EXPORT void ComputeTolReached3d (const Standard_Boolean theToRunParallel);
protected:

5
src/IntTools/IntTools_Tools.cxx
View File

@ -792,12 +792,13 @@ Standard_Boolean IntTools_Tools::ComputeTolerance
const Standard_Real theLast,
Standard_Real& theMaxDist,
Standard_Real& theMaxPar,
const Standard_Real theTolRange)
const Standard_Real theTolRange,
const Standard_Boolean theToRunParallel)
{
GeomLib_CheckCurveOnSurface aCS;
//
aCS.Init(theCurve3D, theSurf, theFirst, theLast, theTolRange);
aCS.Perform(theCurve2D);
aCS.Perform (theCurve2D, !theToRunParallel);
if (!aCS.IsDone()) {
return Standard_False;
}

4
src/IntTools/IntTools_Tools.hxx
View File

@ -172,8 +172,8 @@ public:
const Standard_Real theLast,
Standard_Real& theMaxDist,
Standard_Real& theMaxPar,
const Standard_Real theTolRange =
Precision::PConfusion());
const Standard_Real theTolRange = Precision::PConfusion(),
const Standard_Boolean theToRunParallel = Standard_False);
//! Computes the correct Intersection range for