From 225e95cffa01f2d09a799e9a53e371fb5e5166f0 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Sat, 13 Jan 2018 16:32:46 +0100
Subject: [PATCH] [fvlocalassembler] Remove superfluous member function
---
dumux/assembly/fvlocalassemblerbase.hh | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/dumux/assembly/fvlocalassemblerbase.hh b/dumux/assembly/fvlocalassemblerbase.hh
index dbae670f0b..699b3cce3e 100644
--- a/dumux/assembly/fvlocalassemblerbase.hh
+++ b/dumux/assembly/fvlocalassemblerbase.hh
@@ -41,9 +41,9 @@ namespace Dumux {
* \brief A base class for all local assemblers
* \tparam TypeTag The TypeTag
* \tparam Assembler The assembler type
- * \tparam implicit Specifies whether the time discretization is implicit or not not (i.e. explicit)
+ * \tparam isImplicit Specifies whether the time discretization is implicit or not not (i.e. explicit)
*/
-template<class TypeTag, class Assembler, class Implementation, bool implicit>
+template<class TypeTag, class Assembler, class Implementation, bool isImplicit>
class FVLocalAssemblerBase
{
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
@@ -88,7 +88,7 @@ public:
*/
auto evalLocalResidual() const
{
- if(this->assembler().isStationaryProblem() && !isImplicit())
+ if(this->assembler().isStationaryProblem() && !isImplicit)
DUNE_THROW(Dune::InvalidStateException, "Using explicit jacobian assembler with stationary local residual");
if(elementIsGhost())
@@ -97,8 +97,8 @@ public:
return ResdiualType(0.0);
}
- return isImplicit() ? evalLocalResidual(curElemVolVars())
- : evalLocalResidual(prevElemVolVars());
+ return isImplicit ? evalLocalResidual(curElemVolVars())
+ : evalLocalResidual(prevElemVolVars());
}
/*!
@@ -124,8 +124,8 @@ public:
*/
auto evalLocalFluxAndSourceResidual() const
{
- return isImplicit() ? evalLocalFluxAndSourceResidual(curElemVolVars())
- : evalLocalFluxAndSourceResidual(prevElemVolVars());
+ return isImplicit ? evalLocalFluxAndSourceResidual(curElemVolVars())
+ : evalLocalFluxAndSourceResidual(prevElemVolVars());
}
/*!
@@ -167,7 +167,7 @@ public:
// bind the caches
fvGeometry.bind(element);
- if(isImplicit())
+ if(isImplicit)
{
curElemVolVars.bind(element, fvGeometry, curSol);
elemFluxVarsCache.bind(element, fvGeometry, curElemVolVars);
@@ -250,9 +250,6 @@ public:
const LocalResidual& localResidual() const
{ return localResidual_; }
- constexpr bool isImplicit() const
- { return implicit; }
-
protected:
Implementation &asImp_()
{ return *static_cast<Implementation*>(this); }
--
GitLab