Commit 0e53474c authored by Timo Koch's avatar Timo Koch Committed by Kilian Weishaupt
Browse files

[test][staggered] Velocity output policy is already set per default now

parent d4445f8a
...@@ -155,9 +155,7 @@ int main(int argc, char** argv) try ...@@ -155,9 +155,7 @@ int main(int argc, char** argv) try
// intialize the vtk output module // intialize the vtk output module
StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields); using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
VtkOutputFields::init(vtkWriter); //!< Add model specific output fields VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact"); vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact");
vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact"); vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact");
vtkWriter.addFaceField(problem->getAnalyticalVelocitySolutionOnFace(), "faceVelocityExact"); vtkWriter.addFaceField(problem->getAnalyticalVelocitySolutionOnFace(), "faceVelocityExact");
......
...@@ -156,8 +156,6 @@ int main(int argc, char** argv) try ...@@ -156,8 +156,6 @@ int main(int argc, char** argv) try
// initialize the vtk output module // initialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields); using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
VtkOutputFields::init(vtkWriter); //!< Add model specific output fields VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
vtkWriter.write(0.0); vtkWriter.write(0.0);
......
...@@ -149,8 +149,6 @@ int main(int argc, char** argv) try ...@@ -149,8 +149,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module // intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields); using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
VtkOutputFields::init(vtkWriter); //!< Add model specific output fields VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
vtkWriter.write(0.0); vtkWriter.write(0.0);
......
...@@ -139,8 +139,6 @@ int main(int argc, char** argv) try ...@@ -139,8 +139,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module // intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields); using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
VtkOutputFields::init(vtkWriter); //!< Add model specific output fields VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact"); vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact");
vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact"); vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact");
......
...@@ -136,8 +136,6 @@ int main(int argc, char** argv) try ...@@ -136,8 +136,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module // intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields); using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
VtkOutputFields::init(vtkWriter); //!< Add model specific output fields VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact"); vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact");
vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact"); vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact");
......
...@@ -125,8 +125,6 @@ int main(int argc, char** argv) try ...@@ -125,8 +125,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module // intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields); using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
VtkOutputFields::init(vtkWriter); //!< Add model specific output fields VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact"); vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact");
vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact"); vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact");
......
...@@ -133,8 +133,6 @@ int main(int argc, char** argv) try ...@@ -133,8 +133,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module // intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields); using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
VtkOutputFields::init(vtkWriter); //!< Add model specific output fields VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
vtkWriter.write(0.0); vtkWriter.write(0.0);
......
...@@ -154,8 +154,6 @@ int main(int argc, char** argv) try ...@@ -154,8 +154,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module // intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields); using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
VtkOutputFields::init(vtkWriter); //!< Add model specific output fields VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
vtkWriter.addField(problem->getDeltaP(), "deltaP"); vtkWriter.addField(problem->getDeltaP(), "deltaP");
vtkWriter.write(0.0); vtkWriter.write(0.0);
......
...@@ -153,8 +153,6 @@ int main(int argc, char** argv) try ...@@ -153,8 +153,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module // intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields); using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
VtkOutputFields::init(vtkWriter); //!< Add model specific output fields VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
vtkWriter.addField(problem->getDeltaRho(), "deltaRho"); vtkWriter.addField(problem->getDeltaRho(), "deltaRho");
vtkWriter.write(0.0); vtkWriter.write(0.0);
......
...@@ -153,8 +153,6 @@ int main(int argc, char** argv) try ...@@ -153,8 +153,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module // intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields); using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
VtkOutputFields::init(vtkWriter); //! Add model specific output fields VtkOutputFields::init(vtkWriter); //! Add model specific output fields
vtkWriter.write(0.0); vtkWriter.write(0.0);
......
...@@ -149,8 +149,6 @@ int main(int argc, char** argv) try ...@@ -149,8 +149,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module // intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields); using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
VtkOutputFields::init(vtkWriter); //!< Add model specific output fields VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
vtkWriter.write(0.0); vtkWriter.write(0.0);
......
...@@ -145,8 +145,6 @@ int main(int argc, char** argv) try ...@@ -145,8 +145,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module // intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields); using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name()); StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
VtkOutputFields::init(vtkWriter); //!< Add model specific output fields VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
vtkWriter.write(0.0); vtkWriter.write(0.0);
......
...@@ -193,8 +193,6 @@ int main(int argc, char** argv) try ...@@ -193,8 +193,6 @@ int main(int argc, char** argv) try
StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName); StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter); GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter);
using StokesVelocityOutput = typename GET_PROP_TYPE(StokesTypeTag, VelocityOutput);
stokesVtkWriter.addVelocityOutput(std::make_shared<StokesVelocityOutput>(*stokesGridVariables, stokesSol));
stokesVtkWriter.write(0.0); stokesVtkWriter.write(0.0);
VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName); VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
......
...@@ -194,8 +194,6 @@ int main(int argc, char** argv) try ...@@ -194,8 +194,6 @@ int main(int argc, char** argv) try
StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName); StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter); GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter);
using StokesVelocityOutput = typename GET_PROP_TYPE(StokesTypeTag, VelocityOutput);
stokesVtkWriter.addVelocityOutput(std::make_shared<StokesVelocityOutput>(*stokesGridVariables, stokesSol));
stokesVtkWriter.write(0.0); stokesVtkWriter.write(0.0);
VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName); VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
......
...@@ -186,8 +186,6 @@ int main(int argc, char** argv) try ...@@ -186,8 +186,6 @@ int main(int argc, char** argv) try
StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName); StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter); GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter);
using StokesVelocityOutput = typename GET_PROP_TYPE(StokesTypeTag, VelocityOutput);
stokesVtkWriter.addVelocityOutput(std::make_shared<StokesVelocityOutput>(*stokesGridVariables, stokesSol));
stokesVtkWriter.write(0.0); stokesVtkWriter.write(0.0);
VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName); VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
......
...@@ -160,8 +160,6 @@ int main(int argc, char** argv) try ...@@ -160,8 +160,6 @@ int main(int argc, char** argv) try
StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName); StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter); GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter);
using StokesVelocityOutput = typename GET_PROP_TYPE(StokesTypeTag, VelocityOutput);
stokesVtkWriter.addVelocityOutput(std::make_shared<StokesVelocityOutput>(*stokesGridVariables, stokesSol));
stokesVtkWriter.write(0.0); stokesVtkWriter.write(0.0);
VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName); VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
......
...@@ -163,8 +163,6 @@ int main(int argc, char** argv) try ...@@ -163,8 +163,6 @@ int main(int argc, char** argv) try
StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName); StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter); GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter);
using StokesVelocityOutput = typename GET_PROP_TYPE(StokesTypeTag, VelocityOutput);
stokesVtkWriter.addVelocityOutput(std::make_shared<StokesVelocityOutput>(*stokesGridVariables, stokesSol));
stokesVtkWriter.write(0.0); stokesVtkWriter.write(0.0);
VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName); VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
......
...@@ -185,8 +185,6 @@ int main(int argc, char** argv) try ...@@ -185,8 +185,6 @@ int main(int argc, char** argv) try
StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName); StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter); GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter);
using StokesVelocityOutput = typename GET_PROP_TYPE(StokesTypeTag, VelocityOutput);
stokesVtkWriter.addVelocityOutput(std::make_shared<StokesVelocityOutput>(*stokesGridVariables, stokesSol));
stokesVtkWriter.write(0.0); stokesVtkWriter.write(0.0);
VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName); VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment