Merge branch 'fix/dune_deprecated_macro' into 'master'

Replace DUNE_DEPRECATED by [[deprecated]]

See merge request !65

.gitlab-ci.yml

@@ -6,10 +6,23 @@ before_script:
   - duneci-install-module https://git.imp.fu-berlin.de/agnumpde/dune-fufem.git
   - duneci-install-module https://git.imp.fu-berlin.de/agnumpde/dune-solvers.git
 
-dune:2.7 gcc:
-  image: registry.dune-project.org/docker/ci/dune:2.7-debian-10-gcc-8-17
-  before_script:
+dune:2.8 gcc C++17:
+  image: registry.dune-project.org/docker/ci/dune:2.8-debian-10-gcc-8-17
+  script: duneci-standard-test
+  variables:
+    DUNECI_BRANCH: releases/2.8
+
+dune:2.8 gcc C++20:
+  image: registry.dune-project.org/docker/ci/dune:2.8-debian-11-gcc-9-20
+  script: duneci-standard-test
+  variables:
+    DUNECI_BRANCH: releases/2.8
+
+dune:2.8  clang  C++17:
+  image: registry.dune-project.org/docker/ci/dune:2.8-debian-10-clang-7-libcpp-17
   script: duneci-standard-test
+  variables:
+    DUNECI_BRANCH: releases/2.8
 
 dune:git  clang  C++17:
   image: registry.dune-project.org/docker/ci/dune:git-debian-10-clang-7-libcpp-17

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
      *

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,

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_;
 
 };
 

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>
 {

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>
 {

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;
 
 };
 

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>
 {

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>
 {

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_;

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>
 {

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_;
 

test/mooneyrivlintest.cc

 #include <config.h>
+#include <iomanip>
 
 // Includes for the ADOL-C automatic differentiation library
 // Need to come before (almost) all others.