From 1179e8ae20e6894d69377ebe1eded0c58870c43d Mon Sep 17 00:00:00 2001
From: Lisa Julia Nebel <lisa_julia.nebel@tu-dresden.de>
Date: Tue, 25 Jan 2022 13:56:56 +0100
Subject: [PATCH] Replace DUNE_DEPRECATED by [[deprecated]]
---
dune/elasticity/assemblers/feassembler.hh | 4 ++--
dune/elasticity/assemblers/localadolcstiffness.hh | 2 +-
dune/elasticity/assemblers/localfestiffness.hh | 4 ++--
dune/elasticity/materials/exphenckyenergy.hh | 2 +-
dune/elasticity/materials/henckyenergy.hh | 2 +-
dune/elasticity/materials/localintegralenergy.hh | 4 ++--
dune/elasticity/materials/mooneyrivlinenergy.hh | 2 +-
dune/elasticity/materials/neohookeenergy.hh | 2 +-
dune/elasticity/materials/neumannenergy.hh | 4 ++--
dune/elasticity/materials/stvenantkirchhoffenergy.hh | 2 +-
dune/elasticity/materials/sumenergy.hh | 5 ++---
11 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/dune/elasticity/assemblers/feassembler.hh b/dune/elasticity/assemblers/feassembler.hh
index 43a50ac..19a71f1 100644
--- a/dune/elasticity/assemblers/feassembler.hh
+++ b/dune/elasticity/assemblers/feassembler.hh
@@ -196,8 +196,8 @@ FEAssembler
typedef Dune::FieldMatrix<double, blocksize, blocksize> MatrixBlock;
public:
- const Basis
- DUNE_DEPRECATED_MSG("dune-elasticity with dune-fufem bases is now deprecated. Use Elasticity::FEAssembler with dune-functions bases.") basis_;
+ [[deprecated("dune-elasticity with dune-fufem bases is now deprecated. Use Elasticity::FEAssembler with dune-functions bases.")]]
+ const Basis basis_;
/** \brief Partition type on which to assemble
*
diff --git a/dune/elasticity/assemblers/localadolcstiffness.hh b/dune/elasticity/assemblers/localadolcstiffness.hh
index a66567a..487b94d 100644
--- a/dune/elasticity/assemblers/localadolcstiffness.hh
+++ b/dune/elasticity/assemblers/localadolcstiffness.hh
@@ -182,7 +182,7 @@ public:
LocalADOLCStiffness(const Dune::LocalEnergy<GridView, LocalFiniteElement, AVectorType>* energy)
: localEnergy_(energy)
- {} DUNE_DEPRECATED_MSG("dune-elasticity with dune-fufem bases is now deprecated. Use Elasticity::LocalADOLCStiffness with LocalView concept!")
+ {} [[deprecated("dune-elasticity with dune-fufem bases is now deprecated. Use Elasticity::LocalADOLCStiffness with LocalView concept!")]]
/** \brief Compute the energy at the current configuration */
virtual RT energy (const Entity& e,
diff --git a/dune/elasticity/assemblers/localfestiffness.hh b/dune/elasticity/assemblers/localfestiffness.hh
index ecb66f0..bcb5ef8 100644
--- a/dune/elasticity/assemblers/localfestiffness.hh
+++ b/dune/elasticity/assemblers/localfestiffness.hh
@@ -55,8 +55,8 @@ public:
VectorType& localGradient) = 0;
// assembled data
- Dune::Matrix<Dune::FieldMatrix<RT,blocksize,blocksize> >
- DUNE_DEPRECATED_MSG("Use dune-functions powerBases with LocalView concept. See Dune::Elasticity::LocalFEStiffness") A_;
+ [[deprecated("Use dune-functions powerBases with LocalView concept. See Dune::Elasticity::LocalFEStiffness")]]
+ Dune::Matrix<Dune::FieldMatrix<RT,blocksize,blocksize> > A_;
};
diff --git a/dune/elasticity/materials/exphenckyenergy.hh b/dune/elasticity/materials/exphenckyenergy.hh
index e3a9f5b..4766115 100644
--- a/dune/elasticity/materials/exphenckyenergy.hh
+++ b/dune/elasticity/materials/exphenckyenergy.hh
@@ -7,7 +7,7 @@
namespace Dune {
template<class GridView, class LocalFiniteElement, class field_type=double>
-class DUNE_DEPRECATED_MSG("Use Elasticity::LocalIntegralEnergy with Elasticity::ExpHenckyDensity")
+class [[deprecated("Use Elasticity::LocalIntegralEnergy with Elasticity::ExpHenckyDensity")]]
ExpHenckyEnergy
: public Elasticity::LocalIntegralEnergy<GridView,LocalFiniteElement,field_type>
{
diff --git a/dune/elasticity/materials/henckyenergy.hh b/dune/elasticity/materials/henckyenergy.hh
index e85f6df..b3fa18d 100644
--- a/dune/elasticity/materials/henckyenergy.hh
+++ b/dune/elasticity/materials/henckyenergy.hh
@@ -7,7 +7,7 @@
namespace Dune {
template<class GridView, class LocalFiniteElement, class field_type=double>
-class DUNE_DEPRECATED_MSG("Use Elasticity::LocalIntegralEnergy with Elasticity::HenckyDensity")
+class [[deprecated("Use Elasticity::LocalIntegralEnergy with Elasticity::HenckyDensity")]]
HenckyEnergy
: public Elasticity::LocalIntegralEnergy<GridView,LocalFiniteElement,field_type>
{
diff --git a/dune/elasticity/materials/localintegralenergy.hh b/dune/elasticity/materials/localintegralenergy.hh
index 9acc5c0..7ecb5c8 100644
--- a/dune/elasticity/materials/localintegralenergy.hh
+++ b/dune/elasticity/materials/localintegralenergy.hh
@@ -136,8 +136,8 @@ public:
const std::vector<Dune::FieldVector<field_type,gridDim> >& localConfiguration) const;
protected:
- const std::shared_ptr<Elasticity::LocalDensity<gridDim,field_type,DT>>
- DUNE_DEPRECATED_MSG("Use dune-functions powerBases with LocalView concept. See Elasticity::LocalIntegralEnergy") localDensity_ = nullptr;
+ [[deprecated("Use dune-functions powerBases with LocalView concept. See Elasticity::LocalIntegralEnergy")]]
+ const std::shared_ptr<Elasticity::LocalDensity<gridDim,field_type,DT>> localDensity_ = nullptr;
};
diff --git a/dune/elasticity/materials/mooneyrivlinenergy.hh b/dune/elasticity/materials/mooneyrivlinenergy.hh
index d24d8e2..0bbacb4 100644
--- a/dune/elasticity/materials/mooneyrivlinenergy.hh
+++ b/dune/elasticity/materials/mooneyrivlinenergy.hh
@@ -7,7 +7,7 @@
namespace Dune {
template<class GridView, class LocalFiniteElement, class field_type=double>
-class DUNE_DEPRECATED_MSG("Use Elasticity::LocalIntegralEnergy with Elasticity::MooneyRivlinDensity")
+class [[deprecated("Use Elasticity::LocalIntegralEnergy with Elasticity::MooneyRivlinDensity")]]
MooneyRivlinEnergy
: public Elasticity::LocalIntegralEnergy<GridView,LocalFiniteElement,field_type>
{
diff --git a/dune/elasticity/materials/neohookeenergy.hh b/dune/elasticity/materials/neohookeenergy.hh
index f45fa05..3654f5a 100644
--- a/dune/elasticity/materials/neohookeenergy.hh
+++ b/dune/elasticity/materials/neohookeenergy.hh
@@ -7,7 +7,7 @@
namespace Dune {
template<class GridView, class LocalFiniteElement, class field_type=double>
-class DUNE_DEPRECATED_MSG("Use Elasticity::LocalIntegralEnergy with Elasticity::NeoHookeDensity")
+class [[deprecated("Use Elasticity::LocalIntegralEnergy with Elasticity::NeoHookeDensity")]]
NeoHookeEnergy
: public Elasticity::LocalIntegralEnergy<GridView,LocalFiniteElement,field_type>
{
diff --git a/dune/elasticity/materials/neumannenergy.hh b/dune/elasticity/materials/neumannenergy.hh
index 11b67ee..ee48071 100644
--- a/dune/elasticity/materials/neumannenergy.hh
+++ b/dune/elasticity/materials/neumannenergy.hh
@@ -168,8 +168,8 @@ public:
private:
/** \brief The Neumann boundary */
- const std::shared_ptr<BoundaryPatch<GridView>>
- DUNE_DEPRECATED_MSG("Use dune-functions powerBases with LocalView concept. See Elasticity::NeumannEnergy") neumannBoundary_;
+ [[deprecated("Use dune-functions powerBases with LocalView concept. See Elasticity::NeumannEnergy")]]
+ const std::shared_ptr<BoundaryPatch<GridView>> neumannBoundary_;
/** \brief The function implementing the Neumann data */
const std::shared_ptr<std::function<Dune::FieldVector<double,dim>(Dune::FieldVector<ctype,dim>)>> neumannFunction_;
diff --git a/dune/elasticity/materials/stvenantkirchhoffenergy.hh b/dune/elasticity/materials/stvenantkirchhoffenergy.hh
index 8b9229c..09dc291 100644
--- a/dune/elasticity/materials/stvenantkirchhoffenergy.hh
+++ b/dune/elasticity/materials/stvenantkirchhoffenergy.hh
@@ -7,7 +7,7 @@
namespace Dune {
template<class GridView, class LocalFiniteElement, class field_type=double>
-class DUNE_DEPRECATED_MSG("Use Elasticity::LocalIntegralEnergy with Elasticity::StVenantKirchhoffDensity")
+class [[deprecated("Use Elasticity::LocalIntegralEnergy with Elasticity::StVenantKirchhoffDensity")]]
StVenantKirchhoffEnergy
: public Elasticity::LocalIntegralEnergy<GridView,LocalFiniteElement,field_type>
{
diff --git a/dune/elasticity/materials/sumenergy.hh b/dune/elasticity/materials/sumenergy.hh
index 20037ab..7094783 100644
--- a/dune/elasticity/materials/sumenergy.hh
+++ b/dune/elasticity/materials/sumenergy.hh
@@ -90,9 +90,8 @@ public:
}
private:
-
- std::shared_ptr<LocalEnergy<GridView,LocalFiniteElement,std::vector<FieldVector<field_type,dim> > > >
- DUNE_DEPRECATED_MSG("Use dune-functions powerBases with LocalView concept. See Elasticity::SumEnergy") a_;
+ [[deprecated("Use dune-functions powerBases with LocalView concept. See Elasticity::SumEnergy")]]
+ std::shared_ptr<LocalEnergy<GridView,LocalFiniteElement,std::vector<FieldVector<field_type,dim> > > > a_;
std::shared_ptr<LocalEnergy<GridView,LocalFiniteElement,std::vector<FieldVector<field_type,dim> > > > b_;
--
GitLab