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 'OCCT780'
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_FaceSide.cxx
diff --git
a/src/StdMeshers/StdMeshers_FaceSide.cxx
b/src/StdMeshers/StdMeshers_FaceSide.cxx
index 0ebea37408a71c5d3e62c1036016a2f96b5a8b5e..51a09cc99a9fa4fb34f35a01104bd13d370aef5f 100644
(file)
--- a/
src/StdMeshers/StdMeshers_FaceSide.cxx
+++ b/
src/StdMeshers/StdMeshers_FaceSide.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
0 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-202
4 CEA, EDF
, 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
@@
-835,7
+835,7
@@
bool StdMeshers_FaceSide::GetEdgeNodes(size_t i,
if ( mesh->HasModificationsToDiscard() ) // check nb of nodes on the EDGE sub-mesh
{
int iQuad = sm->NbElements() ? sm->GetElements()->next()->IsQuadratic() : 0;
if ( mesh->HasModificationsToDiscard() ) // check nb of nodes on the EDGE sub-mesh
{
int iQuad = sm->NbElements() ? sm->GetElements()->next()->IsQuadratic() : 0;
-
int
nbExpect = sm->NbElements() - 1 + iQuad * sm->NbElements();
+
smIdType
nbExpect = sm->NbElements() - 1 + iQuad * sm->NbElements();
if ( nbExpect != sm->NbNodes() ) // some nodes are moved from the EDGE by MergeNodes()
{
// add nodes of all segments
if ( nbExpect != sm->NbNodes() ) // some nodes are moved from the EDGE by MergeNodes()
{
// add nodes of all segments
@@
-1045,7
+1045,7
@@
void StdMeshers_FaceSide::SetIgnoreMediumNodes(bool toIgnore)
// since creation of this side
//=======================================================================
// since creation of this side
//=======================================================================
-
int
StdMeshers_FaceSide::NbPoints(const bool update) const
+
smIdType
StdMeshers_FaceSide::NbPoints(const bool update) const
{
if ( !myPoints.empty() )
return myPoints.size();
{
if ( !myPoints.empty() )
return myPoints.size();
@@
-1112,7
+1112,7
@@
int StdMeshers_FaceSide::NbPoints(const bool update) const
// since creation of this side
//=======================================================================
// since creation of this side
//=======================================================================
-
int
StdMeshers_FaceSide::NbSegments(const bool update) const
+
smIdType
StdMeshers_FaceSide::NbSegments(const bool update) const
{
return NbPoints( update ), myNbSegments;
}
{
return NbPoints( update ), myNbSegments;
}
@@
-1148,7
+1148,9
@@
void StdMeshers_FaceSide::reverseProxySubmesh( const TopoDS_Edge& E )
void StdMeshers_FaceSide::dump(const char* msg) const
{
void StdMeshers_FaceSide::dump(const char* msg) const
{
-#ifdef _DEBUG_
+ if (!SALOME::VerbosityActivated())
+ return;
+
if (msg) MESSAGE ( std::endl << msg );
MESSAGE_BEGIN ("NB EDGES: "<< myEdge.size() );
MESSAGE_ADD ( "nbPoints: "<<myNbPonits<<" vecSize: " << myPoints.size()<<" "<<myFalsePoints.size() );
if (msg) MESSAGE ( std::endl << msg );
MESSAGE_BEGIN ("NB EDGES: "<< myEdge.size() );
MESSAGE_ADD ( "nbPoints: "<<myNbPonits<<" vecSize: " << myPoints.size()<<" "<<myFalsePoints.size() );
@@
-1176,9
+1178,6
@@
void StdMeshers_FaceSide::dump(const char* msg) const
MESSAGE_ADD ( "\tF: "<<myFirst[i]<< " L: "<< myLast[i] );
MESSAGE_END ( "\tnormPar: "<<myNormPar[i]<<endl );
}
MESSAGE_ADD ( "\tF: "<<myFirst[i]<< " L: "<< myLast[i] );
MESSAGE_END ( "\tnormPar: "<<myNormPar[i]<<endl );
}
-#else
- (void)msg; // unused in release mode
-#endif
}
//================================================================================
}
//================================================================================