Skip to content
Snippets Groups Projects
Commit 79a6a259 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Fixed passing of the verbose flag to the solver monitor

parent 46dd704a
No related branches found
No related tags found
No related merge requests found
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <core/tnlObject.h> #include <core/tnlObject.h>
#include <config/tnlConfigDescription.h> #include <config/tnlConfigDescription.h>
#include <config/tnlParameterContainer.h> #include <config/tnlParameterContainer.h>
#include <solvers/tnlSolverMonitor.h>
#include <core/tnlLogger.h> #include <core/tnlLogger.h>
template< typename Problem, template< typename Problem,
......
...@@ -347,11 +347,14 @@ class tnlSolverStarterExplicitTimeStepperSetter ...@@ -347,11 +347,14 @@ class tnlSolverStarterExplicitTimeStepperSetter
typedef typename Problem::IndexType IndexType; typedef typename Problem::IndexType IndexType;
typedef tnlODESolverMonitor< RealType, IndexType > SolverMonitorType; typedef tnlODESolverMonitor< RealType, IndexType > SolverMonitorType;
const int verbose = parameters.getParameter< int >( "verbose" );
ExplicitSolver explicitSolver; ExplicitSolver explicitSolver;
explicitSolver.setup( parameters ); explicitSolver.setup( parameters );
int verbose = parameters.getParameter< int >( "verbose" );
explicitSolver.setVerbose( verbose ); explicitSolver.setVerbose( verbose );
SolverMonitorType odeSolverMonitor; SolverMonitorType odeSolverMonitor;
odeSolverMonitor.setVerbose( verbose );
if( ! problem.getSolverMonitor() ) if( ! problem.getSolverMonitor() )
explicitSolver.setSolverMonitor( odeSolverMonitor ); explicitSolver.setSolverMonitor( odeSolverMonitor );
else else
...@@ -390,10 +393,13 @@ class tnlSolverStarterSemiImplicitTimeStepperSetter ...@@ -390,10 +393,13 @@ class tnlSolverStarterSemiImplicitTimeStepperSetter
typedef typename Problem::IndexType IndexType; typedef typename Problem::IndexType IndexType;
typedef tnlIterativeSolverMonitor< RealType, IndexType > SolverMonitorType; typedef tnlIterativeSolverMonitor< RealType, IndexType > SolverMonitorType;
const int verbose = parameters.getParameter< int >( "verbose" );
LinearSystemSolverType linearSystemSolver; LinearSystemSolverType linearSystemSolver;
linearSystemSolver.setup( parameters ); linearSystemSolver.setup( parameters );
SolverMonitorType solverMonitor; SolverMonitorType solverMonitor;
solverMonitor.setVerbose( verbose );
if( ! problem.getSolverMonitor() ) if( ! problem.getSolverMonitor() )
linearSystemSolver.setSolverMonitor( solverMonitor ); linearSystemSolver.setSolverMonitor( solverMonitor );
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment