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

[Output ] Centralise special writing

Write out time step #0, too
parent 7b2f0e43
No related branches found
No related tags found
No related merge requests found
......@@ -313,17 +313,28 @@ int main(int argc, char *argv[]) {
BoundaryWriter<ScalarVector, Vector> horizontalSurfaceWriter(
vertexCoordinates, surfaceNodes, "horizontalSurface",
MyGeometry::horizontalProjection);
SpecialWriter<GridView, dims> specialVelocityWriter("specialVelocities",
leafView);
SpecialWriter<GridView, dims> specialDisplacementWriter(
"specialDisplacements", leafView);
auto const report =
[&](Vector const &_u, Vector const &_v, ScalarVector const &_alpha) {
horizontalSurfaceWriter.writeKinetics(_u, _v);
verticalSurfaceWriter.writeKinetics(_u, _v);
ScalarVector c;
myGlobalFriction->coefficientOfFriction(_v, c);
frictionWriter.writeKinetics(_u, _v);
frictionWriter.writeOther(c, _alpha);
};
auto const report = [&](Vector const &_u, Vector const &_v,
ScalarVector const &_alpha) {
horizontalSurfaceWriter.writeKinetics(_u, _v);
verticalSurfaceWriter.writeKinetics(_u, _v);
ScalarVector c;
myGlobalFriction->coefficientOfFriction(_v, c);
frictionWriter.writeKinetics(_u, _v);
frictionWriter.writeOther(c, _alpha);
BasisGridFunction<typename MyAssembler::VertexBasis, Vector> velocity(
myAssembler.vertexBasis, _v);
BasisGridFunction<typename MyAssembler::VertexBasis, Vector> displacement(
myAssembler.vertexBasis, _u);
specialVelocityWriter.write(velocity);
specialDisplacementWriter.write(displacement);
};
report(u_initial, v_initial, alpha_initial);
MyVTKWriter<typename MyAssembler::VertexBasis,
......@@ -337,11 +348,6 @@ int main(int argc, char *argv[]) {
vtkWriter.write(0, u_initial, v_initial, alpha_initial, stress);
}
SpecialWriter<GridView, dims> specialVelocityWriter("specialVelocities",
leafView);
SpecialWriter<GridView, dims> specialDisplacementWriter(
"specialDisplacements", leafView);
// Set up TNNMG solver
using NonlinearFactory = SolverFactory<
dims,
......@@ -394,14 +400,6 @@ int main(int argc, char *argv[]) {
current.first->extractAlpha(alpha);
report(u, v, alpha);
{
BasisGridFunction<typename MyAssembler::VertexBasis, Vector> velocity(
myAssembler.vertexBasis, v);
BasisGridFunction<typename MyAssembler::VertexBasis, Vector>
displacement(myAssembler.vertexBasis, u);
specialVelocityWriter.write(velocity);
specialDisplacementWriter.write(displacement);
}
if (parset.get<bool>("io.writeVTK")) {
ScalarVector stress;
......
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