geo-/coord-caching

dune/curvedsurfacegrid/geometry.hh

@@ -92,7 +92,7 @@ namespace Dune
       static const int codimension = dimension - mydimension;
 
     protected:
-      typedef CurvedGeometry<ctype, mydimension, coorddimension, Grid::order> BasicMapping;
+      typedef LagrangeCurvedGeometry<ctype, mydimension, coorddimension, Grid::order> BasicMapping;
 
       struct Mapping
         : public BasicMapping

example/example.cc

@@ -58,9 +58,15 @@ int main(int argc, char** argv)
 
   //case2: projection to a surface-mesh of a sphere
   {
+<<<<<<< HEAD
     SurfaceDistanceCoordFunction surfdistCF("dune-curvedsurfacegrid/example/sphere_fine.vtu");
     using GridType = CurvedSurfaceGrid<HostGridType, SurfaceDistanceCoordFunction<>, ip_order>;
     GridType grid(*hostGrid, surfdistCF);
+=======
+    SurfaceDistanceCoordFunction surfdistCF("example/sphere_fine.vtu");
+    using GridType = CurvedSurfaceGrid<HostGridType, SurfaceDistanceCoordFunction, ip_order>;
+    std::shared_ptr<GridType> grid(new GridType(*hostGrid, surfdistCF));
+>>>>>>> 5e1a7e879f2f67079d870c2a9990daabaded47d1
 
     using GridView = GridType::LeafGridView;
     GridView gridView = grid.leafGridView();