src/hdf5/surface-writer.cc

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "restrict.hh"
+#include "surface-writer.hh"
+
+template <class ProgramState, class GridView>
+SurfaceWriter<ProgramState, GridView>::SurfaceWriter(
+    HDF5::Grouplike &file, Vector const &vertexCoordinates, Patch const &surface)
+    : group_(file, "surface"),
+      surface_(surface),
+      surfaceDisplacementWriter_(group_, "displacement", surface.numVertices(),
+                                 Vector::block_type::dimension),
+      surfaceVelocityWriter_(group_, "velocity", surface.numVertices(),
+                             Vector::block_type::dimension) {
+  auto const surfaceCoordinates = restrictToSurface(vertexCoordinates, surface);
+  HDF5::SingletonWriter<2> surfaceCoordinateWriter(group_, "coordinates",
+                                                 surfaceCoordinates.size(),
+                                                 Vector::block_type::dimension);
+  setEntry(surfaceCoordinateWriter, surfaceCoordinates);
+}
+
+template <class ProgramState, class GridView>
+void SurfaceWriter<ProgramState, GridView>::write(
+    ProgramState const &programState) {
+  auto const surfaceDisplacements = restrictToSurface(programState.u, surface_);
+  addEntry(surfaceDisplacementWriter_, programState.timeStep,
+           surfaceDisplacements);
+
+  auto const surfaceVelocities = restrictToSurface(programState.v, surface_);
+  addEntry(surfaceVelocityWriter_, programState.timeStep, surfaceVelocities);
+}
+
+#include "surface-writer_tmpl.cc"

src/hdf5/surface-writer.hh

+#ifndef SRC_HDF_SURFACE_WRITER_HH
+#define SRC_HDF_SURFACE_WRITER_HH
+
+#include <dune/fufem/boundarypatch.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(HDF5::Grouplike &file, Vector const &vertexCoordinates,
+                Patch const &surface);
+
+  void write(ProgramState const &programState);
+
+private:
+  HDF5::Group group_;
+
+  Patch const &surface_;
+
+  HDF5::SequenceIO<2> surfaceDisplacementWriter_;
+  HDF5::SequenceIO<2> surfaceVelocityWriter_;
+};
+#endif

src/hdf5/surface-writer_tmpl.cc

+#include "../explicitvectors.hh"
+#include "../explicitgrid.hh"
+
+#include "../program_state.hh"
+
+using MyProgramState = ProgramState<Vector, ScalarVector>;
+
+template class SurfaceWriter<MyProgramState, GridView>;

src/hdf5/time-writer.cc

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "time-writer.hh"
+
+template <class ProgramState>
+TimeWriter<ProgramState>::TimeWriter(HDF5::Grouplike &file)
+    : file_(file),
+      relativeTimeWriter_(file_, "relativeTime"),
+      relativeTimeIncrementWriter_(file_, "relativeTimeIncrement") {}
+
+template <class ProgramState>
+void TimeWriter<ProgramState>::write(ProgramState const &programState) {
+  addEntry(relativeTimeWriter_, programState.timeStep,
+           programState.relativeTime);
+  addEntry(relativeTimeIncrementWriter_, programState.timeStep,
+           programState.relativeTau);
+}
+
+#include "time-writer_tmpl.cc"

src/hdf5/time-writer.hh

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

src/hdf5/time-writer_tmpl.cc

+#include "../explicitvectors.hh"
+
+#include "../program_state.hh"
+
+using MyProgramState = ProgramState<Vector, ScalarVector>;
+
+template class TimeWriter<MyProgramState>;

src/matrices.hh

+#ifndef SRC_MATRICES_HH
+#define SRC_MATRICES_HH
+
+template <class Matrix> struct Matrices {
+  Matrix elasticity;
+  Matrix damping;
+  Matrix mass;
+};
+#endif

src/one-body-problem-2D.cfg

+# -*- mode:conf -*-
+[boundary.friction]
+smallestDiameter= 2e-3  # [m]
+
+[timeSteps]
+refinementTolerance = 1e-5
+
+[u0.solver]
+tolerance         = 1e-8
+
+[a0.solver]
+tolerance         = 1e-8
+
+[v.solver]
+tolerance         = 1e-8
+
+[v.fpi]
+tolerance         = 1e-5
+
+[solver.tnnmg.linear]
+tolerance          = 1e-10

src/one-body-problem-3D.cfg

