Skip to content
Snippets Groups Projects
Commit 5003c7fc authored by Benjamin Faigle's avatar Benjamin Faigle
Browse files

made destructor virtual to remove compiler warning

docu fix
last changes for common definition of boundary conditions in initialization methods

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@6629 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 49057c35
No related branches found
No related tags found
No related merge requests found
......@@ -140,6 +140,7 @@ public:
//! Concentration initial condition (dimensionless)
/*! The problem is initialized with the following concentration.
* \param element The element.
*/
Scalar initConcentration(const Element& element) const
{
......
......@@ -1101,12 +1101,12 @@ void FVPressure2P2C<TypeTag>::initialMaterialLaws(bool compositional)
problem().variables().capillaryPressure(globalIdx) = 0.;
if (icFormulation == Indices::BoundaryFormulation::saturation) // saturation initial condition
{
sat_0 = problem().initSat(globalPos, *eIt);
sat_0 = problem().initSat(*eIt);
fluidState.satFlash(sat_0, pressure, problem().spatialParameters().porosity(globalPos, *eIt), temperature_);
}
else if (icFormulation == Indices::BoundaryFormulation::concentration) // concentration initial condition
{
Scalar Z1_0 = problem().initConcentration(globalPos, *eIt);
Scalar Z1_0 = problem().initConcentration(*eIt);
fluidState.update(Z1_0, pressure, problem().spatialParameters().porosity(globalPos, *eIt), temperature_);
}
}
......@@ -1115,7 +1115,7 @@ void FVPressure2P2C<TypeTag>::initialMaterialLaws(bool compositional)
if (icFormulation == Indices::BoundaryFormulation::saturation) // saturation initial condition
{
//get saturation, determine pc
sat_0 = problem().initSat(globalPos, *eIt);
sat_0 = problem().initSat(*eIt);
if(GET_PROP_VALUE(TypeTag, PTAG(EnableCapillarity)))
{
problem().variables().capillaryPressure(globalIdx)
......@@ -1146,7 +1146,7 @@ void FVPressure2P2C<TypeTag>::initialMaterialLaws(bool compositional)
}
else if (icFormulation == Indices::BoundaryFormulation::concentration) // concentration initial condition
{
Scalar Z1_0 = problem().initConcentration(globalPos, *eIt);
Scalar Z1_0 = problem().initConcentration(*eIt);
// If total concentrations are given at the boundary, saturation is unknown.
// This may affect pc and hence p_alpha and hence again saturation -> iteration.
......@@ -1200,7 +1200,6 @@ void FVPressure2P2C<TypeTag>::initialMaterialLaws(bool compositional)
pressure[wPhaseIdx] = pressure[nPhaseIdx]
= problem().variables().pressure()[globalIdx];
fluidState.update(Z1_0, pressure, problem().spatialParameters().porosity(globalPos, *eIt), temperature_);
}
} //end conc initial condition
} //end compositional
......
......@@ -129,7 +129,7 @@ public:
problem_(problem), switchNormals(false)
{ }
~FVTransport2P2C()
virtual ~FVTransport2P2C()
{
}
......
......@@ -109,9 +109,8 @@ public:
problem_(problem), switchNormals(false)
{}
~FVTransport2P2CMultiPhysics()
{
}
virtual ~FVTransport2P2CMultiPhysics()
{ }
protected:
Problem& problem_;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment