From d26b261ea5ecb6107aeec3b5d40008797138d904 Mon Sep 17 00:00:00 2001
From: Benjamin Faigle <benjamin.faigle@posteo.de>
Date: Thu, 22 Sep 2011 14:41:19 +0000
Subject: [PATCH] adapted problems to last changes for common definition of
boundary conditions in initialization methods (commit 6629): change in
initial values
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@6643 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
test/decoupled/2p2c/test_dec2p2cproblem.hh | 14 ++------------
.../decoupled/2p2c/test_multiphysics2p2cproblem.hh | 9 +--------
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/test/decoupled/2p2c/test_dec2p2cproblem.hh b/test/decoupled/2p2c/test_dec2p2cproblem.hh
index ad9c3ae36d..9ebed3d74e 100644
--- a/test/decoupled/2p2c/test_dec2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_dec2p2cproblem.hh
@@ -144,7 +144,6 @@ typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
// boundary typedefs
typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
@@ -165,7 +164,6 @@ typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
-typedef Dune::FieldVector<Scalar, dim> LocalPosition;
public:
TestDecTwoPTwoCProblem(TimeManager &timeManager, const GridView &gridView, const GlobalPosition lowerLeft = 0, const GlobalPosition upperRight = 0) :
@@ -302,6 +300,7 @@ void neumannAtPos(PrimaryVariables &neumannValues, const GlobalPosition& globalP
void sourceAtPos(PrimaryVariables &sourceValues, const GlobalPosition& globalPos) const
{
sourceValues[Indices::contiWEqIdx]=0.;
+ sourceValues[Indices::contiNEqIdx]=0.;
if (fabs(globalPos[0] - 4.5) < 1 && fabs(globalPos[1] - 4.5) < 1)
sourceValues[Indices::contiNEqIdx] = 0.0001;
}
@@ -314,19 +313,10 @@ const void initialFormulation(typename Indices::BoundaryFormulation &initialForm
{
initialFormulation = Indices::BoundaryFormulation::concentration;
}
-//! Saturation initial condition (dimensionless)
-/*! The problem is initialized with the following saturation. Both
- * phases are assumed to contain an equilibrium concentration of the
- * correspondingly other component.
- */
-Scalar initSat(const GlobalPosition& globalPos, const Element& element) const
-{
- return 1;
-}
//! Concentration initial condition (dimensionless)
/*! The problem is initialized with the following concentration.
*/
-Scalar initConcentration(const GlobalPosition& globalPos, const Element& element) const
+Scalar initConcentrationAtPos(const GlobalPosition& globalPos) const
{
return 1;
}
diff --git a/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh b/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
index b6ff52f51b..159cc29882 100644
--- a/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
@@ -281,17 +281,10 @@ const void initialFormulation(typename Indices::BoundaryFormulation &initialForm
{
initialFormulation = Indices::BoundaryFormulation::concentration;
}
-/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::initSat()
- */
-Scalar initSat(const GlobalPosition& globalPos, const Element& element) const
-{
- return 1;
-}
/*!
* \copydoc Dumux::TestDecTwoPTwoCProblem::initConcentration()
*/
-Scalar initConcentration(const GlobalPosition& globalPos, const Element& element) const
+Scalar initConcentrationAtPos(const GlobalPosition& globalPos) const
{
return 1;
}
--
GitLab