Commit 82d945d5 authored by Nicolas Schwenck's avatar Nicolas Schwenck
Browse files

reverted commit r13598 - if the pressure model is needed the changes should be...

reverted commit r13598 - if the pressure model is needed the changes should be recommited to a derived model, but not the onemodelproblem itself which does not know a pressure model in all cases


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13601 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent b313153e
...@@ -53,7 +53,6 @@ private: ...@@ -53,7 +53,6 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, Variables) Variables; typedef typename GET_PROP_TYPE(TypeTag, Variables) Variables;
typedef typename GET_PROP_TYPE(TypeTag, Model) Model; typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
typedef typename GET_PROP_TYPE(TypeTag, PressureModel) PressureModel;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
...@@ -135,7 +134,7 @@ public: ...@@ -135,7 +134,7 @@ public:
bBoxMax_[i] = std::max(bBoxMax_[i], vIt->geometry().center()[i]); bBoxMax_[i] = std::max(bBoxMax_[i], vIt->geometry().center()[i]);
} }
} }
timeManager_ = Dune::stackobject_to_shared_ptr<TimeManager>(timeManager); timeManager_ = Dune::stackobject_to_shared_ptr<TimeManager>(timeManager);
model_ = Dune::make_shared<Model>(asImp_()) ; model_ = Dune::make_shared<Model>(asImp_()) ;
...@@ -569,18 +568,9 @@ public: ...@@ -569,18 +568,9 @@ public:
*/ */
const Model &model() const const Model &model() const
{ return *model_; } { return *model_; }
/*!
* \brief Returns the pressure model used for the problem.
*/
PressureModel &pressureModel()
{ return *pressModel_; }
//! \copydoc Dumux::IMPETProblem::pressureModel()
const PressureModel &pressureModel() const
{ return *pressModel_; }
// \} // \}
/*! /*!
* \name Restart mechanism * \name Restart mechanism
*/ */
...@@ -669,7 +659,6 @@ private: ...@@ -669,7 +659,6 @@ private:
Variables variables_; Variables variables_;
Dune::shared_ptr<PressureModel> pressModel_;//!< object including the pressure model
Dune::shared_ptr<Model> model_; Dune::shared_ptr<Model> model_;
Dune::shared_ptr<VtkMultiWriter> resultWriter_; Dune::shared_ptr<VtkMultiWriter> resultWriter_;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment