From 4686bd74b68206300414f994c6e2c96e1f3c04bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Gl=C3=A4ser?= <dennis.glaeser@iws.uni-stuttgart.de>
Date: Tue, 13 Nov 2018 10:30:10 +0100
Subject: [PATCH] [md][cclocalassembler] get rid of assembleResidualImpl()
function
This function is basically just a forward to evalLocalResidual() and
obtaining the first entry. Since this entire header only deals with
cc schemes we can also write out this call in the occurrences. This
is actually also how we do it in the standard cc local assembler.
---
dumux/multidomain/subdomaincclocalassembler.hh | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/dumux/multidomain/subdomaincclocalassembler.hh b/dumux/multidomain/subdomaincclocalassembler.hh
index 6647c2d1ff..5da78217a9 100644
--- a/dumux/multidomain/subdomaincclocalassembler.hh
+++ b/dumux/multidomain/subdomaincclocalassembler.hh
@@ -148,7 +148,7 @@ public:
{
this->asImp_().bindLocalViews();
const auto globalI = this->fvGeometry().fvGridGeometry().elementMapper().index(this->element());
- res[globalI] = this->asImp_().assembleResidualImpl(); // forward to the internal implementation
+ res[globalI] = this->evalLocalResidual()[0]; // forward to the internal implementation
}
//! evaluates the local source term for an element and element volume variables
@@ -217,13 +217,6 @@ public:
}
}
- /*!
- * \brief Computes the residual
- * \return The element residual at the current solution.
- */
- LocalResidualValues assembleResidualImpl()
- { return this->evalLocalResidual()[0]; }
-
const Problem& problem() const
{ return this->assembler().problem(domainId); }
@@ -315,7 +308,7 @@ public:
// assemble the undeflected residual
using Residuals = ReservedBlockVector<LocalResidualValues, maxNeighbors*2+1>;
Residuals origResiduals(numNeighbors + 1); origResiduals = 0.0;
- origResiduals[0] = this->assembleResidualImpl();
+ origResiduals[0] = this->evalLocalResidual()[0];
// get the elements in which we need to evaluate the fluxes
// and calculate these in the undeflected state
@@ -609,7 +602,7 @@ public:
}
// return element residual
- return this->assembleResidualImpl();
+ return this->evalLocalResidual()[0];
}
/*!
--
GitLab