diff --git a/dumux/multidomain/2cnistokes2p2cni/2cnistokes2p2cnilocaloperator.hh b/dumux/multidomain/2cnistokes2p2cni/2cnistokes2p2cnilocaloperator.hh
index aace86cb577949f9ec05e6d86ded5b32eafe6bc5..78200c2cae3966517c550c46833df490f65d6274 100644
--- a/dumux/multidomain/2cnistokes2p2cni/2cnistokes2p2cnilocaloperator.hh
+++ b/dumux/multidomain/2cnistokes2p2cni/2cnistokes2p2cnilocaloperator.hh
@@ -24,6 +24,8 @@
#ifndef DUMUX_TWOCNISTOKES2P2CNILOCALOPERATOR_HH
#define DUMUX_TWOCNISTOKES2P2CNILOCALOPERATOR_HH
+#include <dune/common/deprecated.hh>
+
#include <dumux/multidomain/2cstokes2p2c/2cstokes2p2clocaloperator.hh>
namespace Dumux {
diff --git a/dumux/multidomain/2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh b/dumux/multidomain/2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh
index 42f4fcbe917cf6d8a288eceb129a04a8a5d0ccd4..bc12b54bced74e86b30f7f6d3500418f31e87af7 100644
--- a/dumux/multidomain/2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh
+++ b/dumux/multidomain/2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh
@@ -24,6 +24,8 @@
#ifndef DUMUX_2P2CNI_COUPLING_LOCAL_RESIDUAL_HH
#define DUMUX_2P2CNI_COUPLING_LOCAL_RESIDUAL_HH
+#include <dune/common/deprecated.hh>
+
#include <dumux/implicit/nonisothermal/nilocalresidual.hh>
#include <dumux/implicit/2p2c/2p2cproperties.hh>
@@ -201,6 +203,7 @@ public:
*
* \param scvIdx The sub-control-volume index
*/
+ DUNE_DEPRECATED_MSG("evalComponentFluxes() has been deprecated.")
PrimaryVariables evalComponentFluxes(const int scvIdx)
{
const unsigned int numScv = this->fvGeometry_().numScv;
@@ -242,7 +245,7 @@ public:
* \brief Compute the fluxes within the different fluid phases. This is
* merely for the computation of flux output.
*/
- DUNE_DEPRECATED_MSG("evalPhaseFluxes() has changed signature and has been renamed to evalComponentFluxes.")
+ DUNE_DEPRECATED_MSG("evalPhaseFluxes() has been deprecated.")
void evalPhaseFluxes()
{
elementFluxes_.resize(this->fvGeometry_().numScv);
diff --git a/dumux/multidomain/2cnistokes2p2cni/stokesncnicouplinglocalresidual.hh b/dumux/multidomain/2cnistokes2p2cni/stokesncnicouplinglocalresidual.hh
index d3e9ce03709b5d5d41fbfd1ef868f477f769be9a..53ef5e303f0949a634a7ec8eb6388e5fd4f69db9 100644
--- a/dumux/multidomain/2cnistokes2p2cni/stokesncnicouplinglocalresidual.hh
+++ b/dumux/multidomain/2cnistokes2p2cni/stokesncnicouplinglocalresidual.hh
@@ -26,6 +26,8 @@
#ifndef DUMUX_STOKESNCNI_COUPLING_LOCAL_RESIDUAL_HH
#define DUMUX_STOKESNCNI_COUPLING_LOCAL_RESIDUAL_HH
+#include <dune/common/deprecated.hh>
+
#include <dumux/freeflow/stokesncni/stokesncnilocalresidual.hh>
#include <dumux/freeflow/stokesncni/stokesncnimodel.hh>
diff --git a/dumux/multidomain/2cstokes2p2c/2cstokes2p2clocaloperator.hh b/dumux/multidomain/2cstokes2p2c/2cstokes2p2clocaloperator.hh
index ac754e3f19bcf421237e6f93aee2eeaf7300c14d..fb2ea86989f9a6e96c7093a4d57bf840ce7dc643 100644
--- a/dumux/multidomain/2cstokes2p2c/2cstokes2p2clocaloperator.hh
+++ b/dumux/multidomain/2cstokes2p2c/2cstokes2p2clocaloperator.hh
@@ -26,6 +26,8 @@
#include <iostream>
+#include <dune/common/deprecated.hh>
+
#include <dune/pdelab/multidomain/couplingutilities.hh>
#include <dune/pdelab/localoperator/pattern.hh>
#include <dune/pdelab/localoperator/idefault.hh>
@@ -631,7 +633,7 @@ public:
* \param couplingRes2 the coupling residual from the Darcy domain
*/
template<typename LFSU1, typename LFSU2, typename RES1, typename RES2, typename CParams>
- DUNE_DEPRECATED_MSG("evalCoupling21() is deprecated. Use evalCoupling() instead.")
+ DUNE_DEPRECATED_MSG("evalCoupling12() is deprecated. Use evalCoupling() instead.")
void evalCoupling12(const LFSU1& lfsu1, const LFSU2& lfsu2,
const int vertInElem1, const int vertInElem2,
const SDElement1& sdElement1, const SDElement2& sdElement2,
diff --git a/dumux/multidomain/2cstokes2p2c/2p2ccouplinglocalresidual.hh b/dumux/multidomain/2cstokes2p2c/2p2ccouplinglocalresidual.hh
index 5799651d51a2799e0e630f3e57679793dda9eba4..11b2c98e0c90ca722d5f5d7f4c758b0ad220c080 100644
--- a/dumux/multidomain/2cstokes2p2c/2p2ccouplinglocalresidual.hh
+++ b/dumux/multidomain/2cstokes2p2c/2p2ccouplinglocalresidual.hh
@@ -24,6 +24,8 @@
#ifndef DUMUX_2P2C_COUPLING_LOCAL_RESIDUAL_HH
#define DUMUX_2P2C_COUPLING_LOCAL_RESIDUAL_HH
+#include <dune/common/deprecated.hh>
+
#include <dumux/implicit/2p2c/2p2clocalresidual.hh>
#include <dumux/implicit/2p2c/2p2cproperties.hh>
@@ -194,6 +196,7 @@ public:
*
* \param scvIdx The sub-control-volume index
*/
+ DUNE_DEPRECATED_MSG("evalComponentFluxes() has been deprecated.")
PrimaryVariables evalComponentFluxes(const int scvIdx)
{
const unsigned int numScv = this->fvGeometry_().numScv;
@@ -235,7 +238,7 @@ public:
* \brief Compute the fluxes within the different fluid phases. This is
* merely for the computation of flux output.
*/
- DUNE_DEPRECATED_MSG("evalPhaseFluxes() has changed signature and has been renamed to evalComponentFluxes.")
+ DUNE_DEPRECATED_MSG("evalPhaseFluxes() has been deprecated.")
void evalPhaseFluxes()
{
elementFluxes_.resize(this->fvGeometry_().numScv);
diff --git a/dumux/multidomain/2cstokes2p2c/stokesnccouplinglocalresidual.hh b/dumux/multidomain/2cstokes2p2c/stokesnccouplinglocalresidual.hh
index ea28e7eae07c2d38f587b31b0feebc3bd538ea44..133da0aba6a37ebef8d6e4da4208d6ac76263d5b 100644
--- a/dumux/multidomain/2cstokes2p2c/stokesnccouplinglocalresidual.hh
+++ b/dumux/multidomain/2cstokes2p2c/stokesnccouplinglocalresidual.hh
@@ -26,6 +26,8 @@
#ifndef DUMUX_STOKESNC_COUPLING_LOCAL_RESIDUAL_HH
#define DUMUX_STOKESNC_COUPLING_LOCAL_RESIDUAL_HH
+#include <dune/common/deprecated.hh>
+
#include <dumux/freeflow/stokesnc/stokesnclocalresidual.hh>
#include <dumux/freeflow/stokesnc/stokesncmodel.hh>
diff --git a/dumux/multidomain/common/boxcouplinglocalresidual.hh b/dumux/multidomain/common/boxcouplinglocalresidual.hh
index d302053dc6af1cebbc0ba39ceb69fe606d1c8bf6..c48c419c8655632bf54f37a4a3460f1ec3ce094f 100644
--- a/dumux/multidomain/common/boxcouplinglocalresidual.hh
+++ b/dumux/multidomain/common/boxcouplinglocalresidual.hh
@@ -24,6 +24,8 @@
#ifndef DUMUX_BOX_COUPLING_LOCAL_RESIDUAL_HH
#define DUMUX_BOX_COUPLING_LOCAL_RESIDUAL_HH
+#include <dune/common/deprecated.hh>
+
#include <dumux/implicit/box/boxlocalresidual.hh>
namespace Dumux
@@ -39,7 +41,6 @@ template<class TypeTag>
class BoxCouplingLocalResidual : public BoxLocalResidual<TypeTag>
{
private:
-
typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) Implementation;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
@@ -53,16 +54,12 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GridView::Grid::ctype CoordScalar;
-
typedef typename GridView::template Codim<0>::Entity Element;
-
-
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
-
// copying the local residual class is not a good idea
BoxCouplingLocalResidual(const BoxCouplingLocalResidual &);
@@ -121,6 +118,7 @@ public:
* \param volVarsPrev Volume variables of the previous time step
* \param volVarsCur Volume variables of the current time step
*/
+ DUNE_DEPRECATED_MSG("evalNoBoundary() is deprecated.")
void evalNoBoundary(const Element &element,
const FVElementGeometry fvGeometry,
ElementVolumeVariables& volVarsPrev,
diff --git a/dumux/multidomain/common/multidomainmodel.hh b/dumux/multidomain/common/multidomainmodel.hh
index 88b88550f117f0b0a43ef1a4b5a94b2f40ae6daf..bd206f0f6913f4464723fb14a13499973f886046 100644
--- a/dumux/multidomain/common/multidomainmodel.hh
+++ b/dumux/multidomain/common/multidomainmodel.hh
@@ -25,6 +25,8 @@
#ifndef DUMUX_MULTIDOMAIN_MODEL_HH
#define DUMUX_MULTIDOMAIN_MODEL_HH
+#include <dune/common/deprecated.hh>
+
#include "multidomainproperties.hh"
#include "multidomainpropertydefaults.hh"
#include "multidomainproblem.hh"
@@ -294,6 +296,7 @@ public:
/*!
* \brief Returns the number of global degrees of freedoms (DOFs)
*/
+ DUNE_DEPRECATED_MSG("numDofs() is deprecated.")
size_t numDofs() const
{
return sdModel1().numDofs()*numEq1 + sdModel2().numDofs()*numEq2;