From ecbd279da953c1ccc9738f84496e2bcf08e32116 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Thu, 11 Jan 2018 08:57:02 +0100
Subject: [PATCH] [localAssembly] Rename evalLocalFluxSourceResidual to
evalLocalFluxAndSourceResidual
---
dumux/assembly/boxlocalassembler.hh | 4 ++--
dumux/assembly/cclocalassembler.hh | 7 +++----
dumux/assembly/fvlocalassemblerbase.hh | 12 ++++++------
3 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/dumux/assembly/boxlocalassembler.hh b/dumux/assembly/boxlocalassembler.hh
index c1f8e14a93..fc677e4954 100644
--- a/dumux/assembly/boxlocalassembler.hh
+++ b/dumux/assembly/boxlocalassembler.hh
@@ -109,9 +109,9 @@ public:
}
- auto evalLocalFluxSourceResidual(const ElementVolumeVariables& elemVolVars) const
+ auto evalLocalFluxAndSourceResidual(const ElementVolumeVariables& elemVolVars) const
{
- return this->evalLocalFluxSourceResidual(elemVolVars);
+ return this->evalLocalFluxAndSourceResidual(elemVolVars);
}
auto evalLocalStorageResidual() const
diff --git a/dumux/assembly/cclocalassembler.hh b/dumux/assembly/cclocalassembler.hh
index a10d358e17..85d8fe1383 100644
--- a/dumux/assembly/cclocalassembler.hh
+++ b/dumux/assembly/cclocalassembler.hh
@@ -64,7 +64,6 @@ public:
using ParentType::ParentType;
-
/*!
* \brief Computes the derivatives with respect to the given element and adds them
* to the global matrix. The element residual is written into the right hand side.
@@ -97,9 +96,9 @@ public:
}
- LocalResidualValues evalLocalFluxSourceResidual(const ElementVolumeVariables& elemVolVars) const
+ LocalResidualValues evalLocalFluxAndSourceResidual(const ElementVolumeVariables& elemVolVars) const
{
- return this->evalLocalFluxSourceResidual(elemVolVars)[0];
+ return this->evalLocalFluxAndSourceResidual(elemVolVars)[0];
}
LocalResidualValues evalLocalStorageResidual() const
@@ -326,7 +325,7 @@ public:
DUNE_THROW(Dune::InvalidStateException, "Using explicit jacobian assembler with stationary local residual");
// assemble the undeflected residual
- auto residual = this->elementIsGhost() ? LocalResidualValues(0.0) : this->evalLocalFluxSourceResidual();
+ auto residual = this->elementIsGhost() ? LocalResidualValues(0.0) : this->evalLocalFluxAndSourceResidual();
const auto storageResidual = this->elementIsGhost() ? LocalResidualValues(0.0) : this->evalLocalStorageResidual();
residual += storageResidual;
diff --git a/dumux/assembly/fvlocalassemblerbase.hh b/dumux/assembly/fvlocalassemblerbase.hh
index 3343b4a874..b1db5754b7 100644
--- a/dumux/assembly/fvlocalassemblerbase.hh
+++ b/dumux/assembly/fvlocalassemblerbase.hh
@@ -103,21 +103,21 @@ public:
{
if (!assembler().isStationaryProblem())
{
- auto residual = evalLocalFluxSourceResidual(elemVolVars);
+ auto residual = evalLocalFluxAndSourceResidual(elemVolVars);
residual += evalLocalStorageResidual();
return residual;
}
else
- return evalLocalFluxSourceResidual(elemVolVars);
+ return evalLocalFluxAndSourceResidual(elemVolVars);
}
- auto evalLocalFluxSourceResidual() const
+ auto evalLocalFluxAndSourceResidual() const
{
- return isImplicit() ? evalLocalFluxSourceResidual(curElemVolVars())
- : evalLocalFluxSourceResidual(prevElemVolVars());
+ return isImplicit() ? evalLocalFluxAndSourceResidual(curElemVolVars())
+ : evalLocalFluxAndSourceResidual(prevElemVolVars());
}
- auto evalLocalFluxSourceResidual(const ElementVolumeVariables& elemVolVars) const
+ auto evalLocalFluxAndSourceResidual(const ElementVolumeVariables& elemVolVars) const
{
return localResidual_.evalFluxSource(element_, fvGeometry_, elemVolVars, elemFluxVarsCache_, elemBcTypes_);
}
--
GitLab