From 43a8a3e8e008973bfbbd806589eb80c8c23b890f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20Gr=C3=A4ser?= <graeser@dune-project.org> Date: Thu, 15 Sep 2016 16:13:05 +0200 Subject: [PATCH] Deactivate deprecation of dune-fufem FE-bases The bases from dune-functions can currently not be used as a drop in replacement, because the latter do not allow to select the range type as we did in dune fufem. Before deprecating these, we should either be sure to a happy with double once and for all, or wait until dune-functions is fixed and then remove all uses of fufem bases in fufem itself. Currently the deprecations just clutter the compiler output and you cannot get rid of this. --- dune/fufem/functionspacebases/dgpqkbasis.hh | 2 ++ dune/fufem/functionspacebases/p0basis.hh | 2 ++ dune/fufem/functionspacebases/p1nodalbasis.hh | 2 ++ dune/fufem/functionspacebases/p2nodalbasis.hh | 2 ++ dune/fufem/functionspacebases/p3nodalbasis.hh | 2 ++ dune/fufem/functionspacebases/q1nodalbasis.hh | 3 ++- 6 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dune/fufem/functionspacebases/dgpqkbasis.hh b/dune/fufem/functionspacebases/dgpqkbasis.hh index 9559ef19..ffbea072 100644 --- a/dune/fufem/functionspacebases/dgpqkbasis.hh +++ b/dune/fufem/functionspacebases/dgpqkbasis.hh @@ -1,11 +1,13 @@ #ifndef DG_PQKBASIS_HH #define DG_PQKBASIS_HH +/* #warning This file is deprecated. All implementations of function space bases in dune-fufem \ are in the process of being replaced by counterparts in the new dune-functions module. \ Those are syntactically different, but semantically very close to the dune-fufem implementations. \ To get rid of this warning, replace all occurrences of the Q1NodalBasis<...> class in your code \ by DuneFunctionsBasis<Dune::Functions::LagrangeDGBasis<...> >. +*/ /** \brief Global basis for discontinous Galerkin spaces with local Pk or Qk elements diff --git a/dune/fufem/functionspacebases/p0basis.hh b/dune/fufem/functionspacebases/p0basis.hh index 6ed427fb..86f48dcd 100644 --- a/dune/fufem/functionspacebases/p0basis.hh +++ b/dune/fufem/functionspacebases/p0basis.hh @@ -1,11 +1,13 @@ #ifndef P0_BASIS_HH #define P0_BASIS_HH +/* #warning This file is deprecated. All implementations of function space bases in dune-fufem \ are in the process of being replaced by counterparts in the new dune-functions module. \ Those are syntactically different, but semantically very close to the dune-fufem implementations. \ To get rid of this warning, replace all occurrences of the P0Basis<...> class in your code \ by DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<...,0> >. +*/ /** @file diff --git a/dune/fufem/functionspacebases/p1nodalbasis.hh b/dune/fufem/functionspacebases/p1nodalbasis.hh index 883c59d0..a005911f 100644 --- a/dune/fufem/functionspacebases/p1nodalbasis.hh +++ b/dune/fufem/functionspacebases/p1nodalbasis.hh @@ -1,11 +1,13 @@ #ifndef P1_NODALBASIS_HH #define P1_NODALBASIS_HH +/* #warning This file is deprecated. All implementations of function space bases in dune-fufem \ are in the process of being replaced by counterparts in the new dune-functions module. \ Those are syntactically different, but semantically very close to the dune-fufem implementations. \ To get rid of this warning, replace all occurrences of the P1NodalBasis<...> class in your code \ by DuneFunctionsBasis<Dune::Functions::PQ1NodalBasis<...> >. +*/ /** @file diff --git a/dune/fufem/functionspacebases/p2nodalbasis.hh b/dune/fufem/functionspacebases/p2nodalbasis.hh index e0153759..1fa51f2f 100644 --- a/dune/fufem/functionspacebases/p2nodalbasis.hh +++ b/dune/fufem/functionspacebases/p2nodalbasis.hh @@ -1,11 +1,13 @@ #ifndef P2_NODALBASIS_HH #define P2_NODALBASIS_HH +/* #warning This file is deprecated. All implementations of function space bases in dune-fufem \ are in the process of being replaced by counterparts in the new dune-functions module. \ Those are syntactically different, but semantically very close to the dune-fufem implementations. \ To get rid of this warning, replace all occurrences of the Q1NodalBasis<...> class in your code \ by DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<...> >. +*/ /** @file diff --git a/dune/fufem/functionspacebases/p3nodalbasis.hh b/dune/fufem/functionspacebases/p3nodalbasis.hh index f83dec1a..8a1fc72d 100644 --- a/dune/fufem/functionspacebases/p3nodalbasis.hh +++ b/dune/fufem/functionspacebases/p3nodalbasis.hh @@ -1,11 +1,13 @@ #ifndef P3_NODALBASIS_HH #define P3_NODALBASIS_HH +/* #warning This file is deprecated. All implementations of function space bases in dune-fufem \ are in the process of being replaced by counterparts in the new dune-functions module. \ Those are syntactically different, but semantically very close to the dune-fufem implementations. \ To get rid of this warning, replace all occurrences of the Q1NodalBasis<...> class in your code \ by DuneFunctionsBasis<Dune::Functions::PQkNodalBasis<...,3> >. +*/ /** @file diff --git a/dune/fufem/functionspacebases/q1nodalbasis.hh b/dune/fufem/functionspacebases/q1nodalbasis.hh index 8bbf4923..f7455af8 100644 --- a/dune/fufem/functionspacebases/q1nodalbasis.hh +++ b/dune/fufem/functionspacebases/q1nodalbasis.hh @@ -1,12 +1,13 @@ #ifndef Q1_NODALBASIS_HH #define Q1_NODALBASIS_HH +/* #warning This file is deprecated. All implementations of function space bases in dune-fufem \ are in the process of being replaced by counterparts in the new dune-functions module. \ Those are syntactically different, but semantically very close to the dune-fufem implementations. \ To get rid of this warning, replace all occurrences of the Q1NodalBasis<...> class in your code \ by DuneFunctionsBasis<Dune::Functions::PQ1NodalBasis<...> >. - +*/ /** @file -- GitLab