OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed: Undo of 02d84c07e2

Browse Source 
It feels unneccassary and confusing with two versions of solveStep
and the need for the using statement when one of them is overriden.
This commit is contained in:
Knut Morten Okstad
2017-09-12 16:06:53 +02:00
parent 5001025d2a
commit 7ef84d2350
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Apps/Common/SIMCoupled.h
View File

@@ -53,13 +53,7 @@ public:
}
//! \brief Computes the solution for the current time step.
virtual bool solveStep(TimeStep& tp)
{
return this->solveStep(tp, true);
}
//! \brief Computes the solution for the current time step.
virtual bool solveStep(TimeStep& tp, bool firstS1)
virtual bool solveStep(TimeStep& tp, bool firstS1 = true)
{
if (firstS1)
return S1.solveStep(tp) && S2.solveStep(tp);

3
Apps/Common/SIMCoupledSI.h
View File

@@ -32,8 +32,7 @@ public:
virtual ~SIMCoupledSI() {}
//! \brief Computes the solution for the current time step.
using SIMCoupled<T1,T2>::solveStep;
virtual bool solveStep(TimeStep& tp, bool firstS1)
virtual bool solveStep(TimeStep& tp, bool firstS1 = true)
{
if (maxIter <= 0)
maxIter = std::min(this->S1.getMaxit(),this->S2.getMaxit());