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

[Cleanup] Friction writing: Split writeInfo up into two functions

parent b27415d1
No related branches found
No related tags found
No related merge requests found
...@@ -29,22 +29,32 @@ FrictionWriter<ScalarVector, Vector>::~FrictionWriter() { ...@@ -29,22 +29,32 @@ FrictionWriter<ScalarVector, Vector>::~FrictionWriter() {
} }
template <class ScalarVector, class Vector> template <class ScalarVector, class Vector>
void FrictionWriter<ScalarVector, Vector>::writeInfo( void FrictionWriter<ScalarVector, Vector>::writeKinetics(Vector const &u,
ScalarVector const &coefficient, ScalarVector const &alpha, Vector const &u, Vector const &v) {
Vector const &v) {
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])
continue; continue;
coefficientWriter << coefficient[i] << " ";
displacementWriter << u[i][0] << " "; displacementWriter << u[i][0] << " ";
stateWriter << alpha[i][0] << " ";
velocityWriter << v[i][0] << " "; velocityWriter << v[i][0] << " ";
} }
stateWriter << std::endl;
displacementWriter << std::endl; displacementWriter << std::endl;
velocityWriter << 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; coefficientWriter << std::endl;
} }
......
...@@ -12,8 +12,8 @@ template <class ScalarVector, class Vector> class FrictionWriter { ...@@ -12,8 +12,8 @@ template <class ScalarVector, class Vector> class FrictionWriter {
~FrictionWriter(); ~FrictionWriter();
void writeInfo(ScalarVector const &coefficient, ScalarVector const &alpha, void writeKinetics(Vector const &u, Vector const &v);
Vector const &u, Vector const &v); void writeOther(ScalarVector const &coefficient, ScalarVector const &alpha);
private: private:
std::fstream coefficientWriter; std::fstream coefficientWriter;
......
...@@ -286,7 +286,8 @@ int main(int argc, char *argv[]) { ...@@ -286,7 +286,8 @@ int main(int argc, char *argv[]) {
ScalarVector const &_alpha) { ScalarVector const &_alpha) {
ScalarVector c; ScalarVector c;
myGlobalNonlinearity->coefficientOfFriction(_v, 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); reportFriction(u_initial, v_initial, alpha_initial);
......
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