From c2a91f7d211966f135500fdc9ee13bab0c792e9d Mon Sep 17 00:00:00 2001
From: Thomas Fetzer <thomas.fetzer@iws.uni-stuttgart.de>
Date: Fri, 8 Jan 2016 09:22:32 +0100
Subject: [PATCH] [multidomain] Add and correct deprecation messages
---
.../2cnistokes2p2cni/2cnistokes2p2cnilocaloperator.hh | 2 ++
.../2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh | 5 ++++-
.../2cnistokes2p2cni/stokesncnicouplinglocalresidual.hh | 2 ++
.../multidomain/2cstokes2p2c/2cstokes2p2clocaloperator.hh | 4 +++-
.../multidomain/2cstokes2p2c/2p2ccouplinglocalresidual.hh | 5 ++++-
.../2cstokes2p2c/stokesnccouplinglocalresidual.hh | 2 ++
dumux/multidomain/common/boxcouplinglocalresidual.hh | 8 +++-----
dumux/multidomain/common/multidomainmodel.hh | 3 +++
8 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/dumux/multidomain/2cnistokes2p2cni/2cnistokes2p2cnilocaloperator.hh b/dumux/multidomain/2cnistokes2p2cni/2cnistokes2p2cnilocaloperator.hh
index aace86cb57..78200c2cae 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 42f4fcbe91..bc12b54bce 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 d3e9ce0370..53ef5e303f 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 ac754e3f19..fb2ea86989 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 5799651d51..11b2c98e0c 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 ea28e7eae0..133da0aba6 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 d302053dc6..c48c419c86 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 88b88550f1..bd206f0f69 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;
--
GitLab