diff --git a/tutorial/tutorial_decoupled.cc b/tutorial/tutorial_decoupled.cc index 98da55b5ac36c2a6ddf1dc79152ecf9b11b2fdef..fa40d17bbe2d664939dbb0947e2ae6615b7033f1 100644 --- a/tutorial/tutorial_decoupled.cc +++ b/tutorial/tutorial_decoupled.cc @@ -94,7 +94,7 @@ int main(int argc, char** argv) Problem problem(gridPtr->leafView()); /*@\label{tutorial-decoupled:instantiate-problem}@*/ // load restart file if necessary - if (restart) /*@\label{tutorial-decoupled:restart}@*/ + if (restart) /*@\label{tutorial-decoupled:mainRestart}@*/ problem.deserialize(restartTime); // define simulation parameters diff --git a/tutorial/tutorialproblem_decoupled.hh b/tutorial/tutorialproblem_decoupled.hh index c8df79490ed98671696693edd52d7d2c8e97cf4e..71988b4758ef3257ecb3923e6cb401a3d056d1ea 100644 --- a/tutorial/tutorialproblem_decoupled.hh +++ b/tutorial/tutorialproblem_decoupled.hh @@ -97,11 +97,6 @@ public: // Set the spatial parameters SET_PROP(TutorialProblemDecoupled, SpatialParameters) /*@\label{tutorial-decoupled:set-spatialparameters}@*/ { -private: - typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid; - typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar; - -public: typedef Dumux::TutorialSpatialParametersDecoupled<TypeTag> type; }; @@ -203,7 +198,8 @@ public: //! Returns a constant pressure to enter material laws /* For incrompressible simulations, a constant pressure is necessary - * to enter the material laws to gain a constant density etc. + * to enter the material laws to gain a constant density etc. In the compressible + * case, the pressure is used for the initialization of material laws. */ Scalar referencePressure(const GlobalPosition& globalPos, const Element& element) const /*@\label{tutorial-decoupled:refPressure}@*/ { @@ -225,7 +221,7 @@ public: */ typename BoundaryConditions::Flags bctypePress(const GlobalPosition& globalPos, const Intersection& intersection) const /*@\label{tutorial-decoupled:bctypePress}@*/ { - if ((globalPos[0] < this->bboxMin()[0] + eps_)) + if (globalPos[0] < this->bboxMin()[0] + eps_) return BoundaryConditions::dirichlet; // all other boundaries return BoundaryConditions::neumann; @@ -248,21 +244,15 @@ public: */ Scalar dirichletPress(const GlobalPosition& globalPos, const Intersection& intersection) const /*@\label{tutorial-decoupled:dirichletPress}@*/ { - if (globalPos[0] < this->bboxMin()[0] + eps_) - return 2e5; - // all other boundaries - return 0; + return 2e5; } //! Value for transport dirichlet boundary condition (dimensionless). /*! In case of a dirichlet BC for the transport equation, a saturation - * have to be defined on boundaries. + * has to be defined on boundaries. */ Scalar dirichletSat(const GlobalPosition& globalPos, const Intersection& intersection) const /*@\label{tutorial-decoupled:dirichletSat}@*/ { - if (globalPos[0] < this->bboxMin()[0] + eps_) - return 1; - // all other boundaries - return 0; + return 1; } //! Value for pressure neumann boundary condition \f$ [\frac{kg}{m^3 \cdot s}] \f$. /*! In case of a neumann boundary condition, the flux of matter diff --git a/tutorial/tutorialspatialparameters_decoupled.hh b/tutorial/tutorialspatialparameters_decoupled.hh index 9ed44bade1471c17dfb0c048ee8b2b20480e43bb..997d7dc247eff0833eeea4afe984f006719e2e0d 100644 --- a/tutorial/tutorialspatialparameters_decoupled.hh +++ b/tutorial/tutorialspatialparameters_decoupled.hh @@ -92,7 +92,7 @@ public: // parameters for the Brooks-Corey Law // entry pressures - materialLawParams_.setPe(10000); + materialLawParams_.setPe(1000); // Brooks-Corey shape parameters materialLawParams_.setAlpha(2);