Let solve_stokes() return something more uniform. #2094
Conversation
|
@MFraters -- I'd like you take a close look at this and tell me if this makes sense. Start with the documentation of Because |
source/simulator/solver.cc
Outdated
| { | ||
| TimerOutput::Scope timer (computing_timer, " Solve Stokes system"); | ||
| pcout << " Solving Stokes system... " << std::flush; | ||
|
|
||
| // extract Stokes parts of solution vector, without any ghost elements | ||
| LinearAlgebra::BlockVector distributed_stokes_solution (introspection.index_sets.stokes_partitioning, mpi_communicator); | ||
|
|
||
| double initial_residual = numbers::signaling_nan<double>(); | ||
| double initial_nonlinear_residual = numbers::signaling_nan<double>(); | ||
| // the final linear residual is for the direct solver zero, | ||
| // so we set it here to zero. For the iterative solver, we |
source/simulator/solver.cc
Outdated
| @@ -919,7 +926,8 @@ namespace aspect | |||
| if (parameters.include_melt_transport) | |||
| melt_handler->compute_melt_variables(solution); | |||
|
|
|||
| return initial_residual; | |||
| return std::pair<double,double>(final_linear_residual, | |||
| initial_nonlinear_residual); | |||
There was a problem hiding this comment.
looking at the documentation in simulator.h and the code in solver_schemes, I think you mend to do this the other way around.
There was a problem hiding this comment.
Ah, yes, of course.
Previously, solve_stokes() returned something in some contexts, and something else in others. Make this more uniform by just returning a pair of values. While there, also adjust some naming of variables to indicate that they refer to *nonlinear* residuals.
bangerth
force-pushed
the
fix-solve_stokes
branch
from
d884e91
to
00c8bcf
Compare
|
OK, let's see whether this round makes more sense now. |
|
Looks good to me! |
Previously, solve_stokes() returned something in some contexts, and something else in others.
Make this more uniform by just returning a pair of values.
While there, also adjust some naming of variables to indicate that they refer to
nonlinear residuals.
Fixes #2082.