Commit 6563ff63 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

box 2p2c(ni): further simplify BoxBoundaryVariables and TwoPTwoC(NI)FluxVariables

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7396 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent f4d5a58b
......@@ -104,10 +104,7 @@ public:
molarConcGrad_[phaseIdx] = Scalar(0);
}
if (!onBoundary)
{
calculateValues_(problem, element, face(), elemVolVars);
}
calculateValues_(problem, element, face(), elemVolVars);
}
protected:
......@@ -115,8 +112,7 @@ protected:
void calculateValues_(const Problem &problem,
const Element &element,
const FaceType &face,
const ElementVolumeVariables &elemVolVars,
bool onBoundary = false)
const ElementVolumeVariables &elemVolVars)
{
calculateGradients_(problem, element, face, elemVolVars);
calculateVelocities_(problem, element, face, elemVolVars);
......
......@@ -85,8 +85,7 @@ public:
{
scvfIdx_ = faceIdx;
if (!onBoundary)
calculateValues_(problem, element, this->face(), elemVolVars);
calculateValues_(problem, element, this->face(), elemVolVars);
}
/*!
......@@ -105,12 +104,8 @@ protected:
void calculateValues_(const Problem &problem,
const Element &element,
const FaceType &face,
const ElementVolumeVariables &elemVolVars,
bool onBoundary = false)
const ElementVolumeVariables &elemVolVars)
{
if (onBoundary)
ParentType::calculateValues_(problem, element, face, elemVolVars, onBoundary);
// calculate temperature gradient using finite element
// gradients
temperatureGrad_ = 0;
......@@ -123,7 +118,7 @@ protected:
}
// The spatial parameters calculates the actual heat flux vector
if (!onBoundary)
if (face.i != face.j)
problem.spatialParameters().matrixHeatFlux(tmp,
*this,
elemVolVars,
......
......@@ -53,8 +53,6 @@ class BoxBoundaryVariables : public GET_PROP_TYPE(TypeTag, PTAG(FluxVariables))
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
typedef typename FVElementGeometry::BoundaryFace BoundaryFace;
typedef typename GridView::template Codim<0>::Entity Element;
public:
......@@ -64,9 +62,7 @@ public:
int boundaryFaceIdx,
const ElementVolumeVariables &elemDat)
: ParentType(problem, element, elemGeom, boundaryFaceIdx, elemDat, /*onBoundary=*/ true)
{
ParentType::calculateValues_(problem, element, this->face(), elemDat, /*onBoundary=*/ true);
}
{}
};
} // end namespace
......
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