From c8df93f245a69019b9eb9ff468d1123cd704b2ce Mon Sep 17 00:00:00 2001 From: Konstantin LEONTEV Date: Tue, 15 Nov 2022 09:15:40 +0300 Subject: [PATCH] [bos #32517][EDF] Dynamic log messages switched on and off by SALOME_VERBOSE environment variable --- .../HEXABLOCKPluginGUI_HypothesisCreator.cxx | 39 +-- .../HEXABLOCKPlugin_FromSkin_3D.cxx | 31 +- .../HEXABLOCKPlugin_HEXABLOCK.cxx | 30 +- .../HEXABLOCKPlugin_HEXABLOCK_i.cxx | 12 +- .../HEXABLOCKPlugin_Hypothesis_i.cxx | 10 +- src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx | 9 +- src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx | 276 ++++++++---------- 7 files changed, 167 insertions(+), 240 deletions(-) diff --git a/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.cxx b/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.cxx index 4d6fc35..9a049c0 100644 --- a/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.cxx +++ b/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.cxx @@ -56,12 +56,6 @@ #include #include -#ifdef _DEBUG_ -static int MYDEBUG = 1; -#else -static int MYDEBUG = 0; -#endif - // tabs enum { @@ -166,7 +160,7 @@ void DoubleLineEditDelegate::setModelData(QWidget *editor, QAbstractItemModel *m if (ok) { model->setData(index, value, Qt::EditRole); - if(MYDEBUG) MESSAGE("Value " << value << " was set at index(" << index.row() << "," << index.column() << ")"); + MESSAGE("Value " << value << " was set at index(" << index.row() << "," << index.column() << ")"); } } @@ -380,11 +374,10 @@ bool HEXABLOCKPluginGUI_HypothesisCreator::smpVertexExists(double x, double y, d // MESSAGE("Found y value " << y << " at row " << i); double myZ = mySmpModel->data(mySmpModel->index(i, ENF_VER_Z_COLUMN)).toDouble(); if (myZ == z) { - if (MYDEBUG){ - MESSAGE("Found x value " << x << " at row " << i); - MESSAGE("Found y value " << y << " at row " << i); - MESSAGE("Found z value " << z << " at row " << i); - } + MESSAGE("Found x value " << x << " at row " << i); + MESSAGE("Found y value " << y << " at row " << i); + MESSAGE("Found z value " << z << " at row " << i); + return true; } } @@ -407,7 +400,7 @@ bool HEXABLOCKPluginGUI_HypothesisCreator::checkVertexIsDefined() void HEXABLOCKPluginGUI_HypothesisCreator::onVertexBtnClicked() { - if (MYDEBUG) MESSAGE("HEXABLOCKPluginGUI_HypothesisCreator::onVertexBtnClicked()"); + MESSAGE("HEXABLOCKPluginGUI_HypothesisCreator::onVertexBtnClicked()"); const int row = mySmpModel->rowCount() ; double x = myXCoord->text().toDouble(); double y = myYCoord->text().toDouble(); @@ -454,7 +447,7 @@ void HEXABLOCKPluginGUI_HypothesisCreator::onRemoveVertexBtnClicked() it.toBack(); while ( it.hasPrevious() ) { row = it.previous(); - if (MYDEBUG) MESSAGE("delete row #"<< row); + MESSAGE("delete row #"<< row); mySmpModel->removeRow(row ); } myEnforcedTableView->clearSelection(); @@ -476,7 +469,7 @@ void HEXABLOCKPluginGUI_HypothesisCreator::updateWidgets() bool HEXABLOCKPluginGUI_HypothesisCreator::checkParams(QString& msg) const { - if (MYDEBUG) MESSAGE("HEXABLOCKPluginGUI_HypothesisCreator::checkParams"); + MESSAGE("HEXABLOCKPluginGUI_HypothesisCreator::checkParams"); if ( !QFileInfo( myWorkingDir->text().trimmed() ).isWritable() ) { SUIT_MessageBox::warning( dlg(), @@ -490,7 +483,7 @@ bool HEXABLOCKPluginGUI_HypothesisCreator::checkParams(QString& msg) const void HEXABLOCKPluginGUI_HypothesisCreator::retrieveParams() const { - if (MYDEBUG) MESSAGE("HEXABLOCKPluginGUI_HypothesisCreator::retrieveParams"); + MESSAGE("HEXABLOCKPluginGUI_HypothesisCreator::retrieveParams"); HEXABLOCKHypothesisData data; readParamsFromHypo( data ); @@ -538,7 +531,7 @@ void HEXABLOCKPluginGUI_HypothesisCreator::retrieveParams() const mySmpModel->setData(mySmpModel->index(row, ENF_VER_SIZE_COLUMN),size); mySmpModel->setItem( row, ENF_VER_SIZE_COLUMN, new QStandardItem(QString::number(size)) ); - if (MYDEBUG) MESSAGE("Row " << row << ": (" << x << ","<< y << ","<< z << ") ="<< size); + MESSAGE("Row " << row << ": (" << x << ","<< y << ","<< z << ") ="<< size); row++; } @@ -548,7 +541,7 @@ void HEXABLOCKPluginGUI_HypothesisCreator::retrieveParams() const QString HEXABLOCKPluginGUI_HypothesisCreator::storeParams() const { - if (MYDEBUG) MESSAGE("HEXABLOCKPluginGUI_HypothesisCreator::storeParams"); + MESSAGE("HEXABLOCKPluginGUI_HypothesisCreator::storeParams"); HEXABLOCKHypothesisData data; readParamsFromWidgets( data ); storeParamsToHypo( data ); @@ -608,13 +601,13 @@ QString HEXABLOCKPluginGUI_HypothesisCreator::storeParams() const valStr += ";"; } valStr += " #END ENFORCED VERTICES#"; - if (MYDEBUG) MESSAGE(valStr.toStdString()); + MESSAGE(valStr.toStdString()); return valStr; } bool HEXABLOCKPluginGUI_HypothesisCreator::readParamsFromHypo( HEXABLOCKHypothesisData& h_data ) const { - if (MYDEBUG) MESSAGE("HEXABLOCKPluginGUI_HypothesisCreator::readParamsFromHypo"); + MESSAGE("HEXABLOCKPluginGUI_HypothesisCreator::readParamsFromHypo"); HEXABLOCKPlugin::HEXABLOCKPlugin_Hypothesis_var h = HEXABLOCKPlugin::HEXABLOCKPlugin_Hypothesis::_narrow( initParamsHypothesis() ); @@ -655,7 +648,7 @@ bool HEXABLOCKPluginGUI_HypothesisCreator::readParamsFromHypo( HEXABLOCKHypothes bool HEXABLOCKPluginGUI_HypothesisCreator::storeParamsToHypo( const HEXABLOCKHypothesisData& h_data ) const { - if (MYDEBUG) MESSAGE("HEXABLOCKPluginGUI_HypothesisCreator::storeParamsToHypo"); + MESSAGE("HEXABLOCKPluginGUI_HypothesisCreator::storeParamsToHypo"); HEXABLOCKPlugin::HEXABLOCKPlugin_Hypothesis_var h = HEXABLOCKPlugin::HEXABLOCKPlugin_Hypothesis::_narrow( hypothesis() ); @@ -753,7 +746,7 @@ bool HEXABLOCKPluginGUI_HypothesisCreator::storeParamsToHypo( const HEXABLOCKHyp bool HEXABLOCKPluginGUI_HypothesisCreator::readParamsFromWidgets( HEXABLOCKHypothesisData& h_data ) const { - if (MYDEBUG) MESSAGE("HEXABLOCKPluginGUI_HypothesisCreator::readParamsFromWidgets"); + MESSAGE("HEXABLOCKPluginGUI_HypothesisCreator::readParamsFromWidgets"); h_data.myName = myName ? myName->text() : ""; h_data.myToMeshHoles = myToMeshHolesCheck->isChecked(); h_data.myMaximumMemory = myMaximumMemoryCheck->isChecked() ? myMaximumMemorySpin->value() : -1; @@ -775,7 +768,7 @@ bool HEXABLOCKPluginGUI_HypothesisCreator::readParamsFromWidgets( HEXABLOCKHypot myVertex.push_back(mySmpModel->data(mySmpModel->index(i,ENF_VER_Y_COLUMN)).toDouble()); myVertex.push_back(mySmpModel->data(mySmpModel->index(i,ENF_VER_Z_COLUMN)).toDouble()); myVertex.push_back(mySmpModel->data(mySmpModel->index(i,ENF_VER_SIZE_COLUMN)).toDouble()); - if (MYDEBUG) MESSAGE("Add new enforced vertex (" << myVertex[0] << ", " + MESSAGE("Add new enforced vertex (" << myVertex[0] << ", " << myVertex[1] << ", " << myVertex[2] << ") = " << myVertex[3]); diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx index cde7636..36881f8 100644 --- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx +++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx @@ -35,30 +35,13 @@ //#include "utilities.h" #include -// Define error message and _MYDEBUG_ if needed -#ifdef _DEBUG_ +// Define error message #define BAD_MESH_ERR \ error(SMESH_Comment("Can't detect block-wise structure of the input 2D mesh.\n" \ __FILE__ ":" )<<__LINE__) -//#define _MYDEBUG_ -#else -#define BAD_MESH_ERR \ - error(SMESH_Comment("Can't detect block-wise structure of the input 2D mesh")) -#endif // Debug output -#ifdef _MYDEBUG_ #define _DUMP_(msg) cout << msg << endl -#else -#define _DUMP_(msg) -#endif - - -#ifdef _DEBUG_ -static int MYDEBUG = HEXA_NS::on_debug (); -#else -static int MYDEBUG = 0; -#endif namespace @@ -67,12 +50,12 @@ namespace { B_BOTTOM=0, B_RIGHT, B_TOP, B_LEFT, B_FRONT, B_BACK, NB_BLOCK_SIDES }; -#ifdef _MYDEBUG_ + const char* SBoxSides[] = //!< names of block sides { "BOTTOM", "RIGHT", "TOP", "LEFT", "FRONT", "BACK", "UNDEFINED" }; -#endif + enum EQuadEdge //!< edges of quadrangle side { Q_BOTTOM = 0, Q_RIGHT, Q_TOP, Q_LEFT, NB_QUAD_SIDES @@ -1091,14 +1074,14 @@ SMESH_HexaFromSkin_3D::SMESH_HexaFromSkin_3D(int hypId, SMESH_Gen* gen, HEXA_NS: :SMESH_3D_Algo(hypId, gen), _doc( doc ) { - if(MYDEBUG) MESSAGE("SMESH_HexaFromSkin_3D::SMESH_HexaFromSkin_3D"); + MESSAGE("SMESH_HexaFromSkin_3D::SMESH_HexaFromSkin_3D"); _name = "HexaFromSkin_3D"; } SMESH_HexaFromSkin_3D::~SMESH_HexaFromSkin_3D() { - if(MYDEBUG) MESSAGE("SMESH_HexaFromSkin_3D::~SMESH_HexaFromSkin_3D"); + MESSAGE("SMESH_HexaFromSkin_3D::~SMESH_HexaFromSkin_3D"); } //================================================================================ @@ -1317,7 +1300,7 @@ bool SMESH_HexaFromSkin_3D::Compute( SMESH_Mesh & aMesh, SMESH_MesherHelper* aHe std::map& volumesOnHexa, std::map vertexNode ) { - if(MYDEBUG) MESSAGE("SMESH_HexaFromSkin_3D::Compute BEGIN"); + MESSAGE("SMESH_HexaFromSkin_3D::Compute BEGIN"); _Skin skin; int nbBlocks = skin.findBlocks(aMesh); if ( nbBlocks == 0 ) @@ -1504,7 +1487,7 @@ bool SMESH_HexaFromSkin_3D::Compute( SMESH_Mesh & aMesh, SMESH_MesherHelper* aHe } // loop on blocks - if(MYDEBUG) MESSAGE("SMESH_HexaFromSkin_3D::Compute END"); + MESSAGE("SMESH_HexaFromSkin_3D::Compute END"); return true; } diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx index a61ff7e..dcf0c6d 100644 --- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx +++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx @@ -49,12 +49,6 @@ using namespace std; -#ifdef _DEBUG_ -static int MYDEBUG = HEXA_NS::on_debug (); -#else -static int MYDEBUG = 0; -#endif - //============================================================================= /*! * @@ -64,7 +58,7 @@ static int MYDEBUG = 0; HEXABLOCKPlugin_HEXABLOCK::HEXABLOCKPlugin_HEXABLOCK(int hypId, SMESH_Gen* gen) : SMESH_3D_Algo(hypId, gen) { - if(MYDEBUG) MESSAGE("HEXABLOCKPlugin_HEXABLOCK::HEXABLOCKPlugin_HEXABLOCK"); + MESSAGE("HEXABLOCKPlugin_HEXABLOCK::HEXABLOCKPlugin_HEXABLOCK"); _name = "HEXABLOCK_3D"; _shapeType = (1 << TopAbs_SHELL) | (1 << TopAbs_SOLID);// 1 bit /shape type _compatibleHypothesis.push_back("HEXABLOCK_Parameters"); @@ -84,7 +78,7 @@ HEXABLOCKPlugin_HEXABLOCK::HEXABLOCKPlugin_HEXABLOCK(int hypId, SMESH_Gen* gen) HEXABLOCKPlugin_HEXABLOCK::~HEXABLOCKPlugin_HEXABLOCK() { - if(MYDEBUG) MESSAGE("HEXABLOCKPlugin_HEXABLOCK::~HEXABLOCKPlugin_HEXABLOCK"); + MESSAGE("HEXABLOCKPlugin_HEXABLOCK::~HEXABLOCKPlugin_HEXABLOCK"); } //============================================================================= @@ -115,7 +109,7 @@ bool HEXABLOCKPlugin_HEXABLOCK::CheckHypothesis ( SMESH_Mesh& aMesh, //============================================================================= bool HEXABLOCKPlugin_HEXABLOCK::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& theShape) { - if(MYDEBUG) MESSAGE("HEXABLOCKPlugin_HEXABLOCK::Compute with a shape"); + MESSAGE("HEXABLOCKPlugin_HEXABLOCK::Compute with a shape"); SMESHDS_Mesh* meshDS = theMesh.GetMeshDS(); if ( (_iShape == 0) && (_nbShape == 0) ) { @@ -165,7 +159,7 @@ bool HEXABLOCKPlugin_HEXABLOCK::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& bool HEXABLOCKPlugin_HEXABLOCK::Compute(SMESH_Mesh& theMesh, SMESH_MesherHelper* aHelper) { - if(MYDEBUG) MESSAGE("HEXABLOCKPlugin_HEXABLOCK::Compute without a shape"); + MESSAGE("HEXABLOCKPlugin_HEXABLOCK::Compute without a shape"); switch (_hyp->GetDimension()) { case 0 : return( Compute0D(theMesh) ); @@ -184,7 +178,7 @@ bool HEXABLOCKPlugin_HEXABLOCK::Evaluate(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape, MapShapeNbElems& aResMap) { - if(MYDEBUG) MESSAGE("HEXABLOCKPlugin_HEXABLOCK::Evaluate: do nothing"); + MESSAGE("HEXABLOCKPlugin_HEXABLOCK::Evaluate: do nothing"); return true; } @@ -196,7 +190,7 @@ bool HEXABLOCKPlugin_HEXABLOCK::Evaluate(SMESH_Mesh& aMesh, //============================================================================= bool HEXABLOCKPlugin_HEXABLOCK::Compute3D(SMESH_Mesh& theMesh) { - if(MYDEBUG) MESSAGE("HEXABLOCKPlugin_HEXABLOCK::Compute 3D Begin"); + MESSAGE("HEXABLOCKPlugin_HEXABLOCK::Compute 3D Begin"); SMESH_HexaBlocks hexaBuilder(theMesh); @@ -206,7 +200,7 @@ bool HEXABLOCKPlugin_HEXABLOCK::Compute3D(SMESH_Mesh& theMesh) { hexaBuilder.computeDoc(doc); hexaBuilder.buildGroups(doc); - if(MYDEBUG) MESSAGE("HEXABLOCKPlugin_HEXABLOCK::Compute 3D End"); + MESSAGE("HEXABLOCKPlugin_HEXABLOCK::Compute 3D End"); return true; } @@ -218,7 +212,7 @@ bool HEXABLOCKPlugin_HEXABLOCK::Compute3D(SMESH_Mesh& theMesh) { bool HEXABLOCKPlugin_HEXABLOCK::Compute2D(SMESH_Mesh& theMesh) { - if(MYDEBUG) MESSAGE("HEXABLOCKPlugin_HEXABLOCK::Compute 2D"); + MESSAGE("HEXABLOCKPlugin_HEXABLOCK::Compute 2D"); HEXA_NS::Document* doc = _hyp->GetDocument(); // doc->reorderFaces (); // 0) Abu 06/03/2012 @@ -262,7 +256,7 @@ bool HEXABLOCKPlugin_HEXABLOCK::Compute2D(SMESH_Mesh& theMesh) if ( quadWays.count(quad) > 0 ) hexaBuilder.computeQuad(*quad, quadWays[quad]); else - if(MYDEBUG) MESSAGE("NO QUAD WAY ID = "<GetDocument(); // doc->reorderFaces (); // 0) Abu 06/03/2012 @@ -384,7 +378,7 @@ bool HEXABLOCKPlugin_HEXABLOCK::Compute1D(SMESH_Mesh& theMesh) bool HEXABLOCKPlugin_HEXABLOCK::Compute0D(SMESH_Mesh& theMesh) { - if(MYDEBUG) MESSAGE("HEXABLOCKPlugin_HEXABLOCK::Compute 0D"); + MESSAGE("HEXABLOCKPlugin_HEXABLOCK::Compute 0D"); HEXA_NS::Document* doc = _hyp->GetDocument(); // doc->reorderFaces (); // 0) Abu 06/03/2012 diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx index 96e2037..42962a8 100644 --- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx +++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx @@ -30,12 +30,6 @@ #include "utilities.h" #include "hexa_base.hxx" -#ifdef _DEBUG_ -static int MYDEBUG = HEXA_NS::on_debug (); -#else -static int MYDEBUG = 0; -#endif - using namespace std; //============================================================================= @@ -53,7 +47,7 @@ HEXABLOCKPlugin_HEXABLOCK_i::HEXABLOCKPlugin_HEXABLOCK_i (PortableServer::POA_pt SMESH_Algo_i( thePOA ), SMESH_3D_Algo_i( thePOA ) { - if(MYDEBUG) MESSAGE( "HEXABLOCKPlugin_HEXABLOCK_i::HEXABLOCKPlugin_HEXABLOCK_i" ); + MESSAGE( "HEXABLOCKPlugin_HEXABLOCK_i::HEXABLOCKPlugin_HEXABLOCK_i" ); myBaseImpl = new ::HEXABLOCKPlugin_HEXABLOCK (theGenImpl->GetANewId(), theGenImpl ); } @@ -68,7 +62,7 @@ HEXABLOCKPlugin_HEXABLOCK_i::HEXABLOCKPlugin_HEXABLOCK_i (PortableServer::POA_pt HEXABLOCKPlugin_HEXABLOCK_i::~HEXABLOCKPlugin_HEXABLOCK_i() { - if(MYDEBUG) MESSAGE( "HEXABLOCKPlugin_HEXABLOCK_i::~HEXABLOCKPlugin_HEXABLOCK_i" ); + MESSAGE( "HEXABLOCKPlugin_HEXABLOCK_i::~HEXABLOCKPlugin_HEXABLOCK_i" ); } //============================================================================= @@ -81,7 +75,7 @@ HEXABLOCKPlugin_HEXABLOCK_i::~HEXABLOCKPlugin_HEXABLOCK_i() ::HEXABLOCKPlugin_HEXABLOCK* HEXABLOCKPlugin_HEXABLOCK_i::GetImpl() { - if(MYDEBUG) MESSAGE( "HEXABLOCKPlugin_HEXABLOCK_i::GetImpl" ); + MESSAGE( "HEXABLOCKPlugin_HEXABLOCK_i::GetImpl" ); return ( ::HEXABLOCKPlugin_HEXABLOCK* )myBaseImpl; } diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx index 108bdc5..f5bc710 100644 --- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx +++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx @@ -33,12 +33,6 @@ #include #include -#ifdef _DEBUG_ -static int MYDEBUG = HEXA_NS::on_debug (); -#else -static int MYDEBUG = 0; -#endif - //======================================================================= //function : HEXABLOCKPlugin_Hypothesis_i //======================================================================= @@ -48,7 +42,7 @@ HEXABLOCKPlugin_Hypothesis_i::HEXABLOCKPlugin_Hypothesis_i (PortableServer::POA_ : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - if(MYDEBUG) MESSAGE( "HEXABLOCKPlugin_Hypothesis_i::HEXABLOCKPlugin_Hypothesis_i" ); + MESSAGE( "HEXABLOCKPlugin_Hypothesis_i::HEXABLOCKPlugin_Hypothesis_i" ); myBaseImpl = new ::HEXABLOCKPlugin_Hypothesis (theGenImpl->GetANewId(), theGenImpl); _poa = PortableServer::POA::_duplicate(thePOA); @@ -60,7 +54,7 @@ HEXABLOCKPlugin_Hypothesis_i::HEXABLOCKPlugin_Hypothesis_i (PortableServer::POA_ HEXABLOCKPlugin_Hypothesis_i::~HEXABLOCKPlugin_Hypothesis_i() { - if(MYDEBUG) MESSAGE( "HEXABLOCKPlugin_Hypothesis_i::~HEXABLOCKPlugin_Hypothesis_i" ); + MESSAGE( "HEXABLOCKPlugin_Hypothesis_i::~HEXABLOCKPlugin_Hypothesis_i" ); } //============================================================================= diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx index c75e650..df87c6b 100644 --- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx +++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx @@ -31,13 +31,6 @@ #include "hexa_base.hxx" -#ifdef _DEBUG_ -static int MYDEBUG = HEXA_NS::on_debug (); -#else -static int MYDEBUG = 0; -#endif - - using namespace std; template class HEXABLOCKPlugin_Creator_i:public HypothesisCreator_i @@ -57,7 +50,7 @@ extern "C" HEXABLOCKPLUGINENGINE_EXPORT GenericHypothesisCreator_i* GetHypothesisCreator (const char* aHypName) { - if(MYDEBUG) MESSAGE("GetHypothesisCreator " << aHypName); + MESSAGE("GetHypothesisCreator " << aHypName); GenericHypothesisCreator_i* aCreator = 0; diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx index 49fc73a..2123b57 100644 --- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx +++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx @@ -88,12 +88,6 @@ } #endif -#ifdef _DEBUG_ -static int MYDEBUG = HEXA_NS::on_debug (); -#else -static int MYDEBUG = 0; -#endif - static double HEXA_EPS = 1.0e-3; //1E-3; static double HEXA_QUAD_WAY = M_PI/4.; //3.*PI/8.; @@ -223,7 +217,7 @@ bool SMESH_HexaBlocks::computeEdge(HEXA_NS::Edge& edge, HEXA_NS::Law& law) bool SMESH_HexaBlocks::computeEdgeByAssoc( HEXA_NS::Edge& edge, HEXA_NS::Law& law ) { - if(MYDEBUG) MESSAGE("computeEdgeByAssoc(edgeID = "< "< "< "< "< "< "< "< "<>>>>>>>"); + MESSAGE("computeEdgeByAssoc() : end >>>>>>>>"); return ok; } @@ -332,26 +326,26 @@ bool SMESH_HexaBlocks::computeEdgeByAssoc( HEXA_NS::Edge& edge, HEXA_NS::Law& la bool SMESH_HexaBlocks::computeEdgeByShortestWire( HEXA_NS::Edge& edge, HEXA_NS::Law& law) { - if(MYDEBUG) MESSAGE("computeEdgeByShortestWire() not implemented"); + MESSAGE("computeEdgeByShortestWire() not implemented"); return false; } bool SMESH_HexaBlocks::computeEdgeByPlanWire( HEXA_NS::Edge& edge, HEXA_NS::Law& law) { - if(MYDEBUG) MESSAGE("computeEdgeByPlanWire() not implemented"); + MESSAGE("computeEdgeByPlanWire() not implemented"); return false; } bool SMESH_HexaBlocks::computeEdgeByIsoWire( HEXA_NS::Edge& edge, HEXA_NS::Law& law) { - if(MYDEBUG) MESSAGE("computeEdgeByIsoWire() not implemented"); + MESSAGE("computeEdgeByIsoWire() not implemented"); return false; } bool SMESH_HexaBlocks::computeEdgeBySegment(HEXA_NS::Edge& edge, HEXA_NS::Law& law) { - if(MYDEBUG) MESSAGE("computeEdgeBySegment() : : begin <<<<<<"); + MESSAGE("computeEdgeBySegment() : : begin <<<<<<"); ASSERT( _computeVertexOK ); bool ok = true; @@ -387,7 +381,7 @@ bool SMESH_HexaBlocks::computeEdgeBySegment(HEXA_NS::Edge& edge, HEXA_NS::Law& l //law of discretization int nbNodes = law.getNodes(); - if (MYDEBUG) MESSAGE("nbNodes -> "< "<X() + u * ( LAST_NODE->X() - FIRST_NODE->X() ); @@ -399,7 +393,7 @@ bool SMESH_HexaBlocks::computeEdgeBySegment(HEXA_NS::Edge& edge, HEXA_NS::Law& l nodesOnEdge.push_back(node_b); if (_nodeXx.count(node_b) >= 1 ) ASSERT(false); _nodeXx[ node_b ] = u; - if(MYDEBUG) MESSAGE("_nodeXx <-"<AddEdge(node_a, LAST_NODE); @@ -409,7 +403,7 @@ bool SMESH_HexaBlocks::computeEdgeBySegment(HEXA_NS::Edge& edge, HEXA_NS::Law& l _nodesOnEdge[&edge] = nodesOnEdge; _edgesOnEdge[&edge] = edgesOnEdge; - if(MYDEBUG) MESSAGE("computeEdgeBySegment() : end >>>>>>>>"); + MESSAGE("computeEdgeBySegment() : end >>>>>>>>"); return ok; } @@ -441,7 +435,7 @@ std::map SMESH_HexaBlocks::computeQuadWays( HEXA_NS::Docu // SECOND STEP: setting edges ways while ( skinQuad.size()>0 ){ - if(MYDEBUG) MESSAGE("SEARCHING INITIAL QUAD ..." ); + MESSAGE("SEARCHING INITIAL QUAD ..." ); for ( std::list::iterator it = skinQuad.begin(); it != skinQuad.end(); it++ ){ _searchInitialQuadWay( *it, e_0, e_1 ); if ( e_0 != NULL && e_1 != NULL ){ @@ -450,7 +444,7 @@ std::map SMESH_HexaBlocks::computeQuadWays( HEXA_NS::Docu } } if ( e_0 == NULL && e_1 == NULL ) ASSERT(false);// should never happened, - if(MYDEBUG) MESSAGE("INITIAL QUAD FOUND!" ); + MESSAGE("INITIAL QUAD FOUND!" ); for ( int j=0 ; j < 4 ; ++j ){ e = q->getEdge(j); if ( ((e_0 == e->getVertex(0)) && (e_1 == e->getVertex(1))) @@ -458,13 +452,13 @@ std::map SMESH_HexaBlocks::computeQuadWays( HEXA_NS::Docu break; } } - if(MYDEBUG) MESSAGE("INITIAL EDGE WAY FOUND!" ); + MESSAGE("INITIAL EDGE WAY FOUND!" ); edgeWays[e] = std::make_pair( e_0, e_1 ); workingQuad.push_back(q); while ( workingQuad.size() > 0 ){ - if(MYDEBUG) MESSAGE("COMPUTE QUAD WAY ... ID ="<< q->getId()); + MESSAGE("COMPUTE QUAD WAY ... ID ="<< q->getId()); HEXA_NS::Vertex *lastVertex=NULL, *firstVertex = NULL; int i = 0; std::map > localEdgeWays; @@ -703,10 +697,10 @@ bool SMESH_HexaBlocks::computeQuadByAssoc( HEXA_NS::Quad& quad, bool way ) { // int id = quad.getId(); // if ( id != 11 ) return false; //7 - if (MYDEBUG){ - MESSAGE("computeQuadByLinearApproximation() : : begin <<<<<<"); - MESSAGE("quadID = "<>>>>>>>"); + { + MESSAGE("computeQuadByAssoc() : end >>>>>>>>"); return false; - } + } TopoDS_Shape shapeOrCompound = getFaceShapes ( quad ); @@ -785,26 +779,22 @@ bool SMESH_HexaBlocks::computeQuadByAssoc( HEXA_NS::Quad& quad, bool way ) nodesOnQuad[i][j] = n4; interpolatedPoints[ n4 ] = newPt; - if (MYDEBUG) { - MESSAGE("u parameter is "<X() << "," << n1->Y() << "," << n1->Z() << ")"); - MESSAGE("n2 (" << n2->X() << "," << n2->Y() << "," << n2->Z() << ")"); - MESSAGE("n4 (" << n4->X() << "," << n4->Y() << "," << n4->Z() << ")"); - MESSAGE("n3 (" << n3->X() << "," << n3->Y() << "," << n3->Z() << ")"); - } + MESSAGE("n1 (" << n1->X() << "," << n1->Y() << "," << n1->Z() << ")"); + MESSAGE("n2 (" << n2->X() << "," << n2->Y() << "," << n2->Z() << ")"); + MESSAGE("n4 (" << n4->X() << "," << n4->Y() << "," << n4->Z() << ")"); + MESSAGE("n3 (" << n3->X() << "," << n3->Y() << "," << n3->Z() << ")"); if ( way == true ){ - if (MYDEBUG) MESSAGE("AddFace( n1, n2, n3, n4 )"); + MESSAGE("AddFace( n1, n2, n3, n4 )"); newFace = _theMeshDS->AddFace( n1, n2, n3, n4 ); } else { - if (MYDEBUG) MESSAGE("AddFace( n4, n3, n2, n1 )"); + MESSAGE("AddFace( n4, n3, n2, n1 )"); newFace = _theMeshDS->AddFace( n4, n3, n2, n1 ); } facesOnQuad.push_back(newFace); @@ -813,14 +803,14 @@ bool SMESH_HexaBlocks::computeQuadByAssoc( HEXA_NS::Quad& quad, bool way ) _quadNodes[ &quad ] = nodesOnQuad; _facesOnQuad[&quad] = facesOnQuad; - if(MYDEBUG) MESSAGE("computeQuadByLinearApproximation() : end >>>>>>>>"); + MESSAGE("computeQuadByLinearApproximation() : end >>>>>>>>"); return ok; } bool SMESH_HexaBlocks::computeQuadByFindingGeom( HEXA_NS::Quad& quad, bool way ) { - if(MYDEBUG) MESSAGE("computeQuadByFindingGeom() not implemented"); + MESSAGE("computeQuadByFindingGeom() not implemented"); return false; } @@ -829,7 +819,7 @@ bool SMESH_HexaBlocks::_computeQuadInit( ArrayOfSMESHNodes& nodesOnQuad, std::vector& xx, std::vector& yy) { - if(MYDEBUG) MESSAGE("_computeQuadInit() : begin ---------------"); + MESSAGE("_computeQuadInit() : begin ---------------"); bool ok = true; SMDS_MeshNode *S1, *S2, *S4, *S3; @@ -925,7 +915,7 @@ bool SMESH_HexaBlocks::_computeQuadInit( } } if ( S1 != nodesOnQuad[0][0] ){ - if(MYDEBUG) MESSAGE("ZZZZZZZZZZZZZZZZ quadID = "<X() << "," << n1->Y() << "," << n1->Z() << ")"); - MESSAGE("n2 (" << n2->X() << "," << n2->Y() << "," << n2->Z() << ")"); - MESSAGE("n4 (" << n4->X() << "," << n4->Y() << "," << n4->Z() << ")"); - MESSAGE("n3 (" << n3->X() << "," << n3->Y() << "," << n3->Z() << ")"); - } + MESSAGE("n1 (" << n1->X() << "," << n1->Y() << "," << n1->Z() << ")"); + MESSAGE("n2 (" << n2->X() << "," << n2->Y() << "," << n2->Z() << ")"); + MESSAGE("n4 (" << n4->X() << "," << n4->Y() << "," << n4->Z() << ")"); + MESSAGE("n3 (" << n3->X() << "," << n3->Y() << "," << n3->Z() << ")"); if ( way == true ){ - if (MYDEBUG) MESSAGE("AddFace( n1, n2, n3, n4 )"); + MESSAGE("AddFace( n1, n2, n3, n4 )"); newFace = _theMeshDS->AddFace( n1, n2, n3, n4 ); } else { - if (MYDEBUG) MESSAGE("AddFace( n4, n3, n2, n1 )"); + MESSAGE("AddFace( n4, n3, n2, n1 )"); newFace = _theMeshDS->AddFace( n4, n3, n2, n1 ); } facesOnQuad.push_back(newFace); @@ -1036,7 +1024,7 @@ bool SMESH_HexaBlocks::computeQuadByLinearApproximation( HEXA_NS::Quad& quad, bo _quadNodes[ &quad ] = nodesOnQuad; _facesOnQuad[&quad] = facesOnQuad; - if(MYDEBUG) MESSAGE("computeQuadByLinearApproximation() : end >>>>>>>>"); + MESSAGE("computeQuadByLinearApproximation() : end >>>>>>>>"); return ok; } @@ -1046,7 +1034,7 @@ bool SMESH_HexaBlocks::computeQuadByLinearApproximation( HEXA_NS::Quad& quad, bo // -------------------------------------------------------------- bool SMESH_HexaBlocks::computeHexa( HEXA_NS::Document* doc ) { - if(MYDEBUG) MESSAGE("computeHexa() : : begin <<<<<<"); + MESSAGE("computeHexa() : : begin <<<<<<"); bool ok=false; SMESH_MesherHelper aHelper(*_theMesh); @@ -1060,12 +1048,12 @@ bool SMESH_HexaBlocks::computeHexa( HEXA_NS::Document* doc ) try { ok = algo.Compute( *_theMesh, &aHelper, _volumesOnHexa, _node ); } catch(...) { - if(MYDEBUG) MESSAGE("SMESH_HexaFromSkin_3D error!!! "); - } - if (MYDEBUG){ - MESSAGE("SMESH_HexaFromSkin_3D.comment = "<myComment); - MESSAGE("computeHexa() : end >>>>>>>>"); + MESSAGE("SMESH_HexaFromSkin_3D error!!! "); } + + MESSAGE("SMESH_HexaFromSkin_3D.comment = "<myComment); + MESSAGE("computeHexa() : end >>>>>>>>"); + return ok; } @@ -1076,7 +1064,7 @@ bool SMESH_HexaBlocks::computeHexa( HEXA_NS::Document* doc ) // -------------------------------------------------------------- bool SMESH_HexaBlocks::computeDoc( HEXA_NS::Document* doc ) { - if(MYDEBUG) MESSAGE("computeDoc() : : begin <<<<<<"); + MESSAGE("computeDoc() : : begin <<<<<<"); bool ok = true; // A) Vertex computation @@ -1121,14 +1109,14 @@ bool SMESH_HexaBlocks::computeDoc( HEXA_NS::Document* doc ) if ( quadWays.count(q) > 0 ) ok = computeQuad( *q, quadWays[q] ); else - if(MYDEBUG) MESSAGE("NO QUAD WAY ID = "<>>>>>>>"); + MESSAGE("computeDoc() : end >>>>>>>>"); doc->lockDump (); return ok; } @@ -1136,19 +1124,18 @@ bool SMESH_HexaBlocks::computeDoc( HEXA_NS::Document* doc ) void SMESH_HexaBlocks::buildGroups(HEXA_NS::Document* doc) { - if (MYDEBUG){ - MESSAGE("_addGroups() : : begin <<<<<<"); - MESSAGE("_addGroups() : : nb. hexas= " << doc->countUsedHexa()); - MESSAGE("_addGroups() : : nb. quads= " << doc->countUsedQuad()); - MESSAGE("_addGroups() : : nb. edges= " << doc->countUsedEdge()); - MESSAGE("_addGroups() : : nb. nodes= " << doc->countUsedVertex()); - } + MESSAGE("_addGroups() : : begin <<<<<<"); + MESSAGE("_addGroups() : : nb. hexas= " << doc->countUsedHexa()); + MESSAGE("_addGroups() : : nb. quads= " << doc->countUsedQuad()); + MESSAGE("_addGroups() : : nb. edges= " << doc->countUsedEdge()); + MESSAGE("_addGroups() : : nb. nodes= " << doc->countUsedVertex()); + // Looping on each groups of the document for ( int i=0; i < doc->countGroup(); i++ ){ _fillGroup( doc->getGroup(i) ); }; - if(MYDEBUG) MESSAGE("_addGroups() : end >>>>>>>>"); + MESSAGE("_addGroups() : end >>>>>>>>"); } // -------------------------------------------------------------- @@ -1164,7 +1151,7 @@ double SMESH_HexaBlocks::_Xx( double i, HEXA_NS::Law law, double nbNodes) //, do switch (k){ case HEXA_NS::Uniform: result = (i+1)/(nbNodes+1); - if(MYDEBUG) MESSAGE( "_Xx():" << " Uniform u("<>>>>>>>"); + MESSAGE("_edgeLength() : end >>>>>>>>"); return length; } //--+----1----+----2----+----3----+----4----+----5----+----6----+----7----+----8 @@ -1220,7 +1207,7 @@ void SMESH_HexaBlocks::_buildMyCurve( std::map< BRepAdaptor_Curve*, double>& myCurve_starts, //INOUT HEXA_NS::Edge& edge) // For error diagnostic { - if(MYDEBUG) MESSAGE("_buildMyCurve() : : begin <<<<<<"); + MESSAGE("_buildMyCurve() : : begin <<<<<<"); bool current_way = true; myCurve_tot_len = 0.; BRepAdaptor_Curve* thePreviousCurve = NULL; @@ -1264,7 +1251,6 @@ void SMESH_HexaBlocks::_buildMyCurve( } else { - if (MYDEBUG) MESSAGE("SOMETHING WRONG on edge association... Bad script?"); edge.dumpAsso(); throw (SALOME_Exception (LOCALIZED("Edge association : check association parameters ( first, last ) between HEXA model and CAO"))); @@ -1287,7 +1273,6 @@ void SMESH_HexaBlocks::_buildMyCurve( } else { - if (MYDEBUG) MESSAGE("SOMETHING WRONG on edge association... bad script?"); // ASSERT(false); edge.dumpAsso(); @@ -1314,10 +1299,8 @@ void SMESH_HexaBlocks::_buildMyCurve( myCurve_list = tmp; } - if (MYDEBUG) { - MESSAGE("current_way was :" << current_way); - MESSAGE("_buildMyCurve() : end >>>>>>>>"); - } + MESSAGE("current_way was :" << current_way); + MESSAGE("_buildMyCurve() : end >>>>>>>>"); } @@ -1333,7 +1316,7 @@ gp_Pnt SMESH_HexaBlocks::_getPtOnMyCurve( // std::map< BRepAdaptor_Curve*, double>& myCurve_firsts, // std::map< BRepAdaptor_Curve*, double>& myCurve_lasts, { - if(MYDEBUG) MESSAGE("_getPtOnMyCurve() : : begin <<<<<<"); + MESSAGE("_getPtOnMyCurve() : : begin <<<<<<"); gp_Pnt ptOnMyCurve; // looking for curve which contains parameter myCurve_u @@ -1343,14 +1326,13 @@ gp_Pnt SMESH_HexaBlocks::_getPtOnMyCurve( double curve_u; GCPnts_AbscissaPoint discret; - if (MYDEBUG){ - MESSAGE("looking for curve = "<<(long) curve); - MESSAGE("looking for curve: curve_u = "<>>>>>>>"); - } + MESSAGE("curve found!"); + MESSAGE("curve_u = "<< curve_u); + MESSAGE("curve way = "<< myCurve_ways[curve]); + MESSAGE("_getPtOnMyCurve() : end >>>>>>>>"); + return ptOnMyCurve; } @@ -1395,29 +1375,25 @@ void SMESH_HexaBlocks::_nodeInterpolationUV(double u, double v, SMDS_MeshNode* S1, SMDS_MeshNode* S2, SMDS_MeshNode* S3, SMDS_MeshNode* S4, double& xOut, double& yOut, double& zOut ) { - if (MYDEBUG){ - MESSAGE("_nodeInterpolationUV() IN:"); - MESSAGE("u ( "<< u <<" )"); - MESSAGE("v ( "<< v <<" )"); - - MESSAGE("S1 (" << S1->X() << "," << S1->Y() << "," << S1->Z() << ")"); - MESSAGE("S2 (" << S2->X() << "," << S2->Y() << "," << S2->Z() << ")"); - MESSAGE("S4 (" << S4->X() << "," << S4->Y() << "," << S4->Z() << ")"); - MESSAGE("S3 (" << S3->X() << "," << S3->Y() << "," << S3->Z() << ")"); - - MESSAGE("Pg (" << Pg->X() << "," << Pg->Y() << "," << Pg->Z() << ")"); - MESSAGE("Pd (" << Pd->X() << "," << Pd->Y() << "," << Pd->Z() << ")"); - MESSAGE("Ph (" << Ph->X() << "," << Ph->Y() << "," << Ph->Z() << ")"); - MESSAGE("Pb (" << Pb->X() << "," << Pb->Y() << "," << Pb->Z() << ")"); - } + MESSAGE("_nodeInterpolationUV() IN:"); + MESSAGE("u ( "<< u <<" )"); + MESSAGE("v ( "<< v <<" )"); + + MESSAGE("S1 (" << S1->X() << "," << S1->Y() << "," << S1->Z() << ")"); + MESSAGE("S2 (" << S2->X() << "," << S2->Y() << "," << S2->Z() << ")"); + MESSAGE("S4 (" << S4->X() << "," << S4->Y() << "," << S4->Z() << ")"); + MESSAGE("S3 (" << S3->X() << "," << S3->Y() << "," << S3->Z() << ")"); + + MESSAGE("Pg (" << Pg->X() << "," << Pg->Y() << "," << Pg->Z() << ")"); + MESSAGE("Pd (" << Pd->X() << "," << Pd->Y() << "," << Pd->Z() << ")"); + MESSAGE("Ph (" << Ph->X() << "," << Ph->Y() << "," << Ph->Z() << ")"); + MESSAGE("Pb (" << Pb->X() << "," << Pb->Y() << "," << Pb->Z() << ")"); xOut = ((1.-u)*Pg->X() + v*Ph->X() + u*Pd->X() + (1.-v)*Pb->X()) - (1.-u)*(1.-v)*S1->X() - u*(1.-v)*S2->X() - u*v*S3->X() - (1.-u)*v*S4->X(); yOut = ((1.-u)*Pg->Y() + v*Ph->Y() + u*Pd->Y() + (1.-v)*Pb->Y()) - (1.-u)*(1.-v)*S1->Y() - u*(1.-v)*S2->Y() - u*v*S3->Y() - (1.-u)*v*S4->Y(); zOut = ((1.-u)*Pg->Z() + v*Ph->Z() + u*Pd->Z() + (1.-v)*Pb->Z()) - (1.-u)*(1.-v)*S1->Z() - u*(1.-v)*S2->Z() - u*v*S3->Z() - (1.-u)*v*S4->Z(); - if (MYDEBUG){ - MESSAGE("_nodeInterpolationUV() OUT("<getNbrParents() != 1 ) return; // q must be a skin quad @@ -1601,17 +1577,17 @@ void SMESH_HexaBlocks::_searchInitialQuadWay( HEXA_NS::Quad* q, HEXA_NS::Vertex* v0 = qB; v1 = qA; } - if(MYDEBUG) MESSAGE("_searchInitialQuadWay() : end"); + MESSAGE("_searchInitialQuadWay() : end"); } SMESH_Group* SMESH_HexaBlocks::_createGroup(HEXA_NS::Group& grHex) { - if(MYDEBUG) MESSAGE("_createGroup() : : begin <<<<<<"); + MESSAGE("_createGroup() : : begin <<<<<<"); std::string aGrName = grHex.getName(); HEXA_NS::EnumGroup grHexKind = grHex.getKind(); - if(MYDEBUG) MESSAGE("aGrName"<AddGroup(aGrType, aGrName.c_str()); - if(MYDEBUG) MESSAGE("_createGroup() : end >>>>>>>>"); + MESSAGE("_createGroup() : end >>>>>>>>"); return aGr; } void SMESH_HexaBlocks::_fillGroup(HEXA_NS::Group* grHex ) { - if(MYDEBUG) MESSAGE("_fillGroup() : : begin <<<<<<"); + MESSAGE("_fillGroup() : : begin <<<<<<"); SMESH_Group* aGr = _createGroup( *grHex ); HEXA_NS::EltBase* grHexElt = NULL; HEXA_NS::EnumGroup grHexKind = grHex->getKind(); int grHexNbElt = grHex->countElement(); - if(MYDEBUG) MESSAGE("_fillGroup() : kind = " << grHexKind); - if(MYDEBUG) MESSAGE("_fillGroup() : count= " << grHexNbElt); + MESSAGE("_fillGroup() : kind = " << grHexKind); + MESSAGE("_fillGroup() : count= " << grHexNbElt); // A)Looking for elements ID std::vector aGrEltIDs; @@ -1659,7 +1635,7 @@ void SMESH_HexaBlocks::_fillGroup(HEXA_NS::Group* grHex ) aGrEltIDs.push_back(*aVolume); } } else { - if(MYDEBUG) MESSAGE("GROUP OF VOLUME: volume for hexa (id = "<getId()<<") not found"); + MESSAGE("GROUP OF VOLUME: volume for hexa (id = "<getId()<<") not found"); } } break; @@ -1672,7 +1648,7 @@ void SMESH_HexaBlocks::_fillGroup(HEXA_NS::Group* grHex ) aGrEltIDs.push_back(*aFace); } } else { - if(MYDEBUG) MESSAGE("GROUP OF FACE: face for quad (id = "<getId()<<") not found"); + MESSAGE("GROUP OF FACE: face for quad (id = "<getId()<<") not found"); } } break; @@ -1685,7 +1661,7 @@ void SMESH_HexaBlocks::_fillGroup(HEXA_NS::Group* grHex ) aGrEltIDs.push_back(*anEdge); } } else { - if(MYDEBUG) MESSAGE("GROUP OF Edge: edge for edge (id = "<getId()<<") not found"); + MESSAGE("GROUP OF Edge: edge for edge (id = "<getId()<<") not found"); } } break; @@ -1705,7 +1681,7 @@ void SMESH_HexaBlocks::_fillGroup(HEXA_NS::Group* grHex ) } } } else { - if(MYDEBUG) MESSAGE("GROUP OF HEXA NODES: nodes on hexa (id = "<getId()<<") not found"); + MESSAGE("GROUP OF HEXA NODES: nodes on hexa (id = "<getId()<<") not found"); } } break; @@ -1720,7 +1696,7 @@ void SMESH_HexaBlocks::_fillGroup(HEXA_NS::Group* grHex ) } } } else { - if(MYDEBUG) MESSAGE("GROUP OF QUAD NODES: nodes on quad (id = "<getId()<<") not found"); + MESSAGE("GROUP OF QUAD NODES: nodes on quad (id = "<getId()<<") not found"); } } break; @@ -1733,7 +1709,7 @@ void SMESH_HexaBlocks::_fillGroup(HEXA_NS::Group* grHex ) aGrEltIDs.push_back(*aNode); } } else { - if(MYDEBUG) MESSAGE("GROUP OF EDGE NODES: nodes on edge (id = "<getId()<<") not found"); + MESSAGE("GROUP OF EDGE NODES: nodes on edge (id = "<getId()<<") not found"); } } break; @@ -1743,7 +1719,7 @@ void SMESH_HexaBlocks::_fillGroup(HEXA_NS::Group* grHex ) if ( _node.count(v)>0 ){ aGrEltIDs.push_back(_node[v]); } else { - if(MYDEBUG) MESSAGE("GROUP OF VERTEX NODES: nodes for vertex (id = "<getId()<<") not found"); + MESSAGE("GROUP OF VERTEX NODES: nodes for vertex (id = "<getId()<<") not found"); } } break; @@ -1758,5 +1734,5 @@ void SMESH_HexaBlocks::_fillGroup(HEXA_NS::Group* grHex ) aGroupDS->SMDSGroup().Add( aGrEltIDs[i] ); }; - if(MYDEBUG) MESSAGE("_fillGroup() : end >>>>>>>>"); + MESSAGE("_fillGroup() : end >>>>>>>>"); } -- 2.39.2