Commit 7256247c authored by Dave Moxey's avatar Dave Moxey

Delay output of SessionReader parameters and solver info in verbose mode until...

Delay output of SessionReader parameters and solver info in verbose mode until command-line overrides have been set
parent 6e3d43e2
...@@ -287,6 +287,32 @@ namespace Nektar ...@@ -287,6 +287,32 @@ namespace Nektar
// Override SOLVERINFO and parameters with any specified on the // Override SOLVERINFO and parameters with any specified on the
// command line. // command line.
CmdLineOverride(); CmdLineOverride();
// In verbose mode, print out parameters and solver info sections
if (m_verbose && m_comm)
{
if (m_comm->GetRank() == 0 && m_parameters.size() > 0)
{
cout << "Parameters:" << endl;
ParameterMap::iterator x;
for (x = m_parameters.begin(); x != m_parameters.end(); ++x)
{
cout << "\t" << x->first << " = " << x->second << endl;
}
cout << endl;
}
if (m_comm->GetRank() == 0 && m_solverInfo.size() > 0)
{
cout << "Solver Info:" << endl;
SolverInfoMap::iterator x;
for (x = m_solverInfo.begin(); x != m_solverInfo.end(); ++x)
{
cout << "\t" << x->first << " = " << x->second << endl;
}
cout << endl;
}
}
} }
...@@ -1618,20 +1644,6 @@ namespace Nektar ...@@ -1618,20 +1644,6 @@ namespace Nektar
parameter = parameter->NextSiblingElement(); parameter = parameter->NextSiblingElement();
} }
} }
if (m_verbose && m_parameters.size() > 0 && m_comm)
{
if(m_comm->GetRank() == 0)
{
cout << "Parameters:" << endl;
ParameterMap::iterator x;
for (x = m_parameters.begin(); x != m_parameters.end(); ++x)
{
cout << "\t" << x->first << " = " << x->second << endl;
}
cout << endl;
}
}
} }
...@@ -1716,20 +1728,6 @@ namespace Nektar ...@@ -1716,20 +1728,6 @@ namespace Nektar
m_solverInfo["GLOBALSYSSOLN"] == "XxtMultiLevelStaticCond", m_solverInfo["GLOBALSYSSOLN"] == "XxtMultiLevelStaticCond",
"A parallel solver must be used when run in parallel."); "A parallel solver must be used when run in parallel.");
} }
if (m_verbose && m_solverInfo.size() > 0 && m_comm)
{
if(m_comm->GetRank() == 0)
{
cout << "Solver Info:" << endl;
SolverInfoMap::iterator x;
for (x = m_solverInfo.begin(); x != m_solverInfo.end(); ++x)
{
cout << "\t" << x->first << " = " << x->second << endl;
}
cout << endl;
}
}
} }
......
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