Commit 0db82058 authored by Sina Ackermann's avatar Sina Ackermann
Browse files

[assembly] Rename ResidualVector to NumEqVector for consistency

parent a805d433
......@@ -52,7 +52,7 @@ class BoxLocalResidual : public FVLocalResidual<TypeTag>
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
public:
using ElementResidualVector = typename ParentType::ElementResidualVector;
......@@ -84,7 +84,7 @@ public:
}
//! evaluate flux residuals for one sub control volume face
ResidualVector evalFlux(const Problem& problem,
NumEqVector evalFlux(const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
......@@ -92,7 +92,7 @@ public:
const ElementFluxVariablesCache& elemFluxVarsCache,
const SubControlVolumeFace& scvf) const
{
ResidualVector flux(0.0);
NumEqVector flux(0.0);
// inner faces
if (!scvf.boundary())
......
......@@ -42,7 +42,7 @@ class CCLocalResidual : public FVLocalResidual<TypeTag>
using ParentType = FVLocalResidual<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity;
using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
......@@ -69,14 +69,14 @@ public:
}
//! evaluate the flux residual for a sub control volume face
ResidualVector evalFlux(const Problem& problem,
NumEqVector evalFlux(const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const ElementFluxVariablesCache& elemFluxVarsCache,
const SubControlVolumeFace& scvf) const
{
ResidualVector flux(0.0);
NumEqVector flux(0.0);
// inner faces
if (!scvf.boundary())
......
......@@ -54,7 +54,7 @@ class FVLocalResidual
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
......@@ -64,7 +64,7 @@ class FVLocalResidual
public:
//! the container storing all element residuals
using ElementResidualVector = ReservedBlockVector<ResidualVector, FVElementGeometry::maxNumElementScvs>;
using ElementResidualVector = ReservedBlockVector<NumEqVector, FVElementGeometry::maxNumElementScvs>;
//! the constructor
FVLocalResidual(const Problem* problem,
......@@ -269,7 +269,7 @@ public:
* \note has to be implemented by the model specific residual class
*
*/
ResidualVector computeStorage(const Problem& problem,
NumEqVector computeStorage(const Problem& problem,
const SubControlVolume& scv,
const VolumeVariables& volVars) const
{
......@@ -289,13 +289,13 @@ public:
* in the user interface of the problem
*
*/
ResidualVector computeSource(const Problem& problem,
NumEqVector computeSource(const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const SubControlVolume &scv) const
{
ResidualVector source(0.0);
NumEqVector source(0.0);
// add contributions from volume flux sources
source += problem.source(element, fvGeometry, elemVolVars, scv);
......@@ -320,7 +320,7 @@ public:
* \note has to be implemented by the model specific residual class
*
*/
ResidualVector computeFlux(const Problem& problem,
NumEqVector computeFlux(const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
......@@ -372,8 +372,8 @@ public:
// doing the time discretization...
//! Compute storage with the model specific storage residual
ResidualVector prevStorage = asImp().computeStorage(problem, scv, prevVolVars);
ResidualVector storage = asImp().computeStorage(problem, scv, curVolVars);
NumEqVector prevStorage = asImp().computeStorage(problem, scv, prevVolVars);
NumEqVector storage = asImp().computeStorage(problem, scv, curVolVars);
prevStorage *= prevVolVars.extrusionFactor();
storage *= curVolVars.extrusionFactor();
......@@ -407,7 +407,7 @@ public:
{
//! Compute source with the model specific storage residual
const auto& curVolVars = curElemVolVars[scv];
ResidualVector source = asImp().computeSource(problem, element, fvGeometry, curElemVolVars, scv);
NumEqVector source = asImp().computeSource(problem, element, fvGeometry, curElemVolVars, scv);
source *= scv.volume()*curVolVars.extrusionFactor();
//! subtract source from local rate (sign convention in user interface)
......@@ -452,7 +452,7 @@ public:
* \param elemFluxVarsCache The flux variable caches for the element stencil
* \param scvf The sub control volume face the flux term is integrated over
*/
ResidualVector evalFlux(const Problem& problem,
NumEqVector evalFlux(const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment