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
[bos #40650][CEA 33012] Beta Law distribution: added a new type of distribution for...
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Pattern.cxx
diff --git
a/src/SMESH/SMESH_Pattern.cxx
b/src/SMESH/SMESH_Pattern.cxx
index bb471b5de5fc86b1740ad24699851a01a0d87393..d59495d15e70ce633a5f13aeb3a9889fe40313dc 100644
(file)
--- a/
src/SMESH/SMESH_Pattern.cxx
+++ b/
src/SMESH/SMESH_Pattern.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
1 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
@@
-574,8
+574,8
@@
bool SMESH_Pattern::Load (SMESH_Mesh* theMesh,
SMESH_MesherHelper helper( *theMesh );
helper.SetSubShape( theFace );
SMESH_MesherHelper helper( *theMesh );
helper.SetSubShape( theFace );
-
int
nbNodes = ( !fSubMesh ? 0 : fSubMesh->NbNodes() );
-
int
nbElems = ( !fSubMesh ? 0 : fSubMesh->NbElements() );
+
smIdType
nbNodes = ( !fSubMesh ? 0 : fSubMesh->NbNodes() );
+
smIdType
nbElems = ( !fSubMesh ? 0 : fSubMesh->NbElements() );
if ( nbElems == 0 && aMeshDS->NbFaces() == 0 )
{
MESSAGE( "No elements bound to the face");
if ( nbElems == 0 && aMeshDS->NbFaces() == 0 )
{
MESSAGE( "No elements bound to the face");
@@
-3231,7
+3231,7
@@
bool SMESH_Pattern::Load (SMESH_Mesh* theMesh,
return setErrorCode( ERR_LOADV_BAD_SHAPE );
// count nodes
return setErrorCode( ERR_LOADV_BAD_SHAPE );
// count nodes
-
int nbNodes = 0,
shapeID;
+
smIdType nbNodes = 0; int
shapeID;
for ( shapeID = 1; shapeID <= myShapeIDMap.Extent(); shapeID++ )
{
const TopoDS_Shape& S = myShapeIDMap( shapeID );
for ( shapeID = 1; shapeID <= myShapeIDMap.Extent(); shapeID++ )
{
const TopoDS_Shape& S = myShapeIDMap( shapeID );
@@
-4366,7
+4366,7
@@
void SMESH_Pattern::createElements(SMESH_Mesh* theMes
subMesh->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE );
}
if ( onMeshElements ) {
subMesh->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE );
}
if ( onMeshElements ) {
- list<
int
> elemIDs;
+ list<
smIdType
> elemIDs;
for ( size_t i = 0; i < theElements.size(); i++ )
{
subMesh = theMesh->GetSubMeshContaining( shapeIDs[ i ] );
for ( size_t i = 0; i < theElements.size(); i++ )
{
subMesh = theMesh->GetSubMeshContaining( shapeIDs[ i ] );
@@
-4925,11
+4925,12
@@
list< SMESH_Pattern::TPoint* > & SMESH_Pattern::getShapePoints(const int theShap
void SMESH_Pattern::DumpPoints() const
{
void SMESH_Pattern::DumpPoints() const
{
-#ifdef _DEBUG_
- vector< TPoint >::const_iterator pVecIt = myPoints.begin();
- for ( int i = 0; pVecIt != myPoints.end(); pVecIt++, i++ )
- MESSAGE_ADD ( std::endl << i << ": " << *pVecIt );
-#endif
+ if (SALOME::VerbosityActivated())
+ {
+ vector< TPoint >::const_iterator pVecIt = myPoints.begin();
+ for ( int i = 0; pVecIt != myPoints.end(); pVecIt++, i++ )
+ MESSAGE_ADD ( std::endl << i << ": " << *pVecIt );
+ }
}
//=======================================================================
}
//=======================================================================
@@
-4939,14
+4940,15
@@
void SMESH_Pattern::DumpPoints() const
SMESH_Pattern::TPoint::TPoint()
{
SMESH_Pattern::TPoint::TPoint()
{
-#ifdef _DEBUG_
- myInitXYZ.SetCoord(7,7,7);
- myInitUV.SetCoord(7.,7.);
- myInitU = 7;
- myXYZ.SetCoord(7,7,7);
- myUV.SetCoord(7.,7.);
- myU = 7;
-#endif
+ if (SALOME::VerbosityActivated())
+ {
+ myInitXYZ.SetCoord(7,7,7);
+ myInitUV.SetCoord(7.,7.);
+ myInitU = 7;
+ myXYZ.SetCoord(7,7,7);
+ myUV.SetCoord(7.,7.);
+ myU = 7;
+ }
}
//=======================================================================
}
//=======================================================================