diff --git a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
index 15872d43d2d37997a5bbda7601afb7af929ff7d5..81a09a609889ad456799bb5b921f587de3daeb1f 100644
--- a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
+++ b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
@@ -100,9 +100,7 @@ public:
molarDensity_ = Scalar(0);
density_ = Scalar(0);
potentialGrad_ = Scalar(0);
- concentrationGrad_ = Scalar(0);
moleFractionGrad_ = Scalar(0);
- massFractionGrad_ = Scalar(0);
calculateGradients_(problem, element, elemVolVars);
calculateK_(problem, element, elemVolVars);
@@ -164,21 +162,6 @@ public:
const DimVector &potentialGrad() const
{ return potentialGrad_; }
- /*!
- * \brief Return the concentration gradient \f$\mathrm{[mol/m^3/m]}\f$.
- *
- * \param compIdx The index of the considered component
- */
- DUNE_DEPRECATED_MSG("use moleFractionGrad instead")
- const DimVector &concentrationGrad(int compIdx) const
- {
- if (compIdx != 1)
- { DUNE_THROW(Dune::InvalidStateException,
- "The 1p2c model is supposed to need "
- "only the concentration gradient of "
- "the second component!"); }
- return concentrationGrad_;
- };
/*!
* \brief Return the mole-fraction gradient of a component in a phase \f$\mathrm{[mol/mol/m)]}\f$.
@@ -195,38 +178,6 @@ public:
return moleFractionGrad_;
};
- /*!
- * \brief Return the mole-fraction gradient of a component in a phase \f$\mathrm{[mol/mol/m)]}\f$.
- *
- * \param compIdx The index of the considered component
- */
- DUNE_DEPRECATED_MSG("use moleFractionGrad instead")
- const DimVector &moleFracGrad(int compIdx) const
- {
- if (compIdx != 1)
- { DUNE_THROW(Dune::InvalidStateException,
- "The 1p2c model is supposed to need "
- "only the concentration gradient of "
- "the second component!"); }
- return moleFractionGrad(compIdx);
- };
-
- /*!
- * \brief Return the mass-fraction gradient of a component in a phase \f$\mathrm{[kg/kg/m)]}\f$.
- *
- * \param compIdx The index of the considered component
- */
- DUNE_DEPRECATED_MSG("use moleFractionGrad instead")
- const DimVector &massFracGrad(int compIdx) const
- {
- if (compIdx != 1)
- { DUNE_THROW(Dune::InvalidStateException,
- "The 1p2c model is supposed to need "
- "only the concentration gradient of "
- "the second component!"); }
- return massFractionGrad_;
- };
-
/*!
* \brief The binary diffusion coefficient for each fluid phase in the porous medium \f$\mathrm{[m^2/s]}\f$.
*/
@@ -243,14 +194,6 @@ public:
Scalar viscosity() const
{ return viscosity_;}
- /*!
- * \brief Return viscosity \f$\mathrm{[Pa s]}\f$ of a phase at the integration
- * point.
- */
- DUNE_DEPRECATED_MSG("use viscosity() instead")
- Scalar viscosityAtIP() const
- { return viscosity();}
-
/*!
* \brief Return molar density \f$\mathrm{[mol/m^3]}\f$ of a phase at the integration
* point.
@@ -258,14 +201,6 @@ public:
Scalar molarDensity() const
{ return molarDensity_; }
- /*!
- * \brief Return molar density \f$\mathrm{[mol/m^3]}\f$ of a phase at the integration
- * point.
- */
- DUNE_DEPRECATED_MSG("use molarDensity() instead")
- Scalar molarDensityAtIP() const
- { return molarDensity(); }
-
/*!
* \brief Return density \f$\mathrm{[kg/m^3]}\f$ of a phase at the integration
* point.
@@ -273,14 +208,6 @@ public:
Scalar density() const
{ return density_; }
- /*!
- * \brief Return density \f$\mathrm{[kg/m^3]}\f$ of a phase at the integration
- * point.
- */
- DUNE_DEPRECATED_MSG("use density( instead")
- Scalar densityAtIP() const
- { return density(); }
-
/*!
* \brief Given the intrinsic permeability times the pressure
* potential gradient and SCV face normal for a phase,
@@ -354,21 +281,11 @@ protected:
tmp *= elemVolVars[volVarsIdx].pressure();
potentialGrad_ += tmp;
- // the concentration gradient [mol/m^3/m]
- tmp = feGrad;
- tmp *= elemVolVars[volVarsIdx].molarity(transportCompIdx);
- concentrationGrad_ += tmp;
-
// the mole-fraction gradient
tmp = feGrad;
tmp *= elemVolVars[volVarsIdx].moleFraction(transportCompIdx);
moleFractionGrad_ += tmp;
- // the mass-fraction gradient
- tmp = feGrad;
- tmp *= elemVolVars[volVarsIdx].massFraction(transportCompIdx);
- massFractionGrad_ += tmp;
-
// phase viscosity
viscosity_ += elemVolVars[volVarsIdx].viscosity()*face().shapeValue[idx];
@@ -392,8 +309,6 @@ protected:
potentialGrad_ = tmp;
potentialGrad_ *= volVarsJ.pressure() - volVarsI.pressure();
- concentrationGrad_ = tmp;
- concentrationGrad_ *= volVarsJ.molarity(transportCompIdx) - volVarsI.molarity(transportCompIdx);
moleFractionGrad_ = tmp;
moleFractionGrad_ *= volVarsJ.moleFraction(transportCompIdx) - volVarsI.moleFraction(transportCompIdx);
}
@@ -547,12 +462,8 @@ protected:
//! pressure potential gradient
DimVector potentialGrad_;
- //! DEPRECATED concentration gradient
- DimVector concentrationGrad_;
//! mole-fraction gradient
DimVector moleFractionGrad_;
- //! DEPRECATED mass-fraction gradient
- DimVector massFractionGrad_;
//! the effective diffusion coefficent in the porous medium
Scalar porousDiffCoeff_;
diff --git a/dumux/boxmodels/1p2c/1p2cmodel.hh b/dumux/boxmodels/1p2c/1p2cmodel.hh
index d2553263262ad4c03c29c06873cc38352eb8a33a..3b70302f8581ff7ad664753fdd8c5b17f78c403e 100644
--- a/dumux/boxmodels/1p2c/1p2cmodel.hh
+++ b/dumux/boxmodels/1p2c/1p2cmodel.hh
@@ -28,7 +28,6 @@
#define DUMUX_ONEP_TWOC_MODEL_HH
#include "1p2cproperties.hh"
-#include "1p2cproblem.hh"
#include "1p2clocalresidual.hh"
#include <dumux/boxmodels/common/boxmodel.hh>
diff --git a/dumux/boxmodels/1p2c/1p2cproblem.hh b/dumux/boxmodels/1p2c/1p2cproblem.hh
deleted file mode 100644
index 755f22935778dd7048d23d5a051b5d466356c53f..0000000000000000000000000000000000000000
--- a/dumux/boxmodels/1p2c/1p2cproblem.hh
+++ /dev/null
@@ -1,84 +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 single-phase,
- * two-component box model.
- */
-#ifndef DUMUX_1P2C_PROBLEM_HH
-#define DUMUX_1P2C_PROBLEM_HH
-
-#include <dumux/boxmodels/common/porousmediaboxproblem.hh>
-#include "1p2cproperties.hh"
-
-namespace Dumux
-{
-/*!
- * \ingroup OnePTwoCBoxModel
- * \ingroup BoxBaseProblems
- * \brief Base class for all problems which use the single-phase, two-component box model.
- *
- */
-template<class TypeTag>
-class OnePTwoCBoxProblem : public PorousMediaBoxProblem<TypeTag>
-{
- typedef PorousMediaBoxProblem<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
-
-public:
- /*!
- * \brief The constructor
- *
- * \param timeManager The time manager
- * \param gridView The grid view
- * \param verbose Turn verbosity on or off
- */
- DUNE_DEPRECATED_MSG("use PorousMediaBoxProblem instead")
- OnePTwoCBoxProblem(TimeManager &timeManager,
- const GridView &gridView,
- const bool verbose = true)
- : ParentType(timeManager, gridView)
- {}
-
- /*!
- * \brief The constructor
- *
- * \param timeManager The time manager
- * \param gridView The grid view
- * \param spatialParams The spatial parameters object
- * \param verbose Turn verbosity on or off
- */
- DUNE_DEPRECATED_MSG("use PorousMediaBoxProblem instead")
- OnePTwoCBoxProblem(TimeManager &timeManager,
- const GridView &gridView,
- SpatialParams &spatialParams,
- const bool verbose = true)
- : ParentType(timeManager, gridView)
- {}
-
- ~OnePTwoCBoxProblem()
- {}
-};
-}
-
-#endif
diff --git a/dumux/boxmodels/1p2c/1p2cproperties.hh b/dumux/boxmodels/1p2c/1p2cproperties.hh
index 074577de20fba699ecc4e41c7450ac47546fce23..4f835f0547009622fc37fe43d931e4d5e317a7fa 100644
--- a/dumux/boxmodels/1p2c/1p2cproperties.hh
+++ b/dumux/boxmodels/1p2c/1p2cproperties.hh
@@ -52,15 +52,11 @@ NEW_TYPE_TAG(BoxOnePTwoC, INHERITS_FROM(BoxModel));
NEW_PROP_TAG(NumPhases); //!< Number of fluid phases in the system
NEW_PROP_TAG(PhaseIdx); //!< A phase index in to allow that a two-phase fluidsystem is used
NEW_PROP_TAG(NumComponents); //!< Number of fluid components in the system
-NEW_PROP_TAG(OnePTwoCIndices); //!< DEPRECATED Enumerations for the 1p2c models
NEW_PROP_TAG(Indices); //!< Enumerations for the model
NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
-NEW_PROP_TAG(SpatialParameters); //!< DEPRECATED The type of the spatial parameters
NEW_PROP_TAG(FluidSystem); //!< Type of the multi-component relations
-NEW_PROP_TAG(UpwindWeight); //!< DEPRECATED The default value of the upwind weight
NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The default value of the upwind weight
NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(EnableGravity); //!< DEPRECATED Returns whether gravity is considered in the problem
NEW_PROP_TAG(UseMoles); //!Defines whether mole (true) or mass (false) fractions are used
NEW_PROP_TAG(Scaling); //!Defines Scaling of the model
}
diff --git a/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh b/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh
index b73b31e9d6fe0ac19047628f4663c5f93ce438e3..5511d6d304a2c117cca35822f78b339157a932da 100644
--- a/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh
+++ b/dumux/boxmodels/1p2c/1p2cpropertydefaults.hh
@@ -67,24 +67,20 @@ SET_TYPE_PROP(BoxOnePTwoC, VolumeVariables, OnePTwoCVolumeVariables<TypeTag>);
SET_TYPE_PROP(BoxOnePTwoC, FluxVariables, OnePTwoCFluxVariables<TypeTag>);
//! set default upwind weight to 1.0, i.e. fully upwind
-SET_SCALAR_PROP(BoxOnePTwoC, ImplicitMassUpwindWeight, GET_PROP_VALUE(TypeTag, UpwindWeight));
-SET_SCALAR_PROP(BoxOnePTwoC, UpwindWeight, 1.0);//DEPRECATED!!
+SET_SCALAR_PROP(BoxOnePTwoC, ImplicitMassUpwindWeight, 1.0);
//! Set the indices used by the 1p2c model
-SET_TYPE_PROP(BoxOnePTwoC, Indices, typename GET_PROP_TYPE(TypeTag, OnePTwoCIndices));
-SET_TYPE_PROP(BoxOnePTwoC, OnePTwoCIndices, Dumux::OnePTwoCIndices<TypeTag, 0>);//DEPRECATED
+SET_TYPE_PROP(BoxOnePTwoC, Indices, Dumux::OnePTwoCIndices<TypeTag, 0>);
//! The spatial parameters to be employed.
//! Use BoxSpatialParamsOneP by default.
-SET_TYPE_PROP(BoxOnePTwoC, SpatialParams, typename GET_PROP_TYPE(TypeTag, SpatialParameters));
-SET_TYPE_PROP(BoxOnePTwoC, SpatialParameters, BoxSpatialParamsOneP<TypeTag>);//DEPRECATED
+SET_TYPE_PROP(BoxOnePTwoC, SpatialParams, BoxSpatialParamsOneP<TypeTag>);
//! Set the phaseIndex per default to zero (important for two-phase fluidsystems).
SET_INT_PROP(BoxOnePTwoC, PhaseIdx, 0);
// enable gravity by default
-SET_BOOL_PROP(BoxOnePTwoC, ProblemEnableGravity, GET_PROP_VALUE(TypeTag, EnableGravity));
-SET_BOOL_PROP(BoxOnePTwoC, EnableGravity, true);//DEPRECATED
+SET_BOOL_PROP(BoxOnePTwoC, ProblemEnableGravity, true);
}
// \}
}