From d4445f8a58a05a46d9869af3ab50fbd4d86c747c Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Fri, 20 Jul 2018 15:40:28 +0200 Subject: [PATCH] [io][staggered] Enable velocity output per default --- dumux/discretization/staggered/freeflow/velocityoutput.hh | 5 +++-- 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 - .../freeflow/navierstokes/test_stokes_channel_pseudo3d.input | 1 - test/freeflow/navierstokes/test_stokes_donea.input | 1 - test/freeflow/navierstokesnc/test_msfreeflow.input | 1 + test/freeflow/navierstokesnc/test_stokes2c_advection.input | 1 - .../navierstokesnc/test_stokes2c_densitydrivenflow.input | 1 - .../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 --- 27 files changed, 4 insertions(+), 34 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<bool>(gridVariables.curGridVolVars().problem().paramGroup(), "Vtk.AddVelocity"); + // enable per default + enableOutput_ = getParamFromGroup<bool>(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 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_msfreeflow.input b/test/freeflow/navierstokesnc/test_msfreeflow.input index 2bd101ed81..c0eccab791 100644 --- a/test/freeflow/navierstokesnc/test_msfreeflow.input +++ b/test/freeflow/navierstokesnc/test_msfreeflow.input @@ -20,3 +20,4 @@ MaxRelativeShift = 1e-8 [Vtk] WriteFaceData = false +AddVelocity = false 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 -- GitLab