Protecting log statements with ifdef PZ_LOG

Analysis/TPZEigenAnalysis.cpp

@@ -15,8 +15,10 @@
 
 #include "pzlog.h"
 
+#ifdef PZ_LOG
 static TPZLogger logger("pz.analysis");
 static TPZLogger loggerError("pz.analysis.error");
+#endif
 
 TPZEigenAnalysis::TPZEigenAnalysis()
   : TPZRegisterClassId(&TPZEigenAnalysis::ClassId),TPZAnalysis()
@@ -286,4 +288,4 @@ INSTANTIATE_TEMPLATES(STATE)
 INSTANTIATE_TEMPLATES(CSTATE)
 #undef INSTANTIATE_TEMPLATES
 
-template class TPZRestoreClass<TPZEigenAnalysis>;
+template class TPZRestoreClass<TPZEigenAnalysis>;

Analysis/pznonlinanalysis.cpp

@@ -70,10 +70,14 @@ REAL TPZNonLinearAnalysis::LineSearch(const TPZFMatrix<STATE> &Wn, TPZFMatrix<ST
 			lambdak = Interval; lambdak *= 0.382; lambdak += ak;
 			//computing residual
 			this->LoadSolution(lambdak);
+#ifdef PZ_LOG
 			LOGPZ_DEBUG(logger,"After LoadSolution")
+#endif
 			//		LogWellSolution(*this->Mesh(), 6);
 			this->AssembleResidual();
+#ifdef PZ_LOG
 			LOGPZ_DEBUG(logger,"After AssembleResidual")
+#endif
 			//		LogWellSolution(*this->Mesh(), 6);
 			NormResLambda = Norm(fRhs);
 		}

External/tpznodesetcompute.cpp

