diff --git a/library/MultiRegions/GlobalLinSys.cpp b/library/MultiRegions/GlobalLinSys.cpp index 7b62e7e844e975acddd8c71b395b65b72d997dd2..22701c2a4dbbf814a5a839411e09631123d00d87 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 3c1fe6791edcc612b9fe13e2d9b1a471fa7c0bd7..b977df3d0d9f128fe13c646514ff589940be2ad3 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 be45c145e9545b728826d3bb23b90d3610390cec..cdfb9ac70225742fa021a172c826a9e768981a77 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 e6150c21a5e8b93e1c4155a2b23a16b6928ad4ab..6fa4c3a291e1465b46c58353eb755f1c9a94cbf9 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 6398dbdf6b088d08e12f52ff7ff4827e1cab7ce1..2b393b7e1676014e5aa31a52b05b9b237753c9a3 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 45c39bb77094f6d39120427277175ba089c0648f..cc05ac96c04358b7c8b5e8e898300367023d24ad 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(