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
Copyright update 2021
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_MeshEditor.cxx
diff --git
a/src/SMESH/SMESH_MeshEditor.cxx
b/src/SMESH/SMESH_MeshEditor.cxx
index 3771280caaee84749653b121d7528a1c326d4473..8a872c724a31cc12e95979eecd8275a20282378d 100644
(file)
--- a/
src/SMESH/SMESH_MeshEditor.cxx
+++ b/
src/SMESH/SMESH_MeshEditor.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
0
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-202
1
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
@@
-1927,7
+1927,7
@@
namespace
}
for ( int variant = 0; variant < nbVariants && method._nbSplits == 0; ++variant )
{
}
for ( int variant = 0; variant < nbVariants && method._nbSplits == 0; ++variant )
{
- // check method complianc
y
with adjacent tetras,
+ // check method complianc
e
with adjacent tetras,
// all found splits must be among facets of tetras described by this method
method = TSplitMethod( nbTet, connVariants[variant] );
if ( hasAdjacentSplits && method._nbSplits > 0 )
// all found splits must be among facets of tetras described by this method
method = TSplitMethod( nbTet, connVariants[variant] );
if ( hasAdjacentSplits && method._nbSplits > 0 )
@@
-2126,7
+2126,7
@@
namespace
// there are adjacent prism
for ( int variant = 0; variant < nbVariants; ++variant )
{
// there are adjacent prism
for ( int variant = 0; variant < nbVariants; ++variant )
{
- // check method complianc
y
with adjacent prisms,
+ // check method complianc
e
with adjacent prisms,
// the found prism facets must be among facets of prisms described by current method
method._nbSplits = nbSplits;
method._nbCorners = 6;
// the found prism facets must be among facets of prisms described by current method
method._nbSplits = nbSplits;
method._nbCorners = 6;
@@
-3629,7
+3629,7
@@
static bool getClosestUV (Extrema_GenExtPS& projector,
{
projector.Perform( point );
if ( projector.IsDone() ) {
{
projector.Perform( point );
if ( projector.IsDone() ) {
- double u
, v
, minVal = DBL_MAX;
+ double u
= 0, v = 0
, minVal = DBL_MAX;
for ( int i = projector.NbExt(); i > 0; i-- )
if ( projector.SquareDistance( i ) < minVal ) {
minVal = projector.SquareDistance( i );
for ( int i = projector.NbExt(); i > 0; i-- )
if ( projector.SquareDistance( i ) < minVal ) {
minVal = projector.SquareDistance( i );
@@
-3857,9
+3857,9
@@
void SMESH_MeshEditor::Smooth (TIDSortedElemSet & theElems,
}
else {
if ( isUPeriodic )
}
else {
if ( isUPeriodic )
- newUV.SetX( ElCLib::InPeriod( newUV.X(), u1, u2 ));
// todo: u may be used unitialized
+ newUV.SetX( ElCLib::InPeriod( newUV.X(), u1, u2 ));
if ( isVPeriodic )
if ( isVPeriodic )
- newUV.SetY( ElCLib::InPeriod( newUV.Y(), v1, v2 ));
// todo: v may be used unitialized
+ newUV.SetY( ElCLib::InPeriod( newUV.Y(), v1, v2 ));
// check new UV
// if ( posType != SMDS_TOP_3DSPACE )
// dist2 = pNode.SquareDistance( surface->Value( newUV.X(), newUV.Y() ));
// check new UV
// if ( posType != SMDS_TOP_3DSPACE )
// dist2 = pNode.SquareDistance( surface->Value( newUV.X(), newUV.Y() ));
@@
-7461,10
+7461,10
@@
public:
//int& GroupID() const { return const_cast< int& >( myGroupID ); }
ComparableElement( const ComparableElement& theSource ) // move copy
//int& GroupID() const { return const_cast< int& >( myGroupID ); }
ComparableElement( const ComparableElement& theSource ) // move copy
-
: boost::container::flat_set< int >
()
+
: int_set
()
{
ComparableElement& src = const_cast< ComparableElement& >( theSource );
{
ComparableElement& src = const_cast< ComparableElement& >( theSource );
- (int_set&) (*this ) =
boost
::move( src );
+ (int_set&) (*this ) =
std
::move( src );
myElem = src.myElem;
mySumID = src.mySumID;
myGroupID = src.myGroupID;
myElem = src.myElem;
mySumID = src.mySumID;
myGroupID = src.myGroupID;
@@
-10200,7
+10200,7
@@
namespace // automatically find theAffectedElems for DoubleNodes()
if ( SMESH_MeshAlgos::FaceNormal( _elems[1], norm ))
avgNorm += norm;
if ( SMESH_MeshAlgos::FaceNormal( _elems[1], norm ))
avgNorm += norm;
- gp_XYZ bordDir( SMESH_NodeXYZ(
_nodes[0] ) - SMESH_NodeXYZ( _nodes[1] )); // todo: compiler complains about zero-size array
+ gp_XYZ bordDir( SMESH_NodeXYZ(
this->_nodes[0] ) - SMESH_NodeXYZ( this->_nodes[1] ));
norm = bordDir ^ avgNorm;
}
else
norm = bordDir ^ avgNorm;
}
else