diff --git a/src/friction_writer.cc b/src/friction_writer.cc index b830a01cffc6e13718174b3e266dfb8770533e76..b43bc820d36b987440bafbd3d02debf8d90f0028 100644 --- a/src/friction_writer.cc +++ b/src/friction_writer.cc @@ -29,22 +29,32 @@ FrictionWriter<ScalarVector, Vector>::~FrictionWriter() { } template <class ScalarVector, class Vector> -void FrictionWriter<ScalarVector, Vector>::writeInfo( - ScalarVector const &coefficient, ScalarVector const &alpha, Vector const &u, - Vector const &v) { +void FrictionWriter<ScalarVector, Vector>::writeKinetics(Vector const &u, + Vector const &v) { for (size_t i = 0; i < boundaryNodes.size(); ++i) { if (!boundaryNodes[i][0]) continue; - coefficientWriter << coefficient[i] << " "; displacementWriter << u[i][0] << " "; - stateWriter << alpha[i][0] << " "; velocityWriter << v[i][0] << " "; } - stateWriter << std::endl; displacementWriter << std::endl; velocityWriter << std::endl; +} + +template <class ScalarVector, class Vector> +void FrictionWriter<ScalarVector, Vector>::writeOther( + ScalarVector const &coefficient, ScalarVector const &alpha) { + for (size_t i = 0; i < boundaryNodes.size(); ++i) { + if (!boundaryNodes[i][0]) + continue; + + coefficientWriter << coefficient[i] << " "; + stateWriter << alpha[i][0] << " "; + } + + stateWriter << std::endl; coefficientWriter << std::endl; } diff --git a/src/friction_writer.hh b/src/friction_writer.hh index 09cb1b05ead6e92e1cc930d11ae31e685ef0060a..f5979612332b37734023667a5d41b7ba4f96414b 100644 --- a/src/friction_writer.hh +++ b/src/friction_writer.hh @@ -12,8 +12,8 @@ template <class ScalarVector, class Vector> class FrictionWriter { ~FrictionWriter(); - void writeInfo(ScalarVector const &coefficient, ScalarVector const &alpha, - Vector const &u, Vector const &v); + void writeKinetics(Vector const &u, Vector const &v); + void writeOther(ScalarVector const &coefficient, ScalarVector const &alpha); private: std::fstream coefficientWriter; diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc index 5deffbe67aed68085e9fbb97ea602de7c88c022c..fb80af6a3570fd4e7d44e7dc81bdf668aa66a282 100644 --- a/src/one-body-sample.cc +++ b/src/one-body-sample.cc @@ -286,7 +286,8 @@ int main(int argc, char *argv[]) { ScalarVector const &_alpha) { ScalarVector c; myGlobalNonlinearity->coefficientOfFriction(_v, c); - writer.writeInfo(c, _alpha, _u, _v); + writer.writeKinetics(_u, _v); + writer.writeOther(c, _alpha); }; reportFriction(u_initial, v_initial, alpha_initial);