size += sizeof( myWorkClassifiers[0] ) * myWorkClassifiers.size();
if ( size > 1e+9 ) // 1G
{
-#ifdef _DEBUG_
+
+ if (SALOME::VerbosityActivated())
std::cout << "Avoid ElementsOnShape::clone(), too large: " << size << " bytes " << std::endl;
-#endif
+
return 0;
}
#include "SMESH_Comment.hxx"
-//#define _DEBUG_
#include <utilities.h>
using namespace std;
myErrorMessages.push_back( msg );
MESSAGE(msg);
-#ifdef _DEBUG_
- cout << msg << endl;
-#endif
+
return ( myStatus = isFatal ? DRS_FAIL : DRS_WARN_SKIP_ELEM );
}
// File : DriverCGNS_Read.cxx
// Created : Thu Jun 30 10:33:31 2011
// Author : Edward AGAPOV (eap)
-//#define _DEBUG_
+
#include <utilities.h>
#include "DriverCGNS_Read.hxx"
TGaussInfo::TKey aKey = boost::get<0>(aPreInfo);
aKey2Gauss[aKey] = anInfo;
-#ifdef _DEBUG_
- const EGeometrieElement& aGeom = boost::get<0>(aKey);
- const std::string& aName = boost::get<1>(aKey);
- INITMSG("- aGeom = "<<aGeom<<"; aName = '"<<aName<<"'"<<std::endl);
-#endif
-
+ if (SALOME::VerbosityActivated())
+ {
+ const EGeometrieElement& aGeom = boost::get<0>(aKey);
+ const std::string& aName = boost::get<1>(aKey);
+ INITMSG("- aGeom = "<<aGeom<<"; aName = '"<<aName<<"'"<<std::endl);
+ }
}
+
return aKey2Gauss;
}
}
}
-#ifdef _DEBUG_
+ if (SALOME::VerbosityActivated())
{
INITMSG("theGauss: ");
for(TInt aGaussId = 0; aGaussId < aNbGauss; aGaussId++){
ADDMSG("} ");
}
ADDMSG(std::endl);
- }
- for(TInt anElemId = 0; anElemId < aNbElem; anElemId++){
- TCCoordSliceArr aCoordSliceArr = theGaussCoord.GetCoordSliceArr(anElemId);
- INITMSG("");
- for(TInt aGaussId = 0; aGaussId < aNbGauss; aGaussId++){
- TCCoordSlice aCoordSlice = aCoordSliceArr[aGaussId];
- ADDMSG("{");
- for(TInt aDimId = 0; aDimId < aDim; aDimId++){
- ADDMSG(aCoordSlice[aDimId]<<" ");
+
+ for(TInt anElemId = 0; anElemId < aNbElem; anElemId++){
+ TCCoordSliceArr aCoordSliceArr = theGaussCoord.GetCoordSliceArr(anElemId);
+ INITMSG("");
+ for(TInt aGaussId = 0; aGaussId < aNbGauss; aGaussId++){
+ TCCoordSlice aCoordSlice = aCoordSliceArr[aGaussId];
+ ADDMSG("{");
+ for(TInt aDimId = 0; aDimId < aDim; aDimId++){
+ ADDMSG(aCoordSlice[aDimId]<<" ");
+ }
+ ADDMSG("} ");
}
- ADDMSG("} ");
+ ADDMSG(std::endl);
}
- ADDMSG(std::endl);
}
-#endif
+
return true;
}
}
}
-#ifdef _DEBUG_
- for(TInt anElemId = 0; anElemId < aNbElem; anElemId++){
- TCoordSliceArr aCoordSliceArr = theGaussCoord.GetCoordSliceArr(anElemId);
- INITMSG("");
- for(TInt aGaussId = 0; aGaussId < aNbGauss; aGaussId++){
- TCoordSlice& aCoordSlice = aCoordSliceArr[aGaussId];
- ADDMSG("{");
- for(TInt aDimId = 0; aDimId < aDim; aDimId++){
- ADDMSG(aCoordSlice[aDimId]<<" ");
+ if (SALOME::VerbosityActivated())
+ {
+ for(TInt anElemId = 0; anElemId < aNbElem; anElemId++){
+ TCoordSliceArr aCoordSliceArr = theGaussCoord.GetCoordSliceArr(anElemId);
+ INITMSG("");
+ for(TInt aGaussId = 0; aGaussId < aNbGauss; aGaussId++){
+ TCoordSlice& aCoordSlice = aCoordSliceArr[aGaussId];
+ ADDMSG("{");
+ for(TInt aDimId = 0; aDimId < aDim; aDimId++){
+ ADDMSG(aCoordSlice[aDimId]<<" ");
+ }
+ ADDMSG("} ");
}
- ADDMSG("} ");
+ ADDMSG(std::endl);
}
- ADDMSG(std::endl);
}
-#endif
return true;
}
#include <valarray>
#include <stdexcept>
-//#if defined(_DEBUG_)
# define MED_TCSLICE_CHECK_RANGE
-//#endif
namespace MED
{
#include <vector>
#include <stdexcept>
-//#if defined(_DEBUG_)
# define MED_TVECTOR_CHECK_RANGE
-//#endif
namespace MED
{
PFamilyInfo anInfo = CrFamilyInfo(theMeshInfo, aNbGroup, aNbAttr);
GetFamilyInfo(theId, *anInfo, theErr);
-#ifdef _DEBUG_
- std::string aName = anInfo->GetName();
- INITMSG("GetPFamilyInfo - aFamilyName = '"<<aName<<
- "'; andId = "<<anInfo->GetId()<<
- "; aNbAttr = "<<aNbAttr<<
- "; aNbGroup = "<<aNbGroup<<"\n");
- for (TInt iGroup = 0; iGroup < aNbGroup; iGroup++) {
- aName = anInfo->GetGroupName(iGroup);
- INITMSG("aGroupName = '"<<aName<<"'\n");
+ if (SALOME::VerbosityActivated())
+ {
+ std::string aName = anInfo->GetName();
+ INITMSG("GetPFamilyInfo - aFamilyName = '"<<aName<<
+ "'; andId = "<<anInfo->GetId()<<
+ "; aNbAttr = "<<aNbAttr<<
+ "; aNbGroup = "<<aNbGroup<<"\n");
+ for (TInt iGroup = 0; iGroup < aNbGroup; iGroup++) {
+ aName = anInfo->GetGroupName(iGroup);
+ INITMSG("aGroupName = '"<<aName<<"'\n");
+ }
}
-#endif
return anInfo;
}
PNodeInfo anInfo = CrNodeInfo(theMeshInfo, aNbElems);
GetNodeInfo(*anInfo, theErr);
-#ifdef _DEBUG_
- TInt aDim = theMeshInfo->myDim;
- TInt aNbElem = anInfo->GetNbElem();
- INITMSG("GetPNodeInfo: ");
+ if (SALOME::VerbosityActivated())
{
- INITMSG("aCoords: "<<aNbElem<<": ");
- TNodeCoord& aCoord = anInfo->myCoord;
- for (TInt iElem = 0; iElem < aNbElem; iElem++) {
- for (TInt iDim = 0, anId = iElem*aDim; iDim < aDim; iDim++, anId++) {
- ADDMSG(aCoord[anId]<<",");
+ TInt aDim = theMeshInfo->myDim;
+ TInt aNbElem = anInfo->GetNbElem();
+ INITMSG("GetPNodeInfo: ");
+ {
+ INITMSG("aCoords: "<<aNbElem<<": ");
+ TNodeCoord& aCoord = anInfo->myCoord;
+ for (TInt iElem = 0; iElem < aNbElem; iElem++) {
+ for (TInt iDim = 0, anId = iElem*aDim; iDim < aDim; iDim++, anId++) {
+ ADDMSG(aCoord[anId]<<",");
+ }
+ ADDMSG(" ");
}
- ADDMSG(" ");
- }
- ADDMSG(std::endl);
-
- BEGMSG("GetFamNum: ");
- for (TInt iElem = 0; iElem < aNbElem; iElem++) {
- ADDMSG(anInfo->GetFamNum(iElem)<<", ");
- }
- ADDMSG(std::endl);
+ ADDMSG(std::endl);
- if (anInfo->IsElemNum()) {
- BEGMSG("GetElemNum: ");
+ BEGMSG("GetFamNum: ");
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
- ADDMSG(anInfo->GetElemNum(iElem)<<", ");
+ ADDMSG(anInfo->GetFamNum(iElem)<<", ");
}
ADDMSG(std::endl);
+
+ if (anInfo->IsElemNum()) {
+ BEGMSG("GetElemNum: ");
+ for (TInt iElem = 0; iElem < aNbElem; iElem++) {
+ ADDMSG(anInfo->GetElemNum(iElem)<<", ");
+ }
+ ADDMSG(std::endl);
+ }
}
+ ADDMSG(std::endl);
}
- ADDMSG(std::endl);
-#endif
return anInfo;
}
PPolygoneInfo anInfo = CrPolygoneInfo(theMeshInfo, theEntity, theGeom, aNbElem, aConnSize, theConnMode);
GetPolygoneInfo(anInfo);
-#ifdef _DEBUG_
- INITMSG("GetPPolygoneInfo"<<
- " - theGeom = "<<theGeom<<
- "; aNbElem = "<<aNbElem<<": ");
- for (TInt iElem = 1; iElem < aNbElem; iElem++) {
- TCConnSlice aConnSlice = anInfo->GetConnSlice(iElem);
- TInt aConnDim = aConnSlice.size();
- for (TInt iConn = 0; iConn < aConnDim; iConn++) {
- ADDMSG(aConnSlice[iConn]<<",");
+ if (SALOME::VerbosityActivated())
+ {
+ INITMSG("GetPPolygoneInfo"<<
+ " - theGeom = "<<theGeom<<
+ "; aNbElem = "<<aNbElem<<": ");
+ for (TInt iElem = 1; iElem < aNbElem; iElem++) {
+ TCConnSlice aConnSlice = anInfo->GetConnSlice(iElem);
+ TInt aConnDim = aConnSlice.size();
+ for (TInt iConn = 0; iConn < aConnDim; iConn++) {
+ ADDMSG(aConnSlice[iConn]<<",");
+ }
+ ADDMSG(" ");
}
- ADDMSG(" ");
+ ADDMSG(std::endl);
}
- ADDMSG(std::endl);
-#endif
return anInfo;
}
PPolyedreInfo anInfo = CrPolyedreInfo(theMeshInfo, theEntity, theGeom, aNbElem, aNbFaces, aConnSize, theConnMode);
GetPolyedreInfo(anInfo);
-#ifdef _DEBUG_
- INITMSG("GetPPolyedreInfo"<<
- " - theGeom = "<<theGeom<<
- "; aNbElem = "<<aNbElem<<": ");
- for (TInt iElem = 0; iElem < aNbElem; iElem++) {
- TCConnSliceArr aConnSliceArr = anInfo->GetConnSliceArr(iElem);
- TInt aNbFaces = aConnSliceArr.size();
- ADDMSG("{");
- for (TInt iFace = 0; iFace < aNbFaces; iFace++) {
- TCConnSlice aConnSlice = aConnSliceArr[iFace];
- TInt aNbConn = aConnSlice.size();
- ADDMSG("[");
- for (TInt iConn = 0; iConn < aNbConn; iConn++) {
- ADDMSG(aConnSlice[iConn]<<",");
+ if (SALOME::VerbosityActivated())
+ {
+ INITMSG("GetPPolyedreInfo"<<
+ " - theGeom = "<<theGeom<<
+ "; aNbElem = "<<aNbElem<<": ");
+ for (TInt iElem = 0; iElem < aNbElem; iElem++) {
+ TCConnSliceArr aConnSliceArr = anInfo->GetConnSliceArr(iElem);
+ TInt aNbFaces = aConnSliceArr.size();
+ ADDMSG("{");
+ for (TInt iFace = 0; iFace < aNbFaces; iFace++) {
+ TCConnSlice aConnSlice = aConnSliceArr[iFace];
+ TInt aNbConn = aConnSlice.size();
+ ADDMSG("[");
+ for (TInt iConn = 0; iConn < aNbConn; iConn++) {
+ ADDMSG(aConnSlice[iConn]<<",");
+ }
+ ADDMSG("] ");
}
- ADDMSG("] ");
+ ADDMSG("} ");
}
- ADDMSG("} ");
+ ADDMSG(std::endl);
}
- ADDMSG(std::endl);
-#endif
return anInfo;
}
PCellInfo anInfo = CrCellInfo(theMeshInfo, theEntity, theGeom, aNbElem, theConnMode);
GetCellInfo(anInfo, theErr);
-#ifdef _DEBUG_
- TInt aConnDim = anInfo->GetConnDim();
- INITMSG("GetPCellInfo - theEntity = "<<theEntity<<"; theGeom = "<<theGeom<<"; aConnDim: "<<aConnDim<<"\n");
- BEGMSG("GetPCellInfo - aNbElem: "<<aNbElem<<": ");
- for (TInt iElem = 0; iElem < aNbElem; iElem++) {
- TCConnSlice aConnSlice = anInfo->GetConnSlice(iElem);
- for (TInt iConn = 0; iConn < aConnDim; iConn++) {
- ADDMSG(aConnSlice[iConn]<<",");
+ if (SALOME::VerbosityActivated())
+ {
+ TInt aConnDim = anInfo->GetConnDim();
+ INITMSG("GetPCellInfo - theEntity = "<<theEntity<<"; theGeom = "<<theGeom<<"; aConnDim: "<<aConnDim<<"\n");
+ BEGMSG("GetPCellInfo - aNbElem: "<<aNbElem<<": ");
+ for (TInt iElem = 0; iElem < aNbElem; iElem++) {
+ TCConnSlice aConnSlice = anInfo->GetConnSlice(iElem);
+ for (TInt iConn = 0; iConn < aConnDim; iConn++) {
+ ADDMSG(aConnSlice[iConn]<<",");
+ }
+ ADDMSG(" ");
}
- ADDMSG(" ");
- }
- ADDMSG(std::endl);
-
- BEGMSG("GetPCellInfo - GetFamNum: ");
- for (TInt iElem = 0; iElem < aNbElem; iElem++) {
- ADDMSG(anInfo->GetFamNum(iElem)<<", ");
- }
- ADDMSG(std::endl);
+ ADDMSG(std::endl);
- if (anInfo->IsElemNum()) {
- BEGMSG("GetPCellInfo - GetElemNum: ");
+ BEGMSG("GetPCellInfo - GetFamNum: ");
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
- ADDMSG(anInfo->GetElemNum(iElem)<<", ");
+ ADDMSG(anInfo->GetFamNum(iElem)<<", ");
+ }
+ ADDMSG(std::endl);
+
+ if (anInfo->IsElemNum()) {
+ BEGMSG("GetPCellInfo - GetElemNum: ");
+ for (TInt iElem = 0; iElem < aNbElem; iElem++) {
+ ADDMSG(anInfo->GetElemNum(iElem)<<", ");
+ }
+ ADDMSG(std::endl);
}
ADDMSG(std::endl);
}
- ADDMSG(std::endl);
-#endif
return anInfo;
}
PFieldInfo anInfo = CrFieldInfo(theMeshInfo, aNbComp);
GetFieldInfo(theId, *anInfo, theErr);
-#ifdef _DEBUG_
- INITMSG("GetPFieldInfo "<<
- "- aName = '"<<anInfo->GetName()<<"'"<<
- "; aType = "<<anInfo->GetType()<<
- "; aNbComp = "<<aNbComp<<
- std::endl);
-#endif
+ if (SALOME::VerbosityActivated())
+ {
+ INITMSG("GetPFieldInfo "<<
+ "- aName = '"<<anInfo->GetName()<<"'"<<
+ "; aType = "<<anInfo->GetType()<<
+ "; aNbComp = "<<aNbComp<<
+ std::endl);
+ }
return anInfo;
}
PTimeStampInfo anInfo = CrTimeStampInfo(theFieldInfo, theEntity, theGeom2Size);
GetTimeStampInfo(theId, *anInfo, theErr);
-#ifdef _DEBUG_
- INITMSG("GetPTimeStampInfo - anEntity = "<<anInfo->GetEntity()<<"\n");
- TGeom2NbGauss& aGeom2NbGauss = anInfo->myGeom2NbGauss;
- TGeom2NbGauss::const_iterator anIter = aGeom2NbGauss.begin();
- for (; anIter != aGeom2NbGauss.end(); anIter++) {
- const EGeometrieElement& aGeom = anIter->first;
- INITMSG("aGeom = "<<aGeom<<" - "<<aGeom2NbGauss[aGeom]<<";\n");
+ if (SALOME::VerbosityActivated())
+ {
+ INITMSG("GetPTimeStampInfo - anEntity = "<<anInfo->GetEntity()<<"\n");
+ TGeom2NbGauss& aGeom2NbGauss = anInfo->myGeom2NbGauss;
+ TGeom2NbGauss::const_iterator anIter = aGeom2NbGauss.begin();
+ for (; anIter != aGeom2NbGauss.end(); anIter++) {
+ const EGeometrieElement& aGeom = anIter->first;
+ INITMSG("aGeom = "<<aGeom<<" - "<<aGeom2NbGauss[aGeom]<<";\n");
+ }
}
-#endif
return anInfo;
}
theMKey2Profile,
theKey2Gauss,
theErr);
-#ifdef _DEBUG_
- if (aFieldInfo->GetType() == eFLOAT64)
- Print<TFloatTimeStampValue>(anInfo);
- else
- Print<TIntTimeStampValue>(anInfo);
-#endif
+ if (SALOME::VerbosityActivated())
+ {
+ if (aFieldInfo->GetType() == eFLOAT64)
+ Print<TFloatTimeStampValue>(anInfo);
+ else
+ Print<TIntTimeStampValue>(anInfo);
+ }
return anInfo;
}
GetGrilleInfo(anInfo);
anInfo->SetGrilleType(type);
-#ifdef _DEBUG_
- INITMSG("GetPGrilleInfo: ");
+ if (SALOME::VerbosityActivated())
{
+ INITMSG("GetPGrilleInfo: ");
+
TInt aNbElem = anInfo->GetNbNodes();
BEGMSG("GetFamNumNode: ");
for (TInt iElem = 0; iElem < aNbElem; iElem++) {
ADDMSG(anInfo->GetCoordUnit(iElem)<<", ");
}
ADDMSG(std::endl);
-
}
-#endif
return anInfo;
}
#include <sys/sysinfo.h>
#endif
-#ifdef _DEBUG_
#include <iostream>
-#endif
int main ()
{
}
} catch (...) {}
-// #ifdef _DEBUG_
-// std::cout << freeRamKb / 1024 << std::endl;
-// #endif
+// if (SALOME::VerbosityActivated())
+// std::cout << freeRamKb / 1024 << std::endl;
+
return freeRamKb / 1024;
#endif
_errorMessages.push_back( msg );
//~MESSAGE(msg);
-#ifdef _DEBUG_
- std::cout << msg << std::endl;
-#endif
+ if (SALOME::VerbosityActivated())
+ std::cout << msg << std::endl;
+
return ( _status = isFatal ? MgAdapt::DRS_FAIL : MgAdapt::DRS_WARN_SKIP_ELEM );
}
myReader.SetFile(theFileName);
myReader.SetMeshName(theMeshName);
Driver_Mesh::Status status = myReader.Perform();
-#ifdef _DEBUG_
- SMESH_ComputeErrorPtr er = myReader.GetError();
- if ( er && !er->IsOK() ) std::cout << er->myComment << std::endl;
-#endif
+
+ if (SALOME::VerbosityActivated())
+ {
+ SMESH_ComputeErrorPtr er = myReader.GetError();
+ if ( er && !er->IsOK() ) std::cout << er->myComment << std::endl;
+ }
// Reading groups (sub-meshes are out of scope of MED import functionality)
std::list<TNameAndType> aGroupNames = myReader.GetGroupNamesAndTypes();
rate = algo->GetProgress();
}
catch (...) {
-#ifdef _DEBUG_
- std::cerr << "Exception in " << algo->GetName() << "::GetProgress()" << std::endl;
-#endif
+ if (SALOME::VerbosityActivated())
+ std::cerr << "Exception in " << algo->GetName() << "::GetProgress()" << std::endl;
}
if ( 0. < rate && rate < 1.001 )
{
srcEdges.push_back(aMesh->FindEdge (commonNodes[0],commonNodes[1],commonNodes[2]));
else
srcEdges.push_back(aMesh->FindEdge (commonNodes[0],commonNodes[1]));
-#ifdef _DEBUG_
- if ( !srcEdges.back() )
+
+ if (SALOME::VerbosityActivated() && !srcEdges.back())
{
cout << "SMESH_MeshEditor::makeWalls(), no source edge found for a free face #"
- << iF << " of volume #" << vTool.ID() << endl;
+ << iF << " of volume #" << vTool.ID() << endl;
}
-#endif
}
}
if ( freeInd.empty() )
for ( size_t i = 0; i < new2OldNodes.size(); ++i )
if ( const SMDS_MeshNode* n = new2OldNodes[ i ].first )
{
-#ifndef _DEBUG_
- if ( n->NbInverseElements() > 0 )
-#endif
+
+ if (!SALOME::VerbosityActivated() || n->NbInverseElements() > 0 )
{
const SMDS_MeshNode* n2 =
tgtMeshDS->AddNodeWithID( n->X(), n->Y(), n->Z(), idShift + n->GetID() );
vecRef = du ^ dv;
if ( ++nbLoops > 10 )
{
-#ifdef _DEBUG_
- cout << "SMESH_MesherHelper::GetAngle(): Captured in a sigularity" << endl;
-#endif
+ if (SALOME::VerbosityActivated())
+ cout << "SMESH_MesherHelper::GetAngle(): Captured in a sigularity" << endl;
+
return angle;
}
}
mutable vector< const QLink* > _sides;
mutable bool _sideIsAdded[4]; // added in chain of links
gp_Vec _normal;
-#ifdef _DEBUG_
mutable const SMDS_MeshElement* _face;
-#endif
QFace( const vector< const QLink*>& links, const SMDS_MeshElement* face=0 );
else
_normal.SetCoord(1e-33,0,0);
-#ifdef _DEBUG_
_face = face;
-#else
+
(void)face; // unused in release mode
#endif
}
if ( !myMesh->HasShapeToMesh() ) return;
SetSubShape( myMesh->GetShapeToMesh() );
-#ifdef _DEBUG_
int nbSolids = 0;
TopTools_IndexedMapOfShape solids;
TopExp::MapShapes(myShape,TopAbs_SOLID,solids);
nbSolids = solids.Extent();
-#endif
+
TopTools_MapOfShape faces; // faces not in solid or in not meshed solid
for ( TopExp_Explorer f(myShape,TopAbs_FACE,TopAbs_SOLID); f.More(); f.Next() ) {
faces.Add( f.Current() ); // not in solid
faces.Add( f.Current() ); // in not meshed solid
}
else { // fix nodes in the solid and its faces
-#ifdef _DEBUG_
MSG("FIX SOLID " << nbSolids-- << " #" << GetMeshDS()->ShapeToIndex(s.Current()));
-#endif
+
SMESH_MesherHelper h(*myMesh);
h.SetSubShape( s.Current() );
h.ToFixNodeParameters(true);
// hasRectFaces = hasRectFaces ||
// ( volTool.GetVolumeType() == SMDS_VolumeTool::QUAD_HEXA ||
// volTool.GetVolumeType() == SMDS_VolumeTool::QUAD_PENTA );
-#ifdef _DEBUG_
- if ( nbN == 6 )
- pFace->_face = GetMeshDS()->FindFace(faceNodes[0],faceNodes[2],faceNodes[4]);
- else
- pFace->_face = GetMeshDS()->FindFace(faceNodes[0],faceNodes[2],
- faceNodes[4],faceNodes[6] );
-#endif
+
+ if (SALOME::VerbosityActivated())
+ {
+ if ( nbN == 6 )
+ pFace->_face = GetMeshDS()->FindFace(faceNodes[0],faceNodes[2],faceNodes[4]);
+ else
+ pFace->_face = GetMeshDS()->FindFace(faceNodes[0],faceNodes[2],
+ faceNodes[4],faceNodes[6] );
+ }
}
// collect pyramid apexes for further correction
if ( vol->NbCornerNodes() == 5 )
move = gp_Vec( XYZ((*link1)->_mediumNode), newPnt.Transformed(loc) );
if ( SMDS_FacePositionPtr nPos = (*link1)->_mediumNode->GetPosition())
nPos->SetParameters( newUV.X(), newUV.Y() );
-#ifdef _DEBUG_
- if ( (XYZ((*link1)->node1()) - XYZ((*link1)->node2())).SquareModulus() <
- move.SquareMagnitude())
+
+ if (SALOME::VerbosityActivated())
{
- gp_XY uv0 = faceHlp.GetNodeUV( face, (*link0)->_mediumNode, 0, &checkUV );
- gp_XY uv2 = faceHlp.GetNodeUV( face, (*link2)->_mediumNode, 0, &checkUV );
- MSG( "TOO LONG MOVE \t" <<
- "uv0: "<<uv0.X()<<", "<<uv0.Y()<<" \t" <<
- "uv2: "<<uv2.X()<<", "<<uv2.Y()<<" \t" <<
- "uvOld: "<<oldUV.X()<<", "<<oldUV.Y()<<" \t" <<
- "newUV: "<<newUV.X()<<", "<<newUV.Y()<<" \t");
- uv0.SetX( uv2.X() ); // avoid warning: variable set but not used
+ if ( (XYZ((*link1)->node1()) - XYZ((*link1)->node2())).SquareModulus() <
+ move.SquareMagnitude())
+ {
+ gp_XY uv0 = faceHlp.GetNodeUV( face, (*link0)->_mediumNode, 0, &checkUV );
+ gp_XY uv2 = faceHlp.GetNodeUV( face, (*link2)->_mediumNode, 0, &checkUV );
+ MSG( "TOO LONG MOVE \t" <<
+ "uv0: "<<uv0.X()<<", "<<uv0.Y()<<" \t" <<
+ "uv2: "<<uv2.X()<<", "<<uv2.Y()<<" \t" <<
+ "uvOld: "<<oldUV.X()<<", "<<oldUV.Y()<<" \t" <<
+ "newUV: "<<newUV.X()<<", "<<newUV.Y()<<" \t");
+ uv0.SetX( uv2.X() ); // avoid warning: variable set but not used
+ }
}
-#endif
(*link1)->Move( move, /*sum=*/false, /*is2dFixed=*/true );
}
MSG( "Move " << (*link1)->_mediumNode->GetID() << " following "
{
const char* name = "/tmp/shape.brep";
BRepTools::Write( s, name );
-#ifdef _DEBUG_
- std::cout << name << std::endl;
-#endif
+ if (SALOME::VerbosityActivated())
+ std::cout << name << std::endl;
}
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 );
+ }
}
//=======================================================================
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;
+ }
}
//=======================================================================
if ( aR < 0. || aR > 1. || // PAL19395
aG < 0. || aG > 1. ||
aB < 0. || aB > 1. )
-// #ifdef _DEBUG_
-// cout << "SMESHDS_GroupBase::SetColorGroup("<<theColorGroup<<"), invalid color ignored"<<endl;
-// #endif
+// if (SALOME::VerbosityActivated())
+// cout << "SMESHDS_GroupBase::SetColorGroup("<<theColorGroup<<"), invalid color ignored"<<endl;
+
return;
Quantity_Color aColor( aR, aG, aB, Quantity_TOC_RGB );
SetColor( aColor );
}
}
catch (...) {
-#ifdef _DEBUG_
+
MESSAGE ( "Exception thrown during mesh visualization" );
-#endif
+
if ( SMDS_Mesh::CheckMemory(true) ) { // has memory to show warning?
SMESH::OnVisuException();
}
theEdges.begin(), ++theEdges.begin());
TopExp::Vertices( theEdges.front(), vv[0], vv[1], true );
if ( iE++ > theNbEdgesInWires.back() ) {
-#ifdef _DEBUG_
- gp_Pnt p = BRep_Tool::Pnt( theFirstVertex );
- MESSAGE ( " : Warning : vertex "<< theFirstVertex.TShape().operator->()
- << " ( " << p.X() << " " << p.Y() << " " << p.Z() << " )"
- << " not found in outer wire of face "<< theFace.TShape().operator->()
- << " with vertices: " );
- wExp.Init( *wlIt, theFace );
- for ( int i = 0; wExp.More(); wExp.Next(), i++ )
+
+ if (SALOME::VerbosityActivated())
{
- TopoDS_Edge edge = wExp.Current();
- edge = TopoDS::Edge( edge.Oriented( wExp.Orientation() ));
- TopoDS_Vertex v = TopExp::FirstVertex( edge, true );
- gp_Pnt p = BRep_Tool::Pnt( v );
- MESSAGE_ADD ( i << " " << v.TShape().operator->() << " "
- << p.X() << " " << p.Y() << " " << p.Z() << " " << std::endl );
+ gp_Pnt p = BRep_Tool::Pnt( theFirstVertex );
+ MESSAGE ( " : Warning : vertex "<< theFirstVertex.TShape().operator->()
+ << " ( " << p.X() << " " << p.Y() << " " << p.Z() << " )"
+ << " not found in outer wire of face "<< theFace.TShape().operator->()
+ << " with vertices: " );
+ wExp.Init( *wlIt, theFace );
+ for ( int i = 0; wExp.More(); wExp.Next(), i++ )
+ {
+ TopoDS_Edge edge = wExp.Current();
+ edge = TopoDS::Edge( edge.Oriented( wExp.Orientation() ));
+ TopoDS_Vertex v = TopExp::FirstVertex( edge, true );
+ gp_Pnt p = BRep_Tool::Pnt( v );
+ MESSAGE_ADD ( i << " " << v.TShape().operator->() << " "
+ << p.X() << " " << p.Y() << " " << p.Z() << " " << std::endl );
+ }
}
-#endif
+
break; // break infinite loop
}
}
TElementBoxPool& elBoPool = getLimitAndPool()->_elBoPool;
-#ifdef _DEBUG_
- if ( theElemIt && !theElemIt->more() )
+ if (SALOME::VerbosityActivated() && theElemIt && !theElemIt->more() )
std::cout << "WARNING: ElementBndBoxTree constructed on empty iterator!" << std::endl;
-#endif
SMDS_ElemIteratorPtr elemIt = theElemIt ? theElemIt : mesh.elementsIterator( elemType );
while ( elemIt->more() )
{
if ( nodes[i] == nodes[i+1] || nodes[i] == nodes[i+2] || nodes[i+1] == nodes[i+2] )
{
-#ifdef _DEBUG_
- std::cerr << "BAD tria" << std::endl;
- cf.Dump();
-#else
- if ( i < 0 ) cf.Dump(); // avoid "CutFace::Dump() unused in release mode"
-#endif
+ if (SALOME::VerbosityActivated())
+ {
+ std::cerr << "BAD tria" << std::endl;
+ cf.Dump();
+ }
+ else
+ {
+ if ( i < 0 ) cf.Dump(); // avoid "CutFace::Dump() unused in release mode"
+ }
continue;
}
if (!( tria = myMesh->FindFace( nodes[i], nodes[i+1], nodes[i+2] )))
void SMESH::printErrorInDebugMode(const char* txt)
{
-#ifdef _DEBUG_
- std::cerr << txt << " " << __FILE__ << ": " << __LINE__ << std::endl;
-#else
- (void)txt; // unused in release mode
-#endif
+ if (SALOME::VerbosityActivated())
+ std::cerr << txt << " " << __FILE__ << ": " << __LINE__ << std::endl;
}
// ------------------------------------------------------------------
"Geom_POLYHEDRA", "Geom_BALL" };
if ( -1 < iGeom && iGeom < nbTypes )
Threshold = SMESH + types[ iGeom ];
-#ifdef _DEBUG_
- // is types complete? (compilation failure means that enum GeometryType changed)
- static_assert( sizeof(types) / sizeof(const char*) == nbTypes,
- "Update names of GeometryType's!!!" );
-#endif
+
+ if (SALOME::VerbosityActivated())
+ {
+ // is types complete? (compilation failure means that enum GeometryType changed)
+ static_assert( sizeof(types) / sizeof(const char*) == nbTypes,
+ "Update names of GeometryType's!!!" );
+ }
}
if (Type == "SMESH.FT_EntityType")
{
"Entity_Polyhedra", "Entity_Quad_Polyhedra", "Entity_Ball" };
if ( -1 < iGeom && iGeom < nbTypes )
Threshold = SMESH + types[ iGeom ];
-#ifdef _DEBUG_
- // is 'types' complete? (compilation failure means that enum EntityType changed)
- static_assert( sizeof(types) / sizeof(const char*) == nbTypes,
- "Update names of EntityType's!!!" );
-#endif
+
+ if (SALOME::VerbosityActivated())
+ {
+ // is 'types' complete? (compilation failure means that enum EntityType changed)
+ static_assert( sizeof(types) / sizeof(const char*) == nbTypes,
+ "Update names of EntityType's!!!" );
+ }
}
}
if ( ThresholdID.Length() != 2 ) // neither '' nor ""
if (!envNoCatchSignals || !atoi(envNoCatchSignals))
{
bool raiseFPE;
-#ifdef _DEBUG_
- raiseFPE = true;
- char* envDisableFPE = getenv("DISABLE_FPE");
- if (envDisableFPE && atoi(envDisableFPE))
+
+ if (SALOME::VerbosityActivated())
+ {
+ raiseFPE = true;
+ char* envDisableFPE = getenv("DISABLE_FPE");
+ if (envDisableFPE && atoi(envDisableFPE))
+ raiseFPE = false;
+ }
+ else
+ {
raiseFPE = false;
-#else
- raiseFPE = false;
-#endif
+ }
+
OSD::SetSignal( raiseFPE );
}
// else OSD::SetSignal() is called in GUI
SMESH_CATCH( SMESH::doNothing );
-#ifdef _DEBUG_
- cout << "SMESH_Gen_i::IsApplicable(): exception in " << ( theAlgoType ? theAlgoType : "") << endl;
-#endif
+ if (SALOME::VerbosityActivated())
+ cout << "SMESH_Gen_i::IsApplicable(): exception in " << ( theAlgoType ? theAlgoType : "") << endl;
+
return true;
}
//
SALOME::ExceptionStruct es;
es.type = SALOME::BAD_PARAM;
-#ifdef _DEBUG_
- texte += "\nInvalid AddBoundaryGroup";
-#endif
+
+ if (SALOME::VerbosityActivated())
+ texte += "\nInvalid AddBoundaryGroup";
+
INFOS(texte);
es.text = CORBA::string_dup(texte.c_str());
throw SALOME::SALOME_Exception(es);
// -- Most probably a bad study was saved when there were
// not fixed bugs in SMDS_MeshInfo
if ( elemSet.size() < nbElems ) {
-#ifdef _DEBUG_
- cout << "SMESH_Gen_i::Load(), warning: Node position data is invalid" << endl;
-#endif
+ if (SALOME::VerbosityActivated())
+ cout << "SMESH_Gen_i::Load(), warning: Node position data is invalid" << endl;
+
nbElems = elemSet.size();
}
// add elements to sub-meshes
void printException( const char* text )
{
-#ifdef _DEBUG_
- std::cout << "Exception in SMESH_Gen_i::DumpPython(): " << text << std::endl;
-#else
- (void)text; // unused in release mode
-#endif
+ if (SALOME::VerbosityActivated())
+ std::cout << "Exception in SMESH_Gen_i::DumpPython(): " << text << std::endl;
}
//=======================================================================
if ( iLoop > 20 )
{
-#ifdef _DEBUG_
- cout << "Infinite loop in AdaptiveAlgo::Compute()" << endl;
-#endif
+ if(SALOME::VerbosityActivated())
+ cout << "Infinite loop in AdaptiveAlgo::Compute()" << endl;
+
sizeDecreased = false;
break;
}
int _origNodeInd; // index of _hexNodes[0] node within the _grid
size_t _i,_j,_k;
bool _hasTooSmall;
-
-#ifdef _DEBUG_
int _cellID;
-#endif
public:
Hexahedron(Grid* grid);
tgtLink._link = _hexLinks + ( srcLink._link - other._hexLinks );
}
}
-#ifdef _DEBUG_
- _cellID = cellID;
-#else
- (void)cellID; // unused in release mode
-#endif
+
+ if (SALOME::VerbosityActivated())
+ _cellID = cellID;
}
//================================================================================
h->_eIntPoints.reserve(2);
h->_eIntPoints.push_back( ip );
added = true;
-#ifdef _DEBUG_
+
// check if ip is really inside the hex
- if ( h->isOutParam( ip->_uvw ))
+ if (SALOME::VerbosityActivated() && h->isOutParam( ip->_uvw ))
throw SALOME_Exception("ip outside a hex");
-#endif
}
}
return added;
helper.GetMeshDS()->RemoveFreeElement( v, /*sm=*/nullptr, /*fromGroups=*/false );
v = nullptr;
//_hasTooSmall = true;
-#ifdef _DEBUG_
- std::cout << "Remove INVALID polyhedron, _cellID = " << _cellID
- << " ijk = ( " << _i << " " << _j << " " << _k << " ) "
- << " solid " << volDef->_solidID << std::endl;
-#endif
+
+ if (SALOME::VerbosityActivated())
+ {
+ std::cout << "Remove INVALID polyhedron, _cellID = " << _cellID
+ << " ijk = ( " << _i << " " << _j << " " << _k << " ) "
+ << " solid " << volDef->_solidID << std::endl;
+ }
}
}
}
*/
bool Hexahedron::debugDumpLink( Hexahedron::_Link* link )
{
-#ifdef _DEBUG_
- gp_Pnt p1 = link->_nodes[0]->Point(), p2 = link->_nodes[1]->Point();
- cout << "BUG: not shared link. IKJ = ( "<< _i << " " << _j << " " << _k << " )" << endl
- << "n1 (" << p1.X() << ", "<< p1.Y() << ", "<< p1.Z() << " )" << endl
- << "n2 (" << p2.X() << ", "<< p2.Y() << ", "<< p2.Z() << " )" << endl;
-#else
- (void)link; // unused in release mode
-#endif
+ if (SALOME::VerbosityActivated())
+ {
+ gp_Pnt p1 = link->_nodes[0]->Point(), p2 = link->_nodes[1]->Point();
+ cout << "BUG: not shared link. IKJ = ( "<< _i << " " << _j << " " << _k << " )" << endl
+ << "n1 (" << p1.X() << ", "<< p1.Y() << ", "<< p1.Z() << " )" << endl
+ << "n2 (" << p2.X() << ", "<< p2.Y() << ", "<< p2.Z() << " )" << endl;
+ }
+
return false;
}
//================================================================================
if (mySides.size() != 4)
return false;
-#ifdef _DEBUG_
+if (SALOME::VerbosityActivated())
+{
mySides.GetSide( Q_BOTTOM )->SetID( Q_BOTTOM );
mySides.GetSide( Q_RIGHT )->SetID( Q_RIGHT );
mySides.GetSide( Q_TOP )->SetID( Q_TOP );
mySides.GetSide( Q_LEFT )->SetID( Q_LEFT );
-#endif
+}
return true;
}
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() );
MESSAGE_ADD ( "\tF: "<<myFirst[i]<< " L: "<< myLast[i] );
MESSAGE_END ( "\tnormPar: "<<myNormPar[i]<<endl );
}
-#else
- (void)msg; // unused in release mode
-#endif
}
//================================================================================
void pointsToPython(const std::vector<gp_XYZ>& p)
{
-#ifdef _DEBUG_
- for ( size_t i = SMESH_Block::ID_V000; i < p.size(); ++i )
+ if (SALOME::VerbosityActivated())
{
- cout << "mesh.AddNode( " << p[i].X() << ", "<< p[i].Y() << ", "<< p[i].Z() << ") # " << i <<" " ;
- SMESH_Block::DumpShapeID( i, cout ) << endl;
+ for ( size_t i = SMESH_Block::ID_V000; i < p.size(); ++i )
+ {
+ cout << "mesh.AddNode( " << p[i].X() << ", "<< p[i].Y() << ", "<< p[i].Z() << ") # " << i <<" " ;
+ SMESH_Block::DumpShapeID( i, cout ) << endl;
+ }
}
-#else
- (void)p; // unused in release mode
-#endif
}
} // namespace
continue;
}
}
-#ifdef _DEBUG_
- TopTools_IndexedMapOfShape allShapes; // usage: allShapes.FindIndex( s )
- TopExp::MapShapes( shape, allShapes );
-#endif
+
+ if (SALOME::VerbosityActivated())
+ {
+ TopTools_IndexedMapOfShape allShapes; // usage: allShapes.FindIndex( s )
+ TopExp::MapShapes( shape, allShapes );
+ }
TopTools_IndexedDataMapOfShapeListOfShape facesOfEdge;
TopTools_ListIteratorOfListOfShape faceIt;
if ( iLoop > allFaces.Extent() * 10 )
{
isOK = false;
-#ifdef _DEBUG_
- cerr << "BUG: infinite loop in StdMeshers_Prism_3D::IsApplicable()" << endl;
-#endif
+
+ if(SALOME::VerbosityActivated())
+ {
+ cerr << "BUG: infinite loop in StdMeshers_Prism_3D::IsApplicable()" << endl;
+ }
}
} // while hasAdvanced
void StdMeshers_PrismAsBlock::faceGridToPythonDump(const SMESH_Block::TShapeID face,
const int nb)
{
-#ifdef _DEBUG_
+ if(!SALOME::VerbosityActivated())
+ return;
+
gp_XYZ pOnF[6] = { gp_XYZ(0,0,0), gp_XYZ(0,0,1),
gp_XYZ(0,0,0), gp_XYZ(0,1,0),
gp_XYZ(0,0,0), gp_XYZ(1,0,0) };
<< n << ", " << n+1 << ", "
<< n+nb+2 << ", " << n+nb+1 << "]) " << endl;
}
-#else
- (void)face; // unused in release mode
- (void)nb; // unused in release mode
-#endif
}
//================================================================================
void StdMeshers_PrismAsBlock::TSideFace::dumpNodes(int nbNodes) const
{
-#ifdef _DEBUG_
+ if (!SALOME::VerbosityActivated())
+ return;
+
cout << endl << "NODES OF FACE "; SMESH_Block::DumpShapeID( myID, cout ) << endl;
THorizontalEdgeAdaptor* hSize0 = (THorizontalEdgeAdaptor*) HorizCurve(0);
cout << "Horiz side 0: "; hSize0->dumpNodes(nbNodes); cout << endl;
TVerticalEdgeAdaptor* vSide1 = (TVerticalEdgeAdaptor*) VertiCurve(1);
cout << "Verti side 1: "; vSide1->dumpNodes(nbNodes); cout << endl;
delete hSize0; delete hSize1; delete vSide0; delete vSide1;
-#else
- (void)nbNodes; // unused in release mode
-#endif
}
//================================================================================
void StdMeshers_PrismAsBlock::TVerticalEdgeAdaptor::dumpNodes(int nbNodes) const
{
-#ifdef _DEBUG_
+ if (!SALOME::VerbosityActivated())
+ return;
+
for ( int i = 0; i < nbNodes && i < (int)myNodeColumn->size(); ++i )
cout << (*myNodeColumn)[i]->GetID() << " ";
if ( nbNodes < (int) myNodeColumn->size() )
cout << myNodeColumn->back()->GetID();
-#else
- (void)nbNodes; // unused in release mode
-#endif
}
//================================================================================
void StdMeshers_PrismAsBlock::THorizontalEdgeAdaptor::dumpNodes(int nbNodes) const
{
-#ifdef _DEBUG_
+ if (!SALOME::VerbosityActivated())
+ return;
+
// Not bedugged code. Last node is sometimes incorrect
const TSideFace* side = mySide;
double u = 0;
side->GetColumns( u , col, col2 );
if ( n != col->second[ i ] )
cout << col->second[ i ]->GetID();
-#else
- (void)nbNodes; // unused in release mode
-#endif
}
//================================================================================
bool storeShapeForDebug(const TopoDS_Shape& shape)
{
bool toShow;
-#ifdef _DEBUG_
- const char* type[] ={"COMPOUND","COMPSOLID","SOLID","SHELL","FACE","WIRE","EDGE","VERTEX"};
- BRepTools::Write( shape, SMESH_Comment("/tmp/") << type[shape.ShapeType()] << "_"
- << shape.TShape().operator->() << ".brep");
- toShow = !theMeshDS[0]; // no show
-#else
- toShow = theMeshDS[0]; // no show
-#endif
+
+ if (SALOME::VerbosityActivated())
+ {
+ const char* type[] ={"COMPOUND","COMPSOLID","SOLID","SHELL","FACE","WIRE","EDGE","VERTEX"};
+ BRepTools::Write( shape, SMESH_Comment("/tmp/") << type[shape.ShapeType()] << "_"
+ << shape.TShape().operator->() << ".brep");
+ toShow = !theMeshDS[0]; // no show
+ }
+ else
+ {
+ toShow = theMeshDS[0]; // no show
+ }
+
if ( toShow ) {
show_shape( shape, "avoid warning: show_shape() defined but not used");
show_list( "avoid warning: show_list() defined but not used", list< TopoDS_Edge >() );
// b) find association of a couple of vertices and recall self.
//
-#ifdef _DEBUG_
- theMeshDS[0] = theMesh1->GetMeshDS(); // debug
- theMeshDS[1] = theMesh2->GetMeshDS();
-#endif
+ if (SALOME::VerbosityActivated())
+ {
+ theMeshDS[0] = theMesh1->GetMeshDS(); // debug
+ theMeshDS[1] = theMesh2->GetMeshDS();
+ }
// =================================================================================
// 1) Is it the case of associating a group member -> another group? (PAL16202, 16203)
const double D = M.Determinant();
if ( D < 1e-3 * ( newSrcOrig - _srcOrig ).Modulus() )
{
-#ifdef _DEBUG_
- cerr << "TrsfFinder3D::Invert()"
+ if (SALOME::VerbosityActivated())
+ cerr << "TrsfFinder3D::Invert()"
<< "D " << M.Determinant() << " IsSingular " << M.IsSingular() << endl;
-#endif
+
return false;
}
gp_Mat Minv = M.Inverted();
TAssocTool::Morph morph( srcWires );
morph.Perform( helper, tgtWires, helper.GetSurface( tgtFace ),
_src2tgtNodes, /*moveAll=*/true );
-#ifdef _DEBUG_
- cout << "StdMeshers_Projection_2D: Projection mesh IsDistorted2D() ==> do morph" << endl;
-#endif
+ if(SALOME::VerbosityActivated())
+ cout << "StdMeshers_Projection_2D: Projection mesh IsDistorted2D() ==> do morph" << endl;
if ( !fixDistortedFaces( helper, tgtWires )) // smooth and check
return error("Invalid mesh generated");
theVariants.insert( *this );
-#ifndef _DEBUG_
- if ( theVariants.size() > 1 ) // erase a worse variant
+ if (SALOME::VerbosityActivated() && theVariants.size() > 1 ) // erase a worse variant
theVariants.erase( ++theVariants.begin() );
-#endif
};
// first criterion - equality of nbSeg of opposite sides
void _ViscousBuilder::makeGroupOfLE()
{
-#ifdef _DEBUG_
+ if (!SALOME::VerbosityActivated())
+ return;
+
for ( size_t i = 0 ; i < _sdVec.size(); ++i )
{
if ( _sdVec[i]._n2eMap.empty() ) continue;
<< "'%s-%s' % (faceId1+1, faceId2))");
dumpFunctionEnd();
}
-#endif
}
//================================================================================
}
}
-
-
-#ifdef _DEBUG_
- // dumpMove() for debug
- size_t i = 0;
- for ( ; i < eos._edges.size(); ++i )
- if ( eos._edges[i]->Is( _LayerEdge::MARKED ))
- break;
- if ( i < eos._edges.size() )
+ if (SALOME::VerbosityActivated())
{
- dumpFunction(SMESH_Comment("putOnOffsetSurface_") << eos.ShapeTypeLetter() << eos._shapeID
- << "_InfStep" << infStep << "_" << Abs( smooStep ));
+ // dumpMove() for debug
+ size_t i = 0;
for ( ; i < eos._edges.size(); ++i )
+ if ( eos._edges[i]->Is( _LayerEdge::MARKED ))
+ break;
+ if ( i < eos._edges.size() )
{
- if ( eos._edges[i]->Is( _LayerEdge::MARKED )) {
- dumpMove( eos._edges[i]->_nodes.back() );
+ dumpFunction(SMESH_Comment("putOnOffsetSurface_") << eos.ShapeTypeLetter() << eos._shapeID
+ << "_InfStep" << infStep << "_" << Abs( smooStep ));
+ for ( ; i < eos._edges.size(); ++i )
+ {
+ if ( eos._edges[i]->Is( _LayerEdge::MARKED )) {
+ dumpMove( eos._edges[i]->_nodes.back() );
+ }
}
+ dumpFunctionEnd();
}
- dumpFunctionEnd();
}
-#endif
_ConvexFace* cnvFace;
if ( moveAll != _LayerEdge::UPD_NORMAL_CONV &&
bool SetNewLength( const double length );
-#ifdef _DEBUG_
- int _ID;
-#endif
+ int _ID; // debug
};
//--------------------------------------------------------------------------------
/*!
_error->myAlgo = smError->myAlgo;
smError = _error;
}
-#ifdef _DEBUG_
- cout << "_ViscousBuilder2D::error " << text << endl;
-#endif
+
+ if (SALOME::VerbosityActivated())
+ cout << "_ViscousBuilder2D::error " << text << endl;
+
return false;
}
lEdge._ray.SetDirection( lEdge._normal2D );
lEdge._isBlocked = false;
lEdge._length2D = 0;
-#ifdef _DEBUG_
- lEdge._ID = _nbLE++;
-#endif
+
+ if (SALOME::VerbosityActivated())
+ lEdge._ID = _nbLE++;
}
//================================================================================
