Commit 15636c9b authored by Douglas Serson's avatar Douglas Serson Committed by Dave Moxey
Browse files

Suppress Xxt stats output when running without verbose option

(cherry picked from commit 9111029d)
parent 3cd16603
......@@ -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"))
{
}
......
......@@ -129,6 +129,8 @@ namespace Nektar
const boost::weak_ptr<ExpList> m_expList;
/// Robin boundary info
const std::map<int, RobinBCInfoSharedPtr> m_robinBCInfo;
// Provide verbose output
bool m_verbose;
virtual int v_GetNumBlocks ();
virtual DNekScalMatSharedPtr v_GetBlock (unsigned int n);
......
......@@ -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()))
......
......@@ -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<Array<OneD, NekDouble> > m_prevLinSol;
......
......@@ -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);
}
}
}
}
......@@ -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(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment