From 20d863f37cc3e4892c4318d6a0a3849567bca075 Mon Sep 17 00:00:00 2001 From: Benjamin Faigle Date: Wed, 20 Oct 2010 13:01:24 +0000 Subject: [PATCH] fixed wrong determination of boundary values in tutorial decoupled --- examples/tutorialproblem_decoupled.hh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/tutorialproblem_decoupled.hh b/examples/tutorialproblem_decoupled.hh index 924fea600..de8ad386a 100644 --- a/examples/tutorialproblem_decoupled.hh +++ b/examples/tutorialproblem_decoupled.hh @@ -123,7 +123,7 @@ SET_INT_PROP(TutorialProblemDecoupled, VelocityFormulation, SET_TYPE_PROP(TutorialProblemDecoupled, DiffusivePart, Dumux::CapillaryDiffusion); /*@\label{tutorial-decoupled:DiffusivePart}@*/ -SET_SCALAR_PROP(TutorialProblemDecoupled, CFLFactor, 0.3); /*@\label{tutorial-decoupled:cfl}@*/ +SET_SCALAR_PROP(TutorialProblemDecoupled, CFLFactor, 0.5); /*@\label{tutorial-decoupled:cfl}@*/ // Disable gravity SET_BOOL_PROP(TutorialProblemDecoupled, EnableGravity, false); /*@\label{tutorial-decoupled:gravity}@*/ @@ -224,7 +224,7 @@ public: */ typename BoundaryConditions::Flags bctypePress(const GlobalPosition& globalPos, const Intersection& intersection) const /*@\label{tutorial-decoupled:bctypePress}@*/ { - if ((globalPos[0] < lowerLeft_[0] + eps_)) + if ((globalPos[0] < this->bboxMin()[0] + eps_)) return BoundaryConditions::dirichlet; // all other boundaries return BoundaryConditions::neumann; @@ -236,7 +236,7 @@ public: */ BoundaryConditions::Flags bctypeSat(const GlobalPosition& globalPos, const Intersection& intersection) const /*@\label{tutorial-decoupled:bctypeSat}@*/ { - if (globalPos[0] < lowerLeft_[0] + eps_) + if (globalPos[0] < this->bboxMin()[0] + eps_) return Dumux::BoundaryConditions::dirichlet; else return Dumux::BoundaryConditions::neumann; @@ -247,7 +247,7 @@ public: */ Scalar dirichletPress(const GlobalPosition& globalPos, const Intersection& intersection) const /*@\label{tutorial-decoupled:dirichletPress}@*/ { - if (globalPos[0] < lowerLeft_[0] + eps_) + if (globalPos[0] < this->bboxMin()[0] + eps_) return 2e5; // all other boundaries return 0; @@ -258,7 +258,7 @@ public: */ Scalar dirichletSat(const GlobalPosition& globalPos, const Intersection& intersection) const /*@\label{tutorial-decoupled:dirichletSat}@*/ { - if (globalPos[0] < lowerLeft_[0] + eps_) + if (globalPos[0] < this->bboxMin()[0] + eps_) return 1; // all other boundaries return 0; @@ -270,7 +270,7 @@ public: std::vector neumannPress(const GlobalPosition& globalPos, const Intersection& intersection) const /*@\label{tutorial-decoupled:neumannPress}@*/ { std::vector neumannFlux(2,0.0); - if (globalPos[0] > upperRight_[0] - eps_) + if (globalPos[0] > this->bboxMax()[0] - eps_) { neumannFlux[nPhaseIdx] = 3e-4; }