From dd341052dbfddba3d8a9f92778d140fa4b0a6b6c Mon Sep 17 00:00:00 2001
From: Markus Wolff <markus.wolff@twt-gmbh.de>
Date: Wed, 7 Mar 2012 09:38:14 +0000
Subject: [PATCH] Removed deprecated class methods and constructors after
release 2.1
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7969 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/decoupled/2p/impes/impesproblem2p.hh | 35 -------------
.../2p/transport/transportproblem2p.hh | 41 ----------------
dumux/decoupled/common/impetproblem.hh | 49 -------------------
dumux/decoupled/common/onemodelproblem.hh | 3 --
4 files changed, 128 deletions(-)
diff --git a/dumux/decoupled/2p/impes/impesproblem2p.hh b/dumux/decoupled/2p/impes/impesproblem2p.hh
index bbe4128cff..11a86e37f8 100644
--- a/dumux/decoupled/2p/impes/impesproblem2p.hh
+++ b/dumux/decoupled/2p/impes/impesproblem2p.hh
@@ -108,41 +108,6 @@ public:
gravity_[dim - 1] = - 9.81;
}
- /*!
- * \brief Constructs an IMPESProblem2P object
- *
- * \param gridView The grid view
- * \param verbose Output flag for the time manager.
- */
- IMPESProblem2P(const GridView &gridView, bool verbose = true)
- DUNE_DEPRECATED // use IMPESProblem2P(TimeManager &, const GridView &)
- : ParentType(gridView, verbose),
- gravity_(0)
- {
- newSpatialParams_ = true;
- spatialParameters_ = new SpatialParameters(gridView);
-
- gravity_ = 0;
- if (GET_PARAM(TypeTag, bool, EnableGravity))
- gravity_[dim - 1] = - 9.81;
- }
- /*!
- * \brief Constructs an IMPESProblem2P object
- *
- * \param gridView The grid view
- * \param spatialParameters SpatialParameters instantiation
- * \param verbose Output flag for the time manager.
- */
- IMPESProblem2P(const GridView &gridView, SpatialParameters &spatialParameters, bool verbose = true)
- DUNE_DEPRECATED // use IMPESProblem2P(TimeManager &, const GridView &)
- : ParentType(gridView, verbose),
- gravity_(0),spatialParameters_(&spatialParameters)
- {
- newSpatialParams_ = false;
- gravity_ = 0;
- if (GET_PARAM(TypeTag, bool, EnableGravity))
- gravity_[dim - 1] = - 9.81;
- }
//! Destructor
virtual ~IMPESProblem2P()
diff --git a/dumux/decoupled/2p/transport/transportproblem2p.hh b/dumux/decoupled/2p/transport/transportproblem2p.hh
index 843af008f3..24cae45d44 100644
--- a/dumux/decoupled/2p/transport/transportproblem2p.hh
+++ b/dumux/decoupled/2p/transport/transportproblem2p.hh
@@ -90,47 +90,6 @@ class TransportProblem2P : public OneModelProblem<TypeTag>
{}
public:
- /*!
- * \brief The constructor
- *
- * \param gridView The grid view
- * \param verbose Output flag for the time manager.
- */
- TransportProblem2P(const GridView &gridView, bool verbose = true)
- DUNE_DEPRECATED // use TransportProblem2P(TimeManager&, const GridView&)
- : ParentType(gridView, verbose),
- gravity_(0),spatialParameters_(gridView)
- {
- cFLFactor_ = GET_PARAM(TypeTag, Scalar, CFLFactor);
-
- newSpatialParams_ = true;
- spatialParameters_ = new SpatialParameters(gridView);
-
- gravity_ = 0;
- if (GET_PARAM(TypeTag, bool, EnableGravity))
- gravity_[dim - 1] = - 9.81;
- }
-
- /*!
- * \brief The constructor
- *
- * \param gridView The grid view
- * \param spatialParameters SpatialParameters instantiation
- * \param verbose Output flag for the time manager.
- */
- TransportProblem2P(const GridView &gridView, SpatialParameters &spatialParameters, bool verbose = true)
- DUNE_DEPRECATED // use TransportProblem2P(TimeManager&, const GridView&, SpatialParameters &spatialParameters)
- : ParentType(gridView, verbose),
- gravity_(0), spatialParameters_(spatialParameters)
- {
- cFLFactor_ = GET_PARAM(TypeTag, Scalar, CFLFactor);
-
- newSpatialParams_ = false;
-
- gravity_ = 0;
- if (GET_PARAM(TypeTag, bool, EnableGravity))
- gravity_[dim - 1] = - 9.81;
- }
/*!
* \brief The constructor
diff --git a/dumux/decoupled/common/impetproblem.hh b/dumux/decoupled/common/impetproblem.hh
index b961289c7a..df6c6bb0aa 100644
--- a/dumux/decoupled/common/impetproblem.hh
+++ b/dumux/decoupled/common/impetproblem.hh
@@ -96,51 +96,6 @@ private:
{}
public:
- //! Constructs an object of type IMPETProblemProblem
- /** @param gridView gridview to the grid.
- * @param verbose verbosity.
- */
- IMPETProblem(const GridView &gridView, bool verbose = true)
- DUNE_DEPRECATED // use IMPETProblem(TimeManager&, const GridView&)
- : gridView_(gridView),
- grid_(0),
- bboxMin_(std::numeric_limits<double>::max()),
- bboxMax_(-std::numeric_limits<double>::max()),
- variables_(gridView),
- outputInterval_(1)
- {
- // calculate the bounding box of the grid view
- VertexIterator vIt = gridView.template begin<dim>();
- const VertexIterator vEndIt = gridView.template end<dim>();
- for (; vIt!=vEndIt; ++vIt) {
- for (int i=0; i<dim; i++) {
- bboxMin_[i] = std::min(bboxMin_[i], vIt->geometry().center()[i]);
- bboxMax_[i] = std::max(bboxMax_[i], vIt->geometry().center()[i]);
- }
- }
-
- // communicate to get the bounding box of the whole domain
- if (gridView.comm().size() > 1)
- for (int i = 0; i < dim; ++i) {
- bboxMin_[i] = gridView.comm().min(bboxMin_[i]);
- bboxMax_[i] = gridView.comm().max(bboxMax_[i]);
- }
-
- timeManager_ = new TimeManager(verbose);
- deleteTimeManager_ = true;
-
- pressModel_ = new PressureModel(asImp_());
-
- transportModel_ = new TransportModel(asImp_());
- model_ = new IMPETModel(asImp_()) ;
-
- // create an Object to handle adaptive grids
- if (adaptiveGrid)
- gridAdapt_ = new GridAdaptModel(asImp_());
-
- resultWriter_ = NULL;
- }
-
/*! \brief Constructs an object of type IMPETProblemProblem
* \param timeManager The time manager
* \param gridView gridview to the grid.
@@ -771,10 +726,6 @@ public:
res.deserializeEnd();
};
- //! Use restart() function instead!
- void deserialize(double tRestart) DUNE_DEPRECATED
- { restart(tRestart);}
- // \}
void addOutputVtkFields()
{
diff --git a/dumux/decoupled/common/onemodelproblem.hh b/dumux/decoupled/common/onemodelproblem.hh
index 206ba8c175..2005dd63cf 100644
--- a/dumux/decoupled/common/onemodelproblem.hh
+++ b/dumux/decoupled/common/onemodelproblem.hh
@@ -611,9 +611,6 @@ public:
res.deserializeEnd();
};
- //! Use restart() function instead!
- void deserialize(double tRestart) DUNE_DEPRECATED
- { restart(tRestart);}
// \}
--
GitLab