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

Suppress Xxt stats output when running without verbose option

(cherry picked from commit 9111029d)
parent 3cd16603
...@@ -192,7 +192,9 @@ namespace Nektar ...@@ -192,7 +192,9 @@ namespace Nektar
&pLocToGloMap): &pLocToGloMap):
m_linSysKey(pKey), m_linSysKey(pKey),
m_expList(pExpList), 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 ...@@ -129,6 +129,8 @@ namespace Nektar
const boost::weak_ptr<ExpList> m_expList; const boost::weak_ptr<ExpList> m_expList;
/// Robin boundary info /// Robin boundary info
const std::map<int, RobinBCInfoSharedPtr> m_robinBCInfo; const std::map<int, RobinBCInfoSharedPtr> m_robinBCInfo;
// Provide verbose output
bool m_verbose;
virtual int v_GetNumBlocks (); virtual int v_GetNumBlocks ();
virtual DNekScalMatSharedPtr v_GetBlock (unsigned int n); virtual DNekScalMatSharedPtr v_GetBlock (unsigned int n);
......
...@@ -61,16 +61,12 @@ namespace Nektar ...@@ -61,16 +61,12 @@ namespace Nektar
m_useProjection(false), m_useProjection(false),
m_numPrevSols(0) m_numPrevSols(0)
{ {
LibUtilities::SessionReaderSharedPtr vSession
= pExpList.lock()->GetSession();
m_tolerance = pLocToGloMap->GetIterativeTolerance(); m_tolerance = pLocToGloMap->GetIterativeTolerance();
m_maxiter = pLocToGloMap->GetMaxIterations(); m_maxiter = pLocToGloMap->GetMaxIterations();
LibUtilities::CommSharedPtr vComm = m_expList.lock()->GetComm()->GetRowComm(); LibUtilities::CommSharedPtr vComm = m_expList.lock()->GetComm()->GetRowComm();
m_root = (vComm->GetRank())? false : true; m_root = (vComm->GetRank())? false : true;
m_verbose = (vSession->DefinesCmdLineArgument("verbose"))? true :false;
int successiveRHS; int successiveRHS;
if((successiveRHS = pLocToGloMap->GetSuccessiveRHS())) if((successiveRHS = pLocToGloMap->GetSuccessiveRHS()))
......
...@@ -85,9 +85,8 @@ namespace Nektar ...@@ -85,9 +85,8 @@ namespace Nektar
/// Whether to apply projection technique /// Whether to apply projection technique
bool m_useProjection; bool m_useProjection;
/// Provide verbose output and root if parallel. /// Root if parallel
bool m_root; bool m_root;
bool m_verbose;
/// Storage for solutions to previous linear problems /// Storage for solutions to previous linear problems
boost::circular_buffer<Array<OneD, NekDouble> > m_prevLinSol; boost::circular_buffer<Array<OneD, NekDouble> > m_prevLinSol;
......
...@@ -277,7 +277,10 @@ namespace Nektar ...@@ -277,7 +277,10 @@ namespace Nektar
// Set up XXT and output some stats // Set up XXT and output some stats
LibUtilities::CommSharedPtr vComm = pLocToGloMap->GetComm(); LibUtilities::CommSharedPtr vComm = pLocToGloMap->GetComm();
m_crsData = Xxt::Init(nLocal, vId, m_Ai, m_Aj, m_Ar, vComm); 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 ...@@ -254,7 +254,10 @@ namespace Nektar
// Set up XXT and output some stats // Set up XXT and output some stats
LibUtilities::CommSharedPtr vComm = pLocToGloMap->GetComm()->GetRowComm(); LibUtilities::CommSharedPtr vComm = pLocToGloMap->GetComm()->GetRowComm();
m_crsData = Xxt::Init(nLocal, vId, m_Ai, m_Aj, m_Ar, vComm); 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( 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