From 9cc9965ab696f3ff795a3d6a6944ca2b541d66e0 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Mon, 15 Oct 2012 12:08:27 +0000
Subject: [PATCH] box 3p3cni: 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@9308 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/boxmodels/3p3cni/3p3cniproblem.hh | 78 -------------------
dumux/boxmodels/3p3cni/3p3cniproperties.hh | 5 --
.../3p3cni/3p3cnipropertydefaults.hh | 4 +-
test/boxmodels/3p3cni/kuevetteproblem.hh | 4 +-
4 files changed, 3 insertions(+), 88 deletions(-)
delete mode 100644 dumux/boxmodels/3p3cni/3p3cniproblem.hh
diff --git a/dumux/boxmodels/3p3cni/3p3cniproblem.hh b/dumux/boxmodels/3p3cni/3p3cniproblem.hh
deleted file mode 100644
index 6dd0e877f7..0000000000
--- a/dumux/boxmodels/3p3cni/3p3cniproblem.hh
+++ /dev/null
@@ -1,78 +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 three-phase,
- * three-component box model
- */
-#ifndef DUMUX_3P3CNI_PROBLEM_HH
-#define DUMUX_3P3CNI_PROBLEM_HH
-
-#include <dumux/boxmodels/3p3c/3p3cproblem.hh>
-
-namespace Dumux
-{
-/*!
- * \ingroup ThreePThreeCNIModel
- * \brief Base class for all problems which use the non-isothermal
- * three-phase, three-component box model.
- */
-template<class TypeTag>
-class ThreePThreeCNIProblem : public ThreePThreeCProblem<TypeTag>
-{
- typedef ThreePThreeCProblem<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-
-public:
- /*!
- * \brief The constructor
- *
- * \param timeManager The time manager
- * \param gridView The grid view
- */
- ThreePThreeCNIProblem(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 3p3cni problem"); };
-
- // \}
-};
-
-}
-
-#endif
diff --git a/dumux/boxmodels/3p3cni/3p3cniproperties.hh b/dumux/boxmodels/3p3cni/3p3cniproperties.hh
index 815fb9ff60..0c69522f03 100644
--- a/dumux/boxmodels/3p3cni/3p3cniproperties.hh
+++ b/dumux/boxmodels/3p3cni/3p3cniproperties.hh
@@ -41,11 +41,6 @@ namespace Properties
//! The type tag for the non-isothermal three-phase, three-component problems
NEW_TYPE_TAG(BoxThreePThreeCNI, INHERITS_FROM(BoxThreePThreeC));
-
-//////////////////////////////////////////////////////////////////
-// Property tags
-//////////////////////////////////////////////////////////////////
-NEW_PROP_TAG(ThreePThreeCNIIndices); //!< DEPRECATED Enumerations for the 3p3cni models
}
}
diff --git a/dumux/boxmodels/3p3cni/3p3cnipropertydefaults.hh b/dumux/boxmodels/3p3cni/3p3cnipropertydefaults.hh
index 660c027d67..a00787502d 100644
--- a/dumux/boxmodels/3p3cni/3p3cnipropertydefaults.hh
+++ b/dumux/boxmodels/3p3cni/3p3cnipropertydefaults.hh
@@ -31,7 +31,6 @@
#include <dumux/boxmodels/3p3c/3p3cpropertydefaults.hh>
#include "3p3cnimodel.hh"
-#include "3p3cniproblem.hh"
#include "3p3cniindices.hh"
#include "3p3cnilocalresidual.hh"
#include "3p3cnivolumevariables.hh"
@@ -64,8 +63,7 @@ SET_TYPE_PROP(BoxThreePThreeCNI, VolumeVariables, ThreePThreeCNIVolumeVariables<
SET_TYPE_PROP(BoxThreePThreeCNI, FluxVariables, ThreePThreeCNIFluxVariables<TypeTag>);
//! The indices required by the non-isothermal 3p3c model
-SET_TYPE_PROP(BoxThreePThreeCNI, Indices, typename GET_PROP_TYPE(TypeTag, ThreePThreeCNIIndices));
-SET_TYPE_PROP(BoxThreePThreeCNI, ThreePThreeCNIIndices, ThreePThreeCNIIndices<TypeTag, 0>);//DEPRECATED
+SET_TYPE_PROP(BoxThreePThreeCNI, Indices, ThreePThreeCNIIndices<TypeTag, 0>);
}
diff --git a/test/boxmodels/3p3cni/kuevetteproblem.hh b/test/boxmodels/3p3cni/kuevetteproblem.hh
index c3a5176f29..068fdc8514 100644
--- a/test/boxmodels/3p3cni/kuevetteproblem.hh
+++ b/test/boxmodels/3p3cni/kuevetteproblem.hh
@@ -260,8 +260,8 @@ public:
if (globalPos[0] < eps_)
{
values[Indices::contiWEqIdx] = -0.1435; // 0.3435 [mol/(s m)] in total
- values[Indices::contiAEqIdx] = -0.2;
- values[Indices::contiCEqIdx] = 0.0;
+ values[Indices::contiGEqIdx] = -0.2;
+ values[Indices::contiNEqIdx] = 0.0;
values[Indices::energyEqIdx] = -6929.;
}
}
--
GitLab