Skip to content
Snippets Groups Projects
Commit d695e7e9 authored by Elias Pipping's avatar Elias Pipping
Browse files

[Output] Write friction data to friction* files

parent 06d23481
No related branches found
No related tags found
No related merge requests found
...@@ -7,12 +7,14 @@ ...@@ -7,12 +7,14 @@
template <class ScalarVector, class Vector> template <class ScalarVector, class Vector>
BoundaryWriter<ScalarVector, Vector>::BoundaryWriter( BoundaryWriter<ScalarVector, Vector>::BoundaryWriter(
Vector const &vertexCoordinates, Vector const &vertexCoordinates,
Dune::BitSetVector<1> const &_boundaryNodes, Projector projector) Dune::BitSetVector<1> const &_boundaryNodes, std::string prefix,
: displacementWriter("displacements", std::fstream::out), Projector projector)
velocityWriter("velocities", std::fstream::out), : displacementWriter(prefix + "Displacements", std::fstream::out),
velocityWriter(prefix + "Velocities", std::fstream::out),
boundaryNodes(_boundaryNodes), boundaryNodes(_boundaryNodes),
projector_(projector) { 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) for (size_t i = 0; i < boundaryNodes.size(); ++i)
if (boundaryNodes[i][0]) if (boundaryNodes[i][0])
vertexCoordinateWriter << vertexCoordinates[i] << std::endl; vertexCoordinateWriter << vertexCoordinates[i] << std::endl;
......
...@@ -13,7 +13,7 @@ template <class ScalarVector, class Vector> class BoundaryWriter { ...@@ -13,7 +13,7 @@ template <class ScalarVector, class Vector> class BoundaryWriter {
public: public:
BoundaryWriter(Vector const &vertexCoordinates, BoundaryWriter(Vector const &vertexCoordinates,
Dune::BitSetVector<1> const &_boundaryNodes, Dune::BitSetVector<1> const &_boundaryNodes,
Projector projector); std::string prefix, Projector projector);
virtual ~BoundaryWriter(); virtual ~BoundaryWriter();
......
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
template <class ScalarVector, class Vector> template <class ScalarVector, class Vector>
FrictionWriter<ScalarVector, Vector>::FrictionWriter( FrictionWriter<ScalarVector, Vector>::FrictionWriter(
Vector const &vertexCoordinates, Vector const &vertexCoordinates,
Dune::BitSetVector<1> const &_boundaryNodes, Dune::BitSetVector<1> const &_boundaryNodes, std::string prefix,
typename BW::Projector projector) typename BW::Projector projector)
: BW(vertexCoordinates, _boundaryNodes, projector), : BW(vertexCoordinates, _boundaryNodes, prefix, projector),
coefficientWriter("coefficients", std::fstream::out), coefficientWriter(prefix + "Coefficients", std::fstream::out),
stateWriter("logstates", std::fstream::out) {} stateWriter(prefix + "LogStates", std::fstream::out) {}
template <class ScalarVector, class Vector> template <class ScalarVector, class Vector>
FrictionWriter<ScalarVector, Vector>::~FrictionWriter() { FrictionWriter<ScalarVector, Vector>::~FrictionWriter() {
......
...@@ -15,7 +15,7 @@ class FrictionWriter : public BoundaryWriter<ScalarVector, Vector> { ...@@ -15,7 +15,7 @@ class FrictionWriter : public BoundaryWriter<ScalarVector, Vector> {
public: public:
FrictionWriter(Vector const &vertexCoordinates, FrictionWriter(Vector const &vertexCoordinates,
Dune::BitSetVector<1> const &_boundaryNodes, Dune::BitSetVector<1> const &_boundaryNodes,
typename BW::Projector projector); std::string prefix, typename BW::Projector projector);
~FrictionWriter(); ~FrictionWriter();
......
...@@ -354,7 +354,7 @@ int main(int argc, char *argv[]) { ...@@ -354,7 +354,7 @@ int main(int argc, char *argv[]) {
} }
} }
FrictionWriter<ScalarVector, Vector> frictionWriter( FrictionWriter<ScalarVector, Vector> frictionWriter(
vertexCoordinates, frictionalNodes, vertexCoordinates, frictionalNodes, "friction",
[](LocalVector const &x) { return x[0]; }); [](LocalVector const &x) { return x[0]; });
auto const reportFriction = [&](Vector const &_u, Vector const &_v, auto const reportFriction = [&](Vector const &_u, Vector const &_v,
ScalarVector const &_alpha) { ScalarVector const &_alpha) {
......
...@@ -276,7 +276,7 @@ int main(int argc, char *argv[]) { ...@@ -276,7 +276,7 @@ int main(int argc, char *argv[]) {
} }
} }
FrictionWriter<ScalarVector, Vector> frictionWriter( FrictionWriter<ScalarVector, Vector> frictionWriter(
vertexCoordinates, frictionalNodes, vertexCoordinates, frictionalNodes, "friction",
[](LocalVector const &x) { return x[0]; }); [](LocalVector const &x) { return x[0]; });
auto const reportFriction = [&](Vector const &_u, Vector const &_v, auto const reportFriction = [&](Vector const &_u, Vector const &_v,
ScalarVector const &_alpha) { ScalarVector const &_alpha) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment