From 0e53474c9a012accc697d9e4056f8c3f279486e7 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Fri, 20 Jul 2018 15:41:37 +0200
Subject: [PATCH] [test][staggered] Velocity output policy is already set per
default now
---
test/freeflow/navierstokes/test_angeli.cc | 2 --
test/freeflow/navierstokes/test_channel.cc | 2 --
test/freeflow/navierstokes/test_closedsystem.cc | 2 --
test/freeflow/navierstokes/test_donea.cc | 2 --
test/freeflow/navierstokes/test_kovasznay.cc | 2 --
test/freeflow/navierstokes/test_navierstokes_1d.cc | 2 --
test/freeflow/navierstokes/test_stokes_channel_3d.cc | 2 --
test/freeflow/navierstokesnc/test_channel.cc | 2 --
test/freeflow/navierstokesnc/test_densitydrivenflow.cc | 2 --
test/freeflow/navierstokesnc/test_msfreeflow.cc | 2 --
test/freeflow/rans/test_pipe_laufer.cc | 2 --
test/freeflow/ransnc/test_flatplate.cc | 2 --
.../horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc | 2 --
.../1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc | 2 --
.../stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc | 2 --
.../1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.cc | 2 --
.../1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc | 2 --
.../boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc | 2 --
18 files changed, 36 deletions(-)
diff --git a/test/freeflow/navierstokes/test_angeli.cc b/test/freeflow/navierstokes/test_angeli.cc
index 76607dd72e..b946a99885 100644
--- a/test/freeflow/navierstokes/test_angeli.cc
+++ b/test/freeflow/navierstokes/test_angeli.cc
@@ -155,9 +155,7 @@ int main(int argc, char** argv) try
// intialize the vtk output module
StaggeredVtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
- using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
VtkOutputFields::init(vtkWriter); //!< Add model specific output fields
- vtkWriter.addVelocityOutput(std::make_shared<VelocityOutput>(*gridVariables, x));
vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact");
vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact");
vtkWriter.addFaceField(problem->getAnalyticalVelocitySolutionOnFace(), "faceVelocityExact");
diff --git a/test/freeflow/navierstokes/test_channel.cc b/test/freeflow/navierstokes/test_channel.cc
index b72e30520e..bee7ed183f 100644
--- a/test/freeflow/navierstokes/test_channel.cc
+++ b/test/freeflow/navierstokes/test_channel.cc
@@ -156,8 +156,6 @@ int main(int argc, char** argv) try
// initialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
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
vtkWriter.write(0.0);
diff --git a/test/freeflow/navierstokes/test_closedsystem.cc b/test/freeflow/navierstokes/test_closedsystem.cc
index 3d64a81497..6b5791708d 100644
--- a/test/freeflow/navierstokes/test_closedsystem.cc
+++ b/test/freeflow/navierstokes/test_closedsystem.cc
@@ -149,8 +149,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
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
vtkWriter.write(0.0);
diff --git a/test/freeflow/navierstokes/test_donea.cc b/test/freeflow/navierstokes/test_donea.cc
index 0eb4ce99c6..e6ad45c466 100644
--- a/test/freeflow/navierstokes/test_donea.cc
+++ b/test/freeflow/navierstokes/test_donea.cc
@@ -139,8 +139,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
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
vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact");
vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact");
diff --git a/test/freeflow/navierstokes/test_kovasznay.cc b/test/freeflow/navierstokes/test_kovasznay.cc
index 897b9dfa50..0d54568d92 100644
--- a/test/freeflow/navierstokes/test_kovasznay.cc
+++ b/test/freeflow/navierstokes/test_kovasznay.cc
@@ -136,8 +136,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
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
vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact");
vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact");
diff --git a/test/freeflow/navierstokes/test_navierstokes_1d.cc b/test/freeflow/navierstokes/test_navierstokes_1d.cc
index 65ae0eabb7..7b19b1038a 100644
--- a/test/freeflow/navierstokes/test_navierstokes_1d.cc
+++ b/test/freeflow/navierstokes/test_navierstokes_1d.cc
@@ -125,8 +125,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
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
vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact");
vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact");
diff --git a/test/freeflow/navierstokes/test_stokes_channel_3d.cc b/test/freeflow/navierstokes/test_stokes_channel_3d.cc
index bff1f348a5..3c72b1ecf6 100644
--- a/test/freeflow/navierstokes/test_stokes_channel_3d.cc
+++ b/test/freeflow/navierstokes/test_stokes_channel_3d.cc
@@ -133,8 +133,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
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
vtkWriter.write(0.0);
diff --git a/test/freeflow/navierstokesnc/test_channel.cc b/test/freeflow/navierstokesnc/test_channel.cc
index e31b2dae41..70fbdd037a 100644
--- a/test/freeflow/navierstokesnc/test_channel.cc
+++ b/test/freeflow/navierstokesnc/test_channel.cc
@@ -154,8 +154,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
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
vtkWriter.addField(problem->getDeltaP(), "deltaP");
vtkWriter.write(0.0);
diff --git a/test/freeflow/navierstokesnc/test_densitydrivenflow.cc b/test/freeflow/navierstokesnc/test_densitydrivenflow.cc
index 05deb3c1c7..f4491998c7 100644
--- a/test/freeflow/navierstokesnc/test_densitydrivenflow.cc
+++ b/test/freeflow/navierstokesnc/test_densitydrivenflow.cc
@@ -153,8 +153,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
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
vtkWriter.addField(problem->getDeltaRho(), "deltaRho");
vtkWriter.write(0.0);
diff --git a/test/freeflow/navierstokesnc/test_msfreeflow.cc b/test/freeflow/navierstokesnc/test_msfreeflow.cc
index 2357c25959..91dbaba810 100644
--- a/test/freeflow/navierstokesnc/test_msfreeflow.cc
+++ b/test/freeflow/navierstokesnc/test_msfreeflow.cc
@@ -153,8 +153,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
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
vtkWriter.write(0.0);
diff --git a/test/freeflow/rans/test_pipe_laufer.cc b/test/freeflow/rans/test_pipe_laufer.cc
index 79bb451eb4..8b4d2a70fe 100644
--- a/test/freeflow/rans/test_pipe_laufer.cc
+++ b/test/freeflow/rans/test_pipe_laufer.cc
@@ -149,8 +149,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
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
vtkWriter.write(0.0);
diff --git a/test/freeflow/ransnc/test_flatplate.cc b/test/freeflow/ransnc/test_flatplate.cc
index 86969a129b..40612bd175 100644
--- a/test/freeflow/ransnc/test_flatplate.cc
+++ b/test/freeflow/ransnc/test_flatplate.cc
@@ -145,8 +145,6 @@ int main(int argc, char** argv) try
// intialize the vtk output module
using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
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
vtkWriter.write(0.0);
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc
index 7664a9ed62..0197c2208a 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.cc
@@ -193,8 +193,6 @@ int main(int argc, char** argv) try
StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
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);
VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc
index 30bf4e121b..1f0673f05b 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.cc
@@ -194,8 +194,6 @@ int main(int argc, char** argv) try
StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
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);
VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc
index 95b7216eb8..2f8864a37a 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.cc
@@ -186,8 +186,6 @@ int main(int argc, char** argv) try
StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
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);
VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.cc b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.cc
index 3ea7a0aedb..c1caa48d32 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.cc
@@ -160,8 +160,6 @@ int main(int argc, char** argv) try
StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
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);
VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc
index b6e51d5f91..859451b901 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.cc
@@ -163,8 +163,6 @@ int main(int argc, char** argv) try
StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
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);
VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc b/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc
index 430337e91e..35d4dc9ccc 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.cc
@@ -185,8 +185,6 @@ int main(int argc, char** argv) try
StaggeredVtkOutputModule<StokesGridVariables, typename GET_PROP_TYPE(StokesTypeTag, SolutionVector)> stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName);
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);
VtkOutputModule<DarcyGridVariables, typename GET_PROP_TYPE(DarcyTypeTag, SolutionVector)> darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName);
--
GitLab