@@ -291,12 +291,15 @@ void TPZNodesetCompute::AnalyseForElements(std::set<int64_t> &vertices, std::set
   if(!vertices.size()) return;
   std::set<int64_t> elem;
   std::set<int64_t>::iterator intit,diffit;
+#ifdef PZ_LOG
+    if(logger.isDebugEnabled())
 	{
 		std::stringstream sout;
 		sout << __PRETTY_FUNCTION__ << " Original set of nodes ";
 		Print(sout,vertices,0);
 		LOGPZ_DEBUG(logger,sout.str())
 	}
+#endif
   for(intit = vertices.begin(); intit != vertices.end(); intit++)
   {
     std::set<int64_t> locset,diffset,interset,unionset,loclocset;

Matrix/TPZTensor.h

@@ -66,7 +66,7 @@ class TPZTensor : public TPZSavable {
         }
 
         void Print(std::ostream &out) const {
-#ifdef PZDEBUG
+#ifdef PZ_LOG
             if (fDistinctEigenvalues == 0 || fDistinctEigenvalues > 3) {
                 std::stringstream str;
                 str << "TPZTensor::Decomposed::Print Invalid number of distinct eigenvalues: " << fDistinctEigenvalues << std::endl;
@@ -78,7 +78,7 @@ class TPZTensor : public TPZSavable {
             unsigned int lambda = 0;
             do {
                 const unsigned int geoMult(fGeometricMultiplicity[lambda]);
-#ifdef PZDEBUG
+#ifdef PZ_LOG
                 if (geoMult == 0 || geoMult > 3) {
                     std::stringstream str;
                     str << "TPZTensor::Decomposed::Print Invalid geometric multiplicity (" << geoMult << ") for eigenvalue " << fEigenvalues[lambda] << std::endl;

Matrix/pzblockdiag.cpp

@@ -423,8 +423,9 @@ int TPZBlockDiagonal<TVar>::Decompose_LU(std::list<int64_t> &singular)
 template<class TVar>
 int TPZBlockDiagonal<TVar>::Decompose_LU()
 {
-	
+#ifdef PZ_LOG
 	LOGPZ_DEBUG(logger, "TPZBlockDiagonal::Decompose_LU");
+#endif
 
 	if (  this->fDecomposed && this->fDecomposed == ELU) {
 		return ELU;

Matrix/pzmatred.cpp

@@ -20,6 +20,8 @@ using namespace std;
 #include "pzlog.h"
 #ifdef PZ_LOG
 static TPZLogger logger("pz.matrix.tpzmatred");
+#else
+static int logger;
 #endif
 
 /*************************** Public ***************************/
@@ -543,7 +545,7 @@ void TPZMatRed<TVar, TSideMatrix>::MultAdd(const TPZFMatrix<TVar> &x,
 	// #warning Not functional yet. Still need to Identify all the variables	
 	if(!fIsReduced)
 	{
-		LOGPZ_WARN(logger,"TPZMatRed not reduced, expect trouble")
+		LOGPZ_ERROR(logger,"TPZMatRed not reduced, expect trouble")
 		TPZMatrix<TVar>::MultAdd(x,y,z,alpha,beta,opt);
 		return;
 	}

Matrix/tpzsparseblockdiagonal.cpp

@@ -9,8 +9,9 @@
 
 #include "pzlog.h"
 
+#ifdef PZ_LOG
 static TPZLogger logger("pz.StrMatrix");
-
+#endif
 
 using namespace std;
 
@@ -36,7 +37,9 @@ TPZSparseBlockDiagonal<TVar>::TPZSparseBlockDiagonal(TPZVec<int64_t> &blockgraph
 template<class TVar>
 TPZSparseBlockDiagonal<TVar>::TPZSparseBlockDiagonal(TPZVec<int64_t> &blockgraph, TPZVec<int64_t> &blockgraphindex,int64_t rows, int color, TPZVec<int> &colors) : TPZRegisterClassId(&TPZSparseBlockDiagonal::ClassId)
 {
+#ifdef PZ_LOG
 	LOGPZ_DEBUG(logger, "Constructor of TPZSparseBlockDiagonal");
+#endif
 	int64_t numbl = blockgraphindex.NElements()-1;
 	this->fBlockSize.Resize(numbl);
 	int64_t ibl,iblcount,graphsize = 0;
@@ -195,7 +198,9 @@ void TPZSparseBlockDiagonal<TVar>::AddBlock(int64_t i, TPZFMatrix<TVar>& block)
 template<class TVar>
 void TPZSparseBlockDiagonal<TVar>::BuildFromMatrix(TPZMatrix<TVar>& matrix)
 {
+#ifdef PZ_LOG
 	LOGPZ_DEBUG(logger, "TPZSparseBlockDiagonal::BuildFromMatrix");
+#endif
 	TPZManVector<int64_t> indices;
 	TPZFNMatrix<10000,TVar> submat(0,0);
 	int64_t ibl,nbl = fBlockIndex.NElements()-1;
@@ -220,7 +225,9 @@ void TPZSparseBlockDiagonal<TVar>::GetBlock(int64_t i, TPZFMatrix<TVar>& block)
 template<class TVar>
 void TPZSparseBlockDiagonal<TVar>::MultAdd(const TPZFMatrix<TVar>& x, const TPZFMatrix<TVar>& y, TPZFMatrix<TVar>& z, const TVar alpha, const TVar beta, const int opt) const
 {
+#ifdef PZ_LOG
 	LOGPZ_DEBUG(logger, "TPZSparseBlockDiagonal::MultAdd");
+#endif
 	TPZFNMatrix<1000,TVar> xsc(0,0),ysc(0,0,0.),zsc(0,0);
 	xsc.Resize(this->fBlock.NElements(),x.Cols());
 	z.Zero();
@@ -292,7 +299,9 @@ void TPZSparseBlockDiagonal<TVar>::Gather(const TPZFMatrix<TVar> &in, TPZFMatrix
 template<class TVar>
 void TPZSparseBlockDiagonal<TVar>::UpdateFrom(TPZAutoPointer<TPZMatrix<TVar> > mat)
 {
+#ifdef PZ_LOG
 	LOGPZ_DEBUG(logger, "TPZSparseBlockDiagonal::UpdateFrom");
+#endif
 	if(!mat) 
 	{
 		cout << __PRETTY_FUNCTION__ << " called with zero argument\n";

Mesh/TPZCompElH1.cpp

@@ -6,6 +6,8 @@
 
 #ifdef PZ_LOG
 static TPZLogger logger("pz.mesh.tpzintelgen");
+#else
+static int logger;
 #endif
 
 
@@ -283,4 +285,4 @@ template class TPZRestoreClass< TPZCompElH1<TPZShapeTetra>>;
 template class TPZRestoreClass< TPZCompElH1<TPZShapePrism>>;
 template class TPZRestoreClass< TPZCompElH1<TPZShapePiram>>;
 template class TPZRestoreClass< TPZCompElH1<TPZShapePiramHdiv>>;
-#endif
+#endif

Mesh/TPZCompElHCurl.cpp

@@ -19,6 +19,8 @@
 #ifdef PZ_LOG
 static TPZLogger logger("pz.mesh.TPZCompElHCurl");
 static TPZLogger loggercurl("pz.mesh.tpzinterpolatedelement.divide");
+#else
+static int logger;
 #endif
 /*********************************************************************************************************
                                        TPZHCurlAuxClass methods
@@ -564,7 +566,7 @@ void TPZCompElHCurl<TSHAPE>::RestrainSide(int side, TPZInterpolatedElement *larg
         return;
     }
     if (myConnect.HasDependency() && largeSideDimension > 0) {
-        LOGPZ_WARN(logger, "RestrainSide - unnecessary call to restrainside");
+        LOGPZ_ERROR(logger, "RestrainSide - unnecessary call to restrainside");
         DebugStop();
     }
     if (largeCel->ConnectIndex(largeCel->MidSideConnectLocId(largeCompSide.Side())) == -1) {

Mesh/TPZCompElHDivCollapsed.cpp

@@ -16,6 +16,8 @@
 
 #ifdef PZ_LOG
 static TPZLogger logger("pz.mesh.TPZCompElHDivCollapsed");
+#else
+static int logger;
 #endif
 
 template<class TSHAPE>

Mesh/TPZElementMatrixT.cpp

@@ -3,6 +3,8 @@
 #include "pzlog.h"
 #ifdef PZ_LOG
 static TPZLogger logger("pz.mesh.tpzelmat");
+#else
+static int logger;
 #endif
 
 
@@ -231,7 +233,7 @@ void TPZElementMatrixT<TVar>::ApplyConstraints(){
 				// find the index of the node in the destination (constrained) matrix
 				while(jrnode < totalnodes && this->fConstrConnect[jrnode] != jdfn) jrnode++;
 				if(jrnode == totalnodes) {
-					LOGPZ_WARN(logger, "node not found in node list");
+					LOGPZ_ERROR(logger, "node not found in node list");
 				}
 				// first and last columns in the original matrix
 				int64_t jfirst = this->fBlock.Position(jn);
@@ -275,7 +277,7 @@ void TPZElementMatrixT<TVar>::ApplyConstraints(){
 				int depindex=0;
 				while(depindex < totalnodes && this->fConstrConnect[depindex] != depnodeindex) depindex++;
 				if(depindex == totalnodes) {
-					LOGPZ_WARN(logger,"node not found in node list");
+					LOGPZ_ERROR(logger,"node not found in node list");
 				}
 
 				int64_t deppos = this->fConstrBlock.Position(depindex);
@@ -474,4 +476,4 @@ void TPZElementMatrixT<TVar>::PermuteGather(TPZVec<int64_t> &permute)
 }
 
 template class TPZElementMatrixT<STATE>;
-template class TPZElementMatrixT<CSTATE>;
+template class TPZElementMatrixT<CSTATE>;

Mesh/TPZInterfaceEl.cpp

@@ -653,7 +653,9 @@ void TPZInterfaceElement::ComputeNormal(TPZFMatrix<REAL> &axes, TPZVec<REAL> &no
 		int index = fabs(axes(0,0)) < fabs(axes(0,1)) ? 0 : 1;
 		index = fabs(axes(0,index)) < fabs(axes(0,2)) ? index : 2;
 		vec[index] = 1.;
+#ifdef PZ_LOG
 		LOGPZ_WARN(logger,"Left and Right element centers coincide")
+#endif
 	}
 
 
@@ -1514,4 +1516,4 @@ void TPZInterfaceElement::BuildCornerConnectList(std::set<int64_t> &connectindex
 
 INSTANTIATE_TEMPLATES(STATE)
 INSTANTIATE_TEMPLATES(CSTATE)
-#undef INSTANTIATE_TEMPLATES
+#undef INSTANTIATE_TEMPLATES

Mesh/pzcompel.cpp

@@ -663,7 +663,9 @@ TPZGeoEl * TPZCompEl::GetRefElPatch(){
 #endif
     }
     int j;
+#ifdef PZ_LOG
     LOGPZ_DEBUG(logger, sout.str());
+#endif
     while(ancestors.NElements()) {
         TPZGeoEl *larger = ancestors.Pop();
         for (j=0; j<larger->NSides(); j++){
@@ -684,7 +686,9 @@ TPZGeoEl * TPZCompEl::GetRefElPatch(){
     }
     //cout << " \n \n \n ==================================\n ================================\nElemento PatchReference falho\n";
     //Reference()->Print();
+#ifdef PZ_LOG
     LOGPZ_DEBUG(logger, "Exit GetRefElPatch - Element is its own patch");
+#endif
     return (Reference());
 }
 
@@ -802,7 +806,9 @@ void TPZCompElSide::HigherDimensionElementList(TPZStack<TPZCompElSide> &elsideve
                                                int onlyinterpolated, int removeduplicates) {
     TPZGeoElSide georef = Reference();
     if(!georef.Exists()) {
+#ifdef PZ_LOG
         LOGPZ_INFO(loggerSide, "Entering HigherDimensionElementList - null reference reached");
+#endif
         return;
     }
     georef.HigherDimensionElementList(elsidevec,onlyinterpolated);

Mesh/pzintel.cpp

@@ -25,6 +25,8 @@
 #ifdef PZ_LOG
 static TPZLogger logger("pz.mesh.tpzinterpolatedelement");
 static TPZLogger loggerdiv("pz.mesh.tpzinterpolatedelement.divide");
+#else
+static int logger;
 #endif
 
 
@@ -115,7 +117,9 @@ void TPZInterpolatedElement::ForceSideOrder(int side, int order) {
     TPZCompElSide thisside(this, side);
     TPZCompElSide large = thisside.LowerLevelElementList(1);
     if (large.Exists()) {
+#ifdef PZ_LOG
         LOGPZ_INFO(logger, "Exiting ForceSideOrder - large exists.");
+#endif
         return;
     }
     TPZConnect &c = MidSideConnect(side);
@@ -1112,8 +1116,8 @@ int TPZInterpolatedElement::CheckElementConsistency() {
             sout << "TPZInterpolatedElement::CheckConstraintConsistency : dismall >= dimel: "
                     << dimsmall << " >= " << dimel << endl
                     << "press any key to continue";
-            LOGPZ_INFO(logger, sout.str());
-            cin >> a;
+            LOGPZ_ERROR(logger, sout.str());
+            DebugStop();
             delete sirule;
             return 0;
         }
@@ -1145,7 +1149,9 @@ int TPZInterpolatedElement::CheckElementConsistency() {
                     SideShapeFunction(sidel, ptl, phil, dphil);
                     int check = CompareShapeF(iside, sidel, phis, dphis, phil, dphil, transform);
                     if (!check) {
+#ifdef PZ_LOG
                         LOGPZ_INFO(logger, "Exiting CheckElementConsistency - don't compare shapefunctions.");
+#endif
                         delete sirule;
                         return check;
                     }
@@ -1907,4 +1913,4 @@ void TPZInterpolatedElement::SetCreateFunctions(TPZCompMesh* mesh) {
 
 template
 void TPZInterpolatedElement::
-CalcIntegral<STATE>(TPZElementMatrixT<STATE>&ef);
+CalcIntegral<STATE>(TPZElementMatrixT<STATE>&ef);

Mesh/pzinterpolationspace.cpp

@@ -1027,7 +1027,9 @@ void TPZInterpolationSpace::RemoveInterfaces(){
 		//tirando os elementos de interface da lista
 		for(i=0;i<size;i++){
 			if(list[i].Element()->Type() == EInterface) {
+#ifdef PZ_LOG
 				LOGPZ_DEBUG(logger, "Removing interface element from the list of higher level elements");
+#endif
 				//This need to be done because otherwise list could be invalidated when an interface is removed.
 				list[i] = TPZCompElSide();//tirando interface
 			}
@@ -1107,7 +1109,9 @@ void TPZInterpolationSpace::EvaluateError(TPZVec<REAL> &errors,bool store_error)
 		return;
 	}
 	if (dynamic_cast<TPZBndCond *>(material)) {
+#ifdef PZ_LOG
 		LOGPZ_INFO(logger, "Exiting EvaluateError - null error - boundary condition material.");
+#endif
 		return;
 	}
     if (!materror->HasExactSol()) {

Mesh/pzmultiphysicselement.cpp

@@ -89,7 +89,7 @@ TPZMultiphysicsInterfaceElement * TPZMultiphysicsElement::CreateInterface(int si
 
 	TPZGeoEl *ref = Reference();
 	if(!ref) {
-		LOGPZ_WARN(logger, "Exiting CreateInterface Null reference reached - NULL interface returned");
+		LOGPZ_ERROR(logger, "Exiting CreateInterface Null reference reached - NULL interface returned");
 		return newcreatedinterface;
 	}
 
@@ -342,7 +342,9 @@ void TPZMultiphysicsElement::RemoveInterfaces(){
 		//tirando os elementos de interface da lista
 		for(i=0;i<size;i++){
 			if(list[i].Element()->Type() == EInterface) {
+#ifdef PZ_LOG
 				LOGPZ_DEBUG(logger, "Removing interface element from the list of higher level elements");
+#endif
 				//This need to be done because otherwise list could be invalidated when an interface is removed.
 				list[i] = TPZCompElSide();//tirando interface
 			}

Mesh/pzsubcmesh.cpp

@@ -40,6 +40,8 @@
 #ifdef PZ_LOG
 static TPZLogger logger("pz.mesh.subcmesh");
 static TPZLogger logger2("pz.mesh.tpzcompmesh");
+#else
+static int logger;
 #endif
 
 TPZSubCompMesh::TPZSubCompMesh(TPZCompMesh &mesh, int64_t &index) : TPZRegisterClassId(&TPZSubCompMesh::ClassId), TPZCompMesh(mesh.Reference()), TPZCompEl(mesh,0,index),
@@ -1518,7 +1520,9 @@ void TPZSubCompMesh::SetAnalysisFrontal(int numThreads, TPZAutoPointer<TPZGuiInt
     solver.SetDirect(ELU);
 	fAnalysis->SetSolver(solver);
 
+#ifdef PZ_LOG
 	LOGPZ_DEBUG(logger2, __PRETTY_FUNCTION__)
+#endif
 	PermuteExternalConnects();
 }
 
@@ -1982,6 +1986,7 @@ bool TPZSubCompMesh::NeedsComputing(const std::set<int> &matids)
 
 		}
 	}
+#ifdef PZ_LOG
 	{
 		std::stringstream sout;
 		sout << "Material ids contained in the mesh ";
@@ -1999,11 +2004,12 @@ bool TPZSubCompMesh::NeedsComputing(const std::set<int> &matids)
 		sout << std::endl;
 		LOGPZ_DEBUG(logger, sout.str())
 	}
+#endif
 	if(numtrue && numfalse)
 	{
 		std::stringstream sout;
 		sout << "A substructure should have either all elements computable or not numtrue " << numtrue << " numfalse " << numfalse;
-		LOGPZ_WARN(logger,sout.str())
+		LOGPZ_ERROR(logger,sout.str())
 	}
 	if(numtrue)
 	{