+# -*- mode:conf -*-
+[boundary.friction]
+smallestDiameter= 2e-2  # [m]
+
+[boundary.friction.weakening]
+patchType       = Trapezoidal
+
+[timeSteps]
+refinementTolerance = 1e-5
+
+[u0.solver]
+tolerance         = 1e-6
+
+[a0.solver]
+tolerance         = 1e-6
+
+[v.solver]
+tolerance         = 1e-6
+
+[v.fpi]
+tolerance         = 1e-5
+
+[solver.tnnmg.linear]
+tolerance          = 1e-10

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>
 
@@ -8,8 +8,8 @@
 #include <dune/tectonic/body.hh>
 #include <dune/tectonic/gravity.hh>
 
-#include "twopiece.hh"
 #include "mygeometry.hh"
+#include "segmented-function.hh"
 
 template <int dimension> class MyBody : public Body<dimension> {
   using typename Body<dimension>::ScalarFunction;
@@ -47,9 +47,9 @@ template <int dimension> class MyBody : public Body<dimension> {
 private:
   double const poissonRatio_;
   double const youngModulus_;
-  TwoPieceFunction const shearViscosityField_;
-  TwoPieceFunction const bulkViscosityField_;
-  TwoPieceFunction const densityField_;
+  SegmentedFunction const shearViscosityField_;
+  SegmentedFunction const bulkViscosityField_;
+  SegmentedFunction const densityField_;
   Gravity<dimension> const gravityField_;
 };
 #endif

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

@@ -12,13 +12,6 @@
 
 #include "mygeometry.hh"
 
-double MyGeometry::verticalProjection(LocalVector const &x) {
-  return zenith * x;
-}
-double MyGeometry::horizontalProjection(LocalVector const &x) {
-  return orthogonalZenith * x;
-}
-
 void MyGeometry::write() {
   std::fstream writer("geometry", std::fstream::out);
   writer << "A = " << A << std::endl;
@@ -132,8 +125,7 @@ void MyGeometry::render() {
 
   // labels
   {
-    auto const label = [&](LocalVector2D const &v,
-                           std::string l) { // TODO: implicit?
+    auto const label = [&](LocalVector2D const &v, std::string l) {
       moveTo(v);
       cr->rel_move_to(0.005, -0.02);
       cr->show_text(l);

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,34 +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 orthogonalZenith = createVector(-1, 0);
+  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 {
@@ -102,10 +81,6 @@ LocalVector const Y = rotate(reference::Y);
 LocalVector const Z = rotate(reference::Z);
 
 LocalVector const zenith = rotate(reference::zenith);
-LocalVector const orthogonalZenith = rotate(reference::orthogonalZenith);
-
-double verticalProjection(LocalVector const &);
-double horizontalProjection(LocalVector const &);
 
 void write();
 

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

-#ifndef SRC_SAND_WEDGE_DATA_MYGLOBALFRICTIONDATA_HH
-#define SRC_SAND_WEDGE_DATA_MYGLOBALFRICTIONDATA_HH
+#ifndef SRC_ONE_BODY_PROBLEM_DATA_MYGLOBALFRICTIONDATA_HH
+#define SRC_ONE_BODY_PROBLEM_DATA_MYGLOBALFRICTIONDATA_HH
 
 #include <dune/common/function.hh>
 
@@ -24,12 +24,12 @@ class MyGlobalFrictionData : public GlobalFrictionData<LocalVector::dimension> {
            parset.get<double>("weakening.b"), segment),
         mu0_(parset.get<double>("mu0")) {}
 
-  double virtual const &C() const override { return C_; }
-  double virtual const &L() const override { return L_; }
-  double virtual const &V0() const override { return V0_; }
-  VirtualFunction virtual const &a() const override { return a_; }
-  VirtualFunction virtual const &b() const override { return b_; }
-  double virtual const &mu0() const override { return mu0_; }
+  double const &C() const override { return C_; }
+  double const &L() const override { return L_; }
+  double const &V0() const override { return V0_; }
+  VirtualFunction const &a() const override { return a_; }
+  VirtualFunction const &b() const override { return b_; }
+  double const &mu0() const override { return mu0_; }
 
 private:
   double const C_;

src/sand-wedge-data/mygrid.cc → src/one-body-problem-data/mygrid.cc

@@ -2,9 +2,11 @@
 #include "config.h"
 #endif
 
+#include <dune/fufem/geometry/polyhedrondistance.hh>
+
 #include "mygrid.hh"
 #include "midpoint.hh"
-#include "../distances.hh"
+#include "../diameter.hh"
 
 #if MY_DIM == 3
 SimplexManager::SimplexManager(unsigned int shift) : shift_(shift) {}
@@ -42,7 +44,9 @@ void SimplexManager::addFromVerticesFFB(unsigned int U, unsigned int V,
 #endif
 }
 
-auto SimplexManager::getSimplices() -> SimplexList const &{ return simplices_; }
+auto SimplexManager::getSimplices() -> SimplexList const & {
+  return simplices_;
+}
 
 template <class Grid> GridConstructor<Grid>::GridConstructor() {
   auto const &A = MyGeometry::A;
@@ -131,11 +135,11 @@ bool MyFaces<GridView>::xyBoxed(Vector const &v1, Vector const &v2,
   auto const minmax0 = std::minmax(v1[0], v2[0]);
   auto const minmax1 = std::minmax(v1[1], v2[1]);
 
-  if (minmax0.first - 1e-14 * MyGeometry::lengthScale > x[0] or x[0] >
-      minmax0.second + 1e-14 * MyGeometry::lengthScale)
+  if (minmax0.first - 1e-14 * MyGeometry::lengthScale > x[0] or
+      x[0] > minmax0.second + 1e-14 * MyGeometry::lengthScale)
     return false;
-  if (minmax1.first - 1e-14 * MyGeometry::lengthScale > x[1] or x[1] >
-      minmax1.second + 1e-14 * MyGeometry::lengthScale)
+  if (minmax1.first - 1e-14 * MyGeometry::lengthScale > x[1] or
+      x[1] > minmax1.second + 1e-14 * MyGeometry::lengthScale)
     return false;
 
   return true;
@@ -163,7 +167,6 @@ MyFaces<GridView>::MyFaces(GridView const &gridView)
       upper(gridView)
 #endif
 {
-  using Grid = typename GridView::Grid;
   assert(isClose(MyGeometry::A[1], 0));
   assert(isClose(MyGeometry::B[1], 0));
   lower.insertFacesByProperty([&](typename GridView::Intersection const &in) {
@@ -198,12 +201,11 @@ void refine(Grid &grid, ConvexPolyhedron<LocalVector> const &weakPatch,
   bool needRefine = true;
   while (true) {
     needRefine = false;
-    for (auto it = grid.template leafbegin<0>();
-         it != grid.template leafend<0>(); ++it) {
-      auto const geometry = it->geometry();
+    for (auto &&e : elements(grid.leafGridView())) {
+      auto const geometry = e.geometry();
 
       auto const weakeningRegionDistance =
-          distanceToWeakeningRegion(geometry, weakPatch);
+          distance(weakPatch, geometry, 1e-6 * MyGeometry::lengthScale);
       auto const admissibleDiameter =
           computeAdmissibleDiameter(weakeningRegionDistance, smallestDiameter);
 
@@ -211,7 +213,7 @@ void refine(Grid &grid, ConvexPolyhedron<LocalVector> const &weakPatch,
         continue;
 
       needRefine = true;
-      grid.mark(1, *it);
+      grid.mark(1, e);
     }
     if (!needRefine)
       break;

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

-#ifndef SRC_SAND_WEDGE_DATA_MYGRID_HH
-#define SRC_SAND_WEDGE_DATA_MYGRID_HH
-
-#include <boost/range/irange.hpp>
+#ifndef SRC_ONE_BODY_PROBLEM_DATA_MYGRID_HH
+#define SRC_ONE_BODY_PROBLEM_DATA_MYGRID_HH
 
 #include <dune/common/fmatrix.hh>
 #include <dune/grid/common/gridfactory.hh>
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #include <dune/fufem/boundarypatch.hh>
-#pragma clang diagnostic pop
-
-#include "../polyhedrondistance.hh"
+#include <dune/fufem/geometry/convexpolyhedron.hh>
 
 #include "mygeometry.hh"
 

src/sand-wedge-data/mygrid_tmpl.cc → src/one-body-problem-data/mygrid_tmpl.cc

@@ -2,8 +2,8 @@
 #error MY_DIM unset
 #endif
 
-#include "explicitgrid.hh"
-#include "explicitvectors.hh"
+#include "../explicitgrid.hh"
+#include "../explicitvectors.hh"
 
 template class GridConstructor<Grid>;
 

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

-#ifndef SRC_SAND_WEDGE_DATA_PATCHFUNCTION_HH
-#define SRC_SAND_WEDGE_DATA_PATCHFUNCTION_HH
+#ifndef SRC_ONE_BODY_PROBLEM_DATA_PATCHFUNCTION_HH
+#define SRC_ONE_BODY_PROBLEM_DATA_PATCHFUNCTION_HH
 
 #include <dune/common/function.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/parametertree.hh>
 
-#include "../polyhedrondistance.hh"
+#include <dune/fufem/geometry/polyhedrondistance.hh>
 
 class PatchFunction
     : public Dune::VirtualFunction<Dune::FieldVector<double, MY_DIM>,