From 646226e8724072b21ecf6cabe3d7660a807a699a Mon Sep 17 00:00:00 2001 From: Timo Koch Date: Fri, 20 Jul 2018 15:39:22 +0200 Subject: [PATCH 1/5] [io][staggered] Remove deprecated vtk output module --- dumux/io/staggeredvtkoutputmodule.hh | 29 +--------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/dumux/io/staggeredvtkoutputmodule.hh b/dumux/io/staggeredvtkoutputmodule.hh index 94f2784694..6c16f4bc2c 100644 --- a/dumux/io/staggeredvtkoutputmodule.hh +++ b/dumux/io/staggeredvtkoutputmodule.hh @@ -37,33 +37,6 @@ namespace Dumux { template class PointCloudVtkWriter; -template -class StaggeredVtkOutputModule; - -template -class DUNE_DEPRECATED_MSG("Use StaggeredVtkOutputModule instead!") StaggeredVtkOutputModule -: public StaggeredVtkOutputModule -{ - using ParentType = StaggeredVtkOutputModule; -public: - using ParentType::ParentType; - - template - DUNE_DEPRECATED_MSG("Use StaggeredVtkOutputModule(gridVariables, sol, name) instead!") - StaggeredVtkOutputModule(const Problem& problem, - const FVGridGeometry& fvGridGeometry, - const GridVariables& gridVariables, - const SolutionVector& sol, - const std::string& name, - const std::string& paramGroup = "", - Dune::VTK::DataMode dm = Dune::VTK::conforming, - bool verbose = true) - : ParentType(gridVariables, sol, name, paramGroup, dm, verbose) {} - -}; - /*! * \ingroup InputOutput * \brief A VTK output module to simplify writing dumux simulation data to VTK format @@ -73,7 +46,7 @@ public: * \tparam SolutionVector The solution vector */ template -class StaggeredVtkOutputModule +class StaggeredVtkOutputModule : public VtkOutputModule { using ParentType = VtkOutputModule; -- GitLab From 48546b11d1e6b29ac6db8d441d63b8c43b8c362f Mon Sep 17 00:00:00 2001 From: Timo Koch Date: Fri, 20 Jul 2018 15:39:54 +0200 Subject: [PATCH 2/5] [io][staggered] Set staggered velocity output per default --- dumux/io/staggeredvtkoutputmodule.hh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dumux/io/staggeredvtkoutputmodule.hh b/dumux/io/staggeredvtkoutputmodule.hh index 6c16f4bc2c..6a3d839c66 100644 --- a/dumux/io/staggeredvtkoutputmodule.hh +++ b/dumux/io/staggeredvtkoutputmodule.hh @@ -29,8 +29,7 @@ #include #include #include - -#include +#include namespace Dumux { @@ -96,6 +95,8 @@ public: gridVariables.curGridVolVars().problem().fvGridGeometry().gridView().comm().size() ) { + // enable velocity output per default + this->addVelocityOutput(std::make_shared>(gridVariables, sol)); writeFaceVars_ = getParamFromGroup(paramGroup, "Vtk.WriteFaceData", false); coordinatesInitialized_ = false; } -- GitLab From 3ecb27dfa3bc1cfa210723c9a735dab75f00a200 Mon Sep 17 00:00:00 2001 From: Timo Koch Date: Fri, 20 Jul 2018 15:40:28 +0200 Subject: [PATCH 3/5] [io][staggered] Enable velocity output per default --- dumux/discretization/staggered/freeflow/velocityoutput.hh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dumux/discretization/staggered/freeflow/velocityoutput.hh b/dumux/discretization/staggered/freeflow/velocityoutput.hh index d9d5e40672..57ad84f921 100644 --- a/dumux/discretization/staggered/freeflow/velocityoutput.hh +++ b/dumux/discretization/staggered/freeflow/velocityoutput.hh @@ -65,7 +65,8 @@ public: , sol_(sol) { // check if velocity vectors shall be written to the VTK file - enableOutput_ = getParamFromGroup(gridVariables.curGridVolVars().problem().paramGroup(), "Vtk.AddVelocity"); + // enable per default + enableOutput_ = getParamFromGroup(gridVariables.curGridVolVars().problem().paramGroup(), "Vtk.AddVelocity", true); } //! Returns whether to enable the velocity output or not @@ -103,7 +104,7 @@ private: const GridVariables& gridVariables_; const SolutionVector& sol_; - bool enableOutput_; + bool enableOutput_ = true; }; } // end namespace Dumux -- GitLab From 08e67134e533a94c80d0f29cbe85ca3ea39af2d3 Mon Sep 17 00:00:00 2001 From: Timo Koch Date: Fri, 20 Jul 2018 15:41:37 +0200 Subject: [PATCH 4/5] [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 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(*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 vtkWriter(*gridVariables, x, problem->name()); - using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput); - vtkWriter.addVelocityOutput(std::make_shared(*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 vtkWriter(*gridVariables, x, problem->name()); - using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput); - vtkWriter.addVelocityOutput(std::make_shared(*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 vtkWriter(*gridVariables, x, problem->name()); - using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput); - vtkWriter.addVelocityOutput(std::make_shared(*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 vtkWriter(*gridVariables, x, problem->name()); - using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput); - vtkWriter.addVelocityOutput(std::make_shared(*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 vtkWriter(*gridVariables, x, problem->name()); - using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput); - vtkWriter.addVelocityOutput(std::make_shared(*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 vtkWriter(*gridVariables, x, problem->name()); - using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput); - vtkWriter.addVelocityOutput(std::make_shared(*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 vtkWriter(*gridVariables, x, problem->name()); - using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput); - vtkWriter.addVelocityOutput(std::make_shared(*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 vtkWriter(*gridVariables, x, problem->name()); - using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput); - vtkWriter.addVelocityOutput(std::make_shared(*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 vtkWriter(*gridVariables, x, problem->name()); - using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput); - vtkWriter.addVelocityOutput(std::make_shared(*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 vtkWriter(*gridVariables, x, problem->name()); - using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput); - vtkWriter.addVelocityOutput(std::make_shared(*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 vtkWriter(*gridVariables, x, problem->name()); - using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput); - vtkWriter.addVelocityOutput(std::make_shared(*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 stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName); GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter); - using StokesVelocityOutput = typename GET_PROP_TYPE(StokesTypeTag, VelocityOutput); - stokesVtkWriter.addVelocityOutput(std::make_shared(*stokesGridVariables, stokesSol)); stokesVtkWriter.write(0.0); VtkOutputModule 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 stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName); GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter); - using StokesVelocityOutput = typename GET_PROP_TYPE(StokesTypeTag, VelocityOutput); - stokesVtkWriter.addVelocityOutput(std::make_shared(*stokesGridVariables, stokesSol)); stokesVtkWriter.write(0.0); VtkOutputModule 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 stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName); GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter); - using StokesVelocityOutput = typename GET_PROP_TYPE(StokesTypeTag, VelocityOutput); - stokesVtkWriter.addVelocityOutput(std::make_shared(*stokesGridVariables, stokesSol)); stokesVtkWriter.write(0.0); VtkOutputModule 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 stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName); GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter); - using StokesVelocityOutput = typename GET_PROP_TYPE(StokesTypeTag, VelocityOutput); - stokesVtkWriter.addVelocityOutput(std::make_shared(*stokesGridVariables, stokesSol)); stokesVtkWriter.write(0.0); VtkOutputModule 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 stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName); GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter); - using StokesVelocityOutput = typename GET_PROP_TYPE(StokesTypeTag, VelocityOutput); - stokesVtkWriter.addVelocityOutput(std::make_shared(*stokesGridVariables, stokesSol)); stokesVtkWriter.write(0.0); VtkOutputModule 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 stokesVtkWriter(*stokesGridVariables, stokesSol, stokesName); GET_PROP_TYPE(StokesTypeTag, VtkOutputFields)::init(stokesVtkWriter); - using StokesVelocityOutput = typename GET_PROP_TYPE(StokesTypeTag, VelocityOutput); - stokesVtkWriter.addVelocityOutput(std::make_shared(*stokesGridVariables, stokesSol)); stokesVtkWriter.write(0.0); VtkOutputModule darcyVtkWriter(*darcyGridVariables, sol[darcyIdx], darcyName); -- GitLab From 320fdcaa5a024a4b618e66f99ff59235d33286bd Mon Sep 17 00:00:00 2001 From: Timo Koch Date: Fri, 20 Jul 2018 15:42:13 +0200 Subject: [PATCH 5/5] [test][freeflow] Velocity output is enabled by default now --- test/freeflow/navierstokes/test_channel_navierstokes.input | 1 - test/freeflow/navierstokes/test_channel_stokes.input | 2 -- .../navierstokes/test_channel_stokesni_conduction.input | 1 - .../navierstokes/test_channel_stokesni_convection.input | 1 - test/freeflow/navierstokes/test_hydrostaticpressure.input | 1 - test/freeflow/navierstokes/test_liddrivencavity_re1.input | 1 - test/freeflow/navierstokes/test_liddrivencavity_re1000.input | 1 - test/freeflow/navierstokes/test_navierstokes_1d.input | 1 - test/freeflow/navierstokes/test_navierstokes_angeli.input | 1 - test/freeflow/navierstokes/test_navierstokes_kovasznay.input | 1 - test/freeflow/navierstokes/test_stokes_channel_3d.input | 1 - test/freeflow/navierstokes/test_stokes_channel_pseudo3d.input | 1 - test/freeflow/navierstokes/test_stokes_donea.input | 1 - test/freeflow/navierstokesnc/test_stokes2c_advection.input | 1 - .../navierstokesnc/test_stokes2c_densitydrivenflow.input | 1 - test/freeflow/navierstokesnc/test_stokes2c_purediffusion.input | 1 - test/freeflow/navierstokesnc/test_stokes2cni_advection.input | 1 - test/freeflow/navierstokesnc/test_stokes2cni_diffusion.input | 1 - test/freeflow/rans/test_pipe_laufer.input | 1 - test/freeflow/rans/test_pipe_laufer_reference.input | 1 - .../rans/test_pipe_laufer_reference_wallfunction.input | 1 - test/freeflow/rans/test_pipe_zeroeqni.input | 1 - test/freeflow/ransnc/test_flatplate2c.input | 3 --- test/freeflow/ransnc/test_flatplate2cni.input | 3 --- test/freeflow/ransnc/test_flatplate2cni_wallfunction.input | 3 --- .../horizontalflow/test_stokes1p2cdarcy1p2chorizontal.input | 3 --- .../verticalflow/test_stokes1p2cdarcy1p2cvertical.input | 3 --- .../test_stokes1p2cdarcy1p2cvertical_diffusion.input | 3 --- .../1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.input | 1 - .../1p2c_2p2c/test_stokes1p2cnidarcy2p2cnihorizontal.input | 1 - .../1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.input | 3 --- .../1p_1p/verticalflow/test_stokes1pdarcy1pvertical.input | 3 --- .../stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.input | 3 --- 33 files changed, 52 deletions(-) diff --git a/test/freeflow/navierstokes/test_channel_navierstokes.input b/test/freeflow/navierstokes/test_channel_navierstokes.input index 112b0f2a1d..8583ee9652 100644 --- a/test/freeflow/navierstokes/test_channel_navierstokes.input +++ b/test/freeflow/navierstokes/test_channel_navierstokes.input @@ -16,5 +16,4 @@ MaxSteps = 10 MaxRelativeShift = 1e-5 [Vtk] -AddVelocity = true WriteFaceData = false diff --git a/test/freeflow/navierstokes/test_channel_stokes.input b/test/freeflow/navierstokes/test_channel_stokes.input index 651184566d..ed56ca7244 100644 --- a/test/freeflow/navierstokes/test_channel_stokes.input +++ b/test/freeflow/navierstokes/test_channel_stokes.input @@ -16,10 +16,8 @@ MaxSteps = 10 MaxRelativeShift = 1e-8 [Vtk] -AddVelocity = true WriteFaceData = false - [Assembly] NumericDifference.BaseEpsilon = 1e-8 diff --git a/test/freeflow/navierstokes/test_channel_stokesni_conduction.input b/test/freeflow/navierstokes/test_channel_stokesni_conduction.input index ebc6488b75..cb06ec9a95 100644 --- a/test/freeflow/navierstokes/test_channel_stokesni_conduction.input +++ b/test/freeflow/navierstokes/test_channel_stokesni_conduction.input @@ -16,5 +16,4 @@ MaxSteps = 10 MaxRelativeShift = 1e-8 [Vtk] -AddVelocity = true WriteFaceData = false diff --git a/test/freeflow/navierstokes/test_channel_stokesni_convection.input b/test/freeflow/navierstokes/test_channel_stokesni_convection.input index dbaf6ddb5d..353c4b3582 100644 --- a/test/freeflow/navierstokes/test_channel_stokesni_convection.input +++ b/test/freeflow/navierstokes/test_channel_stokesni_convection.input @@ -16,5 +16,4 @@ MaxSteps = 10 MaxRelativeShift = 1e-8 [Vtk] -AddVelocity = true WriteFaceData = false diff --git a/test/freeflow/navierstokes/test_hydrostaticpressure.input b/test/freeflow/navierstokes/test_hydrostaticpressure.input index a48eb5fb26..4dcaf50ac0 100644 --- a/test/freeflow/navierstokes/test_hydrostaticpressure.input +++ b/test/freeflow/navierstokes/test_hydrostaticpressure.input @@ -19,5 +19,4 @@ MaxSteps = 10 MaxRelativeShift = 1e-5 [Vtk] -AddVelocity = true WriteFaceData = false diff --git a/test/freeflow/navierstokes/test_liddrivencavity_re1.input b/test/freeflow/navierstokes/test_liddrivencavity_re1.input index 8a7be861e5..286d9c374e 100644 --- a/test/freeflow/navierstokes/test_liddrivencavity_re1.input +++ b/test/freeflow/navierstokes/test_liddrivencavity_re1.input @@ -20,5 +20,4 @@ MaxSteps = 10 MaxRelativeShift = 1e-5 [Vtk] -AddVelocity = true WriteFaceData = false diff --git a/test/freeflow/navierstokes/test_liddrivencavity_re1000.input b/test/freeflow/navierstokes/test_liddrivencavity_re1000.input index d0204fd129..cd5be48163 100644 --- a/test/freeflow/navierstokes/test_liddrivencavity_re1000.input +++ b/test/freeflow/navierstokes/test_liddrivencavity_re1000.input @@ -25,7 +25,6 @@ MaxRelativeShift = 1e-8 NumericDifference.BaseEpsilon = 1e-8 [Vtk] -AddVelocity = true WriteFaceData = false [Implicit] diff --git a/test/freeflow/navierstokes/test_navierstokes_1d.input b/test/freeflow/navierstokes/test_navierstokes_1d.input index 28c4f696f1..a6a61d8265 100644 --- a/test/freeflow/navierstokes/test_navierstokes_1d.input +++ b/test/freeflow/navierstokes/test_navierstokes_1d.input @@ -17,4 +17,3 @@ MaxRelativeShift = 1e-9 [Vtk] WriteFaceData = false -AddVelocity = true diff --git a/test/freeflow/navierstokes/test_navierstokes_angeli.input b/test/freeflow/navierstokes/test_navierstokes_angeli.input index 230e41dda7..787d776fc0 100644 --- a/test/freeflow/navierstokes/test_navierstokes_angeli.input +++ b/test/freeflow/navierstokes/test_navierstokes_angeli.input @@ -25,4 +25,3 @@ MaxRelativeShift = 1e-5 [Vtk] WriteFaceData = false -AddVelocity = true diff --git a/test/freeflow/navierstokes/test_navierstokes_kovasznay.input b/test/freeflow/navierstokes/test_navierstokes_kovasznay.input index 03029c6f46..1ac0582f42 100644 --- a/test/freeflow/navierstokes/test_navierstokes_kovasznay.input +++ b/test/freeflow/navierstokes/test_navierstokes_kovasznay.input @@ -18,4 +18,3 @@ MaxRelativeShift = 1e-5 [Vtk] WriteFaceData = false -AddVelocity = true diff --git a/test/freeflow/navierstokes/test_stokes_channel_3d.input b/test/freeflow/navierstokes/test_stokes_channel_3d.input index ce28a56783..7193f13d9b 100644 --- a/test/freeflow/navierstokes/test_stokes_channel_3d.input +++ b/test/freeflow/navierstokes/test_stokes_channel_3d.input @@ -20,7 +20,6 @@ MaxSteps = 10 MaxRelativeShift = 1e-8 [Vtk] -AddVelocity = true WriteFaceData = false [FluxOverPlane] diff --git a/test/freeflow/navierstokes/test_stokes_channel_pseudo3d.input b/test/freeflow/navierstokes/test_stokes_channel_pseudo3d.input index 462959a1c6..e450d1a3b7 100644 --- a/test/freeflow/navierstokes/test_stokes_channel_pseudo3d.input +++ b/test/freeflow/navierstokes/test_stokes_channel_pseudo3d.input @@ -22,4 +22,3 @@ NumericDifference.BaseEpsilon = 1e-8 [Vtk] WriteFaceData = false -AddVelocity = true diff --git a/test/freeflow/navierstokes/test_stokes_donea.input b/test/freeflow/navierstokes/test_stokes_donea.input index 1304128ffd..cf34501bff 100644 --- a/test/freeflow/navierstokes/test_stokes_donea.input +++ b/test/freeflow/navierstokes/test_stokes_donea.input @@ -13,4 +13,3 @@ MaxRelativeShift = 1e-5 [Vtk] WriteFaceData = false -AddVelocity = true diff --git a/test/freeflow/navierstokesnc/test_stokes2c_advection.input b/test/freeflow/navierstokesnc/test_stokes2c_advection.input index d3558dec4c..7b79ad4247 100644 --- a/test/freeflow/navierstokesnc/test_stokes2c_advection.input +++ b/test/freeflow/navierstokesnc/test_stokes2c_advection.input @@ -19,5 +19,4 @@ MaxSteps = 10 MaxRelativeShift = 1e-8 [Vtk] -AddVelocity = true WriteFaceData = false diff --git a/test/freeflow/navierstokesnc/test_stokes2c_densitydrivenflow.input b/test/freeflow/navierstokesnc/test_stokes2c_densitydrivenflow.input index ae643fd64c..e3dcd14f57 100644 --- a/test/freeflow/navierstokesnc/test_stokes2c_densitydrivenflow.input +++ b/test/freeflow/navierstokesnc/test_stokes2c_densitydrivenflow.input @@ -20,5 +20,4 @@ MaxSteps = 10 MaxRelativeShift = 1e-8 [Vtk] -AddVelocity = true WriteFaceData = false diff --git a/test/freeflow/navierstokesnc/test_stokes2c_purediffusion.input b/test/freeflow/navierstokesnc/test_stokes2c_purediffusion.input index bb365a1671..4fa305b802 100644 --- a/test/freeflow/navierstokesnc/test_stokes2c_purediffusion.input +++ b/test/freeflow/navierstokesnc/test_stokes2c_purediffusion.input @@ -16,5 +16,4 @@ MaxSteps = 10 MaxRelativeShift = 1e-8 [Vtk] -AddVelocity = true WriteFaceData = false diff --git a/test/freeflow/navierstokesnc/test_stokes2cni_advection.input b/test/freeflow/navierstokesnc/test_stokes2cni_advection.input index 8580cc0dff..43a8a92c73 100644 --- a/test/freeflow/navierstokesnc/test_stokes2cni_advection.input +++ b/test/freeflow/navierstokesnc/test_stokes2cni_advection.input @@ -19,5 +19,4 @@ MaxSteps = 10 MaxRelativeShift = 1e-8 [Vtk] -AddVelocity = true WriteFaceData = false diff --git a/test/freeflow/navierstokesnc/test_stokes2cni_diffusion.input b/test/freeflow/navierstokesnc/test_stokes2cni_diffusion.input index ec46ddaf8e..82d99aacaf 100644 --- a/test/freeflow/navierstokesnc/test_stokes2cni_diffusion.input +++ b/test/freeflow/navierstokesnc/test_stokes2cni_diffusion.input @@ -16,5 +16,4 @@ MaxSteps = 10 MaxRelativeShift = 1e-8 [Vtk] -AddVelocity = true WriteFaceData = false diff --git a/test/freeflow/rans/test_pipe_laufer.input b/test/freeflow/rans/test_pipe_laufer.input index b0245e8898..05350ff926 100644 --- a/test/freeflow/rans/test_pipe_laufer.input +++ b/test/freeflow/rans/test_pipe_laufer.input @@ -37,5 +37,4 @@ TargetSteps = 5 MaxRelativeShift = 1e-5 [Vtk] -AddVelocity = true WriteFaceData = false diff --git a/test/freeflow/rans/test_pipe_laufer_reference.input b/test/freeflow/rans/test_pipe_laufer_reference.input index ef597de3f0..398523ccd1 100644 --- a/test/freeflow/rans/test_pipe_laufer_reference.input +++ b/test/freeflow/rans/test_pipe_laufer_reference.input @@ -31,5 +31,4 @@ TargetSteps = 5 MaxRelativeShift = 1e-6 [Vtk] -AddVelocity = true WriteFaceData = false diff --git a/test/freeflow/rans/test_pipe_laufer_reference_wallfunction.input b/test/freeflow/rans/test_pipe_laufer_reference_wallfunction.input index b0e86caf4e..e1dccd2249 100644 --- a/test/freeflow/rans/test_pipe_laufer_reference_wallfunction.input +++ b/test/freeflow/rans/test_pipe_laufer_reference_wallfunction.input @@ -30,5 +30,4 @@ TargetSteps = 5 MaxRelativeShift = 1e-5 [Vtk] -AddVelocity = true WriteFaceData = true diff --git a/test/freeflow/rans/test_pipe_zeroeqni.input b/test/freeflow/rans/test_pipe_zeroeqni.input index 924d125906..9826fde708 100644 --- a/test/freeflow/rans/test_pipe_zeroeqni.input +++ b/test/freeflow/rans/test_pipe_zeroeqni.input @@ -29,5 +29,4 @@ MaxSteps = 10 MaxRelativeShift = 1e-5 [Vtk] -AddVelocity = true WriteFaceData = false diff --git a/test/freeflow/ransnc/test_flatplate2c.input b/test/freeflow/ransnc/test_flatplate2c.input index d55a971715..7ebd7c9bae 100644 --- a/test/freeflow/ransnc/test_flatplate2c.input +++ b/test/freeflow/ransnc/test_flatplate2c.input @@ -27,6 +27,3 @@ NumericEpsilon.BaseEpsilon = 1e-8 MaxSteps = 10 TargetSteps = 8 MaxRelativeShift = 1e-5 - -[Vtk] -AddVelocity = true diff --git a/test/freeflow/ransnc/test_flatplate2cni.input b/test/freeflow/ransnc/test_flatplate2cni.input index b23acfd7ee..ed2afed061 100644 --- a/test/freeflow/ransnc/test_flatplate2cni.input +++ b/test/freeflow/ransnc/test_flatplate2cni.input @@ -27,6 +27,3 @@ NumericDifferenceMethod = 0 MaxSteps = 10 TargetSteps = 8 MaxRelativeShift = 1e-5 - -[Vtk] -AddVelocity = true diff --git a/test/freeflow/ransnc/test_flatplate2cni_wallfunction.input b/test/freeflow/ransnc/test_flatplate2cni_wallfunction.input index 53b88eeca2..a39400964f 100644 --- a/test/freeflow/ransnc/test_flatplate2cni_wallfunction.input +++ b/test/freeflow/ransnc/test_flatplate2cni_wallfunction.input @@ -28,6 +28,3 @@ NumericDifferenceMethod = 0 MaxSteps = 10 TargetSteps = 8 MaxRelativeShift = 1e-5 - -[Vtk] -AddVelocity = true diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.input b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.input index 3021588f84..f890c4c15d 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.input +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.input @@ -34,8 +34,5 @@ Tortuosity = 0.5 Name = test_stokes1p2cdarcy1p2chorizontal EnableGravity = false -[Vtk] -AddVelocity = 1 - [Assembly.NumericDifference] BaseEpsilon = 1e-6 diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.input b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.input index 976011231b..45bdee9bf0 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.input +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.input @@ -30,8 +30,5 @@ Tortuosity = 0.5 Name = test_stokes1p2cdarcy1p2cvertical EnableGravity = false -[Vtk] -AddVelocity = 1 - [Assembly.NumericDifference] BaseEpsilon = 1e-6 diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical_diffusion.input b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical_diffusion.input index aea1232f6b..e43b3cdd95 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical_diffusion.input +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical_diffusion.input @@ -29,6 +29,3 @@ Tortuosity = 1.0 Name = test_stokes1p2cdarcy1p2cvertical_diffusion EnableGravity = false OnlyDiffusion = true - -[Vtk] -AddVelocity = 1 diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.input b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.input index 62dcb440c0..c7c6e3e6ce 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.input +++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.input @@ -48,7 +48,6 @@ EnableGravity = true InterfaceDiffusionCoefficientAvg = FreeFlowOnly [Vtk] -AddVelocity = true WriteFaceData = false [Newton] diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cnidarcy2p2cnihorizontal.input b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cnidarcy2p2cnihorizontal.input index 0199afc02c..d9ea198333 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cnidarcy2p2cnihorizontal.input +++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cnidarcy2p2cnihorizontal.input @@ -48,7 +48,6 @@ EnableGravity = true InterfaceDiffusionCoefficientAvg = FreeFlowOnly [Vtk] -AddVelocity = true WriteFaceData = false [Newton] diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.input b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.input index 5853715126..9072a25d56 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.input +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/test_stokes1pdarcy1phorizontal.input @@ -22,6 +22,3 @@ AlphaBeaversJoseph = 1.0 [Problem] Name = test_stokes1pdarcy1phorizontal EnableGravity = false - -[Vtk] -AddVelocity = 1 diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.input b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.input index 18e3f20b36..7b604260f7 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.input +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.input @@ -23,8 +23,5 @@ AlphaBeaversJoseph = 1.0 Name = test_stokes1pdarcy1pvertical EnableGravity = false -[Vtk] -AddVelocity = 1 - [Assembly.NumericDifference] BaseEpsilon = 1e-6 diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.input b/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.input index 35fa237d71..869307a12b 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.input +++ b/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.input @@ -37,9 +37,6 @@ VgN = 8.0 Name = test_stokes1pdarcy2pvertical EnableGravity = false -[Vtk] -AddVelocity = 1 - [Assembly.NumericDifference] BaseEpsilon = 1e-6 -- GitLab