Merge branch 'minor-modernizations' into 'master'

Several minor modernization changes

See merge request !94

dune/fufem/assemblers/localassemblers/massassembler.hh

@@ -220,11 +220,11 @@ class MassAssembler : public LocalOperatorAssembler < GridType, TrialLocalFE, An
                 double z = quad[pt].weight() * integrationElement;
                 for(int i=0; i<rows; ++i)
                 {
-                    double zi = values[i]*z;
+                    auto zi = values[i]*z;
 
                     for (int j=i+1; j<cols; ++j)
                     {
-                        double zij = values[j] * zi;
+                        auto zij = values[j] * zi;
                         Dune::MatrixVector::addToDiagonal(localMatrix[i][j],zij);
                         Dune::MatrixVector::addToDiagonal(localMatrix[j][i],zij);
                     }

dune/fufem/estimators/errorfractionmarking.hh

@@ -81,7 +81,7 @@ mark(const std::vector<RefinementIndicator<GridType>*>& refinementIndicators,
      const std::vector<GridType*>& grids,
      double fraction)
 {
-    typedef typename Dune::LeafMultipleCodimMultipleGeomTypeMapper<GridType> AllCodimMapper;
+    typedef typename Dune::MultipleCodimMultipleGeomTypeMapper<typename GridType::LeafGridView> AllCodimMapper;
     typedef typename std::multimap<double, std::pair<int,int>, std::greater<double> > ErrorMap;
 
     if (grids.size() != refinementIndicators.size())

dune/fufem/estimators/fractionalmarking.hh

@@ -109,7 +109,7 @@ mark(const std::vector<std::shared_ptr<RefinementIndicator<GridType> > >& refine
         minGridError[i] =  std::numeric_limits<field_type>::max();
         maxGridError[i] = -std::numeric_limits<field_type>::max();
 
-        Dune::LeafMultipleCodimMultipleGeomTypeMapper<GridType> p0Mapper(*grids[i], Dune::mcmgElementLayout());
+        Dune::MultipleCodimMultipleGeomTypeMapper<typename GridType::LeafGridView> p0Mapper(grids[i]->leafGridView(), Dune::mcmgElementLayout());
 
         const auto& leafView = grids[i]->leafGridView();
 
@@ -169,7 +169,7 @@ mark(const std::vector<std::shared_ptr<RefinementIndicator<GridType> > >& refine
 
     for (size_t i=0; i<grids.size(); i++) {
 
-        Dune::LeafMultipleCodimMultipleGeomTypeMapper<GridType> p0Mapper(*grids[i], Dune::mcmgElementLayout());
+        Dune::MultipleCodimMultipleGeomTypeMapper<typename GridType::LeafGridView> p0Mapper(grids[i]->leafGridView(), Dune::mcmgElementLayout());
 
         for (const auto& e : elements(grids[i]->leafGridView()))
             if (refinedElements[i][p0Mapper.index(e)][0])

dune/fufem/quadraturerules/compositequadraturerule.hh

@@ -23,9 +23,9 @@ class CompositeQuadratureRule:
         CompositeQuadratureRule(const Dune::QuadratureRule<ct,dim>& quad, int refinement)
         {
             
-            typedef Dune::StaticRefinement<Dune::Impl::SimplexTopology<dim>::type::id, 
+            typedef Dune::StaticRefinement<Dune::GeometryTypes::simplex(dim).id(),
                                            ct,
-                                           Dune::Impl::SimplexTopology<dim>::type::id,
+                                           Dune::GeometryTypes::simplex(dim).id(),
                                            dim> Refinement;
 
             int numberOfSubelements = (1<<(dim*refinement));