Skip to content
Snippets Groups Projects
Commit 970d0d30 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Fixed solver monitor.

parent 7143e05f
No related branches found
No related tags found
No related merge requests found
...@@ -46,6 +46,8 @@ class PDESolver : public Object ...@@ -46,6 +46,8 @@ class PDESolver : public Object
void setComputeTimer( Timer& computeTimer ); void setComputeTimer( Timer& computeTimer );
void setTotalTimer( Timer& totalTimer ); void setTotalTimer( Timer& totalTimer );
SolverMonitorType& getSolverMonitor();
bool writeEpilog( Logger& logger ) const; bool writeEpilog( Logger& logger ) const;
......
...@@ -46,11 +46,18 @@ setup( const Config::ParameterContainer& parameters, ...@@ -46,11 +46,18 @@ setup( const Config::ParameterContainer& parameters,
*/ */
this->solverMonitorPointer->setVerbose( parameters.getParameter< int >( "verbose" ) ); this->solverMonitorPointer->setVerbose( parameters.getParameter< int >( "verbose" ) );
this->solverMonitorPointer->setTimer( *this->totalTimer ); this->solverMonitorPointer->setTimer( *this->totalTimer );
SolverMonitorThread t( *this->solverMonitorPointer );
return true; return true;
} }
template< typename Real,
typename Index >
typename PDESolver< Real, Index >::SolverMonitorType&
PDESolver< Real, Index >::
getSolverMonitor()
{
return *this->solverMonitorPointer;
}
template< typename Real, template< typename Real,
typename Index > typename Index >
bool bool
......
...@@ -446,6 +446,11 @@ bool SolverStarter< ConfigTag > :: runPDESolver( Problem& problem, ...@@ -446,6 +446,11 @@ bool SolverStarter< ConfigTag > :: runPDESolver( Problem& problem,
solver.setComputeTimer( this->computeTimer ); solver.setComputeTimer( this->computeTimer );
solver.setIoTimer( this->ioTimer ); solver.setIoTimer( this->ioTimer );
solver.setTotalTimer( this->totalTimer ); solver.setTotalTimer( this->totalTimer );
/****
* Create solver monitor thread
*/
SolverMonitorThread t( solver.getSolverMonitor() );
/**** /****
* Start the solver * Start the solver
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment