diff --git a/src/boundary_writer.cc b/src/boundary_writer.cc index 8d039d9d79163a0130442c4cda71256718bf5459..7a37208001e73301bf30c0578bf3a8de6e9539de 100644 --- a/src/boundary_writer.cc +++ b/src/boundary_writer.cc @@ -7,12 +7,14 @@ template <class ScalarVector, class Vector> BoundaryWriter<ScalarVector, Vector>::BoundaryWriter( Vector const &vertexCoordinates, - Dune::BitSetVector<1> const &_boundaryNodes, Projector projector) - : displacementWriter("displacements", std::fstream::out), - velocityWriter("velocities", std::fstream::out), + Dune::BitSetVector<1> const &_boundaryNodes, std::string prefix, + Projector projector) + : displacementWriter(prefix + "Displacements", std::fstream::out), + velocityWriter(prefix + "Velocities", std::fstream::out), boundaryNodes(_boundaryNodes), projector_(projector) { - std::fstream vertexCoordinateWriter("coordinates", std::fstream::out); + std::fstream vertexCoordinateWriter(prefix + "Coordinates", + std::fstream::out); for (size_t i = 0; i < boundaryNodes.size(); ++i) if (boundaryNodes[i][0]) vertexCoordinateWriter << vertexCoordinates[i] << std::endl; diff --git a/src/boundary_writer.hh b/src/boundary_writer.hh index 670e68b007612bb8dc76fa8e2fdd7361d7a2f341..5e4b0085f95f452e6f2642efa321686d62087238 100644 --- a/src/boundary_writer.hh +++ b/src/boundary_writer.hh @@ -13,7 +13,7 @@ template <class ScalarVector, class Vector> class BoundaryWriter { public: BoundaryWriter(Vector const &vertexCoordinates, Dune::BitSetVector<1> const &_boundaryNodes, - Projector projector); + std::string prefix, Projector projector); virtual ~BoundaryWriter(); diff --git a/src/friction_writer.cc b/src/friction_writer.cc index b018f802b5215f635f33f38eba8e2a0fef8b3a31..9f07b3c2c3a5a552da9ff1a93e23a2220b29487c 100644 --- a/src/friction_writer.cc +++ b/src/friction_writer.cc @@ -7,11 +7,11 @@ template <class ScalarVector, class Vector> FrictionWriter<ScalarVector, Vector>::FrictionWriter( Vector const &vertexCoordinates, - Dune::BitSetVector<1> const &_boundaryNodes, + Dune::BitSetVector<1> const &_boundaryNodes, std::string prefix, typename BW::Projector projector) - : BW(vertexCoordinates, _boundaryNodes, projector), - coefficientWriter("coefficients", std::fstream::out), - stateWriter("logstates", std::fstream::out) {} + : BW(vertexCoordinates, _boundaryNodes, prefix, projector), + coefficientWriter(prefix + "Coefficients", std::fstream::out), + stateWriter(prefix + "LogStates", std::fstream::out) {} template <class ScalarVector, class Vector> FrictionWriter<ScalarVector, Vector>::~FrictionWriter() { diff --git a/src/friction_writer.hh b/src/friction_writer.hh index 32b42ed4675a0d05d4ca383eff5c76d9c0f2d8ed..dc78e05763108b94e42725bec941a2dc91a4ff58 100644 --- a/src/friction_writer.hh +++ b/src/friction_writer.hh @@ -15,7 +15,7 @@ class FrictionWriter : public BoundaryWriter<ScalarVector, Vector> { public: FrictionWriter(Vector const &vertexCoordinates, Dune::BitSetVector<1> const &_boundaryNodes, - typename BW::Projector projector); + std::string prefix, typename BW::Projector projector); ~FrictionWriter(); diff --git a/src/sand-wedge.cc b/src/sand-wedge.cc index e8ae93c683fb840477c3f66b2393383967c404d3..c985b1f13aba9560983b5c7f5a9df6bf2fc21a55 100644 --- a/src/sand-wedge.cc +++ b/src/sand-wedge.cc @@ -354,7 +354,7 @@ int main(int argc, char *argv[]) { } } FrictionWriter<ScalarVector, Vector> frictionWriter( - vertexCoordinates, frictionalNodes, + vertexCoordinates, frictionalNodes, "friction", [](LocalVector const &x) { return x[0]; }); auto const reportFriction = [&](Vector const &_u, Vector const &_v, ScalarVector const &_alpha) { diff --git a/src/sliding-block.cc b/src/sliding-block.cc index 55185c366a1adbfa555b5fae481982743c61d18e..42a284e62512f895783338c165d7445252fbef6f 100644 --- a/src/sliding-block.cc +++ b/src/sliding-block.cc @@ -276,7 +276,7 @@ int main(int argc, char *argv[]) { } } FrictionWriter<ScalarVector, Vector> frictionWriter( - vertexCoordinates, frictionalNodes, + vertexCoordinates, frictionalNodes, "friction", [](LocalVector const &x) { return x[0]; }); auto const reportFriction = [&](Vector const &_u, Vector const &_v, ScalarVector const &_alpha) {