removes a couple more, now useless FEM NS branches

dune/stuff/common/math.hh

@@ -35,13 +35,8 @@ namespace boost {
 namespace math {
 //! isinf specialization for Dune::StraightenBlockVector
 template <class BlockVectorImp, class DofImp>
-#if DUNE_FEM_IS_LOCALFUNCTIONS_COMPATIBLE
 inline bool isinf(const Dune::Fem::StraightenBlockVector<BlockVectorImp, DofImp>& x)
 {
-#else
-inline bool isinf(const Dune::Fem::StraightenBlockVector<BlockVectorImp, DofImp>& x)
-{
-#endif
   for (size_t i = 0; i < x.size(); ++i) {
     if (std::isinf(x[i]))
       return true;

dune/stuff/common/ranges.hh

@@ -26,45 +26,25 @@ namespace Dune {
 namespace Fem {
 
 template <class DiscreteFunctionTraits>
-#if DUNE_FEM_IS_LOCALFUNCTIONS_COMPATIBLE
-auto begin(const Dune::Fem::DiscreteFunctionInterface<DiscreteFunctionTraits>& func)
-#else
-auto begin(const Dune::Fem::DiscreteFunctionInterface<DiscreteFunctionTraits>& func)
-#endif
-    -> decltype(func.dbegin())
+auto begin(const Dune::Fem::DiscreteFunctionInterface<DiscreteFunctionTraits>& func) -> decltype(func.dbegin())
 {
   return func.dbegin();
 }
 
 template <class DiscreteFunctionTraits>
-#if DUNE_FEM_IS_LOCALFUNCTIONS_COMPATIBLE
-auto end(const Dune::Fem::DiscreteFunctionInterface<DiscreteFunctionTraits>& func)
-#else
-auto end(const Dune::Fem::DiscreteFunctionInterface<DiscreteFunctionTraits>& func)
-#endif
-    -> decltype(func.dend())
+auto end(const Dune::Fem::DiscreteFunctionInterface<DiscreteFunctionTraits>& func) -> decltype(func.dend())
 {
   return func.dend();
 }
 
 template <class DiscreteFunctionTraits>
-#if DUNE_FEM_IS_LOCALFUNCTIONS_COMPATIBLE
-auto begin(Dune::Fem::DiscreteFunctionInterface<DiscreteFunctionTraits>& func)
-#else
-auto begin(Dune::Fem::DiscreteFunctionInterface<DiscreteFunctionTraits>& func)
-#endif
-    -> decltype(func.dbegin())
+auto begin(Dune::Fem::DiscreteFunctionInterface<DiscreteFunctionTraits>& func) -> decltype(func.dbegin())
 {
   return func.dbegin();
 }
 
 template <class DiscreteFunctionTraits>
-#if DUNE_FEM_IS_LOCALFUNCTIONS_COMPATIBLE
-auto end(Dune::Fem::DiscreteFunctionInterface<DiscreteFunctionTraits>& func)
-#else
-auto end(Dune::Fem::DiscreteFunctionInterface<DiscreteFunctionTraits>& func)
-#endif
-    -> decltype(func.dend())
+auto end(Dune::Fem::DiscreteFunctionInterface<DiscreteFunctionTraits>& func) -> decltype(func.dend())
 {
   return func.dend();
 }

dune/stuff/fem/localmassmatrix.hh

@@ -13,24 +13,12 @@
 
 #include <dune/fem/operator/1order/localmassmatrix.hh>
 
-#include <dune/stuff/fem/namespace.hh>
-
 namespace Dune {
 namespace Stuff {
 namespace Fem {
 
 //! create yet another child class just in case fem actually implements something in LocalMassMatrix in addition to its
 //! base
-#if DUNE_FEM_IS_LOCALFUNCTIONS_COMPATIBLE
-template <class DiscreteFunctionSpaceImp, class VolumeQuadratureImp>
-struct LocalMassMatrix : public Dune::Fem::LocalMassMatrix<DiscreteFunctionSpaceImp, VolumeQuadratureImp>
-{
-  LocalMassMatrix(const DiscreteFunctionSpaceImp& spc, const int volQuadOrd = -1)
-    : Dune::Fem::LocalMassMatrix<DiscreteFunctionSpaceImp, VolumeQuadratureImp>(spc, volQuadOrd)
-  {
-  }
-};
-#else // DUNE_FEM_IS
 template <class DiscreteFunctionSpaceImp, class VolumeQuadratureImp>
 struct LocalMassMatrix : public Dune::Fem::LocalMassMatrix<DiscreteFunctionSpaceImp, VolumeQuadratureImp>
 {
@@ -39,7 +27,6 @@ struct LocalMassMatrix : public Dune::Fem::LocalMassMatrix<DiscreteFunctionSpace
   {
   }
 };
-#endif // DUNE_FEM_IS
 
 } // namespace Fem
 } // namespace Stuff