Cleanup

src/one-body-sample.cc

@@ -27,7 +27,6 @@
 #include <dune/common/parametertree.hh>
 #include <dune/common/parametertreeparser.hh>
 #include <dune/common/shared_ptr.hh>
-#include <dune/common/stdstreams.hh>
 #include <dune/common/timer.hh>
 #include <dune/grid/common/mcmgmapper.hh>
 #include <dune/grid/yaspgrid.hh>
@@ -43,20 +42,19 @@
 #include <dune/fufem/functionspacebases/p0basis.hh>
 #include <dune/fufem/functionspacebases/p1nodalbasis.hh>
 #include <dune/fufem/sharedpointermap.hh>
-#include <dune/solvers/common/numproc.hh> // Solver::FULL
 #include <dune/solvers/norms/energynorm.hh>
 #include <dune/solvers/solvers/loopsolver.hh>
+#include <dune/solvers/solvers/solver.hh> // Solver::FULL
 
 #include <dune/tectonic/myblockproblem.hh>
 #include <dune/tectonic/myconvexproblem.hh>
 
 #include "assemblers.hh"
 #include "compute_state.hh"
+#include "mysolver.cc" // TODO
 #include "print.hh"
 #include "vtk.hh"
 
-#include "mysolver.cc" // TODO
-
 int const dim = 2;
 
 template <class GridView>
@@ -66,9 +64,8 @@ void setup_boundary(GridView const &gridView,
                     Dune::BitSetVector<1> &frictionalNodes) {
   typedef typename GridView::template Codim<dim>::Iterator VertexLeafIterator;
 
-  typedef Dune::MultipleCodimMultipleGeomTypeMapper<
-      GridView, Dune::MCMGVertexLayout> VertexMapper;
-  VertexMapper const myVertexMapper(gridView);
+  Dune::MultipleCodimMultipleGeomTypeMapper<
+      GridView, Dune::MCMGVertexLayout> const myVertexMapper(gridView);
 
   size_t dirichlet_nodes = 0;
   size_t neumann_nodes = 0;