src/hdf5/frictionalboundary-writer.cc

@@ -2,12 +2,14 @@
 #include "config.h"
 #endif
 
+#include <dune/fufem/hdf5/singletonwriter.hh>
+
 #include "frictionalboundary-writer.hh"
 #include "restrict.hh"
 
 template <class ProgramState, class GridView>
 FrictionalBoundaryWriter<ProgramState, GridView>::FrictionalBoundaryWriter(
-    HDF5Grouplike &file, Vector const &vertexCoordinates,
+    HDF5::Grouplike &file, Vector const &vertexCoordinates,
     Patch const &frictionalBoundary)
     : group_(file, "frictionalBoundary"),
       frictionalBoundary_(frictionalBoundary),
@@ -23,7 +25,7 @@ FrictionalBoundaryWriter<ProgramState, GridView>::FrictionalBoundaryWriter(
                                            frictionalBoundary.numVertices()) {
   auto const frictionalBoundaryCoordinates =
       restrictToSurface(vertexCoordinates, frictionalBoundary);
-  HDF5SingletonWriter<2> frictionalBoundaryCoordinateWriter(
+  HDF5::SingletonWriter<2> frictionalBoundaryCoordinateWriter(
       group_, "coordinates", frictionalBoundaryCoordinates.size(),
       Vector::block_type::dimension);
   setEntry(frictionalBoundaryCoordinateWriter, frictionalBoundaryCoordinates);

src/hdf5/frictionalboundary-writer.hh

@@ -3,8 +3,7 @@
 
 #include <dune/fufem/boundarypatch.hh>
 
-#include <dune/fufem/hdf5/hdf5-sequence-io.hh>
-#include <dune/fufem/hdf5/hdf5-singleton-writer.hh>
+#include <dune/fufem/hdf5/sequenceio.hh>
 
 template <class ProgramState, class GridView> class FrictionalBoundaryWriter {
   using ScalarVector = typename ProgramState::ScalarVector;
@@ -12,20 +11,20 @@ template <class ProgramState, class GridView> class FrictionalBoundaryWriter {
   using Patch = BoundaryPatch<GridView>;
 
 public:
-  FrictionalBoundaryWriter(HDF5Grouplike &file, Vector const &vertexCoordinates,
+  FrictionalBoundaryWriter(HDF5::Grouplike &file, Vector const &vertexCoordinates,
                            Patch const &frictionalBoundary);
 
   template <class Friction>
   void write(ProgramState const &programState, Friction &friction);
 
 private:
-  HDF5Group group_;
+  HDF5::Group group_;
 
   Patch const &frictionalBoundary_;
 
-  HDF5SequenceIO<2> frictionalBoundaryDisplacementWriter_;
-  HDF5SequenceIO<2> frictionalBoundaryVelocityWriter_;
-  HDF5SequenceIO<1> frictionalBoundaryStateWriter_;
-  HDF5SequenceIO<1> frictionalBoundaryCoefficientWriter_;
+  HDF5::SequenceIO<2> frictionalBoundaryDisplacementWriter_;
+  HDF5::SequenceIO<2> frictionalBoundaryVelocityWriter_;
+  HDF5::SequenceIO<1> frictionalBoundaryStateWriter_;
+  HDF5::SequenceIO<1> frictionalBoundaryCoefficientWriter_;
 };
 #endif

src/hdf5/iteration-writer.cc

@@ -4,7 +4,7 @@
 
 #include "iteration-writer.hh"
 
-IterationWriter::IterationWriter(HDF5Grouplike &file)
+IterationWriter::IterationWriter(HDF5::Grouplike &file)
     : group_(file, "iterations"),
       fpiSubGroup_(group_, "fixedPoint"),
       mgSubGroup_(group_, "multiGrid"),

src/hdf5/iteration-writer.hh

 #ifndef SRC_HDF_ITERATION_WRITER_HH
 #define SRC_HDF_ITERATION_WRITER_HH
 
-#include <dune/fufem/hdf5/hdf5-sequence-io.hh>
+#include <dune/fufem/hdf5/sequenceio.hh>
 
 #include "../time-stepping/adaptivetimestepper.hh"
 
 class IterationWriter {
 public:
-  IterationWriter(HDF5Grouplike &file);
+  IterationWriter(HDF5::Grouplike &file);
 
   void write(size_t timeStep, IterationRegister const &iterationCount);
 
 private:
-  HDF5Group group_;
-  HDF5Group fpiSubGroup_;
-  HDF5Group mgSubGroup_;
+  HDF5::Group group_;
+  HDF5::Group fpiSubGroup_;
+  HDF5::Group mgSubGroup_;
 
-  HDF5SequenceIO<0, size_t> finalMGIterationWriter_;
-  HDF5SequenceIO<0, size_t> finalFPIIterationWriter_;
-  HDF5SequenceIO<0, size_t> totalMGIterationWriter_;
-  HDF5SequenceIO<0, size_t> totalFPIIterationWriter_;
+  HDF5::SequenceIO<0, size_t> finalMGIterationWriter_;
+  HDF5::SequenceIO<0, size_t> finalFPIIterationWriter_;
+  HDF5::SequenceIO<0, size_t> totalMGIterationWriter_;
+  HDF5::SequenceIO<0, size_t> totalFPIIterationWriter_;
 };
 #endif

src/hdf5/patchinfo-writer.cc

@@ -3,6 +3,7 @@
 #endif
 
 #include <dune/fufem/grid/hierarchic-approximation.hh>
+#include <dune/fufem/hdf5/singletonwriter.hh>
 
 #include "patchinfo-writer.hh"
 
@@ -42,7 +43,7 @@ GridEvaluator<LocalVector, GridView>::GridEvaluator(
       global[2] = zCoordinates[zi];
       auto const element = hApproximation.findEntity(global);
       localInfo[xi][zi] =
-          std::make_pair(element, element->geometry().local(global));
+          std::make_pair(element, element.geometry().local(global));
     }
   }
 }
@@ -65,7 +66,7 @@ GridEvaluator<LocalVector, GridView>::evaluate(Function const &f) const {
 
 template <class ProgramState, class VertexBasis, class GridView>
 PatchInfoWriter<ProgramState, VertexBasis, GridView>::PatchInfoWriter(
-    HDF5Grouplike &file, VertexBasis const &vertexBasis,
+    HDF5::Grouplike &file, VertexBasis const &vertexBasis,
     Patch const &frictionalBoundary,
     ConvexPolyhedron<LocalVector> const &weakPatch)
     : group_(file, "weakPatchGrid"),
@@ -74,11 +75,11 @@ PatchInfoWriter<ProgramState, VertexBasis, GridView>::PatchInfoWriter(
       weakPatchGridVelocityWriter_(
           group_, "velocity", gridEvaluator_.xCoordinates.size(),
           gridEvaluator_.zCoordinates.size(), Vector::block_type::dimension) {
-  HDF5SingletonWriter<1> weakPatchGridXCoordinateWriter(
+  HDF5::SingletonWriter<1> weakPatchGridXCoordinateWriter(
       group_, "xCoordinates", gridEvaluator_.xCoordinates.size());
   setEntry(weakPatchGridXCoordinateWriter, gridEvaluator_.xCoordinates);
 
-  HDF5SingletonWriter<1> weakPatchGridZCoordinateWriter(
+  HDF5::SingletonWriter<1> weakPatchGridZCoordinateWriter(
       group_, "zCoordinates", gridEvaluator_.zCoordinates.size());
   setEntry(weakPatchGridZCoordinateWriter, gridEvaluator_.zCoordinates);
 }

src/hdf5/patchinfo-writer.hh

@@ -6,15 +6,12 @@
 #include <dune/fufem/boundarypatch.hh>
 #include <dune/fufem/functions/basisgridfunction.hh>
 #include <dune/fufem/geometry/convexpolyhedron.hh>
-#include <dune/fufem/hdf5/hdf5-sequence-io.hh>
-#include <dune/fufem/hdf5/hdf5-singleton-writer.hh>
+#include <dune/fufem/hdf5/sequenceio.hh>
 
-#include "../sand-wedge-data/mygeometry.hh"
+#include "../one-body-problem-data/mygeometry.hh"
 
 template <class LocalVector, class GridView> class GridEvaluator {
   using Element = typename GridView::Grid::template Codim<0>::Entity;
-  using ElementPointer =
-      typename GridView::Grid::template Codim<0>::EntityPointer;
 
 public:
   GridEvaluator(ConvexPolyhedron<LocalVector> const &weakPatch,
@@ -27,7 +24,7 @@ template <class LocalVector, class GridView> class GridEvaluator {
   Dune::BlockVector<Dune::FieldVector<double, 1>> zCoordinates;
 
 private:
-  std::vector<std::vector<std::pair<ElementPointer, LocalVector>>> localInfo;
+  std::vector<std::vector<std::pair<Element, LocalVector>>> localInfo;
 };
 
 template <class ProgramState, class VertexBasis, class GridView>
@@ -37,18 +34,18 @@ class PatchInfoWriter {
   using Patch = BoundaryPatch<GridView>;
 
 public:
-  PatchInfoWriter(HDF5Grouplike &file, VertexBasis const &vertexBasis,
+  PatchInfoWriter(HDF5::Grouplike &file, VertexBasis const &vertexBasis,
                   Patch const &frictionalBoundary,
                   ConvexPolyhedron<LocalVector> const &weakPatch);
 
   void write(ProgramState const &programState);
 
 private:
-  HDF5Group group_;
+  HDF5::Group group_;
 
   VertexBasis const &vertexBasis_;
 
   GridEvaluator<LocalVector, GridView> const gridEvaluator_;
-  HDF5SequenceIO<3> weakPatchGridVelocityWriter_;
+  HDF5::SequenceIO<3> weakPatchGridVelocityWriter_;
 };
 #endif

src/hdf5/restart-io.cc

@@ -5,24 +5,23 @@
 #include "restart-io.hh"
 
 template <class ProgramState>
-RestartIO<ProgramState>::RestartIO(HDF5Grouplike &file, size_t vertexCount)
-    : group_(file, "restarts"),
-      displacementWriter_(group_, "displacement", vertexCount,
+RestartIO<ProgramState>::RestartIO(HDF5::Grouplike &group, size_t vertexCount)
+    : displacementWriter_(group, "displacement", vertexCount,
                           Vector::block_type::dimension),
-      velocityWriter_(group_, "velocity", vertexCount,
+      velocityWriter_(group, "velocity", vertexCount,
                       Vector::block_type::dimension),
-      accelerationWriter_(group_, "acceleration", vertexCount,
+      accelerationWriter_(group, "acceleration", vertexCount,
                           Vector::block_type::dimension),
-      stateWriter_(group_, "state", vertexCount),
-      weightedNormalStressWriter_(group_, "weightedNormalStress", vertexCount),
-      relativeTimeWriter_(group_, "relativeTime"),
-      relativeTimeIncrementWriter_(group_, "relativeTimeIncrement") {}
+      stateWriter_(group, "state", vertexCount),
+      weightedNormalStressWriter_(group, "weightedNormalStress", vertexCount),
+      relativeTimeWriter_(group, "relativeTime"),
+      relativeTimeIncrementWriter_(group, "relativeTimeIncrement") {}
 
 template <class ProgramState>
 void RestartIO<ProgramState>::write(ProgramState const &programState) {
   addEntry(displacementWriter_, programState.timeStep, programState.u);
   addEntry(velocityWriter_, programState.timeStep, programState.v);
-  addEntry(accelerationWriter_, programState.timeStep, programState.u);
+  addEntry(accelerationWriter_, programState.timeStep, programState.a);
   addEntry(stateWriter_, programState.timeStep, programState.alpha);
   addEntry(weightedNormalStressWriter_, programState.timeStep,
            programState.weightedNormalStress);
@@ -38,7 +37,7 @@ void RestartIO<ProgramState>::read(size_t timeStep,
   programState.timeStep = timeStep;
   readEntry(displacementWriter_, timeStep, programState.u);
   readEntry(velocityWriter_, timeStep, programState.v);
-  readEntry(accelerationWriter_, timeStep, programState.u);
+  readEntry(accelerationWriter_, timeStep, programState.a);
   readEntry(stateWriter_, timeStep, programState.alpha);
   readEntry(weightedNormalStressWriter_, timeStep,
             programState.weightedNormalStress);

src/hdf5/restart-io.hh

 #ifndef SRC_HDF_RESTART_HDF_HH
 #define SRC_HDF_RESTART_HDF_HH
 
-#include <dune/fufem/hdf5/hdf5file.hh>
-#include <dune/fufem/hdf5/hdf5-sequence-io.hh>
+#include <dune/fufem/hdf5/file.hh>
+#include <dune/fufem/hdf5/sequenceio.hh>
 
 template <class ProgramState> class RestartIO {
   using ScalarVector = typename ProgramState::ScalarVector;
   using Vector = typename ProgramState::Vector;
 
 public:
-  RestartIO(HDF5Grouplike &file, size_t vertexCount);
+  RestartIO(HDF5::Grouplike &group, size_t vertexCount);
 
   void write(ProgramState const &programState);
 
   void read(size_t timeStep, ProgramState &programState);
 
 private:
-  HDF5Group group_;
-
-  HDF5SequenceIO<2> displacementWriter_;
-  HDF5SequenceIO<2> velocityWriter_;
-  HDF5SequenceIO<2> accelerationWriter_;
-  HDF5SequenceIO<1> stateWriter_;
-  HDF5SequenceIO<1> weightedNormalStressWriter_;
-  HDF5SequenceIO<0> relativeTimeWriter_;
-  HDF5SequenceIO<0> relativeTimeIncrementWriter_;
+  HDF5::SequenceIO<2> displacementWriter_;
+  HDF5::SequenceIO<2> velocityWriter_;
+  HDF5::SequenceIO<2> accelerationWriter_;
+  HDF5::SequenceIO<1> stateWriter_;
+  HDF5::SequenceIO<1> weightedNormalStressWriter_;
+  HDF5::SequenceIO<0> relativeTimeWriter_;
+  HDF5::SequenceIO<0> relativeTimeIncrementWriter_;
 };
 #endif

src/hdf5/surface-writer.cc

@@ -7,7 +7,7 @@
 
 template <class ProgramState, class GridView>
 SurfaceWriter<ProgramState, GridView>::SurfaceWriter(
-    HDF5Grouplike &file, Vector const &vertexCoordinates, Patch const &surface)
+    HDF5::Grouplike &file, Vector const &vertexCoordinates, Patch const &surface)
     : group_(file, "surface"),
       surface_(surface),
       surfaceDisplacementWriter_(group_, "displacement", surface.numVertices(),
@@ -15,7 +15,7 @@ SurfaceWriter<ProgramState, GridView>::SurfaceWriter(
       surfaceVelocityWriter_(group_, "velocity", surface.numVertices(),
                              Vector::block_type::dimension) {
   auto const surfaceCoordinates = restrictToSurface(vertexCoordinates, surface);
-  HDF5SingletonWriter<2> surfaceCoordinateWriter(group_, "coordinates",
+  HDF5::SingletonWriter<2> surfaceCoordinateWriter(group_, "coordinates",
                                                  surfaceCoordinates.size(),
                                                  Vector::block_type::dimension);
   setEntry(surfaceCoordinateWriter, surfaceCoordinates);

src/hdf5/surface-writer.hh

@@ -3,25 +3,25 @@
 
 #include <dune/fufem/boundarypatch.hh>
 
-#include <dune/fufem/hdf5/hdf5-sequence-io.hh>
-#include <dune/fufem/hdf5/hdf5-singleton-writer.hh>
+#include <dune/fufem/hdf5/sequenceio.hh>
+#include <dune/fufem/hdf5/singletonwriter.hh>
 
 template <class ProgramState, class GridView> class SurfaceWriter {
   using Vector = typename ProgramState::Vector;
   using Patch = BoundaryPatch<GridView>;
 
 public:
-  SurfaceWriter(HDF5Grouplike &file, Vector const &vertexCoordinates,
+  SurfaceWriter(HDF5::Grouplike &file, Vector const &vertexCoordinates,
                 Patch const &surface);
 
   void write(ProgramState const &programState);
 
 private:
-  HDF5Group group_;
+  HDF5::Group group_;
 
   Patch const &surface_;
 
-  HDF5SequenceIO<2> surfaceDisplacementWriter_;
-  HDF5SequenceIO<2> surfaceVelocityWriter_;
+  HDF5::SequenceIO<2> surfaceDisplacementWriter_;
+  HDF5::SequenceIO<2> surfaceVelocityWriter_;
 };
 #endif

src/hdf5/time-writer.cc

@@ -5,7 +5,7 @@
 #include "time-writer.hh"
 
 template <class ProgramState>
-TimeWriter<ProgramState>::TimeWriter(HDF5Grouplike &file)
+TimeWriter<ProgramState>::TimeWriter(HDF5::Grouplike &file)
     : file_(file),
       relativeTimeWriter_(file_, "relativeTime"),
       relativeTimeIncrementWriter_(file_, "relativeTimeIncrement") {}

src/hdf5/time-writer.hh

 #ifndef SRC_HDF_TIME_WRITER_HH
 #define SRC_HDF_TIME_WRITER_HH
 
-#include <dune/fufem/hdf5/hdf5file.hh>
-#include <dune/fufem/hdf5/hdf5-sequence-io.hh>
+#include <dune/fufem/hdf5/file.hh>
+#include <dune/fufem/hdf5/sequenceio.hh>
 
 template <class ProgramState> class TimeWriter {
 public:
-  TimeWriter(HDF5Grouplike &file);
+  TimeWriter(HDF5::Grouplike &file);
   void write(ProgramState const &programState);
 
 private:
-  HDF5Grouplike &file_;
-  HDF5SequenceIO<0> relativeTimeWriter_;
-  HDF5SequenceIO<0> relativeTimeIncrementWriter_;
+  HDF5::Grouplike &file_;
+  HDF5::SequenceIO<0> relativeTimeWriter_;
+  HDF5::SequenceIO<0> relativeTimeIncrementWriter_;
 };
 #endif

src/one-body-problem-data/bc.hh

+#ifndef SRC_ONE_BODY_PROBLEM_DATA_BC_HH
+#define SRC_ONE_BODY_PROBLEM_DATA_BC_HH
+
+class VelocityDirichletCondition
+    : public Dune::VirtualFunction<double, double> {
+  void evaluate(double const &relativeTime, double &y) const {
+    // Assumed to vanish at time zero
+    double const finalVelocity = -5e-5;
+    y = (relativeTime <= 0.1)
+            ? finalVelocity * (1.0 - std::cos(relativeTime * M_PI / 0.1)) / 2.0
+            : finalVelocity;
+  }
+};
+
+class NeumannCondition : public Dune::VirtualFunction<double, double> {
+  void evaluate(double const &relativeTime, double &y) const { y = 0.0; }
+};
+#endif

src/sand-wedge-data/mybody.hh → src/one-body-problem-data/mybody.hh

-#ifndef SRC_SAND_WEDGE_DATA_MYBODY_HH
-#define SRC_SAND_WEDGE_DATA_MYBODY_HH
+#ifndef SRC_ONE_BODY_PROBLEM_DATA_MYBODY_HH
+#define SRC_ONE_BODY_PROBLEM_DATA_MYBODY_HH
 
 #include <dune/common/fvector.hh>
 

src/sand-wedge-data/mygeometry.hh → src/one-body-problem-data/mygeometry.hh

@@ -11,24 +11,6 @@ namespace {
   using LocalMatrix2D = Dune::FieldMatrix<double, 2, 2>;
 
   using LocalVector = Dune::FieldVector<double, MY_DIM>;
-
-  // kludge because fieldvectors have no initialiser_list constructor, see
-  // https://dune-project.org/flyspray/index.php?do=details&task_id=1166
-  LocalVector2D createVector(double x, double y) {
-    LocalVector2D ret(0);
-    ret[0] = x;
-    ret[1] = y;
-    return ret;
-  }
-
-  LocalMatrix2D createMatrix(double a11, double a12, double a21, double a22) {
-    LocalMatrix2D ret(0);
-    ret[0][0] = a11;
-    ret[0][1] = a12;
-    ret[1][0] = a21;
-    ret[1][1] = a22;
-    return ret;
-  }
 }
 
 namespace reference {
@@ -42,33 +24,31 @@ namespace reference {
 
   double const zDistance = 0.35;
 
-  LocalVector2D const A = createVector(0, 0);
-  LocalVector2D const B = createVector(leftLeg, -rightLeg);
-  LocalVector2D const C = createVector(leftLeg, 0);
+  LocalVector2D const A = {0, 0};
+  LocalVector2D const B = {leftLeg, -rightLeg};
+  LocalVector2D const C = {leftLeg, 0};
 
-  LocalVector2D const Z = createVector(zDistance * s, 0);
-  LocalVector2D const Y =
-      createVector(zDistance * s, -zDistance *s / leftLeg * rightLeg);
-  LocalVector2D const X = createVector(Y[0] - weakLen * std::cos(leftAngle),
-                                       Y[1] + weakLen * std::sin(leftAngle));
+  LocalVector2D const Z = {zDistance * s, 0};
+  LocalVector2D const Y = {zDistance * s, -zDistance *s / leftLeg *rightLeg};
+  LocalVector2D const X = {Y[0] - weakLen * std::cos(leftAngle),
+                           Y[1] + weakLen *std::sin(leftAngle)};
 
-  LocalVector2D const U = createVector(X[0], 0);
+  LocalVector2D const U = {X[0], 0};
 
-  LocalVector2D const K =
-      createVector(B[0] - leftLeg * viscoHeight / rightLeg, B[1] + viscoHeight);
-  LocalVector2D const M = createVector(B[0], B[1] + viscoHeight);
+  LocalVector2D const K = {B[0] - leftLeg * viscoHeight / rightLeg,
+                           B[1] + viscoHeight};
+  LocalVector2D const M = {B[0], B[1] + viscoHeight};
 
   LocalVector2D const G = midPoint(A, X);
   LocalVector2D const H = midPoint(X, Y);
   LocalVector2D const J = midPoint(Y, B);
 
-  LocalVector2D const I = createVector(Y[0] + G[0], Y[1] + G[1]);
+  LocalVector2D const I = {Y[0] + G[0], Y[1] + G[1]};
 
-  LocalVector2D const zenith = createVector(0, 1);
+  LocalVector2D const zenith = {0, 1};
 
-  LocalMatrix2D const rotation =
-      createMatrix(std::cos(leftAngle), -std::sin(leftAngle),
-                   std::sin(leftAngle), std::cos(leftAngle));
+  LocalMatrix2D const rotation = {{std::cos(leftAngle), -std::sin(leftAngle)},
+                                  {std::sin(leftAngle), std::cos(leftAngle)}};
 }
 
 namespace {