From e7788f7be2a39f04c8a534cc8e719b08a9106cee Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Mon, 15 Oct 2012 12:07:05 +0000
Subject: [PATCH] box 2pni: remove everything deprecated during 2.2-svn. This
includes removal of the model-specific problem, as well as several property,
parameter and member function names. Reviewed by Christoph
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9304 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/boxmodels/2pni/2pniproblem.hh | 81 --------------------
dumux/boxmodels/2pni/2pniproperties.hh | 5 --
dumux/boxmodels/2pni/2pnipropertydefaults.hh | 3 +-
3 files changed, 1 insertion(+), 88 deletions(-)
delete mode 100644 dumux/boxmodels/2pni/2pniproblem.hh
diff --git a/dumux/boxmodels/2pni/2pniproblem.hh b/dumux/boxmodels/2pni/2pniproblem.hh
deleted file mode 100644
index 84d66064c8..0000000000
--- a/dumux/boxmodels/2pni/2pniproblem.hh
+++ /dev/null
@@ -1,81 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Base class for all problems which use the non-isothermal
- * two-phase box model
- */
-#ifndef DUMUX_2PNI_PROBLEM_HH
-#define DUMUX_2PNI_PROBLEM_HH
-
-#include <dumux/boxmodels/2p/2pproblem.hh>
-
-
-namespace Dumux
-{
-/*!
- * \ingroup TwoPNIModel
- * \ingroup BoxBaseProblems
- * \brief Base class for all problems which use the non-isothermal
- * two-phase box model.
- *
- */
-template<class TypeTag>
-class TwoPNIProblem : public TwoPProblem<TypeTag>
-{
- typedef TwoPProblem<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
-public:
- /*!
- * \brief The constructor
- *
- * \param timeManager The time manager
- * \param gridView The grid view
- */
- DUNE_DEPRECATED_MSG("use PorousMediaBoxProblem instead")
- TwoPNIProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
- {}
-
- /*!
- * \name Problem parameters
- */
- // \{
-
- /*!
- * \brief Returns the temperature within the domain.
- *
- * This is a non-isothermal model, so this method just throws an
- * exception. This method MUST NOT be overwritten by the actual
- * problem.
- */
- Scalar temperature() const
- { DUNE_THROW(Dune::Exception, "temperature() method called for a 2p2cni problem"); };
-
- // \}
-};
-
-}
-
-#endif
diff --git a/dumux/boxmodels/2pni/2pniproperties.hh b/dumux/boxmodels/2pni/2pniproperties.hh
index 404f843828..d58ba13095 100644
--- a/dumux/boxmodels/2pni/2pniproperties.hh
+++ b/dumux/boxmodels/2pni/2pniproperties.hh
@@ -41,11 +41,6 @@ namespace Properties
//! The type tag for the non-isothermal two-phase problems
NEW_TYPE_TAG(BoxTwoPNI, INHERITS_FROM(BoxTwoP));
-//////////////////////////////////////////////////////////////////
-// Property tags
-//////////////////////////////////////////////////////////////////
-
-NEW_PROP_TAG(TwoPNIIndices); //!< DEPRECATED Enumerations for the non-isothermal 2p models
}
}
diff --git a/dumux/boxmodels/2pni/2pnipropertydefaults.hh b/dumux/boxmodels/2pni/2pnipropertydefaults.hh
index a00f70f864..2a96f75eb1 100644
--- a/dumux/boxmodels/2pni/2pnipropertydefaults.hh
+++ b/dumux/boxmodels/2pni/2pnipropertydefaults.hh
@@ -63,8 +63,7 @@ SET_TYPE_PROP(BoxTwoPNI, VolumeVariables, TwoPNIVolumeVariables<TypeTag>);
SET_TYPE_PROP(BoxTwoPNI, FluxVariables, TwoPNIFluxVariables<TypeTag>);
//! The indices required by the non-isothermal two-phase model
-SET_TYPE_PROP(BoxTwoPNI, Indices, typename GET_PROP_TYPE(TypeTag, TwoPNIIndices));
-SET_TYPE_PROP(BoxTwoPNI, TwoPNIIndices, TwoPNIIndices<TypeTag, 0>);
+SET_TYPE_PROP(BoxTwoPNI, Indices, TwoPNIIndices<TypeTag, 0>);
}
--
GitLab