Commit dbf837a1 authored by Klaus Mosthaf's avatar Klaus Mosthaf
Browse files

removed BoxBoundaryVariables property

removed computeOutflowValues in 2p2cnilocalresidual


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7421 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent cb1bd4e9
......@@ -65,7 +65,6 @@ class TwoPTwoCLocalResidual: public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryVariables) BoundaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
......
......@@ -124,9 +124,6 @@ SET_TYPE_PROP(BoxTwoPTwoC, VolumeVariables, TwoPTwoCVolumeVariables<TypeTag>);
//! the FluxVariables property
SET_TYPE_PROP(BoxTwoPTwoC, FluxVariables, TwoPTwoCFluxVariables<TypeTag>);
//! the BoundaryVariables property
SET_TYPE_PROP(BoxTwoPTwoC, BoundaryVariables, TwoPTwoCFluxVariables<TypeTag>);
//! the upwind weight for the mass conservation equations.
SET_SCALAR_PROP(BoxTwoPTwoC, MassUpwindWeight, 1.0);
......
......@@ -56,7 +56,6 @@ class TwoPTwoCNILocalResidual : public TwoPTwoCLocalResidual<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryVariables) BoundaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
......@@ -176,45 +175,6 @@ public:
fluxData.normalMatrixHeatFlux();
}
/*!
* \brief Compute the fluxes at outflow boundaries. This does essentially the same
* as computeFluxes, but the fluxes are evaluated at the integration point
* of the boundary face. Therefore, still some variables are evaluated
* at the vertex (usually the ones which are upwinded).
*
* \param flux A temporary vector, where the outflow boundary fluxes are written into
* \param boundaryVars The boundary variables object
* \param scvIdx The index of the SCV containing the outflow boundary face
* \param boundaryFaceIdx The index of the boundary face
*/
void computeOutflowValues(PrimaryVariables &flux,
const BoundaryVariables &boundaryVars,
const int scvIdx,
const int boundaryFaceIdx)
{
ParentType::computeOutflowValues(flux, boundaryVars, scvIdx, boundaryFaceIdx);
const BoundaryTypes &bcTypes = this->bcTypes_(scvIdx);
const VolumeVariables &vertVars = this->curVolVars_()[scvIdx];
if (bcTypes.isOutflow(energyEqIdx))
{
// advective heat flux in all phases
flux[energyEqIdx] = 0;
for (int phase = 0; phase < numPhases; ++phase) {
flux[energyEqIdx] +=
boundaryVars.KmvpNormal(phase) *
vertVars.density(phase) *
vertVars.mobility(phase) *
vertVars.enthalpy(phase);
}
// add conductive heat flux in all phases
flux[energyEqIdx] +=
boundaryVars.normalMatrixHeatFlux();
}
}
private:
Scalar massUpwindWeight_;
......
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