From 35717daacddee464a5115e9ea9d9bc3a60a08cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkovsky@mmg.fjfi.cvut.cz>
Date: Sun, 2 Feb 2020 09:11:28 +0100
Subject: [PATCH] Fixed writeProlog methods in TimeDependentPDESolver and
TimeIndependentPDESolver
---
src/TNL/Solvers/PDE/TimeDependentPDESolver_impl.h | 2 +-
src/TNL/Solvers/PDE/TimeIndependentPDESolver.h | 9 +++++----
src/TNL/Solvers/PDE/TimeIndependentPDESolver_impl.h | 10 +---------
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/TNL/Solvers/PDE/TimeDependentPDESolver_impl.h b/src/TNL/Solvers/PDE/TimeDependentPDESolver_impl.h
index f1e24a05ee..89369c8865 100644
--- a/src/TNL/Solvers/PDE/TimeDependentPDESolver_impl.h
+++ b/src/TNL/Solvers/PDE/TimeDependentPDESolver_impl.h
@@ -146,7 +146,7 @@ writeProlog( Logger& logger,
logger.writeParameter< double >( "Adaptivity:", "merson-adaptivity", parameters, 1 );
if( solverName == "sor" )
logger.writeParameter< double >( "Omega:", "sor-omega", parameters, 1 );
- if( solverName == "gmres" || solverName == "cwygmres" ) {
+ if( solverName == "gmres" ) {
logger.writeParameter< int >( "Restarting min:", "gmres-restarting-min", parameters, 1 );
logger.writeParameter< int >( "Restarting max:", "gmres-restarting-max", parameters, 1 );
logger.writeParameter< int >( "Restarting step min:", "gmres-restarting-step-min", parameters, 1 );
diff --git a/src/TNL/Solvers/PDE/TimeIndependentPDESolver.h b/src/TNL/Solvers/PDE/TimeIndependentPDESolver.h
index bdab1a541e..8b5b8f52ed 100644
--- a/src/TNL/Solvers/PDE/TimeIndependentPDESolver.h
+++ b/src/TNL/Solvers/PDE/TimeIndependentPDESolver.h
@@ -34,10 +34,11 @@ class TimeIndependentPDESolver : public PDESolver< typename Problem::RealType,
{
public:
- typedef Problem ProblemType;
- typedef typename ProblemType::RealType RealType;
- typedef typename ProblemType::DeviceType DeviceType;
- typedef typename ProblemType::IndexType IndexType;
+ using RealType = typename Problem::RealType;
+ using DeviceType = typename Problem::DeviceType;
+ using IndexType = typename Problem::IndexType;
+ using BaseType = PDESolver< RealType, IndexType >;
+ using ProblemType = Problem;
typedef typename ProblemType::MeshType MeshType;
typedef typename ProblemType::DofVectorType DofVectorType;
typedef Pointers::SharedPointer< MeshType, DeviceType > MeshPointer;
diff --git a/src/TNL/Solvers/PDE/TimeIndependentPDESolver_impl.h b/src/TNL/Solvers/PDE/TimeIndependentPDESolver_impl.h
index d676c8af05..81ada508d4 100644
--- a/src/TNL/Solvers/PDE/TimeIndependentPDESolver_impl.h
+++ b/src/TNL/Solvers/PDE/TimeIndependentPDESolver_impl.h
@@ -119,15 +119,7 @@ writeProlog( Logger& logger,
logger.writeParameter< int >( "Maximal number of iterations:", "max-iterations", parameters );
logger.writeParameter< int >( "Minimal number of iterations:", "min-iterations", parameters );
logger.writeSeparator();
- logger.writeParameter< String >( "Real type:", "real-type", parameters, 0 );
- logger.writeParameter< String >( "Index type:", "index-type", parameters, 0 );
- logger.writeParameter< String >( "Device:", "device", parameters, 0 );
- logger.writeSeparator();
- logger.writeSystemInformation( parameters );
- logger.writeSeparator();
- logger.writeCurrentTime( "Started at:" );
- logger.writeSeparator();
- return true;
+ return BaseType::template writeProlog< typename Problem::CommunicatorType >( logger, parameters );
}
template< typename Problem >
--
GitLab