diff --git a/dune/elasticity/assemblers/feassembler.hh b/dune/elasticity/assemblers/feassembler.hh index 43a50ac9198a6df0d8f6bfb9fea38d8513b11b73..19a71f1ec61d5ef14d4e2c81abd06dfe166370c0 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 a66567a77de9025c35470cd79b70846377b3ab55..487b94d4c5d3032e9b79de534313666ff2e6ccac 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 ecb66f0f4cf53297f1280745115c874b75773a2d..bcb5ef82de94ae2d4b1f5dc2633335bd1067c1bb 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 e3a9f5be2c1b8321303c43f70a319365814346e6..4766115865cf0dbfba6362a9cfdacde655195367 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 e85f6dfeb483ea8f3a98638d8c10886aee274806..b3fa18d40e22ec261e426ee73e6424b4bb3eec86 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 9acc5c0ef105b679455b673fd3cb7d19c87d0735..7ecb5c8c87eed8485b07aa2f99e89575f099d0c1 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 d24d8e24c1340468a54031fea104b0c2cdccb247..0bbacb4a00a536fc8141b42a154962ca16a6bd65 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 f45fa059d088ff42ac89675b5cea4f7ff5c4bd54..3654f5aacd4b9d13822eade3204ce5475e2455ce 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 11b67eedd1af6652427c70bd60a3781f45305cda..ee480715d15a3b8ec5152da6100c023db2dd8a2b 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 8b9229c7beb5f3cd7e80fd95768af668bdaddf8b..09dc29112560fd086d08acd750884178139b8d5c 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 20037abe6fa2dea22ba3323613b36f37e75bf00d..70947830ce43236bf8805e8ad748111d360ea228 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_;