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

Small changes in TNL::Solvers

parent b8dead52
No related branches found
No related tags found
No related merge requests found
......@@ -42,8 +42,8 @@ configSetup( Config::ConfigDescription& config,
config.addRequiredEntry< double >( prefix + "final-time", "Stop time of the time dependent problem." );
config.addEntry< double >( prefix + "initial-time", "Initial time of the time dependent problem.", 0 );
config.addRequiredEntry< double >( prefix + "snapshot-period", "Time period for writing the problem status.");
config.addEntry< double >( "time-step", "The time step for the time discretisation.", 1.0 );
config.addEntry< double >( "time-step-order", "The time step is set to time-step*pow( space-step, time-step-order).", 0.0 );
config.addEntry< double >( prefix + "time-step", "The time step for the time discretisation.", 1.0 );
config.addEntry< double >( prefix + "time-step-order", "The time step is set to time-step*pow( space-step, time-step-order).", 0.0 );
}
template< typename Problem,
......
......@@ -130,7 +130,7 @@ class UserDefinedTimeDiscretisationSetter< Problem, ConfigTag, void >
/****
* Set-up the time discretisation
*/
const String& timeDiscretisation = parameters. getParameter< String>( "time-discretisation" );
const String& timeDiscretisation = parameters.getParameter< String>( "time-discretisation" );
if( timeDiscretisation == "explicit" )
return SolverStarterTimeDiscretisationSetter< Problem, ExplicitTimeDiscretisationTag, ConfigTag >::run( problem, parameters );
if( timeDiscretisation == "semi-implicit" )
......@@ -182,7 +182,7 @@ class SolverStarterTimeDiscretisationSetter< Problem, ExplicitTimeDiscretisation
static bool run( Problem& problem,
const Config::ParameterContainer& parameters )
{
const String& discreteSolver = parameters. getParameter< String>( "discrete-solver" );
const String& discreteSolver = parameters.getParameter< String>( "discrete-solver" );
if( discreteSolver != "euler" &&
discreteSolver != "merson" )
{
......@@ -219,7 +219,7 @@ class SolverStarterTimeDiscretisationSetter< Problem, ImplicitTimeDiscretisation
static bool run( Problem& problem,
const Config::ParameterContainer& parameters )
{
// const String& discreteSolver = parameters. getParameter< String>( "discrete-solver" );
// const String& discreteSolver = parameters.getParameter< String>( "discrete-solver" );
return false;
}
};
......@@ -265,11 +265,11 @@ bool SolverStarter< ConfigTag > :: runPDESolver( Problem& problem,
{
this->totalTimer.reset();
this->totalTimer.start();
using SolverMonitorType = IterativeSolverMonitor< typename Problem::RealType,
typename Problem::IndexType >;
SolverMonitorType solverMonitor, *solverMonitorPointer( &solverMonitor );
/****
* Open the log file
*/
......@@ -293,7 +293,7 @@ bool SolverStarter< ConfigTag > :: runPDESolver( Problem& problem,
solverMonitorPointer->setVerbose( parameters.getParameter< int >( "verbose" ) );
solverMonitorPointer->setTimer( this->totalTimer );
solver.setSolverMonitor( *solverMonitorPointer );
// catching exceptions ala gtest:
// https://github.com/google/googletest/blob/59c795ce08be0c8b225bc894f8da6c7954ea5c14/googletest/src/gtest.cc#L2409-L2431
const int catch_exceptions = parameters.getParameter< bool >( "catch-exceptions" );
......@@ -325,7 +325,7 @@ bool SolverStarter< ConfigTag > :: runPDESolver( Problem& problem,
* Write a prolog
*/
const int verbose = parameters.getParameter< int >( "verbose" );
parameters.getParameter< int >( "log-width", logWidth );
logWidth = parameters.getParameter< int >( "log-width" );
if( verbose ) {
Logger logger( logWidth, std::cout );
solver.writeProlog( logger, parameters );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment