Use the GridView typedef

src/one-body-sample.cc

@@ -218,8 +218,8 @@ int main(int argc, char *argv[]) {
     // }}}
 
     // Set up bases
-    typedef P0Basis<GridType::LeafGridView, double> P0Basis;
-    typedef P1NodalBasis<GridType::LeafGridView, double> P1Basis;
+    typedef P0Basis<GridView, double> P0Basis;
+    typedef P1NodalBasis<GridView, double> P1Basis;
     P0Basis const p0Basis(leafView);
     P1Basis const p1Basis(leafView);
 
@@ -262,7 +262,7 @@ int main(int argc, char *argv[]) {
     VectorType b3;
 
     std::vector<Dune::FieldVector<double, 1>> nodalIntegrals;
-    assemble_frictional<GridType, GridType::LeafGridView, SmallVector, P1Basis>(
+    assemble_frictional<GridType, GridView, SmallVector, P1Basis>(
         leafView, p1Basis, frictionalNodes, nodalIntegrals);
 
     Dune::shared_ptr<Dune::GlobalNonlinearity<dim> const> myGlobalNonlinearity;
@@ -274,7 +274,7 @@ int main(int argc, char *argv[]) {
       std::cout.flush();
 
       // b = neumann
-      assemble_neumann<GridType, GridType::LeafGridView, SmallVector, P1Basis>(
+      assemble_neumann<GridType, GridView, SmallVector, P1Basis>(
           leafView, p1Basis, neumannNodes, b1, run);
       b2 = b1;
       b3 = b1;
@@ -305,7 +305,7 @@ int main(int argc, char *argv[]) {
         FunctionalAssembler<P0Basis>(p0Basis)
             .assemble(localStressAssembler, vonMisesStress, true);
 
-        Dune::VTKWriter<GridType::LeafGridView> writer(leafView);
+        Dune::VTKWriter<GridView> writer(leafView);
         std::string filename((boost::format("obs%d") % run).str());
         Dune::shared_ptr<VTKBasisGridFunction<P1Basis, VectorType>>
         displacement_ptr(new VTKBasisGridFunction<P1Basis, VectorType>(