Commit 1179e8ae authored by lisa_julia.nebel_at_tu-dresden.de's avatar lisa_julia.nebel_at_tu-dresden.de
Browse files

Replace DUNE_DEPRECATED by [[deprecated]]

parent 5bc341cb
Pipeline #46942 passed with stage
in 16 minutes and 14 seconds
......@@ -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
*
......
......@@ -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,
......
......@@ -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_;
};
......
......@@ -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>
{
......
......@@ -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>
{
......
......@@ -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;
};
......
......@@ -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>
{
......
......@@ -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>
{
......
......@@ -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_;
......
......@@ -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>
{
......
......@@ -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_;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment