[Cleanup] Friction writing: Use a general projector for outputting

src/boundary_writer.cc

@@ -7,10 +7,11 @@
 template <class ScalarVector, class Vector>
 BoundaryWriter<ScalarVector, Vector>::BoundaryWriter(
     Vector const &vertexCoordinates,
-    Dune::BitSetVector<1> const &_boundaryNodes)
+    Dune::BitSetVector<1> const &_boundaryNodes, Projector projector)
     : displacementWriter("displacements", std::fstream::out),
       velocityWriter("velocities", std::fstream::out),
-      boundaryNodes(_boundaryNodes) {
+      boundaryNodes(_boundaryNodes),
+      projector_(projector) {
   std::fstream vertexCoordinateWriter("coordinates", std::fstream::out);
   for (size_t i = 0; i < boundaryNodes.size(); ++i)
     if (boundaryNodes[i][0])
@@ -31,8 +32,8 @@ void BoundaryWriter<ScalarVector, Vector>::writeKinetics(Vector const &u,
     if (!boundaryNodes[i][0])
       continue;
 
-    displacementWriter << u[i][0] << " ";
-    velocityWriter << v[i][0] << " ";
+    displacementWriter << projector_(u[i]) << " ";
+    velocityWriter << projector_(v[i]) << " ";
   }
 
   displacementWriter << std::endl;

src/boundary_writer.hh

@@ -7,9 +7,13 @@
 #include <dune/common/bitsetvector.hh>
 
 template <class ScalarVector, class Vector> class BoundaryWriter {
+protected:
+  using Projector = std::function<double(typename Vector::block_type const &)>;
+
 public:
   BoundaryWriter(Vector const &vertexCoordinates,
-                 Dune::BitSetVector<1> const &_boundaryNodes);
+                 Dune::BitSetVector<1> const &_boundaryNodes,
+                 Projector projector);
 
   virtual ~BoundaryWriter();
 
@@ -19,5 +23,7 @@ template <class ScalarVector, class Vector> class BoundaryWriter {
   std::fstream displacementWriter;
   std::fstream velocityWriter;
   Dune::BitSetVector<1> const &boundaryNodes;
+
+  Projector projector_;
 };
 #endif

src/friction_writer.cc

@@ -7,8 +7,9 @@
 template <class ScalarVector, class Vector>
 FrictionWriter<ScalarVector, Vector>::FrictionWriter(
     Vector const &vertexCoordinates,
-    Dune::BitSetVector<1> const &_boundaryNodes)
-    : BW(vertexCoordinates, _boundaryNodes),
+    Dune::BitSetVector<1> const &_boundaryNodes,
+    typename BW::Projector projector)
+    : BW(vertexCoordinates, _boundaryNodes, projector),
       coefficientWriter("coefficients", std::fstream::out),
       stateWriter("states", std::fstream::out) {}
 

src/friction_writer.hh

@@ -14,7 +14,8 @@ class FrictionWriter : public BoundaryWriter<ScalarVector, Vector> {
 
 public:
   FrictionWriter(Vector const &vertexCoordinates,
-                 Dune::BitSetVector<1> const &_boundaryNodes);
+                 Dune::BitSetVector<1> const &_boundaryNodes,
+                 typename BW::Projector projector);
 
   ~FrictionWriter();
 

src/one-body-sample.cc

@@ -280,8 +280,9 @@ int main(int argc, char *argv[]) {
         vertexCoordinates[vertexMapper.map(*it)] = geometry.corner(0);
       }
     }
-    FrictionWriter<ScalarVector, Vector> frictionWriter(vertexCoordinates,
-                                                        frictionalNodes);
+    FrictionWriter<ScalarVector, Vector> frictionWriter(
+        vertexCoordinates, frictionalNodes,
+        [](LocalVector const &x) { return x[0]; });
     auto const reportFriction = [&](Vector const &_u, Vector const &_v,
                                     ScalarVector const &_alpha) {
       ScalarVector c;