Commit aa5687ff authored by Melanie Lipp's avatar Melanie Lipp Committed by Timo Koch
Browse files

[test][freeflow] Process third round of comments in MR to move...

[test][freeflow] Process third round of comments in MR to move createAnalyticalSolution to file and reuse for several tests.
parent 9ce3675c
......@@ -103,6 +103,14 @@ private:
std::vector<VelocityVector> analyticalVelocity_;
std::vector<VelocityVector> analyticalVelocityOnFace_;
};
template<class Problem>
NavierStokesAnalyticalSolutionVectors(std::shared_ptr<Problem> p)
-> NavierStokesAnalyticalSolutionVectors<Problem>;
template<class Problem, class Scalar>
NavierStokesAnalyticalSolutionVectors(std::shared_ptr<Problem> p, Scalar t)
-> NavierStokesAnalyticalSolutionVectors<Problem, Scalar>;
} // end namespace Dumux
#endif
......@@ -113,7 +113,7 @@ int main(int argc, char** argv)
StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using IOFields = GetPropType<TypeTag, Properties::IOFields>;
IOFields::initOutputModule(vtkWriter); // Add model specific output fields
NavierStokesAnalyticalSolutionVectors<Problem> analyticalSolVectors(problem, tStart);
NavierStokesAnalyticalSolutionVectors analyticalSolVectors(problem, tStart);
vtkWriter.addField(analyticalSolVectors.getAnalyticalPressureSolution(), "pressureExact");
vtkWriter.addField(analyticalSolVectors.getAnalyticalVelocitySolution(), "velocityExact");
vtkWriter.addFaceField(analyticalSolVectors.getAnalyticalVelocitySolutionOnFace(), "faceVelocityExact");
......
......@@ -98,7 +98,7 @@ int main(int argc, char** argv)
StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
IOFields::initOutputModule(vtkWriter); // Add model specific output fields
NavierStokesAnalyticalSolutionVectors<Problem> analyticalSolVectors(problem);
NavierStokesAnalyticalSolutionVectors analyticalSolVectors(problem);
vtkWriter.addField(analyticalSolVectors.getAnalyticalPressureSolution(), "pressureExact");
vtkWriter.addField(analyticalSolVectors.getAnalyticalVelocitySolution(), "velocityExact");
vtkWriter.addFaceField(analyticalSolVectors.getAnalyticalVelocitySolutionOnFace(), "faceVelocityExact");
......
......@@ -119,7 +119,7 @@ int main(int argc, char** argv)
if (problem->hasAnalyticalSolution())
{
NavierStokesAnalyticalSolutionVectors<Problem> analyticalSolVectors(problem);
NavierStokesAnalyticalSolutionVectors analyticalSolVectors(problem);
vtkWriter.addField(analyticalSolVectors.getAnalyticalPressureSolution(), "pressureExact");
vtkWriter.addField(analyticalSolVectors.getAnalyticalVelocitySolution(), "velocityExact");
......
......@@ -100,7 +100,7 @@ int main(int argc, char** argv)
StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
IOFields::initOutputModule(vtkWriter); // Add model specific output fields
NavierStokesAnalyticalSolutionVectors<Problem> analyticalSolVectors(problem);
NavierStokesAnalyticalSolutionVectors analyticalSolVectors(problem);
vtkWriter.addField(analyticalSolVectors.getAnalyticalPressureSolution(), "pressureExact");
vtkWriter.addField(analyticalSolVectors.getAnalyticalVelocitySolution(), "velocityExact");
vtkWriter.addFaceField(analyticalSolVectors.getAnalyticalVelocitySolutionOnFace(), "faceVelocityExact");
......
......@@ -128,7 +128,7 @@ int main(int argc, char** argv)
StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
IOFields::initOutputModule(vtkWriter); // Add model specific output fields
NavierStokesAnalyticalSolutionVectors<Problem> analyticalSolVectors(problem);
NavierStokesAnalyticalSolutionVectors analyticalSolVectors(problem);
vtkWriter.addField(analyticalSolVectors.getAnalyticalPressureSolution(), "pressureExact");
vtkWriter.addField(analyticalSolVectors.getAnalyticalVelocitySolution(), "velocityExact");
vtkWriter.addFaceField(analyticalSolVectors.getAnalyticalVelocitySolutionOnFace(), "faceVelocityExact");
......
......@@ -188,7 +188,7 @@ int main(int argc, char** argv)
vtkWriter.addField(sourceX, "sourceX");
vtkWriter.addField(sourceY, "sourceY");
NavierStokesAnalyticalSolutionVectors<Problem> analyticalSolVectors(problem, 0.0);
NavierStokesAnalyticalSolutionVectors analyticalSolVectors(problem, 0.0);
vtkWriter.addField(analyticalSolVectors.getAnalyticalPressureSolution(), "pressureExact");
vtkWriter.addField(analyticalSolVectors.getAnalyticalVelocitySolution(), "velocityExact");
vtkWriter.addFaceField(analyticalSolVectors.getAnalyticalVelocitySolutionOnFace(), "faceVelocityExact");
......
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