Made output of 1D solver more compact at loglevel 1

This commit is contained in:
Ray Speth 2012-11-14 21:07:21 +00:00
parent 0da6fb4d36
commit 6546a6b22c
2 changed files with 12 additions and 5 deletions

View file

@ -279,10 +279,13 @@ void Sim1D::solve(int loglevel, bool refine_grid)
nsteps = m_steps[istep];
bool ok = false;
if (loglevel > 0) {
writelog("\n");
sim1D_drawline();
}
while (!ok) {
if (loglevel > 0) {
sim1D_drawline();
writelog("\nAttempt Newton solution of steady-state problem...");
writelog("Attempt Newton solution of steady-state problem...");
}
int status = newtonSolve(loglevel-1);
@ -297,15 +300,14 @@ void Sim1D::solve(int loglevel, bool refine_grid)
}
}
writelog("]");
writelog(" point grid(s).\n\n");
writelog(" point grid(s).\n");
}
ok = true;
soln_number++;
} else {
char buf[100];
if (loglevel > 0) {
writelog(" failure. \n\n");
sim1D_drawline();
writelog(" failure. \n");
writelog("Take "+int2str(nsteps)+" timesteps ");
}
dt = timeStep(nsteps, dt, DATA_PTR(m_x), DATA_PTR(m_xnew),
@ -326,6 +328,10 @@ void Sim1D::solve(int loglevel, bool refine_grid)
}
}
}
if (loglevel > 0) {
sim1D_drawline();
writelog("\n");
}
if (loglevel > 2) {
showSolution();
}

View file

@ -201,6 +201,7 @@ void Refiner::show()
writelog(string(bb->first)+" ");
}
writelog("\n");
r_drawline();
} else if (m_domain->nPoints() > 1) {
writelog("no new points needed in "+m_domain->id()+"\n");
//writelog("curve = "+fp2str(m_curve)+"\n");