From 15636c9bc5b0b236a85ffdd9ce4eb104e9c7cc6b Mon Sep 17 00:00:00 2001 From: Douglas Serson Date: Thu, 2 Jun 2016 16:28:13 +0100 Subject: [PATCH] Suppress Xxt stats output when running without verbose option (cherry picked from commit 9111029d1fd5576627faa42b1f18698eb425cde1) --- library/MultiRegions/GlobalLinSys.cpp | 4 +++- library/MultiRegions/GlobalLinSys.h | 2 ++ library/MultiRegions/GlobalLinSysIterative.cpp | 6 +----- library/MultiRegions/GlobalLinSysIterative.h | 3 +-- library/MultiRegions/GlobalLinSysXxtFull.cpp | 5 ++++- library/MultiRegions/GlobalLinSysXxtStaticCond.cpp | 5 ++++- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/library/MultiRegions/GlobalLinSys.cpp b/library/MultiRegions/GlobalLinSys.cpp index 7b62e7e84..22701c2a4 100644 --- a/library/MultiRegions/GlobalLinSys.cpp +++ b/library/MultiRegions/GlobalLinSys.cpp @@ -192,7 +192,9 @@ namespace Nektar &pLocToGloMap): m_linSysKey(pKey), m_expList(pExpList), - m_robinBCInfo(m_expList.lock()->GetRobinBCInfo()) + m_robinBCInfo(m_expList.lock()->GetRobinBCInfo()), + m_verbose(m_expList.lock()->GetSession()-> + DefinesCmdLineArgument("verbose")) { } diff --git a/library/MultiRegions/GlobalLinSys.h b/library/MultiRegions/GlobalLinSys.h index 3c1fe6791..b977df3d0 100644 --- a/library/MultiRegions/GlobalLinSys.h +++ b/library/MultiRegions/GlobalLinSys.h @@ -129,6 +129,8 @@ namespace Nektar const boost::weak_ptr m_expList; /// Robin boundary info const std::map m_robinBCInfo; + // Provide verbose output + bool m_verbose; virtual int v_GetNumBlocks (); virtual DNekScalMatSharedPtr v_GetBlock (unsigned int n); diff --git a/library/MultiRegions/GlobalLinSysIterative.cpp b/library/MultiRegions/GlobalLinSysIterative.cpp index be45c145e..cdfb9ac70 100644 --- a/library/MultiRegions/GlobalLinSysIterative.cpp +++ b/library/MultiRegions/GlobalLinSysIterative.cpp @@ -61,16 +61,12 @@ namespace Nektar m_useProjection(false), m_numPrevSols(0) { - LibUtilities::SessionReaderSharedPtr vSession - = pExpList.lock()->GetSession(); - m_tolerance = pLocToGloMap->GetIterativeTolerance(); m_maxiter = pLocToGloMap->GetMaxIterations(); LibUtilities::CommSharedPtr vComm = m_expList.lock()->GetComm()->GetRowComm(); m_root = (vComm->GetRank())? false : true; - m_verbose = (vSession->DefinesCmdLineArgument("verbose"))? true :false; - + int successiveRHS; if((successiveRHS = pLocToGloMap->GetSuccessiveRHS())) diff --git a/library/MultiRegions/GlobalLinSysIterative.h b/library/MultiRegions/GlobalLinSysIterative.h index e6150c21a..6fa4c3a29 100644 --- a/library/MultiRegions/GlobalLinSysIterative.h +++ b/library/MultiRegions/GlobalLinSysIterative.h @@ -85,9 +85,8 @@ namespace Nektar /// Whether to apply projection technique bool m_useProjection; - /// Provide verbose output and root if parallel. + /// Root if parallel bool m_root; - bool m_verbose; /// Storage for solutions to previous linear problems boost::circular_buffer > m_prevLinSol; diff --git a/library/MultiRegions/GlobalLinSysXxtFull.cpp b/library/MultiRegions/GlobalLinSysXxtFull.cpp index 6398dbdf6..2b393b7e1 100644 --- a/library/MultiRegions/GlobalLinSysXxtFull.cpp +++ b/library/MultiRegions/GlobalLinSysXxtFull.cpp @@ -277,7 +277,10 @@ namespace Nektar // Set up XXT and output some stats LibUtilities::CommSharedPtr vComm = pLocToGloMap->GetComm(); m_crsData = Xxt::Init(nLocal, vId, m_Ai, m_Aj, m_Ar, vComm); - Xxt::nektar_crs_stats(m_crsData); + if (m_verbose) + { + Xxt::nektar_crs_stats(m_crsData); + } } } } diff --git a/library/MultiRegions/GlobalLinSysXxtStaticCond.cpp b/library/MultiRegions/GlobalLinSysXxtStaticCond.cpp index 45c39bb77..cc05ac96c 100644 --- a/library/MultiRegions/GlobalLinSysXxtStaticCond.cpp +++ b/library/MultiRegions/GlobalLinSysXxtStaticCond.cpp @@ -254,7 +254,10 @@ namespace Nektar // Set up XXT and output some stats LibUtilities::CommSharedPtr vComm = pLocToGloMap->GetComm()->GetRowComm(); m_crsData = Xxt::Init(nLocal, vId, m_Ai, m_Aj, m_Ar, vComm); - Xxt::nektar_crs_stats(m_crsData); + if (m_verbose) + { + Xxt::nektar_crs_stats(m_crsData); + } } GlobalLinSysStaticCondSharedPtr GlobalLinSysXxtStaticCond::v_Recurse( -- GitLab