Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into pre/penta18
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Adaptive1D.cxx
diff --git
a/src/StdMeshers/StdMeshers_Adaptive1D.cxx
b/src/StdMeshers/StdMeshers_Adaptive1D.cxx
index a9981339f83cf7c23add4b63f8ab2acd30f9aa43..ba2e031ac96c00f8c70f1a5b408b45d1e26a4638 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Adaptive1D.cxx
+++ b/
src/StdMeshers/StdMeshers_Adaptive1D.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-24,12
+24,13
@@
//
#include "StdMeshers_Adaptive1D.hxx"
//
#include "StdMeshers_Adaptive1D.hxx"
+#include "SMESHDS_Mesh.hxx"
#include "SMESH_Gen.hxx"
#include "SMESH_Gen.hxx"
+#include "SMESH_HypoFilter.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESH_MesherHelper.hxx"
#include "SMESH_Octree.hxx"
#include "SMESH_subMesh.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESH_MesherHelper.hxx"
#include "SMESH_Octree.hxx"
#include "SMESH_subMesh.hxx"
-#include "SMESH_HypoFilter.hxx"
#include <Utils_SALOME_Exception.hxx>
#include <Utils_SALOME_Exception.hxx>
@@
-39,6
+40,7
@@
#include <BRepMesh_IncrementalMesh.hxx>
#include <BRep_Tool.hxx>
#include <Bnd_B3d.hxx>
#include <BRepMesh_IncrementalMesh.hxx>
#include <BRep_Tool.hxx>
#include <Bnd_B3d.hxx>
+#include <Bnd_Box.hxx>
#include <GCPnts_AbscissaPoint.hxx>
#include <GeomAdaptor_Curve.hxx>
#include <Geom_Curve.hxx>
#include <GCPnts_AbscissaPoint.hxx>
#include <GeomAdaptor_Curve.hxx>
#include <Geom_Curve.hxx>
@@
-534,7
+536,7
@@
namespace // internal utils
for ( int i = 0; i < 3; ++i )
{
const gp_Pnt& pn = myNodes->Value(n[i]);
for ( int i = 0; i < 3; ++i )
{
const gp_Pnt& pn = myNodes->Value(n[i]);
- if (
avoidTria = ( pn.SquareDistance( *avoidPnt ) <= tol2
))
+ if (
( avoidTria = ( pn.SquareDistance( *avoidPnt ) <= tol2 )
))
break;
if ( !projectedOnly )
minD2 = Min( minD2, pn.SquareDistance( p ));
break;
if ( !projectedOnly )
minD2 = Min( minD2, pn.SquareDistance( p ));
@@
-702,7
+704,7
@@
namespace // internal utils
void ElementBndBoxTree::buildChildrenData()
{
ElemTreeData* data = GetElemData();
void ElementBndBoxTree::buildChildrenData()
{
ElemTreeData* data = GetElemData();
- for (
in
t i = 0; i < _elementIDs.size(); ++i )
+ for (
size_
t i = 0; i < _elementIDs.size(); ++i )
{
const Bnd_B3d* elemBox = data->GetBox( _elementIDs[i] );
for (int j = 0; j < 8; j++)
{
const Bnd_B3d* elemBox = data->GetBox( _elementIDs[i] );
for (int j = 0; j < 8; j++)
@@
-717,7
+719,7
@@
namespace // internal utils
{
ElementBndBoxTree* child = static_cast<ElementBndBoxTree*>( myChildren[j] );
child->_elementIDs = data->myWorkIDs[ j ];
{
ElementBndBoxTree* child = static_cast<ElementBndBoxTree*>( myChildren[j] );
child->_elementIDs = data->myWorkIDs[ j ];
- if ( child->_elementIDs.size() <= theMaxNbElemsInLeaf )
+ if (
(int)
child->_elementIDs.size() <= theMaxNbElemsInLeaf )
child->myIsLeaf = true;
data->myWorkIDs[ j ].clear();
}
child->myIsLeaf = true;
data->myWorkIDs[ j ].clear();
}
@@
-740,7
+742,7
@@
namespace // internal utils
if ( isLeaf() )
{
ElemTreeData* data = GetElemData();
if ( isLeaf() )
{
ElemTreeData* data = GetElemData();
- for (
in
t i = 0; i < _elementIDs.size(); ++i )
+ for (
size_
t i = 0; i < _elementIDs.size(); ++i )
if ( !data->GetBox( _elementIDs[i] )->IsOut( center, radius ))
foundElemIDs.push_back( _elementIDs[i] );
}
if ( !data->GetBox( _elementIDs[i] )->IsOut( center, radius ))
foundElemIDs.push_back( _elementIDs[i] );
}
@@
-991,7
+993,7
@@
ostream & StdMeshers_Adaptive1D::SaveTo(ostream & save)
istream & StdMeshers_Adaptive1D::LoadFrom(istream & load)
{
int dummyParam;
istream & StdMeshers_Adaptive1D::LoadFrom(istream & load)
{
int dummyParam;
- bool isOK = (load >> myMinSize >> myMaxSize >> myDeflection >> dummyParam >> dummyParam);
+ bool isOK =
static_cast<bool>
(load >> myMinSize >> myMaxSize >> myDeflection >> dummyParam >> dummyParam);
if (!isOK)
load.clear(ios::badbit | load.rdstate());
return load;
if (!isOK)
load.clear(ios::badbit | load.rdstate());
return load;
@@
-1178,6
+1180,7
@@
bool AdaptiveAlgo::Compute(SMESH_Mesh & theMesh,
eData.AddPoint( eData.myPoints.end(), eData.myC3d.LastParameter() );
}
}
eData.AddPoint( eData.myPoints.end(), eData.myC3d.LastParameter() );
}
}
+ if ( myEdges.empty() ) return true;
if ( _computeCanceled ) return false;
// Take into account size of already existing segments
if ( _computeCanceled ) return false;
// Take into account size of already existing segments
@@
-1195,7
+1198,7
@@
bool AdaptiveAlgo::Compute(SMESH_Mesh & theMesh,
StdMeshers_Regular_1D::_value[ DEFLECTION_IND ] = myHyp->GetDeflection();
list< double > params;
StdMeshers_Regular_1D::_value[ DEFLECTION_IND ] = myHyp->GetDeflection();
list< double > params;
- for (
in
t iE = 0; iE < myEdges.size(); ++iE )
+ for (
size_
t iE = 0; iE < myEdges.size(); ++iE )
{
EdgeData& eData = myEdges[ iE ];
//cout << "E " << theMesh.GetMeshDS()->ShapeToIndex( eData.Edge() ) << endl;
{
EdgeData& eData = myEdges[ iE ];
//cout << "E " << theMesh.GetMeshDS()->ShapeToIndex( eData.Edge() ) << endl;
@@
-1241,7
+1244,7
@@
bool AdaptiveAlgo::Compute(SMESH_Mesh & theMesh,
triaSearcher->SetSizeByTrias( sizeTree, myHyp->GetDeflection() );
triaSearcher->SetSizeByTrias( sizeTree, myHyp->GetDeflection() );
- for (
in
t iE = 0; iE < myEdges.size(); ++iE )
+ for (
size_
t iE = 0; iE < myEdges.size(); ++iE )
{
EdgeData& eData = myEdges[ iE ];
{
EdgeData& eData = myEdges[ iE ];
@@
-1288,6
+1291,7
@@
bool AdaptiveAlgo::Compute(SMESH_Mesh & theMesh,
//cout << "E " << theMesh.GetMeshDS()->ShapeToIndex( eData.Edge() ) << endl;
sizeDecreased = false;
const gp_Pnt* avoidPnt = & eData.First().myP;
//cout << "E " << theMesh.GetMeshDS()->ShapeToIndex( eData.Edge() ) << endl;
sizeDecreased = false;
const gp_Pnt* avoidPnt = & eData.First().myP;
+ EdgeData::TPntIter pItLast = --eData.myPoints.end(), pItFirst = eData.myPoints.begin();
for ( pIt1 = eData.myPoints.begin(); pIt1 != eData.myPoints.end(); )
{
double distToFace =
for ( pIt1 = eData.myPoints.begin(); pIt1 != eData.myPoints.end(); )
{
double distToFace =
@@
-1305,19
+1309,16
@@
bool AdaptiveAlgo::Compute(SMESH_Mesh & theMesh,
// << "\t SetSize " << allowedSize << " at "
// << pIt1->myP.X() <<", "<< pIt1->myP.Y()<<", "<<pIt1->myP.Z() << endl;
pIt2 = pIt1;
// << "\t SetSize " << allowedSize << " at "
// << pIt1->myP.X() <<", "<< pIt1->myP.Y()<<", "<<pIt1->myP.Z() << endl;
pIt2 = pIt1;
- if (
--pIt2 != eData.myPoints.end() && pIt2
->mySegSize > allowedSize )
+ if (
pIt1 != pItFirst && ( --pIt2 )
->mySegSize > allowedSize )
sizeTree.SetSize( eData.myC3d.Value( 0.6*pIt2->myU + 0.4*pIt1->myU ), allowedSize );
pIt2 = pIt1;
sizeTree.SetSize( eData.myC3d.Value( 0.6*pIt2->myU + 0.4*pIt1->myU ), allowedSize );
pIt2 = pIt1;
- if (
++pIt2 != eData.myPoints.end() && pIt2
->mySegSize > allowedSize )
+ if (
pIt1 != pItLast && ( ++pIt2 )
->mySegSize > allowedSize )
sizeTree.SetSize( eData.myC3d.Value( 0.6*pIt2->myU + 0.4*pIt1->myU ), allowedSize );
}
pIt1->mySegSize = allowedSize;
}
++pIt1;
sizeTree.SetSize( eData.myC3d.Value( 0.6*pIt2->myU + 0.4*pIt1->myU ), allowedSize );
}
pIt1->mySegSize = allowedSize;
}
++pIt1;
- if ( & (*pIt1) == & eData.Last() )
- avoidPnt = & eData.Last().myP;
- else
- avoidPnt = NULL;
+ avoidPnt = ( pIt1 == pItLast ) ? & eData.Last().myP : NULL;
if ( iLoop > 20 )
{
if ( iLoop > 20 )
{
@@
-1354,7
+1355,7
@@
bool AdaptiveAlgo::makeSegments()
vector< double > nbSegs, params;
vector< double > nbSegs, params;
- for (
in
t iE = 0; iE < myEdges.size(); ++iE )
+ for (
size_
t iE = 0; iE < myEdges.size(); ++iE )
{
EdgeData& eData = myEdges[ iE ];
{
EdgeData& eData = myEdges[ iE ];
@@
-1365,13
+1366,13
@@
bool AdaptiveAlgo::makeSegments()
edgeMinSize = Min( edgeMinSize,
Min( pIt1->mySegSize, mySizeTree->GetSize( pIt1->myP )));
edgeMinSize = Min( edgeMinSize,
Min( pIt1->mySegSize, mySizeTree->GetSize( pIt1->myP )));
- const double f = eData.myC3d.FirstParameter(), l = eData.myC3d.LastParameter();
+ const double
f = eData.myC3d.FirstParameter(), l = eData.myC3d.LastParameter();
const double parLen = l - f;
const int nbDivSeg = 5;
const double parLen = l - f;
const int nbDivSeg = 5;
-
int
nbDiv = Max( 1, int ( eData.myLength / edgeMinSize * nbDivSeg ));
+
size_t
nbDiv = Max( 1, int ( eData.myLength / edgeMinSize * nbDivSeg ));
// compute nb of segments
// compute nb of segments
- bool toRecompute = true;
+ bool
toRecompute = true;
double maxSegSize = 0;
size_t i = 1, segCount;
//cout << "E " << theMesh.GetMeshDS()->ShapeToIndex( eData.Edge() ) << endl;
double maxSegSize = 0;
size_t i = 1, segCount;
//cout << "E " << theMesh.GetMeshDS()->ShapeToIndex( eData.Edge() ) << endl;
@@
-1429,7
+1430,7
@@
bool AdaptiveAlgo::makeSegments()
}
// compute parameters of nodes
}
// compute parameters of nodes
-
in
t nbSegFinal = Max( 1, int(floor( nbSegs.back() + 0.5 )));
+
size_
t nbSegFinal = Max( 1, int(floor( nbSegs.back() + 0.5 )));
double fact = nbSegFinal / nbSegs.back();
if ( maxSegSize / fact > myHyp->GetMaxSize() )
fact = ++nbSegFinal / nbSegs.back();
double fact = nbSegFinal / nbSegs.back();
if ( maxSegSize / fact > myHyp->GetMaxSize() )
fact = ++nbSegFinal / nbSegs.back();
@@
-1502,7
+1503,7
@@
bool AdaptiveAlgo::Evaluate(SMESH_Mesh & theMesh,
for ( ; edExp.More(); edExp.Next() )
{
for ( ; edExp.More(); edExp.Next() )
{
- const TopoDS_Edge & edge = TopoDS::Edge( edExp.Current() );
+
//
const TopoDS_Edge & edge = TopoDS::Edge( edExp.Current() );
StdMeshers_Regular_1D::Evaluate( theMesh, theShape, theResMap );
}
return true;
StdMeshers_Regular_1D::Evaluate( theMesh, theShape, theResMap );
}
return true;