From 5003c7fce1f875cacac2c854b12d91be97b98f1d Mon Sep 17 00:00:00 2001
From: Benjamin Faigle <benjamin.faigle@posteo.de>
Date: Mon, 19 Sep 2011 08:26:55 +0000
Subject: [PATCH] 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
---
dumux/decoupled/2p2c/2p2cproblem.hh | 1 +
dumux/decoupled/2p2c/fvpressure2p2c.hh | 9 ++++-----
dumux/decoupled/2p2c/fvtransport2p2c.hh | 2 +-
dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh | 5 ++---
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/dumux/decoupled/2p2c/2p2cproblem.hh b/dumux/decoupled/2p2c/2p2cproblem.hh
index d8a48442ac..5ab3a9203a 100644
--- a/dumux/decoupled/2p2c/2p2cproblem.hh
+++ b/dumux/decoupled/2p2c/2p2cproblem.hh
@@ -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
{
diff --git a/dumux/decoupled/2p2c/fvpressure2p2c.hh b/dumux/decoupled/2p2c/fvpressure2p2c.hh
index 2cf62fd349..2d71c181d2 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2c.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2c.hh
@@ -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
diff --git a/dumux/decoupled/2p2c/fvtransport2p2c.hh b/dumux/decoupled/2p2c/fvtransport2p2c.hh
index a424a12f6e..fcfd85be8f 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2c.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2c.hh
@@ -129,7 +129,7 @@ public:
problem_(problem), switchNormals(false)
{ }
- ~FVTransport2P2C()
+ virtual ~FVTransport2P2C()
{
}
diff --git a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
index b825d30697..ee06843980 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
@@ -109,9 +109,8 @@ public:
problem_(problem), switchNormals(false)
{}
- ~FVTransport2P2CMultiPhysics()
- {
- }
+ virtual ~FVTransport2P2CMultiPhysics()
+ { }
protected:
Problem& problem_;
--
GitLab