From fa95110a3b64cb8323176103200e3dd17f0ed67e Mon Sep 17 00:00:00 2001 From: Konstantin LEONTEV Date: Tue, 15 Nov 2022 09:04:21 +0300 Subject: [PATCH] [bos #32517][EDF] Dynamic log messages switched on and off by SALOME_VERBOSE environment variable --- src/Controls/SMESH_Controls.cxx | 5 +- src/Driver/Driver_Mesh.cxx | 5 +- src/DriverCGNS/DriverCGNS_Read.cxx | 2 +- src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx | 31 +- src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx | 13 +- src/MEDWrapper/MED_Algorithm.cxx | 93 +++--- src/MEDWrapper/MED_GaussUtils.cxx | 153 +++++---- src/MEDWrapper/MED_SliceArray.hxx | 2 - src/MEDWrapper/MED_Utilities.cxx | 9 +- src/MEDWrapper/MED_Utilities.hxx | 19 +- src/MEDWrapper/MED_Vector.hxx | 2 - src/MEDWrapper/MED_Wrapper.cxx | 295 +++++++++--------- src/OBJECT/SMESH_Actor.cxx | 13 +- src/OBJECT/SMESH_ActorUtils.cxx | 5 - src/OBJECT/SMESH_DeviceActor.cxx | 21 +- src/OBJECT/SMESH_ExtractGeometry.cxx | 6 - src/OBJECT/SMESH_Object.cxx | 49 ++- src/OBJECT/SMESH_PreviewActorsCollection.cxx | 10 +- src/SMDS/SMDS_MemoryLimit.cxx | 8 +- src/SMESH/MG_ADAPT.cxx | 6 +- src/SMESH/SMESH_Mesh.cxx | 45 ++- src/SMESH/SMESH_MeshEditor.cxx | 12 +- src/SMESH/SMESH_MesherHelper.cxx | 75 +++-- src/SMESH/SMESH_Pattern.cxx | 28 +- src/SMESHClient/SMESH_Client.cxx | 22 +- src/SMESHDS/SMESHDS_GroupBase.cxx | 6 +- src/SMESHGUI/SMESHGUI_ComputeDlg.cxx | 4 +- src/SMESHGUI/SMESHGUI_HomardBoundaryDlg.cxx | 20 +- src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx | 30 +- src/SMESHUtils/SMESH_Block.cxx | 33 +- src/SMESHUtils/SMESH_MAT2d.cxx | 19 +- src/SMESHUtils/SMESH_MGLicenseKeyGen.cxx | 2 +- src/SMESHUtils/SMESH_MeshAlgos.cxx | 4 +- src/SMESHUtils/SMESH_Offset.cxx | 15 +- src/SMESHUtils/SMESH_TryCatch.cxx | 7 +- src/SMESH_I/SMESH_2smeshpy.cxx | 24 +- src/SMESH_I/SMESH_Gen_i.cxx | 118 ++++--- src/SMESH_I/SMESH_Gen_i_1.cxx | 34 +- src/SMESH_I/SMESH_Homard_i.cxx | 7 +- src/SMESH_I/SMESH_Mesh_i.cxx | 37 +-- src/SMESH_I/SMESH_NoteBook.cxx | 24 +- src/SMESH_I/SMESH_PreMeshInfo.cxx | 6 +- src/SMESH_I/SMESH_PythonDump.cxx | 15 +- src/StdMeshers/StdMeshers_Adaptive1D.cxx | 6 +- src/StdMeshers/StdMeshers_Cartesian_3D.cxx | 44 ++- .../StdMeshers_CompositeHexa_3D.cxx | 5 +- src/StdMeshers/StdMeshers_FaceSide.cxx | 7 +- src/StdMeshers/StdMeshers_HexaFromSkin_3D.cxx | 18 +- src/StdMeshers/StdMeshers_Prism_3D.cxx | 60 ++-- src/StdMeshers/StdMeshers_ProjectionUtils.cxx | 36 ++- src/StdMeshers/StdMeshers_Projection_2D.cxx | 5 +- src/StdMeshers/StdMeshers_Quadrangle_2D.cxx | 4 +- src/StdMeshers/StdMeshers_ViscousLayers.cxx | 34 +- src/StdMeshers/StdMeshers_ViscousLayers2D.cxx | 17 +- 54 files changed, 700 insertions(+), 870 deletions(-) diff --git a/src/Controls/SMESH_Controls.cxx b/src/Controls/SMESH_Controls.cxx index faaf3dac1..0474d7a57 100644 --- a/src/Controls/SMESH_Controls.cxx +++ b/src/Controls/SMESH_Controls.cxx @@ -4425,9 +4425,10 @@ Predicate* ElementsOnShape::clone() const 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; } diff --git a/src/Driver/Driver_Mesh.cxx b/src/Driver/Driver_Mesh.cxx index f8b83e4e3..6157f4c4a 100644 --- a/src/Driver/Driver_Mesh.cxx +++ b/src/Driver/Driver_Mesh.cxx @@ -28,7 +28,6 @@ #include "SMESH_Comment.hxx" -//#define _DEBUG_ #include using namespace std; @@ -79,9 +78,7 @@ Driver_Mesh::Status Driver_Mesh::addMessage(const std::string& msg, myErrorMessages.push_back( msg ); MESSAGE(msg); -#ifdef _DEBUG_ - cout << msg << endl; -#endif + return ( myStatus = isFatal ? DRS_FAIL : DRS_WARN_SKIP_ELEM ); } diff --git a/src/DriverCGNS/DriverCGNS_Read.cxx b/src/DriverCGNS/DriverCGNS_Read.cxx index 2b28c9f6b..13277284f 100644 --- a/src/DriverCGNS/DriverCGNS_Read.cxx +++ b/src/DriverCGNS/DriverCGNS_Read.cxx @@ -22,7 +22,7 @@ // File : DriverCGNS_Read.cxx // Created : Thu Jun 30 10:33:31 2011 // Author : Edward AGAPOV (eap) -//#define _DEBUG_ + #include #include "DriverCGNS_Read.hxx" diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx index 9936a7393..9eab4fc88 100644 --- a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx +++ b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx @@ -42,13 +42,6 @@ //#include -#ifdef _DEBUG_ -static int MYDEBUG = 0; -//#define _DEXCEPT_ -#else -static int MYDEBUG = 0; -#endif - #define _EDF_NODE_IDS_ using namespace MED; @@ -110,7 +103,7 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform() try { #endif myFamilies.clear(); - if(MYDEBUG) MESSAGE("Perform - myFile : "<GetName()); + MESSAGE("Perform - aMeshName : "<GetName()); if ( aMeshName != aMeshInfo->GetName() ) continue; aResult = DRS_OK; @@ -133,18 +126,18 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform() //------------------------------------------------ TErr anErr; TInt aNbFams = aMed->GetNbFamilies(aMeshInfo); - if(MYDEBUG) MESSAGE("Read " << aNbFams << " families"); + MESSAGE("Read " << aNbFams << " families"); for (TInt iFam = 0; iFam < aNbFams; iFam++) { PFamilyInfo aFamilyInfo = aMed->GetPFamilyInfo(aMeshInfo,iFam+1,&anErr); if(anErr >= 0){ TInt aFamId = aFamilyInfo->GetId(); - if(MYDEBUG) MESSAGE("Family " << aFamId << " :"); + MESSAGE("Family " << aFamId << " :"); DriverMED_FamilyPtr aFamily (new DriverMED_Family); TInt aNbGrp = aFamilyInfo->GetNbGroup(); - if(MYDEBUG) MESSAGE("belong to " << aNbGrp << " groups"); + MESSAGE("belong to " << aNbGrp << " groups"); bool isAttrOk = false; if(aFamilyInfo->GetNbAttr() == aNbGrp) isAttrOk = true; @@ -155,7 +148,7 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform() TInt anAttrVal = aFamilyInfo->GetAttrVal(iGr); aFamily->SetGroupAttributVal(anAttrVal); } - if(MYDEBUG) MESSAGE(aGroupName); + MESSAGE(aGroupName); if ( strncmp( aGroupName.c_str(), NIG_GROUP_PREFIX, strlen(NIG_GROUP_PREFIX) ) != 0 ) aFamily->AddGroupName( fixUTF8( aGroupName )); } @@ -182,7 +175,7 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform() EBooleen anIsNodeNum = aNodeInfo->IsElemNum(); TInt aNbElems = aNodeInfo->GetNbElem(); - if(MYDEBUG) MESSAGE("Perform - aNodeInfo->GetNbElem() = "<GetNbElem() = "<GetStoreName(); - if(MYDEBUG) MESSAGE("Get Group " << aGroupName); + MESSAGE("Get Group " << aGroupName); if (( famVecPtr = myGroups2FamiliesMap.ChangeSeek( aGroupName ))) { diff --git a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx index 4b270fd00..cf1045e32 100644 --- a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx +++ b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx @@ -37,13 +37,6 @@ using namespace std; - -#ifdef _DEBUG_ -static int MYDEBUG = 0; -#else -static int MYDEBUG = 0; -#endif - namespace { /*! @@ -123,7 +116,7 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform() using namespace UNV2411; TDataSet aDataSet2411; UNV2411::Read(in_stream,aDataSet2411); - if(MYDEBUG) MESSAGE("Perform - aDataSet2411.size() = "<GetPElemInfo(theMeshInfo,anEntity,aGeom,MED::eNOD,&anErr); } } - ADDMSG(MYDEBUG,"\n"); + ADDMSG("\n"); return anEntity2TGeom2ElemInfo; } @@ -70,17 +62,17 @@ namespace MED GetFamilyInfoSet(const PWrapper& theWrapper, const PMeshInfo& theMeshInfo) { - MSG(MYDEBUG,"GetFamilies(...)"); + MSG("GetFamilies(...)"); TErr anErr; TFamilyInfoSet aFamilyInfoSet; TInt aNbFam = theWrapper->GetNbFamilies(*theMeshInfo); - INITMSG(MYDEBUG,"GetNbFamilies() = "<GetPFamilyInfo(theMeshInfo,iFam,&anErr); if(anErr >= 0) aFamilyInfoSet.insert(aFamilyInfo); } - ADDMSG(MYDEBUG,"\n"); + ADDMSG("\n"); return aFamilyInfoSet; } @@ -88,7 +80,7 @@ namespace MED TGroupInfo GetGroupInfo(const TFamilyInfoSet& theFamilyInfoSet) { - MSG(MYDEBUG,"GetFamiliesByGroup(...)"); + MSG("GetFamiliesByGroup(...)"); TGroupInfo aGroup; TFamilyInfoSet::const_iterator anIter = theFamilyInfoSet.begin(); for(; anIter != theFamilyInfoSet.end(); anIter++){ @@ -99,22 +91,20 @@ namespace MED } } -#ifdef _DEBUG_ - if(MYDEBUG){ + if(SALOME::VerbosityActivated()){ TGroupInfo::const_iterator anIter = aGroup.begin(); for(; anIter != aGroup.end(); anIter++){ const std::string& aName = anIter->first; - INITMSG(MYDEBUG,"aGroupName = '"<second; TFamilyInfoSet::const_iterator anFamIter = aFamilyInfoSet.begin(); for(; anFamIter != aFamilyInfoSet.end(); anFamIter++){ const PFamilyInfo& aFamilyInfo = *anFamIter; - INITMSG(MYDEBUG,"aFamilyName = '"<GetName()<<"'\n"); + INITMSG("aFamilyName = '"<GetName()<<"'\n"); } } - ADDMSG(MYDEBUG,"\n"); + ADDMSG("\n"); } -#endif return aGroup; } @@ -125,28 +115,26 @@ namespace MED const PMeshInfo& theMeshInfo, const MED::TEntityInfo& theEntityInfo) { - MSG(MYDEBUG,"GetFieldsByEntity(...)"); + MSG("GetFieldsByEntity(...)"); TFieldInfo2TimeStampInfoSet aFieldInfo2TimeStampInfoSet; TInt aNbFields = theWrapper->GetNbFields(); - INITMSG(MYDEBUG,"GetNbFields() = "<GetPFieldInfo(theMeshInfo,iField); - INITMSG(MYDEBUG,"aFieldName = '"<GetName()<< + INITMSG("aFieldName = '"<GetName()<< "'; aNbComp = "<GetNbComp()<<"; "); TGeom2Size aGeom2Size; EEntiteMaillage anEntity = EEntiteMaillage(-1); TInt aNbTimeStamps = theWrapper->GetNbTimeStamps(aFieldInfo,theEntityInfo,anEntity,aGeom2Size); - ADDMSG(MYDEBUG,"anEntity = "<GetPTimeStampInfo(aFieldInfo,anEntity,aGeom2Size,iTimeStamp); aFieldInfo2TimeStampInfoSet[aFieldInfo].insert(aTimeStamp); - INITMSG(MYDEBUG, - "aDt = "<GetDt()<< - ", Unit = \'"<GetUnitDt()<<"\n"); + INITMSG("aDt = "<GetDt()<<", Unit = \'"<GetUnitDt()<<"\n"); } } - ADDMSG(MYDEBUG,"\n"); + ADDMSG("\n"); return aFieldInfo2TimeStampInfoSet; } @@ -182,7 +170,7 @@ namespace MED const TEntity2TGeom2ElemInfo& theEntity2TGeom2ElemInfo, const TFamilyInfoSet& theFamilyInfoSet) { - MSG(MYDEBUG,"GetFamiliesByEntity(...)"); + MSG("GetFamiliesByEntity(...)"); TEntity2FamilySet anEntity2FamilySet; typedef std::map TId2Family; @@ -220,7 +208,7 @@ namespace MED TEntity2FamilyID::const_iterator anIter = anEntity2FamilyID.begin(); for(; anIter != anEntity2FamilyID.end(); anIter++){ const EEntiteMaillage& anEntity = anIter->first; - INITMSG(MYDEBUG,"anEntity = "<second; TFamilyID2Size::const_iterator anIter2 = aFamilyID2Size.begin(); for(; anIter2 != aFamilyID2Size.end(); anIter2++){ @@ -230,15 +218,14 @@ namespace MED if(anIter3 != anId2Family.end()){ const PFamilyInfo& aFamilyInfo = anIter3->second; anEntity2FamilySet[anEntity].insert(TFamilyTSize(aFamilyInfo,aSize)); - INITMSG(MYDEBUG, - "aFamilyName = '"<GetName()<< + INITMSG("aFamilyName = '"<GetName()<< "' anId = "<GetId()<<"\n"); } } } } } - ADDMSG(MYDEBUG,"\n"); + ADDMSG("\n"); return anEntity2FamilySet; } @@ -248,7 +235,7 @@ namespace MED TErr* theErr, EModeSwitch theMode) { - INITMSG(MYDEBUG,"GetKey2Gauss - theMode = "<(aKey); + const std::string& aName = boost::get<1>(aKey); + INITMSG("- aGeom = "<GetSize(); - for(TInt iElem = 0; iElem < aNbElem; iElem++){ - ADDMSG(MYVALUEDEBUG,anInfo->GetElemNum(iElem)<<", "); - } - ADDMSG(MYVALUEDEBUG, std::endl); -#endif + if(SALOME::VerbosityActivated()){ + INITMSG("- aName = '"<GetSize(); + for(TInt iElem = 0; iElem < aNbElem; iElem++){ + ADDMSG(anInfo->GetElemNum(iElem)<<", "); + } + + ADDMSG(std::endl); + } } return TMKey2Profile(theMode,aKey2Profile); } diff --git a/src/MEDWrapper/MED_GaussUtils.cxx b/src/MEDWrapper/MED_GaussUtils.cxx index cecd61937..2502833a4 100644 --- a/src/MEDWrapper/MED_GaussUtils.cxx +++ b/src/MEDWrapper/MED_GaussUtils.cxx @@ -23,14 +23,6 @@ #include "MED_GaussUtils.hxx" #include "MED_Utilities.hxx" -#ifdef _DEBUG_ -static int MYDEBUG = 0; -static int MYVALUEDEBUG = 0; -#else -// static int MYDEBUG = 0; // unused in release mode -// static int MYVALUEDEBUG = 0; // unused in release mode -#endif - namespace MED { //--------------------------------------------------------------- @@ -209,7 +201,7 @@ namespace MED { TInt aNbRef = theRefCoord.size(); TInt aNbRef2 = GetNbRef(); - INITMSG(MYDEBUG,"TShapeFun::IsSatisfy "<< + INITMSG("TShapeFun::IsSatisfy "<< "- aNbRef("<GetDim(); static TInt aNbGauss = 1; @@ -1935,7 +1927,7 @@ namespace MED TInt aConnDim = theCellInfo.GetConnDim(); - INITMSGA(MYDEBUG,0, + INITMSGA(0, "- aDim = "<GetDim(); static TInt aNbGauss = 1; @@ -2006,7 +1999,7 @@ namespace MED theGaussCoord.Init(aNbElem,aNbGauss,aDim,theMode); - INITMSGA(MYDEBUG,0, + INITMSGA(0, "- aDim = "<GetDim(); static TInt aNbGauss = 1; @@ -2064,7 +2057,7 @@ namespace MED theGaussCoord.Init(aNbElem,aNbGauss,aDim,theMode); - INITMSGA(MYDEBUG,0, + INITMSGA(0, "- aDim = "< #include @@ -45,19 +46,11 @@ namespace MED }; } -#ifdef _DEBUG_ - #define MSG(deb,msg) if(deb) std::cout< #include -//#if defined(_DEBUG_) # define MED_TVECTOR_CHECK_RANGE -//#endif namespace MED { diff --git a/src/MEDWrapper/MED_Wrapper.cxx b/src/MEDWrapper/MED_Wrapper.cxx index cd5774b19..e789927b3 100644 --- a/src/MEDWrapper/MED_Wrapper.cxx +++ b/src/MEDWrapper/MED_Wrapper.cxx @@ -36,14 +36,6 @@ #include -#ifdef _DEBUG_ -static int MYDEBUG = 0; -static int MYVALUEDEBUG = 0; -#else -// static int MYDEBUG = 0; // unused in release mode -// static int MYVALUEDEBUG = 0; // unused in release mode -#endif - namespace MED { //--------------------------------------------------------------- @@ -56,13 +48,13 @@ namespace MED #else boost::detail::thread::lock_ops::lock(myWrapper->myMutex); #endif - INITMSG(MYDEBUG, "TLockProxy() - this -"<myGeom2Value; typename TimeStampValueType::TTGeom2Value::const_iterator anIter = aGeom2Value.begin(); for (; anIter != aGeom2Value.end(); anIter++) { @@ -177,22 +169,22 @@ namespace MED TInt aNbElem = aMeshValue.myNbElem; TInt aNbGauss = aMeshValue.myNbGauss; TInt aNbComp = aMeshValue.myNbComp; - INITMSG(MYDEBUG, "aGeom = "<Id(),&aMeshName); - INITMSG(MYDEBUG, "TWrapper::SetMeshInfo - MED_MODE_ACCES = "<GetGroupName(iGroup); - INITMSG(MYDEBUG, "aGroupName = '"<GetName(); + INITMSG("GetPFamilyInfo - aFamilyName = '"<GetGroupName(iGroup); + INITMSG("aGroupName = '"<myDim; - TInt aNbElem = anInfo->GetNbElem(); - INITMSG(MYDEBUG, "GetPNodeInfo: "); + if (SALOME::VerbosityActivated()) { - INITMSG(MYDEBUG, "aCoords: "<myCoord; - for (TInt iElem = 0; iElem < aNbElem; iElem++) { - for (TInt iDim = 0, anId = iElem*aDim; iDim < aDim; iDim++, anId++) { - ADDMSG(MYVALUEDEBUG, aCoord[anId]<<","); + TInt aDim = theMeshInfo->myDim; + TInt aNbElem = anInfo->GetNbElem(); + INITMSG("GetPNodeInfo: "); + { + INITMSG("aCoords: "<myCoord; + for (TInt iElem = 0; iElem < aNbElem; iElem++) { + for (TInt iDim = 0, anId = iElem*aDim; iDim < aDim; iDim++, anId++) { + ADDMSG(aCoord[anId]<<","); + } + ADDMSG(" "); } - ADDMSG(MYVALUEDEBUG, " "); - } - ADDMSG(MYDEBUG, std::endl); - - BEGMSG(MYVALUEDEBUG, "GetFamNum: "); - for (TInt iElem = 0; iElem < aNbElem; iElem++) { - ADDMSG(MYVALUEDEBUG, anInfo->GetFamNum(iElem)<<", "); - } - ADDMSG(MYVALUEDEBUG, std::endl); + ADDMSG(std::endl); - if (anInfo->IsElemNum()) { - BEGMSG(MYVALUEDEBUG, "GetElemNum: "); + BEGMSG("GetFamNum: "); for (TInt iElem = 0; iElem < aNbElem; iElem++) { - ADDMSG(MYVALUEDEBUG, 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(MYVALUEDEBUG, std::endl); } + ADDMSG(std::endl); } - ADDMSG(MYDEBUG, std::endl); -#endif return anInfo; } @@ -1548,20 +1542,21 @@ namespace MED PPolygoneInfo anInfo = CrPolygoneInfo(theMeshInfo, theEntity, theGeom, aNbElem, aConnSize, theConnMode); GetPolygoneInfo(anInfo); -#ifdef _DEBUG_ - INITMSG(MYDEBUG, "GetPPolygoneInfo"<< - " - theGeom = "<GetConnSlice(iElem); - TInt aConnDim = aConnSlice.size(); - for (TInt iConn = 0; iConn < aConnDim; iConn++) { - ADDMSG(MYVALUEDEBUG, aConnSlice[iConn]<<","); + if (SALOME::VerbosityActivated()) + { + INITMSG("GetPPolygoneInfo"<< + " - theGeom = "<GetConnSlice(iElem); + TInt aConnDim = aConnSlice.size(); + for (TInt iConn = 0; iConn < aConnDim; iConn++) { + ADDMSG(aConnSlice[iConn]<<","); + } + ADDMSG(" "); } - ADDMSG(MYDEBUG, " "); + ADDMSG(std::endl); } - ADDMSG(MYDEBUG, std::endl); -#endif return anInfo; } @@ -1858,27 +1853,28 @@ namespace MED PPolyedreInfo anInfo = CrPolyedreInfo(theMeshInfo, theEntity, theGeom, aNbElem, aNbFaces, aConnSize, theConnMode); GetPolyedreInfo(anInfo); -#ifdef _DEBUG_ - INITMSG(MYDEBUG, "GetPPolyedreInfo"<< - " - theGeom = "<GetConnSliceArr(iElem); - TInt aNbFaces = aConnSliceArr.size(); - ADDMSG(MYDEBUG, "{"); - for (TInt iFace = 0; iFace < aNbFaces; iFace++) { - TCConnSlice aConnSlice = aConnSliceArr[iFace]; - TInt aNbConn = aConnSlice.size(); - ADDMSG(MYDEBUG, "["); - for (TInt iConn = 0; iConn < aNbConn; iConn++) { - ADDMSG(MYVALUEDEBUG, aConnSlice[iConn]<<","); + if (SALOME::VerbosityActivated()) + { + INITMSG("GetPPolyedreInfo"<< + " - theGeom = "<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(MYDEBUG, "] "); + ADDMSG("} "); } - ADDMSG(MYDEBUG, "} "); + ADDMSG(std::endl); } - ADDMSG(MYDEBUG, std::endl); -#endif return anInfo; } @@ -2279,34 +2275,35 @@ namespace MED PCellInfo anInfo = CrCellInfo(theMeshInfo, theEntity, theGeom, aNbElem, theConnMode); GetCellInfo(anInfo, theErr); -#ifdef _DEBUG_ - TInt aConnDim = anInfo->GetConnDim(); - INITMSG(MYDEBUG, "GetPCellInfo - theEntity = "<GetConnSlice(iElem); - for (TInt iConn = 0; iConn < aConnDim; iConn++) { - ADDMSG(MYVALUEDEBUG, aConnSlice[iConn]<<","); + if (SALOME::VerbosityActivated()) + { + TInt aConnDim = anInfo->GetConnDim(); + INITMSG("GetPCellInfo - theEntity = "<GetConnSlice(iElem); + for (TInt iConn = 0; iConn < aConnDim; iConn++) { + ADDMSG(aConnSlice[iConn]<<","); + } + ADDMSG(" "); } - ADDMSG(MYVALUEDEBUG, " "); - } - ADDMSG(MYDEBUG, std::endl); - - BEGMSG(MYVALUEDEBUG, "GetPCellInfo - GetFamNum: "); - for (TInt iElem = 0; iElem < aNbElem; iElem++) { - ADDMSG(MYVALUEDEBUG, anInfo->GetFamNum(iElem)<<", "); - } - ADDMSG(MYVALUEDEBUG, std::endl); + ADDMSG(std::endl); - if (anInfo->IsElemNum()) { - BEGMSG(MYVALUEDEBUG, "GetPCellInfo - GetElemNum: "); + BEGMSG("GetPCellInfo - GetFamNum: "); for (TInt iElem = 0; iElem < aNbElem; iElem++) { - ADDMSG(MYVALUEDEBUG, 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(MYVALUEDEBUG, std::endl); + ADDMSG(std::endl); } - ADDMSG(MYDEBUG, std::endl); -#endif return anInfo; } @@ -2687,14 +2684,14 @@ namespace MED PFieldInfo anInfo = CrFieldInfo(theMeshInfo, aNbComp); GetFieldInfo(theId, *anInfo, theErr); -#ifdef _DEBUG_ - INITMSG(MYDEBUG, - "GetPFieldInfo "<< - "- aName = '"<GetName()<<"'"<< - "; aType = "<GetType()<< - "; aNbComp = "<myGeom2NbGauss; - TGeom2NbGauss::const_iterator anIter = aGeom2NbGauss.begin(); - for (; anIter != aGeom2NbGauss.end(); anIter++) { - const EGeometrieElement& aGeom = anIter->first; - INITMSG(MYDEBUG, "aGeom = "<myGeom2NbGauss; + TGeom2NbGauss::const_iterator anIter = aGeom2NbGauss.begin(); + for (; anIter != aGeom2NbGauss.end(); anIter++) { + const EGeometrieElement& aGeom = anIter->first; + INITMSG("aGeom = "<GetValueSize(aGeom); - INITMSG(MYDEBUG, - "TWrapper::GetTimeStampValue - aGeom = "<GetNbNodes(); - BEGMSG(MYVALUEDEBUG, "GetFamNumNode: "); + BEGMSG("GetFamNumNode: "); for (TInt iElem = 0; iElem < aNbElem; iElem++) { - ADDMSG(MYVALUEDEBUG, anInfo->GetFamNumNode(iElem)<<", "); + ADDMSG(anInfo->GetFamNumNode(iElem)<<", "); } TInt aNbCells = anInfo->GetNbCells(); - BEGMSG(MYVALUEDEBUG, "GetFamNum: "); + BEGMSG("GetFamNum: "); for (TInt iElem = 0; iElem < aNbCells; iElem++) { - ADDMSG(MYVALUEDEBUG, anInfo->GetFamNum(iElem)<<", "); + ADDMSG(anInfo->GetFamNum(iElem)<<", "); } - ADDMSG(MYVALUEDEBUG, std::endl); - BEGMSG(MYVALUEDEBUG, "GetCoordName: "); + ADDMSG(std::endl); + BEGMSG("GetCoordName: "); for (TInt iElem = 0; iElem < theMeshInfo->GetDim(); iElem++) { - ADDMSG(MYVALUEDEBUG, anInfo->GetCoordName(iElem)<<", "); + ADDMSG(anInfo->GetCoordName(iElem)<<", "); } - ADDMSG(MYVALUEDEBUG, std::endl); - BEGMSG(MYVALUEDEBUG, "GetCoordUnit: "); + ADDMSG(std::endl); + BEGMSG("GetCoordUnit: "); for (TInt iElem = 0; iElem < theMeshInfo->GetDim(); iElem++) { - ADDMSG(MYVALUEDEBUG, anInfo->GetCoordUnit(iElem)<<", "); + ADDMSG(anInfo->GetCoordUnit(iElem)<<", "); } - ADDMSG(MYVALUEDEBUG, std::endl); - + ADDMSG(std::endl); } -#endif return anInfo; } diff --git a/src/OBJECT/SMESH_Actor.cxx b/src/OBJECT/SMESH_Actor.cxx index 44d2747b7..1d0400ce2 100644 --- a/src/OBJECT/SMESH_Actor.cxx +++ b/src/OBJECT/SMESH_Actor.cxx @@ -82,11 +82,6 @@ #include "utilities.h" -#ifdef _DEBUG_ -static int MYDEBUG = 0; -#else -static int MYDEBUG = 0; -#endif SMESH_ActorDef* SMESH_ActorDef::New(){ return new SMESH_ActorDef(); @@ -114,7 +109,7 @@ SMESH_Actor* SMESH_Actor::New(TVisualObjPtr theVisualObj, SMESH_ActorDef::SMESH_ActorDef() { - if(MYDEBUG) MESSAGE("SMESH_ActorDef - "<Update(); @@ -2657,7 +2652,7 @@ void SMESH_ActorDef::UpdateFilter() } if ( GetVisibility() ) aFilter->Update(); - if (MYDEBUG) MESSAGE(aFilter->GetOutput()->GetNumberOfCells()); + MESSAGE(aFilter->GetOutput()->GetNumberOfCells()); } #ifndef DISABLE_PLOT2DVIEWER diff --git a/src/OBJECT/SMESH_ActorUtils.cxx b/src/OBJECT/SMESH_ActorUtils.cxx index d58acaa46..d8712a5b4 100644 --- a/src/OBJECT/SMESH_ActorUtils.cxx +++ b/src/OBJECT/SMESH_ActorUtils.cxx @@ -46,11 +46,6 @@ #include #include -//#ifdef _DEBUG_ -//static int MYDEBUG = 1; -//#else -//static int MYDEBUG = 0; -//#endif namespace SMESH { diff --git a/src/OBJECT/SMESH_DeviceActor.cxx b/src/OBJECT/SMESH_DeviceActor.cxx index c476156c8..bf9521bab 100644 --- a/src/OBJECT/SMESH_DeviceActor.cxx +++ b/src/OBJECT/SMESH_DeviceActor.cxx @@ -68,11 +68,6 @@ #include "utilities.h" -#ifdef _DEBUG_ -static int MYDEBUG = 0; -#else -static int MYDEBUG = 0; -#endif using namespace std; @@ -83,7 +78,7 @@ vtkStandardNewMacro(SMESH_DeviceActor) SMESH_DeviceActor ::SMESH_DeviceActor() { - if(MYDEBUG) MESSAGE("SMESH_DeviceActor - "<Delete(); // myPlaneCollection->Delete(); -- it is vtkSmartPointer @@ -851,7 +846,7 @@ SMESH_DeviceActor anID = myExtractGeometry->GetNodeObjId(theVtkID); vtkIdType aRetID = myVisualObj->GetNodeObjId(anID); - if(MYDEBUG) MESSAGE("GetNodeObjId - theVtkID = "<GetReferenceCount() = " << myGrid->GetReferenceCount() ); + MESSAGE("--------------------------------SMESH_VisualObjDef::~SMESH_VisualObjDef"); + MESSAGE( "myGrid->GetReferenceCount() = " << myGrid->GetReferenceCount() ); myGrid->Delete(); } @@ -200,7 +193,7 @@ void SMESH_VisualObjDef::createPoints( vtkPoints* thePoints ) //================================================================================= void SMESH_VisualObjDef::buildPrs(bool buildGrid) { - if ( MYDEBUG ) MESSAGE("---------------------------SMESH_VisualObjDef::buildPrs " << buildGrid); + MESSAGE("---------------------------SMESH_VisualObjDef::buildPrs " << buildGrid); if (buildGrid) { myLocalGrid = true; @@ -234,7 +227,7 @@ void SMESH_VisualObjDef::buildPrs(bool buildGrid) if (!GetMesh()->IsCompacted()) { NulData(); // detach from the SMDS grid to allow immediate memory de-allocation in compactMesh() - if ( MYDEBUG ) MESSAGE("*** buildPrs ==> compactMesh!"); + MESSAGE("*** buildPrs ==> compactMesh!"); GetMesh()->CompactMesh(); if ( SMESHDS_Mesh* m = dynamic_cast( GetMesh() )) // IPAL53915 m->GetScript()->SetModified(false); // drop IsModified set in compactMesh() @@ -309,8 +302,7 @@ void SMESH_VisualObjDef::buildElemPrs() myGrid->SetPoints( aPoints ); aPoints->Delete(); - if ( MYDEBUG ) - MESSAGE("Update - myGrid->GetNumberOfPoints() = "<GetNumberOfPoints()); + MESSAGE("Update - myGrid->GetNumberOfPoints() = "<GetNumberOfPoints()); // Calculate cells size @@ -361,8 +353,8 @@ void SMESH_VisualObjDef::buildElemPrs() } } } - if ( MYDEBUG ) - MESSAGE( "Update - aNbCells = "<_is_nil() = "<_is_nil()); + + MESSAGE("SMESH_MeshObj - this = "<_is_nil() = "<_is_nil()); } //================================================================================= @@ -638,8 +630,7 @@ SMESH_MeshObj::SMESH_MeshObj(SMESH::SMESH_Mesh_ptr theMesh): //================================================================================= SMESH_MeshObj::~SMESH_MeshObj() { - if ( MYDEBUG ) - MESSAGE("SMESH_MeshObj - this = "<Delete(); } @@ -651,9 +642,9 @@ SMESH_MeshObj::~SMESH_MeshObj() bool SMESH_MeshObj::Update( int theIsClear ) { // Update SMDS_Mesh on client part - if ( MYDEBUG ) MESSAGE("SMESH_MeshObj::Update " << this); + MESSAGE("SMESH_MeshObj::Update " << this); if ( myClient.Update(theIsClear) || GetUnstructuredGrid()->GetNumberOfPoints()==0) { - if ( MYDEBUG ) MESSAGE("buildPrs"); + MESSAGE("buildPrs"); buildPrs(); // Fill unstructured grid return true; } @@ -662,7 +653,7 @@ bool SMESH_MeshObj::Update( int theIsClear ) bool SMESH_MeshObj::NulData() { - if ( MYDEBUG ) MESSAGE ("SMESH_MeshObj::NulData() ============================================="); + MESSAGE ("SMESH_MeshObj::NulData() ============================================="); if (!myEmptyGrid) { myEmptyGrid = SMDS_UnstructuredGrid::New(); @@ -821,7 +812,7 @@ bool SMESH_MeshObj::IsNodePrs() const //================================================================================= SMESH_SubMeshObj::SMESH_SubMeshObj( SMESH_MeshObj* theMeshObj ) { - if ( MYDEBUG ) MESSAGE( "SMESH_SubMeshObj - theMeshObj = " << theMeshObj ); + MESSAGE( "SMESH_SubMeshObj - theMeshObj = " << theMeshObj ); myMeshObj = theMeshObj; } @@ -855,7 +846,7 @@ void SMESH_SubMeshObj::UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunc //================================================================================= bool SMESH_SubMeshObj::Update( int theIsClear ) { - if ( MYDEBUG ) MESSAGE("SMESH_SubMeshObj::Update " << this) + MESSAGE("SMESH_SubMeshObj::Update " << this); bool changed = myMeshObj->Update( theIsClear ); buildPrs(true); return changed; @@ -876,13 +867,13 @@ SMESH_GroupObj::SMESH_GroupObj( SMESH::SMESH_GroupBase_ptr theGroup, : SMESH_SubMeshObj( theMeshObj ), myGroupServer( SMESH::SMESH_GroupBase::_duplicate(theGroup) ) { - if ( MYDEBUG ) MESSAGE("SMESH_GroupObj - theGroup->_is_nil() = "<_is_nil()); + MESSAGE("SMESH_GroupObj - theGroup->_is_nil() = "<_is_nil()); myGroupServer->Register(); } SMESH_GroupObj::~SMESH_GroupObj() { - if ( MYDEBUG ) MESSAGE("~SMESH_GroupObj"); + MESSAGE("~SMESH_GroupObj"); myGroupServer->UnRegister(); } @@ -1011,14 +1002,14 @@ SMESH_subMeshObj::SMESH_subMeshObj( SMESH::SMESH_subMesh_ptr theSubMesh, : SMESH_SubMeshObj( theMeshObj ), mySubMeshServer( SMESH::SMESH_subMesh::_duplicate( theSubMesh ) ) { - if ( MYDEBUG ) MESSAGE( "SMESH_subMeshObj - theSubMesh->_is_nil() = " << theSubMesh->_is_nil() ); + MESSAGE( "SMESH_subMeshObj - theSubMesh->_is_nil() = " << theSubMesh->_is_nil() ); mySubMeshServer->Register(); } SMESH_subMeshObj::~SMESH_subMeshObj() { - if ( MYDEBUG ) MESSAGE( "~SMESH_subMeshObj" ); + MESSAGE( "~SMESH_subMeshObj" ); mySubMeshServer->UnRegister(); } diff --git a/src/OBJECT/SMESH_PreviewActorsCollection.cxx b/src/OBJECT/SMESH_PreviewActorsCollection.cxx index 1c346644f..b4d7cda41 100644 --- a/src/OBJECT/SMESH_PreviewActorsCollection.cxx +++ b/src/OBJECT/SMESH_PreviewActorsCollection.cxx @@ -44,23 +44,17 @@ #include #include -#ifdef _DEBUG_ -static int MYDEBUG = 0; -#else -static int MYDEBUG = 0; -#endif - SMESH_PreviewActorsCollection::SMESH_PreviewActorsCollection() : mySelector( 0 ), myRenderer( 0 ), myCurrentChunk( 0 ), myChunkSize( 0 ), myIsShown( true ) { - if(MYDEBUG) MESSAGE("SMESH_PreviewActorsCollection - "< #endif -#ifdef _DEBUG_ #include -#endif int main () { @@ -59,9 +57,9 @@ 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 diff --git a/src/SMESH/MG_ADAPT.cxx b/src/SMESH/MG_ADAPT.cxx index 739394b78..50f467fc0 100644 --- a/src/SMESH/MG_ADAPT.cxx +++ b/src/SMESH/MG_ADAPT.cxx @@ -1575,9 +1575,9 @@ MgAdapt::Status MgAdapt::addMessage(const std::string& msg, _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 ); } diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx index 5ff4c1830..90f4a8a02 100644 --- a/src/SMESH/SMESH_Mesh.cxx +++ b/src/SMESH/SMESH_Mesh.cxx @@ -83,12 +83,6 @@ // maximum stored group name length in MED file #define MAX_MED_GROUP_NAME_LENGTH 80 -#ifdef _DEBUG_ -static int MYDEBUG = 0; -#else -static int MYDEBUG = 0; -#endif - #define cSMESH_Hyp(h) static_cast(h) typedef SMESH_HypoFilter THypType; @@ -109,7 +103,7 @@ SMESH_Mesh::SMESH_Mesh(int theLocalId, SMESHDS_Document* theDocument): _groupId( 0 ), _nbSubShapes( 0 ) { - if(MYDEBUG) MESSAGE("SMESH_Mesh::SMESH_Mesh(int localId)"); + MESSAGE("SMESH_Mesh::SMESH_Mesh(int localId)"); _id = theLocalId; _gen = theGen; _document = theDocument; @@ -192,7 +186,7 @@ namespace SMESH_Mesh::~SMESH_Mesh() { - if(MYDEBUG) MESSAGE("SMESH_Mesh::~SMESH_Mesh"); + MESSAGE("SMESH_Mesh::~SMESH_Mesh"); if ( _document ) // avoid destructing _meshDS from ~SMESH_Gen() _document->RemoveMesh( _id ); @@ -276,7 +270,7 @@ SMESH_Mesh* SMESH_Mesh::FindMesh( int meshId ) const void SMESH_Mesh::ShapeToMesh(const TopoDS_Shape & aShape) { - if(MYDEBUG) MESSAGE("SMESH_Mesh::ShapeToMesh"); + MESSAGE("SMESH_Mesh::ShapeToMesh"); if ( !aShape.IsNull() && _isShapeToMesh ) { if ( aShape.ShapeType() != TopAbs_COMPOUND && // group contents is allowed to change @@ -530,10 +524,12 @@ int SMESH_Mesh::MEDToMesh(const char* theFileName, const char* theMeshName) 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 aGroupNames = myReader.GetGroupNamesAndTypes(); @@ -638,7 +634,7 @@ SMESH_Mesh::AddHypothesis(const TopoDS_Shape & aSubShape, int anHypId, std::string* anError ) { - if(MYDEBUG) MESSAGE("SMESH_Mesh::AddHypothesis"); + MESSAGE("SMESH_Mesh::AddHypothesis"); if ( anError ) anError->clear(); @@ -662,7 +658,7 @@ SMESH_Mesh::AddHypothesis(const TopoDS_Shape & aSubShape, std::string hypName = anHyp->GetName(); if ( hypName == "NotConformAllowed" ) { - if(MYDEBUG) MESSAGE( "Hypothesis can be only global" ); + MESSAGE( "Hypothesis can be only global" ); return SMESH_Hypothesis::HYP_INCOMPATIBLE; } } @@ -717,8 +713,8 @@ SMESH_Mesh::AddHypothesis(const TopoDS_Shape & aSubShape, HasModificationsToDiscard(); // to reset _isModified flag if a mesh becomes empty GetMeshDS()->Modified(); - if(MYDEBUG) subMesh->DumpAlgoState(true); - if(MYDEBUG) SCRUTE(ret); + if(SALOME::VerbosityActivated()) subMesh->DumpAlgoState(true); + SCRUTE(ret); return ret; } @@ -732,14 +728,14 @@ SMESH_Hypothesis::Hypothesis_Status SMESH_Mesh::RemoveHypothesis(const TopoDS_Shape & aSubShape, int anHypId) { - if(MYDEBUG) MESSAGE("SMESH_Mesh::RemoveHypothesis"); + MESSAGE("SMESH_Mesh::RemoveHypothesis"); StudyContextStruct *sc = _gen->GetStudyContext(); if (sc->mapHypothesis.find(anHypId) == sc->mapHypothesis.end()) throw SALOME_Exception(LOCALIZED("hypothesis does not exist")); SMESH_Hypothesis *anHyp = sc->mapHypothesis[anHypId]; - if(MYDEBUG) { SCRUTE(anHyp->GetType()); } + SCRUTE(anHyp->GetType()); // shape @@ -787,8 +783,8 @@ SMESH_Mesh::RemoveHypothesis(const TopoDS_Shape & aSubShape, HasModificationsToDiscard(); // to reset _isModified flag if mesh become empty GetMeshDS()->Modified(); - if(MYDEBUG) subMesh->DumpAlgoState(true); - if(MYDEBUG) SCRUTE(ret); + if(SALOME::VerbosityActivated()) subMesh->DumpAlgoState(true); + SCRUTE(ret); return ret; } @@ -1748,9 +1744,8 @@ double SMESH_Mesh::GetComputeProgress() const 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 ) { @@ -2027,7 +2022,7 @@ int SMESH_Mesh::NbMeshes() const // nb meshes in the Study bool SMESH_Mesh::IsNotConformAllowed() const { - if(MYDEBUG) MESSAGE("SMESH_Mesh::IsNotConformAllowed"); + MESSAGE("SMESH_Mesh::IsNotConformAllowed"); static SMESH_HypoFilter filter( SMESH_HypoFilter::HasName( "NotConformAllowed" )); return GetHypothesis( _meshDS->ShapeToMesh(), filter, false ); diff --git a/src/SMESH/SMESH_MeshEditor.cxx b/src/SMESH/SMESH_MeshEditor.cxx index efa01a4c2..395be58ac 100644 --- a/src/SMESH/SMESH_MeshEditor.cxx +++ b/src/SMESH/SMESH_MeshEditor.cxx @@ -5219,13 +5219,12 @@ void SMESH_MeshEditor::makeWalls (TNodeOfNodeListMap & mapNewNodes, 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() ) @@ -6816,9 +6815,8 @@ SMESH_MeshEditor::PGroupIDs SMESH_MeshEditor::Offset( TIDSortedElemSet & theElem 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() ); diff --git a/src/SMESH/SMESH_MesherHelper.cxx b/src/SMESH/SMESH_MesherHelper.cxx index 28ef9ae55..af658f2aa 100644 --- a/src/SMESH/SMESH_MesherHelper.cxx +++ b/src/SMESH/SMESH_MesherHelper.cxx @@ -3323,9 +3323,9 @@ double SMESH_MesherHelper::GetAngle( const TopoDS_Edge & theE1, 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; } } @@ -3745,9 +3745,7 @@ namespace { // Structures used by FixQuadraticElements() 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 ); @@ -3861,11 +3859,8 @@ namespace { // Structures used by FixQuadraticElements() else _normal.SetCoord(1e-33,0,0); -#ifdef _DEBUG_ - _face = face; -#else - (void)face; // unused in release mode -#endif + if (SALOME::VerbosityActivated()) + _face = face; } //================================================================================ /*! @@ -4963,12 +4958,11 @@ void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& compError, 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 @@ -4979,9 +4973,8 @@ void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& compError, 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); @@ -4996,10 +4989,9 @@ void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& compError, } } // fix nodes on geom faces -#ifdef _DEBUG_ - int nbfaces = nbSolids; - nbfaces = faces.Extent(); /*avoid "unused varianbles": */ nbfaces++, nbfaces--; -#endif + + int nbfaces = faces.Extent(); + for ( TopTools_MapIteratorOfMapOfShape fIt( faces ); fIt.More(); fIt.Next() ) { MESSAGE("FIX FACE " << nbfaces-- << " #" << GetMeshDS()->ShapeToIndex(fIt.Key())); MSG("FIX FACE " << nbfaces-- << " #" << GetMeshDS()->ShapeToIndex(fIt.Key())); @@ -5102,13 +5094,15 @@ void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& compError, // 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 ) @@ -5340,20 +5334,22 @@ void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& compError, 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: "<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: "<Move( move, /*sum=*/false, /*is2dFixed=*/true ); } MSG( "Move " << (*link1)->_mediumNode->GetID() << " following " @@ -5588,8 +5584,7 @@ void SMESH_MesherHelper::WriteShape(const TopoDS_Shape& s) { 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; } diff --git a/src/SMESH/SMESH_Pattern.cxx b/src/SMESH/SMESH_Pattern.cxx index 6dd11d6d9..60b82c1fd 100644 --- a/src/SMESH/SMESH_Pattern.cxx +++ b/src/SMESH/SMESH_Pattern.cxx @@ -4925,11 +4925,12 @@ list< SMESH_Pattern::TPoint* > & SMESH_Pattern::getShapePoints(const int theShap 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() { -#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; + } } //======================================================================= diff --git a/src/SMESHClient/SMESH_Client.cxx b/src/SMESHClient/SMESH_Client.cxx index 1cb045681..7f84e6555 100644 --- a/src/SMESHClient/SMESH_Client.cxx +++ b/src/SMESHClient/SMESH_Client.cxx @@ -59,12 +59,6 @@ } #endif -#ifdef _DEBUG_ -static int MYDEBUG = 0; -#else -static int MYDEBUG = 0; -#endif - namespace { using std::runtime_error; @@ -829,19 +823,19 @@ SMESH_Client::SMESH_Client(CORBA::ORB_ptr theORB, mySMESHDSMesh(NULL), mySMDSMesh(NULL) { - if ( MYDEBUG ) MESSAGE("SMESH_Client::SMESH_Client"); + MESSAGE("SMESH_Client::SMESH_Client"); myMeshServer->Register(); CORBA::Boolean anIsEmbeddedMode; GetSMESHGen(theORB,anIsEmbeddedMode); if(anIsEmbeddedMode){ - if ( MYDEBUG ) MESSAGE("Info: The same process, update mesh by pointer "); + MESSAGE("Info: The same process, update mesh by pointer "); // just set client mesh pointer to server mesh pointer //SMESH_Mesh* aMesh = reinterpret_cast(theMesh->GetMeshPtr()); CORBA::LongLong pointeur = theMesh->GetMeshPtr(); - if( MYDEBUG ) MESSAGE("SMESH_Client::SMESH_Client pointeur "< (pointeur); - if ( MYDEBUG ) MESSAGE("SMESH_Client::SMESH_Client aMesh "<GetMeshDS()->IsEmbeddedMode()){ if(anIsEmbeddedMode){ mySMESHDSMesh = aMesh->GetMeshDS(); @@ -899,18 +893,18 @@ SMESH_Client::Update(bool theIsClear) bool anIsModified = true; if(mySMESHDSMesh) { - if ( MYDEBUG ) MESSAGE("Update mySMESHDSMesh"); + MESSAGE("Update mySMESHDSMesh"); SMESHDS_Script* aScript = mySMESHDSMesh->GetScript(); anIsModified = aScript->IsModified(); aScript->SetModified(false); } else { - if ( MYDEBUG ) MESSAGE("Update CORBA"); + MESSAGE("Update CORBA"); SMESH::log_array_var aSeq = myMeshServer->GetLog( theIsClear ); CORBA::Long aLength = aSeq->length(); anIsModified = aLength > 0; - if ( MYDEBUG ) MESSAGE( "Update: length of the script is "<NbNodes() = "<NbNodes()); MESSAGE("Update - mySMDSMesh->Nb0DElements() = "<Nb0DElements()); diff --git a/src/SMESHDS/SMESHDS_GroupBase.cxx b/src/SMESHDS/SMESHDS_GroupBase.cxx index fa3a10d0a..be09123ae 100644 --- a/src/SMESHDS/SMESHDS_GroupBase.cxx +++ b/src/SMESHDS/SMESHDS_GroupBase.cxx @@ -184,9 +184,9 @@ void SMESHDS_GroupBase::SetColorGroup(int theColorGroup) if ( aR < 0. || aR > 1. || // PAL19395 aG < 0. || aG > 1. || aB < 0. || aB > 1. ) -// #ifdef _DEBUG_ -// cout << "SMESHDS_GroupBase::SetColorGroup("<setVisible(1); gBSphere->setVisible(0); gBCone->setVisible(0); @@ -555,7 +555,7 @@ void SMESH_CreateBoundaryAn::SetCylinder() void SMESH_CreateBoundaryAn::SetSphere() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetSphere") + MESSAGE("Debut de SetSphere"); gBCylindre->setVisible(0); gBSphere->setVisible(1); gBCone->setVisible(0); @@ -570,7 +570,7 @@ void SMESH_CreateBoundaryAn::SetSphere() void SMESH_CreateBoundaryAn::SetConeR() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetConeR") + MESSAGE("Debut de SetConeR"); // // Stockage et conversion des valeurs si elles ont change if ((_BoundaryAnXaxisCone != SpinBox_Cone_X1->value()) || @@ -581,7 +581,7 @@ void SMESH_CreateBoundaryAn::SetConeR() (_BoundaryAnZorigCone != SpinBox_Cone_Z2->value()) || (_BoundaryAngle != SpinBox_Cone_V1->value()) ) { - MESSAGE("Stockage et conversion") + MESSAGE("Stockage et conversion"); _BoundaryAnXaxisCone = SpinBox_Cone_X1->value() ; _BoundaryAnYaxisCone = SpinBox_Cone_Y1->value() ; _BoundaryAnZaxisCone = SpinBox_Cone_Z1->value() ; @@ -624,7 +624,7 @@ void SMESH_CreateBoundaryAn::SetConeR() void SMESH_CreateBoundaryAn::SetConeA() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetConeA") + MESSAGE("Debut de SetConeA"); // Stockage et conversion des valeurs si elles ont change if ((_BoundaryAnXcone1 != SpinBox_Cone_X1->value()) || (_BoundaryAnYcone1 != SpinBox_Cone_Y1->value()) || @@ -635,7 +635,7 @@ void SMESH_CreateBoundaryAn::SetConeA() (_BoundaryAnZcone2 != SpinBox_Cone_Z2->value()) || (_BoundaryAnRayon2 != SpinBox_Cone_V2->value()) ) { - MESSAGE("Stockage et conversion") + MESSAGE("Stockage et conversion"); _BoundaryAnXcone1 = SpinBox_Cone_X1->value() ; _BoundaryAnYcone1 = SpinBox_Cone_Y1->value() ; _BoundaryAnZcone1 = SpinBox_Cone_Z1->value() ; @@ -678,7 +678,7 @@ void SMESH_CreateBoundaryAn::SetConeA() void SMESH_CreateBoundaryAn::SetCone() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetCone") + MESSAGE("Debut de SetCone"); gBCylindre->setVisible(0); gBSphere->setVisible(0); gBCone->setVisible(1); @@ -700,7 +700,7 @@ void SMESH_CreateBoundaryAn::SetCone() void SMESH_CreateBoundaryAn::SetTore() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetTore") + MESSAGE("Debut de SetTore"); gBCylindre->setVisible(0); gBSphere->setVisible(0); gBCone->setVisible(0); @@ -718,7 +718,7 @@ void SMESH_CreateBoundaryAn::convertRayonAngle(int option) // par deux rayons ou avec un axe et un angle. // Voir sfcoi1 de HOMARD { - MESSAGE("Debut de convertRayonAngle, option = "< THypothesisDataMap; @@ -497,7 +491,7 @@ namespace SMESH SMESHGUI_GenericHypothesisCreator* GetHypothesisCreator(const QString& aHypType) { - if(MYDEBUG) MESSAGE("Get HypothesisCreator for " << aHypType.toLatin1().data()); + MESSAGE("Get HypothesisCreator for " << aHypType.toLatin1().data()); SMESHGUI_GenericHypothesisCreator* aCreator = 0; @@ -522,7 +516,7 @@ namespace SMESH // 3. Load Client Plugin Library try { // load plugin library - if(MYDEBUG) MESSAGE("Loading client meshers plugin library ..."); + MESSAGE("Loading client meshers plugin library ..."); #ifdef WIN32 #ifdef UNICODE LPTSTR path = new TCHAR[aClientLibName.length() + 1]; @@ -552,21 +546,21 @@ namespace SMESH } else { // get method, returning hypothesis creator - if(MYDEBUG) MESSAGE("Find GetHypothesisCreator() method ..."); + MESSAGE("Find GetHypothesisCreator() method ..."); typedef SMESHGUI_GenericHypothesisCreator* (*GetHypothesisCreator) \ ( const QString& ); GetHypothesisCreator procHandle = (GetHypothesisCreator)GetProc(libHandle, "GetHypothesisCreator"); if (!procHandle) { - if(MYDEBUG) MESSAGE("bad hypothesis client plugin library"); + MESSAGE("bad hypothesis client plugin library"); UnLoadLib(libHandle); } else { // get hypothesis creator - if(MYDEBUG) MESSAGE("Get Hypothesis Creator for " << aHypType.toLatin1().data()); + MESSAGE("Get Hypothesis Creator for " << aHypType.toLatin1().data()); aCreator = procHandle( aHypType ); if (!aCreator) { - if(MYDEBUG) MESSAGE("no such a hypothesis in this plugin"); + MESSAGE("no such a hypothesis in this plugin"); } else { // map hypothesis creator to a hypothesis name @@ -595,7 +589,7 @@ namespace SMESH const QString& aHypName, const bool /*isAlgo*/) { - if(MYDEBUG) MESSAGE("Create " << aHypType.toLatin1().data() << + MESSAGE("Create " << aHypType.toLatin1().data() << " with name " << aHypName.toLatin1().data()); HypothesisData* aHypData = GetHypothesisData(aHypType); QString aServLib = aHypData->ServerLibName; @@ -641,7 +635,7 @@ namespace SMESH bool AddHypothesisOnMesh (SMESH::SMESH_Mesh_ptr aMesh, SMESH::SMESH_Hypothesis_ptr aHyp) { - if(MYDEBUG) MESSAGE ("SMESHGUI::AddHypothesisOnMesh"); + MESSAGE ("SMESHGUI::AddHypothesisOnMesh"); int res = SMESH::HYP_UNKNOWN_FATAL; SUIT_OverrideCursor wc; @@ -669,7 +663,7 @@ namespace SMESH bool AddHypothesisOnSubMesh (SMESH::SMESH_subMesh_ptr aSubMesh, SMESH::SMESH_Hypothesis_ptr aHyp) { - if(MYDEBUG) MESSAGE("SMESHGUI::AddHypothesisOnSubMesh() "); + MESSAGE("SMESHGUI::AddHypothesisOnSubMesh() "); int res = SMESH::HYP_UNKNOWN_FATAL; SUIT_OverrideCursor wc; @@ -797,7 +791,7 @@ namespace SMESH if (SO_Hypothesis) { SObjectList listSO = SMESH::getStudy()->FindDependances(SO_Hypothesis); - if(MYDEBUG) MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): dependency number ="< 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 } } diff --git a/src/SMESHUtils/SMESH_MAT2d.cxx b/src/SMESHUtils/SMESH_MAT2d.cxx index 944c9a9eb..43a44394c 100644 --- a/src/SMESHUtils/SMESH_MAT2d.cxx +++ b/src/SMESHUtils/SMESH_MAT2d.cxx @@ -46,11 +46,9 @@ #include #include -#ifdef _DEBUG_ -//#define _MYDEBUG_ #include "SMESH_File.hxx" #include "SMESH_Comment.hxx" -#endif +#include "utilities.h" using namespace std; using boost::polygon::x; @@ -155,12 +153,13 @@ namespace // } // ------------------------------------------------------------------------------------- -#ifdef _MYDEBUG_ + // writes segments into a txt file readable by voronoi_visualizer void inSegmentsToFile( vector< InSegment>& inSegments) { - if ( inSegments.size() > 1000 ) + if (inSegments.size() > 1000 || !SALOME::VerbosityActivated()) return; + const char* fileName = "/misc/dn25/salome/eap/salome/misc/Code/C++/MAdebug.txt"; const char* user = getenv("USER"); if ( !user || strcmp( user, "eap" )) return; @@ -219,11 +218,6 @@ namespace } while (edge != cell->incident_edge()); } } -#else - #define inSegmentsToFile(arg) {} - //void dumpEdge( const TVDEdge* edge ) {} - //void dumpCell( const TVDCell* cell ) {} -#endif } // ------------------------------------------------------------------------------------- @@ -420,9 +414,9 @@ namespace void bndSegsToMesh( const vector< vector< BndSeg > >& bndSegsPerEdge ) { - if ( bndSegsPerEdge.empty() ) + if (bndSegsPerEdge.empty() || !SALOME::VerbosityActivated()) return; -#ifdef _MYDEBUG_ + if ( !getenv("bndSegsToMesh")) return; map< const TVDVertex *, int > v2Node; map< const TVDVertex *, int >::iterator v2n; @@ -472,7 +466,6 @@ namespace text << "\n"; file.write( text.c_str(), text.size() ); cout << fileName << endl; -#endif } //================================================================================ diff --git a/src/SMESHUtils/SMESH_MGLicenseKeyGen.cxx b/src/SMESHUtils/SMESH_MGLicenseKeyGen.cxx index 1b5655e0c..01a926b24 100644 --- a/src/SMESHUtils/SMESH_MGLicenseKeyGen.cxx +++ b/src/SMESHUtils/SMESH_MGLicenseKeyGen.cxx @@ -309,7 +309,7 @@ namespace buffer[length] = '\0'; infile.read(const_cast( buffer.get() ),length); - MESSAGE( buffer.get() ) + MESSAGE( buffer.get() ); } { SMESH_File redirectFile( redirect, /*open=*/false ); diff --git a/src/SMESHUtils/SMESH_MeshAlgos.cxx b/src/SMESHUtils/SMESH_MeshAlgos.cxx index b12d6065d..92d1574c5 100644 --- a/src/SMESHUtils/SMESH_MeshAlgos.cxx +++ b/src/SMESHUtils/SMESH_MeshAlgos.cxx @@ -286,10 +286,8 @@ namespace // Utils used in SMESH_ElementSearcherImpl::FindElementsByPoint() 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() ) diff --git a/src/SMESHUtils/SMESH_Offset.cxx b/src/SMESHUtils/SMESH_Offset.cxx index 638bb193b..4eba92a7e 100644 --- a/src/SMESHUtils/SMESH_Offset.cxx +++ b/src/SMESHUtils/SMESH_Offset.cxx @@ -2019,12 +2019,15 @@ namespace SMESH_MeshAlgos { 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] ))) diff --git a/src/SMESHUtils/SMESH_TryCatch.cxx b/src/SMESHUtils/SMESH_TryCatch.cxx index b808a791b..49bfe9c53 100644 --- a/src/SMESHUtils/SMESH_TryCatch.cxx +++ b/src/SMESHUtils/SMESH_TryCatch.cxx @@ -41,11 +41,8 @@ const char* SMESH::returnError(const char* txt) 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; } // ------------------------------------------------------------------ diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx index 03a600094..9b622a1a9 100644 --- a/src/SMESH_I/SMESH_2smeshpy.cxx +++ b/src/SMESH_I/SMESH_2smeshpy.cxx @@ -932,11 +932,13 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand "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") { @@ -953,11 +955,13 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand "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 "" diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx index 263454015..944251e83 100644 --- a/src/SMESH_I/SMESH_Gen_i.cxx +++ b/src/SMESH_I/SMESH_Gen_i.cxx @@ -161,12 +161,6 @@ using SMESH::TVar; #define NUM_TMP_FILES 2 -#ifdef _DEBUG_ -static int MYDEBUG = 0; -#else -static int MYDEBUG = 0; -#endif - // Static variables definition GEOM::GEOM_Gen_var SMESH_Gen_i::myGeomGen; CORBA::ORB_var SMESH_Gen_i::myOrb; @@ -455,7 +449,7 @@ GenericHypothesisCreator_i* SMESH_Gen_i::getHypothesisCreator(const char* theHyp thePlatformLibName = aPlatformLibName; Unexpect aCatch(SALOME_SalomeException); - if(MYDEBUG) MESSAGE( "Create Hypothesis <" << theHypName << "> from " << aPlatformLibName); + MESSAGE( "Create Hypothesis <" << theHypName << "> from " << aPlatformLibName); typedef GenericHypothesisCreator_i* (*GetHypothesisCreator)(const char* ); GenericHypothesisCreator_i* aCreator; @@ -465,7 +459,7 @@ GenericHypothesisCreator_i* SMESH_Gen_i::getHypothesisCreator(const char* theHyp if (myHypCreatorMap.find(string(theHypName)) == myHypCreatorMap.end()) { // load plugin library - if(MYDEBUG) MESSAGE("Loading server meshers plugin library ..."); + MESSAGE("Loading server meshers plugin library ..."); #ifdef WIN32 # ifdef UNICODE const wchar_t* path = Kernel_Utils::decode_s(aPlatformLibName); @@ -491,7 +485,7 @@ GenericHypothesisCreator_i* SMESH_Gen_i::getHypothesisCreator(const char* theHyp } // get method, returning hypothesis creator - if(MYDEBUG) MESSAGE("Find GetHypothesisCreator() method ..."); + MESSAGE("Find GetHypothesisCreator() method ..."); GetHypothesisCreator procHandle = (GetHypothesisCreator)GetProc( libHandle, "GetHypothesisCreator" ); if (!procHandle) @@ -502,7 +496,7 @@ GenericHypothesisCreator_i* SMESH_Gen_i::getHypothesisCreator(const char* theHyp } // get hypothesis creator - if(MYDEBUG) MESSAGE("Get Hypothesis Creator for " << theHypName); + MESSAGE("Get Hypothesis Creator for " << theHypName); aCreator = procHandle(theHypName); if (!aCreator) { @@ -553,8 +547,7 @@ SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::createHypothesis(const char* theHypName // activate the CORBA servant of hypothesis hypothesis_i = myHypothesis_i->_this(); int nextId = RegisterObject( hypothesis_i ); - if(MYDEBUG) { MESSAGE( "Add hypo to map with id = "<< nextId ); } - else { (void)nextId; } // avoid "unused variable" warning in release mode + MESSAGE( "Add hypo to map with id = "<< nextId ); } return hypothesis_i._retn(); } @@ -570,21 +563,21 @@ SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::createHypothesis(const char* theHypName SMESH::SMESH_Mesh_ptr SMESH_Gen_i::createMesh() { Unexpect aCatch(SALOME_SalomeException); - if(MYDEBUG) MESSAGE( "SMESH_Gen_i::createMesh" ); + MESSAGE( "SMESH_Gen_i::createMesh" ); // Get or create the GEOM_Client instance try { // create a new mesh object servant, store it in a map in study context SMESH_Mesh_i* meshServant = new SMESH_Mesh_i( GetPOA(), this ); // create a new mesh object - if(MYDEBUG) MESSAGE("myIsEmbeddedMode " << myIsEmbeddedMode); + MESSAGE("myIsEmbeddedMode " << myIsEmbeddedMode); meshServant->SetImpl( myGen.CreateMesh( myIsEmbeddedMode )); // activate the CORBA servant of Mesh SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow( meshServant->_this() ); int nextId = RegisterObject( mesh ); - if(MYDEBUG) { MESSAGE( "Add mesh to map with id = "<< nextId); } - else { (void)nextId; } // avoid "unused variable" warning in release mode + MESSAGE( "Add mesh to map with id = "<< nextId); + return mesh._retn(); } catch (SALOME_Exception& S_ex) { @@ -641,14 +634,19 @@ void SMESH_Gen_i::SetEmbeddedMode( CORBA::Boolean theMode ) 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 @@ -1200,7 +1198,7 @@ char* SMESH_Gen_i::GetOption(const char* name) SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMesh( GEOM::GEOM_Object_ptr theShapeObject ) { Unexpect aCatch(SALOME_SalomeException); - if(MYDEBUG) MESSAGE( "SMESH_Gen_i::CreateMesh" ); + MESSAGE( "SMESH_Gen_i::CreateMesh" ); // create mesh SMESH::SMESH_Mesh_var mesh = this->createMesh(); // set shape @@ -1234,7 +1232,7 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMesh( GEOM::GEOM_Object_ptr theShapeObj SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateEmptyMesh() { Unexpect aCatch(SALOME_SalomeException); - if(MYDEBUG) MESSAGE( "SMESH_Gen_i::CreateMesh" ); + MESSAGE( "SMESH_Gen_i::CreateMesh" ); // create mesh SMESH::SMESH_Mesh_var mesh = this->createMesh(); @@ -1586,7 +1584,7 @@ CORBA::Boolean SMESH_Gen_i::IsReadyToCompute( SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theShapeObject ) { Unexpect aCatch(SALOME_SalomeException); - if(MYDEBUG) MESSAGE( "SMESH_Gen_i::IsReadyToCompute" ); + MESSAGE( "SMESH_Gen_i::IsReadyToCompute" ); if ( CORBA::is_nil( theShapeObject ) ) THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", @@ -1660,7 +1658,7 @@ SMESH::compute_error_array* SMESH_Gen_i::GetComputeErrors( SMESH::SMESH_Mesh_ptr GEOM::GEOM_Object_ptr theSubObject ) { Unexpect aCatch(SALOME_SalomeException); - if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetComputeErrors()" ); + MESSAGE( "SMESH_Gen_i::GetComputeErrors()" ); if ( CORBA::is_nil( theSubObject ) && theMesh->HasShapeToMesh()) THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", SALOME::BAD_PARAM ); @@ -1734,7 +1732,7 @@ SMESH_Gen_i::GetBadInputElements( SMESH::SMESH_Mesh_ptr theMesh, CORBA::Short theSubShapeID ) { Unexpect aCatch(SALOME_SalomeException); - if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetBadInputElements()" ); + MESSAGE( "SMESH_Gen_i::GetBadInputElements()" ); if ( CORBA::is_nil( theMesh ) ) THROW_SALOME_CORBA_EXCEPTION( "bad Mesh reference",SALOME::BAD_PARAM ); @@ -1855,7 +1853,7 @@ SMESH::algo_error_array* SMESH_Gen_i::GetAlgoState( SMESH::SMESH_Mesh_ptr theMes GEOM::GEOM_Object_ptr theSubObject ) { Unexpect aCatch(SALOME_SalomeException); - if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetAlgoState()" ); + MESSAGE( "SMESH_Gen_i::GetAlgoState()" ); if ( CORBA::is_nil( theSubObject ) && theMesh->HasShapeToMesh()) THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", SALOME::BAD_PARAM ); @@ -1916,7 +1914,7 @@ SMESH_Gen_i::GetSubShapesId( GEOM::GEOM_Object_ptr theMainShapeObject, const SMESH::object_array& theListOfSubShapeObject ) { Unexpect aCatch(SALOME_SalomeException); - if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetSubShapesId" ); + MESSAGE( "SMESH_Gen_i::GetSubShapesId" ); SMESH::long_array_var shapesId = new SMESH::long_array; set setId; @@ -1943,19 +1941,19 @@ SMESH_Gen_i::GetSubShapesId( GEOM::GEOM_Object_ptr theMainShapeObject, { const TopoDS_Face& F = TopoDS::Face(exp.Current()); setId.insert(myIndexToShape.FindIndex(F)); - if(MYDEBUG) SCRUTE(myIndexToShape.FindIndex(F)); + SCRUTE(myIndexToShape.FindIndex(F)); } for (TopExp_Explorer exp(locShape,TopAbs_EDGE); exp.More(); exp.Next()) { const TopoDS_Edge& E = TopoDS::Edge(exp.Current()); setId.insert(myIndexToShape.FindIndex(E)); - if(MYDEBUG) SCRUTE(myIndexToShape.FindIndex(E)); + SCRUTE(myIndexToShape.FindIndex(E)); } for (TopExp_Explorer exp(locShape,TopAbs_VERTEX); exp.More(); exp.Next()) { const TopoDS_Vertex& V = TopoDS::Vertex(exp.Current()); setId.insert(myIndexToShape.FindIndex(V)); - if(MYDEBUG) SCRUTE(myIndexToShape.FindIndex(V)); + SCRUTE(myIndexToShape.FindIndex(V)); } } shapesId->length(setId.size()); @@ -1963,9 +1961,9 @@ SMESH_Gen_i::GetSubShapesId( GEOM::GEOM_Object_ptr theMainShapeObject, int i=0; for (iind = setId.begin(); iind != setId.end(); iind++) { - if(MYDEBUG) SCRUTE((*iind)); + SCRUTE((*iind)); shapesId[i] = (*iind); - if(MYDEBUG) SCRUTE(shapesId[i]); + SCRUTE(shapesId[i]); i++; } } @@ -1990,7 +1988,7 @@ CORBA::Boolean SMESH_Gen_i::Compute( SMESH::SMESH_Mesh_ptr theMesh, { //MEMOSTAT; Unexpect aCatch(SALOME_SalomeException); - if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Compute" ); + MESSAGE( "SMESH_Gen_i::Compute" ); if ( CORBA::is_nil( theShapeObject ) && theMesh->HasShapeToMesh()) THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", @@ -2085,7 +2083,7 @@ SMESH::MeshPreviewStruct* SMESH_Gen_i::Precompute( SMESH::SMESH_Mesh_ptr theMesh SMESH::long_array& theShapesId) { Unexpect aCatch(SALOME_SalomeException); - if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Precompute" ); + MESSAGE( "SMESH_Gen_i::Precompute" ); if ( CORBA::is_nil( theShapeObject ) && theMesh->HasShapeToMesh()) THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", @@ -2271,7 +2269,7 @@ SMESH::smIdType_array* SMESH_Gen_i::Evaluate(SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theShapeObject) { Unexpect aCatch(SALOME_SalomeException); - if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Evaluate" ); + MESSAGE( "SMESH_Gen_i::Evaluate" ); if ( CORBA::is_nil( theShapeObject ) && theMesh->HasShapeToMesh()) THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", SALOME::BAD_PARAM ); @@ -2872,16 +2870,16 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateDualMesh(SMESH::SMESH_IDSource_ptr mesh if (PyErr_Occurred()) { // Restrieving python error - MESSAGE("Catching error") + MESSAGE("Catching error"); PyObject *errtype, *errvalue, *traceback; PyErr_Fetch(&errtype, &errvalue, &traceback); if(errvalue != NULL) { - MESSAGE("Error has a value") + MESSAGE("Error has a value"); PyObject *s = PyObject_Str(errvalue); Py_ssize_t size; std::string msg = PyUnicode_AsUTF8AndSize(s, &size); msg = "Issue with the execution of create_dual_mesh:\n"+msg; - MESSAGE("throwing exception") + MESSAGE("throwing exception"); // We need to deactivate the GIL before throwing the exception PyGILState_Release(gstate); THROW_SALOME_CORBA_EXCEPTION(msg.c_str(), SALOME::INTERNAL_ERROR ); @@ -5221,7 +5219,7 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent, SALOMEDS::TMPFile* SMESH_Gen_i::SaveASCII( SALOMEDS::SComponent_ptr theComponent, const char* theURL, bool isMultiFile ) { - if(MYDEBUG) MESSAGE( "SMESH_Gen_i::SaveASCII" ); + MESSAGE( "SMESH_Gen_i::SaveASCII" ); SALOMEDS::TMPFile_var aStreamFile = Save( theComponent, theURL, isMultiFile ); return aStreamFile._retn(); @@ -5361,7 +5359,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent, size = aDataset->GetSize(); char* libname_str = new char[ size ]; aDataset->ReadFromDisk( libname_str ); - if(MYDEBUG) SCRUTE( libname_str ); + SCRUTE( libname_str ); libname = string( libname_str ); delete [] libname_str; aDataset->CloseOnDisk(); @@ -5383,7 +5381,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent, // --> restore hypothesis from data if ( id > 0 && !hypname.empty()/* && !hypdata.empty()*/ ) { // VSR : persistent data can be empty - if(MYDEBUG) MESSAGE("VSR - load hypothesis : id = " << id << + MESSAGE("VSR - load hypothesis : id = " << id << ", name = " << hypname.c_str() << ", persistent string = " << hypdata.c_str()); SMESH::SMESH_Hypothesis_var myHyp; @@ -5403,7 +5401,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent, myStudyContext->mapOldToNew( id, newId ); } else - if(MYDEBUG) MESSAGE( "VSR - SMESH_Gen::Load - can't get servant" ); + MESSAGE( "VSR - SMESH_Gen::Load - can't get servant" ); } } } @@ -5460,7 +5458,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent, size = aDataset->GetSize(); char* libname_str = new char[ size ]; aDataset->ReadFromDisk( libname_str ); - if(MYDEBUG) SCRUTE( libname_str ); + SCRUTE( libname_str ); libname = string( libname_str ); delete [] libname_str; aDataset->CloseOnDisk(); @@ -5472,7 +5470,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent, size = aDataset->GetSize(); char* hypdata_str = new char[ size ]; aDataset->ReadFromDisk( hypdata_str ); - if(MYDEBUG) SCRUTE( hypdata_str ); + SCRUTE( hypdata_str ); hypdata = string( hypdata_str ); delete [] hypdata_str; aDataset->CloseOnDisk(); @@ -5483,7 +5481,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent, // --> restore algorithm from data if ( id > 0 && !hypname.empty()/* && !hypdata.empty()*/ ) { // VSR : persistent data can be empty - if(MYDEBUG) MESSAGE("VSR - load algo : id = " << id << + MESSAGE("VSR - load algo : id = " << id << ", name = " << hypname.c_str() << ", persistent string = " << hypdata.c_str()); SMESH::SMESH_Hypothesis_var myHyp; @@ -5507,7 +5505,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent, myStudyContext->mapOldToNew( id, newId ); } else - if(MYDEBUG) MESSAGE( "VSR - SMESH_Gen::Load - can't get servant" ); + MESSAGE( "VSR - SMESH_Gen::Load - can't get servant" ); } } } @@ -5536,7 +5534,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent, int aNbObjects = aTopGroup->nInternalObjects(); if ( aNbObjects > 0 ) { // create mesh - if(MYDEBUG) MESSAGE( "VSR - load mesh : id = " << id ); + MESSAGE( "VSR - load mesh : id = " << id ); SMESH::SMESH_Mesh_var myNewMesh = this->createMesh(); SMESH_Mesh_i* myNewMeshImpl = dynamic_cast( GetServant( myNewMesh ).in() ); if ( !myNewMeshImpl ) @@ -5672,7 +5670,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent, aGroup->OpenOnDisk(); // get number of applied algorithms int aNbSubObjects = aGroup->nInternalObjects(); - if(MYDEBUG) MESSAGE( "VSR - number of applied algos " << aNbSubObjects ); + MESSAGE( "VSR - number of applied algos " << aNbSubObjects ); for ( int j = 0; j < aNbSubObjects; j++ ) { char name_dataset[ HDF_NAME_MAX_LEN+1 ]; aGroup->InternalObjectIndentify( j, name_dataset ); @@ -6175,7 +6173,7 @@ bool SMESH_Gen_i::LoadASCII( SALOMEDS::SComponent_ptr theComponent, const SALOMEDS::TMPFile& theStream, const char* theURL, bool isMultiFile ) { - if(MYDEBUG) MESSAGE( "SMESH_Gen_i::LoadASCII" ); + MESSAGE( "SMESH_Gen_i::LoadASCII" ); return Load( theComponent, theStream, theURL, isMultiFile ); //before call main ::Load method it's need for decipher text format to @@ -6212,7 +6210,7 @@ bool SMESH_Gen_i::LoadASCII( SALOMEDS::SComponent_ptr theComponent, void SMESH_Gen_i::Close( SALOMEDS::SComponent_ptr theComponent ) { - if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Close" ); + MESSAGE( "SMESH_Gen_i::Close" ); // Clear study contexts data myStudyContext->Clear(); @@ -6236,7 +6234,7 @@ void SMESH_Gen_i::Close( SALOMEDS::SComponent_ptr theComponent ) char* SMESH_Gen_i::ComponentDataType() { - if(MYDEBUG) MESSAGE( "SMESH_Gen_i::ComponentDataType" ); + MESSAGE( "SMESH_Gen_i::ComponentDataType" ); return CORBA::string_dup( "SMESH" ); } @@ -6254,12 +6252,12 @@ char* SMESH_Gen_i::IORToLocalPersistentID( SALOMEDS::SObject_ptr /*theSObject*/, CORBA::Boolean /*isMultiFile*/, CORBA::Boolean /*isASCII*/ ) { - if(MYDEBUG) MESSAGE( "SMESH_Gen_i::IORToLocalPersistentID" ); + MESSAGE( "SMESH_Gen_i::IORToLocalPersistentID" ); if ( myStudyContext && strcmp( IORString, "" ) != 0 ) { int anId = myStudyContext->findId( IORString ); if ( anId ) { - if(MYDEBUG) MESSAGE( "VSR " << anId ) + MESSAGE( "VSR " << anId ); char strId[ 20 ]; sprintf( strId, "%d", anId ); return CORBA::string_dup( strId ); @@ -6281,7 +6279,7 @@ char* SMESH_Gen_i::LocalPersistentIDToIOR( SALOMEDS::SObject_ptr /*theSObject*/, CORBA::Boolean /*isMultiFile*/, CORBA::Boolean /*isASCII*/ ) { - if(MYDEBUG) MESSAGE( "SMESH_Gen_i::LocalPersistentIDToIOR(): id = " << aLocalPersistentID ); + MESSAGE( "SMESH_Gen_i::LocalPersistentIDToIOR(): id = " << aLocalPersistentID ); if ( myStudyContext && strcmp( aLocalPersistentID, "" ) != 0 ) { int anId = atoi( aLocalPersistentID ); @@ -6645,8 +6643,8 @@ CORBA::Boolean SMESH_Gen_i::IsApplicable ( const char* theAlgoType, 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; } diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx index 0896c5dc2..bbf5d6d02 100644 --- a/src/SMESH_I/SMESH_Gen_i_1.cxx +++ b/src/SMESH_I/SMESH_Gen_i_1.cxx @@ -46,12 +46,6 @@ #include -#ifdef _DEBUG_ -static int MYDEBUG = 0; -#else -static int MYDEBUG = 0; -#endif - using namespace std; //============================================================================= @@ -162,7 +156,7 @@ long SMESH_Gen_i::GetBallElementsGroupsTag() bool SMESH_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR) { - if(MYDEBUG) MESSAGE("CanPublishInStudy - "<_is_nil() ) return true; - if(MYDEBUG) MESSAGE("CanPublishInStudy--CANT"); + MESSAGE("CanPublishInStudy--CANT"); return false; } @@ -501,7 +495,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr /*theSOb return aSO._retn(); if ( CORBA::is_nil( theIOR )) return aSO._retn(); - if(MYDEBUG) MESSAGE("PublishInStudy"); + MESSAGE("PublishInStudy"); // Publishing a mesh SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( theIOR ); @@ -528,7 +522,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr /*theSOb aMesh = aGroup->GetMesh(); aSO = PublishGroup( aMesh, aGroup, aShapeObject, theName ); } - if(MYDEBUG) MESSAGE("PublishInStudy_END"); + MESSAGE("PublishInStudy_END"); return aSO._retn(); } @@ -540,7 +534,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr /*theSOb SALOMEDS::SComponent_ptr SMESH_Gen_i::PublishComponent() { - if(MYDEBUG) MESSAGE("PublishComponent"); + MESSAGE("PublishComponent"); if ( !myIsEnablePublish ) return SALOMEDS::SComponent::_nil(); @@ -602,7 +596,7 @@ SALOMEDS::SComponent_ptr SMESH_Gen_i::PublishComponent() // (to support tree representation customization and drag-n-drop) useCaseBuilder->SetRootCurrent(); useCaseBuilder->Append( father ); // component object is added as the top level item - if(MYDEBUG) MESSAGE("PublishComponent--END"); + MESSAGE("PublishComponent--END"); return father._retn(); } @@ -619,7 +613,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SMESH::SMESH_Mesh_ptr theMesh, return SALOMEDS::SObject::_nil(); if ( CORBA::is_nil( theMesh )) return SALOMEDS::SObject::_nil(); - if(MYDEBUG) MESSAGE("PublishMesh--IN"); + MESSAGE("PublishMesh--IN"); // find or publish a mesh @@ -690,7 +684,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SMESH::SMESH_Mesh_ptr theMesh, } } - if(MYDEBUG) MESSAGE("PublishMesh_END"); + MESSAGE("PublishMesh_END"); return aMeshSO._retn(); } @@ -900,7 +894,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishHypothesis (SMESH::SMESH_Hypothesis_ptr theHyp, const char* theName) { - if(MYDEBUG) MESSAGE("PublishHypothesis"); + MESSAGE("PublishHypothesis"); if ( !myIsEnablePublish ) return SALOMEDS::SObject::_nil(); if (theHyp->_is_nil()) @@ -935,7 +929,7 @@ SMESH_Gen_i::PublishHypothesis (SMESH::SMESH_Hypothesis_ptr theHyp, SetName( aHypSO, theName, hypType.in() ); - if(MYDEBUG) MESSAGE("PublishHypothesis--END") + MESSAGE("PublishHypothesis--END"); return aHypSO._retn(); } @@ -1097,7 +1091,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::GetMeshOrSubmeshByShape (SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theShape) { - if(MYDEBUG) MESSAGE("GetMeshOrSubmeshByShape") + MESSAGE("GetMeshOrSubmeshByShape"); SALOMEDS::SObject_wrap aMeshOrSubMesh; if (theMesh->_is_nil() || ( theShape->_is_nil() && theMesh->HasShapeToMesh())) return aMeshOrSubMesh._retn(); @@ -1121,7 +1115,7 @@ SMESH_Gen_i::GetMeshOrSubmeshByShape (SMESH::SMESH_Mesh_ptr theMesh, aMeshOrSubMesh = ObjectToSObject( aSubMesh ); } } - if(MYDEBUG) MESSAGE("GetMeshOrSubmeshByShape--END") + MESSAGE("GetMeshOrSubmeshByShape--END"); return aMeshOrSubMesh._retn(); } @@ -1134,7 +1128,7 @@ bool SMESH_Gen_i::AddHypothesisToShape(SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theShape, SMESH::SMESH_Hypothesis_ptr theHyp) { - if(MYDEBUG) MESSAGE("AddHypothesisToShape") + MESSAGE("AddHypothesisToShape"); if (theMesh->_is_nil() || theHyp->_is_nil() || (theShape->_is_nil() && theMesh->HasShapeToMesh()) ) @@ -1175,7 +1169,7 @@ bool SMESH_Gen_i::AddHypothesisToShape(SMESH::SMESH_Mesh_ptr theMesh, addReference( AHR, theHyp ); - if(MYDEBUG) MESSAGE("AddHypothesisToShape--END") + MESSAGE("AddHypothesisToShape--END"); return true; } diff --git a/src/SMESH_I/SMESH_Homard_i.cxx b/src/SMESH_I/SMESH_Homard_i.cxx index a0e3c3613..89383d76b 100644 --- a/src/SMESH_I/SMESH_Homard_i.cxx +++ b/src/SMESH_I/SMESH_Homard_i.cxx @@ -591,9 +591,10 @@ void HOMARD_Cas_i::AddBoundaryGroup(const char* BoundaryName, const char* Group) // 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); diff --git a/src/SMESH_I/SMESH_Mesh_i.cxx b/src/SMESH_I/SMESH_Mesh_i.cxx index b307c7bbb..badd43640 100644 --- a/src/SMESH_I/SMESH_Mesh_i.cxx +++ b/src/SMESH_I/SMESH_Mesh_i.cxx @@ -96,12 +96,6 @@ #include "SMESH_TryCatch.hxx" // include after OCCT headers! -#ifdef _DEBUG_ -static int MYDEBUG = 0; -#else -static int MYDEBUG = 0; -#endif - using namespace std; using SMESH::TPythonDump; using SMESH::TVar; @@ -664,7 +658,7 @@ SMESH_Mesh_i::AddHypothesis(GEOM::GEOM_Object_ptr aSubShape, if ( prevNbMeshEnt > 0 /*newNbMeshEnt != prevNbMeshEnt*/ ) _gen_i->UpdateIcons( mesh ); } - if(MYDEBUG) MESSAGE( " AddHypothesis(): status = " << status ); + MESSAGE( " AddHypothesis(): status = " << status ); // Update Python script TPythonDump() << "status = " << mesh << ".AddHypothesis( " @@ -684,7 +678,7 @@ SMESH_Mesh_i::addHypothesis(GEOM::GEOM_Object_ptr aSubShape, SMESH::SMESH_Hypothesis_ptr anHyp, std::string* anErrorText) { - if(MYDEBUG) MESSAGE("addHypothesis"); + MESSAGE("addHypothesis"); if (CORBA::is_nil( aSubShape ) && HasShapeToMesh()) THROW_SALOME_CORBA_EXCEPTION("bad Sub-shape reference",SALOME::BAD_PARAM); @@ -770,7 +764,7 @@ SMESH_Hypothesis::Hypothesis_Status SMESH_Mesh_i::removeHypothesis(GEOM::GEOM_Object_ptr aSubShape, SMESH::SMESH_Hypothesis_ptr anHyp) { - if(MYDEBUG) MESSAGE("removeHypothesis()"); + MESSAGE("removeHypothesis()"); if (CORBA::is_nil( aSubShape ) && HasShapeToMesh()) THROW_SALOME_CORBA_EXCEPTION("bad Sub-shape reference", SALOME::BAD_PARAM); @@ -816,7 +810,7 @@ SMESH::ListOfHypothesis * SMESH_Mesh_i::GetHypothesisList(GEOM::GEOM_Object_ptr aSubShape) { Unexpect aCatch(SALOME_SalomeException); - if (MYDEBUG) MESSAGE("GetHypothesisList"); + MESSAGE("GetHypothesisList"); if (_impl->HasShapeToMesh() && CORBA::is_nil(aSubShape)) THROW_SALOME_CORBA_EXCEPTION("bad Sub-shape reference", SALOME::BAD_PARAM); @@ -856,7 +850,7 @@ SMESH_Mesh_i::GetHypothesisList(GEOM::GEOM_Object_ptr aSubShape) SMESH::submesh_array* SMESH_Mesh_i::GetSubMeshes() { Unexpect aCatch(SALOME_SalomeException); - if (MYDEBUG) MESSAGE("GetSubMeshes"); + MESSAGE("GetSubMeshes"); SMESH::submesh_array_var aList = new SMESH::submesh_array(); @@ -1220,7 +1214,7 @@ void SMESH_Mesh_i::RemoveGroupWithContents( SMESH::SMESH_GroupBase_ptr theGroup SMESH::ListOfGroups * SMESH_Mesh_i::GetGroups() { Unexpect aCatch(SALOME_SalomeException); - if (MYDEBUG) MESSAGE("GetGroups"); + MESSAGE("GetGroups"); SMESH::ListOfGroups_var aList = new SMESH::ListOfGroups(); @@ -3122,7 +3116,7 @@ SMESH::SMESH_Group_ptr SMESH_Mesh_i::ConvertToStandalone( SMESH::SMESH_GroupBase SMESH::SMESH_subMesh_ptr SMESH_Mesh_i::createSubMesh( GEOM::GEOM_Object_ptr theSubShapeObject ) { - if(MYDEBUG) MESSAGE( "createSubMesh" ); + MESSAGE( "createSubMesh" ); TopoDS_Shape myLocSubShape = _gen_i->GeomObjectToShape(theSubShapeObject); ::SMESH_subMesh * mySubMesh = _impl->GetSubMesh(myLocSubShape); int subMeshId = 0; @@ -3154,8 +3148,7 @@ SMESH::SMESH_subMesh_ptr SMESH_Mesh_i::createSubMesh( GEOM::GEOM_Object_ptr theS // register CORBA object for persistence int nextId = _gen_i->RegisterObject( subMesh ); - if(MYDEBUG) { MESSAGE( "Add submesh to map with id = "<< nextId); } - else { (void)nextId; } // avoid "unused variable" warning + MESSAGE( "Add submesh to map with id = "<< nextId); // to track changes of GEOM groups if ( subMeshId > 0 ) @@ -3291,8 +3284,7 @@ SMESH::SMESH_GroupBase_ptr SMESH_Mesh_i::createGroup (SMESH::ElementType // register CORBA object for persistence int nextId = _gen_i->RegisterObject( aGroup ); - if(MYDEBUG) { MESSAGE( "Add group to map with id = "<< nextId); } - else { nextId = ( nextId > 0 ); } // avoid "unused variable" warning in release mode + MESSAGE( "Add group to map with id = "<< nextId); // to track changes of GEOM groups if ( !theShape.IsNull() ) { @@ -3313,7 +3305,7 @@ SMESH::SMESH_GroupBase_ptr SMESH_Mesh_i::createGroup (SMESH::ElementType void SMESH_Mesh_i::removeGroup( const int theId ) { - if(MYDEBUG) MESSAGE("SMESH_Mesh_i::removeGroup()" ); + MESSAGE("SMESH_Mesh_i::removeGroup()"); if ( _mapGroups.find( theId ) != _mapGroups.end() ) { SMESH::SMESH_GroupBase_var group = _mapGroups[theId]; _mapGroups.erase( theId ); @@ -3480,7 +3472,7 @@ void SMESH_Mesh_i::onHypothesisModified(int theHypID, bool theUpdateIcons) void SMESH_Mesh_i::SetImpl(::SMESH_Mesh * impl) { - if(MYDEBUG) MESSAGE("SMESH_Mesh_i::SetImpl"); + MESSAGE("SMESH_Mesh_i::SetImpl"); _impl = impl; if ( _impl ) _impl->SetCallUp( new TCallUp_i(this)); @@ -3494,7 +3486,7 @@ void SMESH_Mesh_i::SetImpl(::SMESH_Mesh * impl) ::SMESH_Mesh & SMESH_Mesh_i::GetImpl() { - if(MYDEBUG) MESSAGE("SMESH_Mesh_i::GetImpl()"); + MESSAGE("SMESH_Mesh_i::GetImpl()"); return *_impl; } @@ -5189,7 +5181,7 @@ CORBA::LongLong SMESH_Mesh_i::GetMeshPtr() _preMeshInfo->FullLoadFromFile(); CORBA::LongLong pointeur = CORBA::LongLong(_impl); - if ( MYDEBUG ) MESSAGE("CORBA::LongLong SMESH_Mesh_i::GetMeshPtr() "<RegisterObject( groupVar ); - if(MYDEBUG) { MESSAGE( "Add group to map with id = "<< nextId); } - else { (void)nextId; } // avoid "unused variable" warning in release mode + MESSAGE( "Add group to map with id = "<< nextId); // publishing the groups in the study GEOM::GEOM_Object_var shapeVar = _gen_i->ShapeToGeomObject( shape ); diff --git a/src/SMESH_I/SMESH_NoteBook.cxx b/src/SMESH_I/SMESH_NoteBook.cxx index fdc571e22..821276c4f 100644 --- a/src/SMESH_I/SMESH_NoteBook.cxx +++ b/src/SMESH_I/SMESH_NoteBook.cxx @@ -36,12 +36,6 @@ #include #include -#ifdef _DEBUG_ -static int MYDEBUG = 0; -#else -static int MYDEBUG = 0; -#endif - using namespace std; @@ -242,7 +236,7 @@ void SMESH_NoteBook::ReplaceVariables() TCollection_AsciiString aMethod = aCmd->GetMethod(); TCollection_AsciiString aObject = aCmd->GetObject(); TCollection_AsciiString aResultValue = aCmd->GetResultValue(); - if(MYDEBUG) { + if(SALOME::VerbosityActivated()) { cout<<"Command before : "<< aCmd->GetString()<AddDistribution(aCmd->GetArg(1)); - if(MYDEBUG) + if(SALOME::VerbosityActivated()) cout<<"Add Distribution :"<GetArg(1)<GetString()< allVars = aGen->GetAllParameters( anID.in() ); SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(aParameters.in()); _entry2VarsMap[ TCollection_AsciiString( anID.in() )] = allVars; - if(MYDEBUG) { + if(SALOME::VerbosityActivated()) { cout<<"Entry : "<< anID<_is_nil() ) { anObjType = "Mesh"; } - if(MYDEBUG) + if(SALOME::VerbosityActivated()) cout<<"The object Type : "< -#ifdef _DEBUG_ -static int MYDEBUG = 0; -#else -static int MYDEBUG = 0; -#endif - #include "SMESH_TryCatch.hxx" namespace SMESH @@ -92,7 +86,7 @@ namespace SMESH if ( !objEntry.empty() ) aCollection += (TVar::ObjPrefix() + objEntry ).c_str(); aSMESHGen->AddToPythonScript(aCollection); - if(MYDEBUG) MESSAGE(aString); + MESSAGE(aString); // prevent misuse of already treated variables aSMESHGen->UpdateParameters(CORBA::Object_var().in(),""); } @@ -693,11 +687,8 @@ namespace SMESH 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; } //======================================================================= diff --git a/src/StdMeshers/StdMeshers_Adaptive1D.cxx b/src/StdMeshers/StdMeshers_Adaptive1D.cxx index d7ea4c302..bd5d9580a 100644 --- a/src/StdMeshers/StdMeshers_Adaptive1D.cxx +++ b/src/StdMeshers/StdMeshers_Adaptive1D.cxx @@ -1317,9 +1317,9 @@ bool AdaptiveAlgo::Compute(SMESH_Mesh & theMesh, 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; } diff --git a/src/StdMeshers/StdMeshers_Cartesian_3D.cxx b/src/StdMeshers/StdMeshers_Cartesian_3D.cxx index 6c50428ff..1973209ac 100644 --- a/src/StdMeshers/StdMeshers_Cartesian_3D.cxx +++ b/src/StdMeshers/StdMeshers_Cartesian_3D.cxx @@ -977,10 +977,7 @@ namespace 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); @@ -2429,11 +2426,9 @@ namespace tgtLink._link = _hexLinks + ( srcLink._link - other._hexLinks ); } } -#ifdef _DEBUG_ - _cellID = cellID; -#else - (void)cellID; // unused in release mode -#endif + + if (SALOME::VerbosityActivated()) + _cellID = cellID; } //================================================================================ @@ -4249,11 +4244,10 @@ namespace 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; @@ -4816,11 +4810,13 @@ namespace 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; + } } } } @@ -5253,14 +5249,14 @@ namespace */ 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; } //================================================================================ diff --git a/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx b/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx index 5db8e5427..b10eb3b8c 100644 --- a/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx +++ b/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx @@ -1242,12 +1242,13 @@ bool _QuadFaceGrid::Init(const TopoDS_Face& f, SMESH_ProxyMesh& mesh) 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; } diff --git a/src/StdMeshers/StdMeshers_FaceSide.cxx b/src/StdMeshers/StdMeshers_FaceSide.cxx index 0939eaef5..f560bc966 100644 --- a/src/StdMeshers/StdMeshers_FaceSide.cxx +++ b/src/StdMeshers/StdMeshers_FaceSide.cxx @@ -1148,7 +1148,9 @@ void StdMeshers_FaceSide::reverseProxySubmesh( const TopoDS_Edge& E ) 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: "<& 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 @@ -3283,10 +3282,12 @@ bool StdMeshers_Prism_3D::IsApplicable(const TopoDS_Shape & shape, bool toCheckA 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; @@ -3475,9 +3476,11 @@ bool StdMeshers_Prism_3D::IsApplicable(const TopoDS_Shape & shape, bool toCheckA 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 @@ -4342,7 +4345,9 @@ bool StdMeshers_PrismAsBlock::IsForwardEdge(SMESHDS_Mesh* meshDS, 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) }; @@ -4378,10 +4383,6 @@ void StdMeshers_PrismAsBlock::faceGridToPythonDump(const SMESH_Block::TShapeID f << n << ", " << n+1 << ", " << n+nb+2 << ", " << n+nb+1 << "]) " << endl; } -#else - (void)face; // unused in release mode - (void)nb; // unused in release mode -#endif } //================================================================================ @@ -4989,7 +4990,9 @@ int StdMeshers_PrismAsBlock::TSideFace::InsertSubShapes(TBlockShapes& shapeMap) 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; @@ -5000,9 +5003,6 @@ void StdMeshers_PrismAsBlock::TSideFace::dumpNodes(int nbNodes) const 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 } //================================================================================ @@ -5043,14 +5043,13 @@ gp_Pnt StdMeshers_PrismAsBlock::TVerticalEdgeAdaptor::Value(const Standard_Real 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 } //================================================================================ @@ -5074,7 +5073,9 @@ gp_Pnt StdMeshers_PrismAsBlock::THorizontalEdgeAdaptor::Value(const Standard_Rea 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; @@ -5108,9 +5109,6 @@ void StdMeshers_PrismAsBlock::THorizontalEdgeAdaptor::dumpNodes(int nbNodes) con side->GetColumns( u , col, col2 ); if ( n != col->second[ i ] ) cout << col->second[ i ]->GetID(); -#else - (void)nbNodes; // unused in release mode -#endif } //================================================================================ diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx index a504888d0..bfaf9166a 100644 --- a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx +++ b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx @@ -124,14 +124,19 @@ namespace { 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 >() ); @@ -542,10 +547,11 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the // 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) @@ -2803,10 +2809,10 @@ namespace StdMeshers_ProjectionUtils 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(); diff --git a/src/StdMeshers/StdMeshers_Projection_2D.cxx b/src/StdMeshers/StdMeshers_Projection_2D.cxx index 1940bd3a3..dcc3f1e0b 100644 --- a/src/StdMeshers/StdMeshers_Projection_2D.cxx +++ b/src/StdMeshers/StdMeshers_Projection_2D.cxx @@ -2507,9 +2507,8 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& 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"); diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx index f030eb5b0..0ed10fa29 100644 --- a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx +++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx @@ -1194,10 +1194,8 @@ namespace 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 diff --git a/src/StdMeshers/StdMeshers_ViscousLayers.cxx b/src/StdMeshers/StdMeshers_ViscousLayers.cxx index 680708d7e..b35f5cf3d 100644 --- a/src/StdMeshers/StdMeshers_ViscousLayers.cxx +++ b/src/StdMeshers/StdMeshers_ViscousLayers.cxx @@ -4644,7 +4644,9 @@ void _Simplex::SortSimplices(vector<_Simplex>& simplices) void _ViscousBuilder::makeGroupOfLE() { -#ifdef _DEBUG_ + if (!SALOME::VerbosityActivated()) + return; + for ( size_t i = 0 ; i < _sdVec.size(); ++i ) { if ( _sdVec[i]._n2eMap.empty() ) continue; @@ -4700,7 +4702,6 @@ void _ViscousBuilder::makeGroupOfLE() << "'%s-%s' % (faceId1+1, faceId2))"); dumpFunctionEnd(); } -#endif } //================================================================================ @@ -5835,27 +5836,26 @@ void _ViscousBuilder::putOnOffsetSurface( _EdgesOnShape& eos, } } - - -#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 && diff --git a/src/StdMeshers/StdMeshers_ViscousLayers2D.cxx b/src/StdMeshers/StdMeshers_ViscousLayers2D.cxx index 8ad624c6e..52de37e6d 100644 --- a/src/StdMeshers/StdMeshers_ViscousLayers2D.cxx +++ b/src/StdMeshers/StdMeshers_ViscousLayers2D.cxx @@ -240,9 +240,7 @@ namespace VISCOUS_2D bool SetNewLength( const double length ); -#ifdef _DEBUG_ - int _ID; -#endif + int _ID; // debug }; //-------------------------------------------------------------------------------- /*! @@ -674,9 +672,10 @@ bool _ViscousBuilder2D::error(const string& text ) _error->myAlgo = smError->myAlgo; smError = _error; } -#ifdef _DEBUG_ - cout << "_ViscousBuilder2D::error " << text << endl; -#endif + + if (SALOME::VerbosityActivated()) + cout << "_ViscousBuilder2D::error " << text << endl; + return false; } @@ -1339,9 +1338,9 @@ void _ViscousBuilder2D::setLayerEdgeData( _LayerEdge& lEdge, lEdge._ray.SetDirection( lEdge._normal2D ); lEdge._isBlocked = false; lEdge._length2D = 0; -#ifdef _DEBUG_ - lEdge._ID = _nbLE++; -#endif + + if (SALOME::VerbosityActivated()) + lEdge._ID = _nbLE++; } //================================================================================ -- 2.30.2