From c9779723397736c2199a6b8d24e41567e2b6b132 Mon Sep 17 00:00:00 2001 From: Kilian Weishaupt Date: Fri, 31 Aug 2018 11:12:37 +0200 Subject: [PATCH 1/4] [freeflow] Make EnableInertiaTerms a runtime parameter * remove property --- dumux/common/parameters.hh | 1 + dumux/common/properties.hh | 1 - dumux/freeflow/compositional/navierstokesncmodel.hh | 1 - dumux/freeflow/navierstokes/model.hh | 1 - dumux/freeflow/navierstokes/problem.hh | 9 +++++++++ dumux/freeflow/navierstokes/staggered/fluxvariables.hh | 7 +++---- dumux/freeflow/rans/model.hh | 2 -- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dumux/common/parameters.hh b/dumux/common/parameters.hh index 8ac9c24e75..f0fe7178c0 100644 --- a/dumux/common/parameters.hh +++ b/dumux/common/parameters.hh @@ -232,6 +232,7 @@ private: // parameters in the problem group params["Problem.EnableGravity"] = "true"; + params["Problem.EnableInertiaTerms"] = "true"; // parameters in the Newton group params["Newton.MaxSteps"] = "18"; diff --git a/dumux/common/properties.hh b/dumux/common/properties.hh index 456e4c552f..1dac2c41ab 100644 --- a/dumux/common/properties.hh +++ b/dumux/common/properties.hh @@ -188,7 +188,6 @@ NEW_PROP_TAG(SherwoodFormulation); // Properties used by free flow models ///////////////////////////////////////////////////////////// -NEW_PROP_TAG(EnableInertiaTerms); //!< Returns whether to include inertia terms in the momentum balance eq or not (Stokes / Navier-Stokes) NEW_PROP_TAG(NormalizePressure); //!< Returns whether to normalize the pressure term in the momentum balance or not ///////////////////////////////////////////////////////////// diff --git a/dumux/freeflow/compositional/navierstokesncmodel.hh b/dumux/freeflow/compositional/navierstokesncmodel.hh index a4c28bd3ba..8b1e608675 100644 --- a/dumux/freeflow/compositional/navierstokesncmodel.hh +++ b/dumux/freeflow/compositional/navierstokesncmodel.hh @@ -152,7 +152,6 @@ public: SET_BOOL_PROP(NavierStokesNC, UseMoles, false); //!< Defines whether molar (true) or mass (false) density is used SET_INT_PROP(NavierStokesNC, ReplaceCompEqIdx, 0); //(paramGroup, "Problem.EnableGravity")) gravity_[dim-1] = -9.81; + + enableInertiaTerms_ = getParamFromGroup(paramGroup, "Problem.EnableInertiaTerms"); } /*! @@ -130,6 +132,12 @@ public: const GravityVector& gravity() const { return gravity_; } + /*! + * \brief Returns whether interia terms should be considered. + */ + bool enableInertiaTerms() const + { return enableInertiaTerms_; } + //! Applys the initial face solution (velocities on the faces). Specialization for staggered grid discretization. template typename std::enable_if::type @@ -246,6 +254,7 @@ private: { return *static_cast(this); } GravityVector gravity_; + bool enableInertiaTerms_; }; } // end namespace Dumux diff --git a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh index 84bf734ffa..657639ce3e 100644 --- a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh +++ b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh @@ -74,7 +74,6 @@ class NavierStokesFluxVariablesImpl using FacePrimaryVariables = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables); using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes); - static constexpr bool enableInertiaTerms = GET_PROP_VALUE(TypeTag, EnableInertiaTerms); static constexpr bool normalizePressure = GET_PROP_VALUE(TypeTag, NormalizePressure); using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -199,7 +198,7 @@ public: const auto& insideVolVars = elemVolVars[scvf.insideScvIdx()]; // Advective flux. - if(enableInertiaTerms) + if (problem.enableInertiaTerms()) { // Get the average velocity at the center of the element (i.e. the location of the staggered face). const Scalar transportingVelocity = (velocitySelf + velocityOpposite) * 0.5; @@ -329,7 +328,7 @@ public: } // If there is no symmetry or Neumann boundary condition for the given sub face, proceed to calculate the tangential momentum flux. - if(enableInertiaTerms) + if (problem.enableInertiaTerms()) normalFlux += computeAdvectivePartOfLateralMomentumFlux_(problem, element, scvf, normalFace, elemVolVars, faceVars, localSubFaceIdx, bcTypes); normalFlux += computeDiffusivePartOfLateralMomentumFlux_(problem, element, scvf, normalFace, elemVolVars, faceVars, localSubFaceIdx, bcTypes); @@ -557,7 +556,7 @@ private: FacePrimaryVariables inOrOutflow(0.0); // Advective momentum flux. - if(enableInertiaTerms) + if (problem.enableInertiaTerms()) { const Scalar velocitySelf = elemFaceVars[scvf].velocitySelf(); const auto& insideVolVars = elemVolVars[scvf.insideScvIdx()]; diff --git a/dumux/freeflow/rans/model.hh b/dumux/freeflow/rans/model.hh index 3532e1320a..62232a86d3 100644 --- a/dumux/freeflow/rans/model.hh +++ b/dumux/freeflow/rans/model.hh @@ -60,8 +60,6 @@ NEW_TYPE_TAG(RANS, INHERITS_FROM(NavierStokes)); /////////////////////////////////////////////////////////////////////////// // default property values for the isothermal single phase model /////////////////////////////////////////////////////////////////////////// -SET_BOOL_PROP(RANS, EnableInertiaTerms, true); //!< Explicitly force the consideration of inertia terms by default - /*! * \ingroup RANSModel * \brief Traits for the Reynolds-averaged Navier-Stokes model -- GitLab From fc4ecc99792a662d96614e9f4886639c6a29f041 Mon Sep 17 00:00:00 2001 From: Kilian Weishaupt Date: Fri, 31 Aug 2018 11:13:51 +0200 Subject: [PATCH 2/4] [test][freeflow] Fix Stokes channel test problem --- test/freeflow/navierstokes/channeltestproblem.hh | 7 ------- test/freeflow/navierstokes/test_channel_stokes.input | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/test/freeflow/navierstokes/channeltestproblem.hh b/test/freeflow/navierstokes/channeltestproblem.hh index cf323d7905..5c9dd1fb4e 100644 --- a/test/freeflow/navierstokes/channeltestproblem.hh +++ b/test/freeflow/navierstokes/channeltestproblem.hh @@ -68,13 +68,6 @@ SET_BOOL_PROP(ChannelTestTypeTag, EnableFVGridGeometryCache, true); SET_BOOL_PROP(ChannelTestTypeTag, EnableGridFluxVariablesCache, true); SET_BOOL_PROP(ChannelTestTypeTag, EnableGridVolumeVariablesCache, true); - - -#if ENABLE_NAVIERSTOKES -SET_BOOL_PROP(ChannelTestTypeTag, EnableInertiaTerms, true); -#else -SET_BOOL_PROP(ChannelTestTypeTag, EnableInertiaTerms, false); -#endif } /*! diff --git a/test/freeflow/navierstokes/test_channel_stokes.input b/test/freeflow/navierstokes/test_channel_stokes.input index ed56ca7244..d51547e34b 100644 --- a/test/freeflow/navierstokes/test_channel_stokes.input +++ b/test/freeflow/navierstokes/test_channel_stokes.input @@ -10,6 +10,7 @@ Cells = 100 50 Name = test_channel_stokes # name passed to the output routines InletVelocity = 1 EnableGravity = false +EnableInertiaTerms = false [ Newton ] MaxSteps = 10 -- GitLab From c94878fa4bee88e398f4d5fe8bd74e6267ea04bc Mon Sep 17 00:00:00 2001 From: Lincoln Sherpa Date: Tue, 4 Sep 2018 11:25:25 +0200 Subject: [PATCH 3/4] [test][navierstokes] Use same executable for Stokes/NavierStokes channel test * rename test --- test/freeflow/navierstokes/CMakeLists.txt | 51 ++++++++++++----------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/test/freeflow/navierstokes/CMakeLists.txt b/test/freeflow/navierstokes/CMakeLists.txt index 09e9e5c151..3687b99ed6 100644 --- a/test/freeflow/navierstokes/CMakeLists.txt +++ b/test/freeflow/navierstokes/CMakeLists.txt @@ -31,14 +31,37 @@ dune_add_test(NAME test_navierstokes_hydrostaticpressure --command "${CMAKE_CURRENT_BINARY_DIR}/test_closedsystem test_hydrostaticpressure.input" --zeroThreshold {"velocity_liq \(m/s\)":1e-16}) -dune_add_test(NAME test_channel_stokes - SOURCES test_channel.cc +add_executable(test_channel EXCLUDE_FROM_ALL test_channel.cc) + +dune_add_test(NAME test_stokes_channel + TARGET test_channel CMAKE_GUARD HAVE_UMFPACK COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/channel-stokes.vtu ${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokes-00002.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokes") + --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel test_channel_stokes.input") + +dune_add_test(NAME test_navierstokes_channel + TARGET test_channel + CMAKE_GUARD HAVE_UMFPACK + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/channel-navierstokes-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/test_channel_navierstokes-00002.vtu + --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel test_channel_navierstokes.input -Vtk.WriteFaceData 1") + +dune_add_test(NAME test_navierstokes_channel_restart + TARGET test_channel + CMAKE_GUARD HAVE_UMFPACK + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/channel-navierstokes-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/test_channel_navierstokes_restart-00001.vtu + --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel test_channel_navierstokes.input -Vtk.WriteFaceData 1 -TimeLoop.DtInitial 1 -Restart.Time 1 -CellCenter.Restart.File test_channel_navierstokes-00001.vtu -Face.Restart.File test_channel_navierstokes-face-00001.vtp -Problem.Name test_channel_navierstokes_restart") + +# the restart test has to run after the test that produces the corresponding vtu file +set_tests_properties(test_navierstokes_channel_restart PROPERTIES DEPENDS test_channel_navierstokes) add_executable(test_channel_stokesni EXCLUDE_FROM_ALL test_channel.cc) target_compile_definitions(test_channel_stokesni PUBLIC "NONISOTHERMAL=1") @@ -62,28 +85,6 @@ dune_add_test(NAME test_channel_stokesni_conduction --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokesni test_channel_stokesni_conduction.input" --zeroThreshold {"velocity_liq \(m/s\)":1e-20}) -dune_add_test(NAME test_channel_navierstokes - SOURCES test_channel.cc - COMPILE_DEFINITIONS ENABLE_NAVIERSTOKES=1 - CMAKE_GUARD HAVE_UMFPACK - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/channel-navierstokes-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/test_channel_navierstokes-00002.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel_navierstokes -Vtk.WriteFaceData 1") - -dune_add_test(NAME test_channel_navierstokes_restart - TARGET test_channel_navierstokes - CMAKE_GUARD HAVE_UMFPACK - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/channel-navierstokes-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/test_channel_navierstokes_restart-00001.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel_navierstokes -Vtk.WriteFaceData 1 -TimeLoop.DtInitial 1 -Restart.Time 1 -CellCenter.Restart.File test_channel_navierstokes-00001.vtu -Face.Restart.File test_channel_navierstokes-face-00001.vtp -Problem.Name test_channel_navierstokes_restart") - -# the restart test has to run after the test that produces the corresponding vtu file -set_tests_properties(test_channel_navierstokes_restart PROPERTIES DEPENDS test_channel_navierstokes) - dune_add_test(NAME test_stokes_donea_no_caching SOURCES test_donea.cc CMAKE_GUARD HAVE_UMFPACK -- GitLab From e63e1ec35046b280a64f93b8012bd080d265b0d4 Mon Sep 17 00:00:00 2001 From: Lincoln Sherpa Date: Tue, 4 Sep 2018 12:12:32 +0200 Subject: [PATCH 4/4] [test][freeflow] Account for runtime inertia in all test --- test/freeflow/navierstokes/angelitestproblem.hh | 1 - test/freeflow/navierstokes/doneatestproblem.hh | 6 ------ test/freeflow/navierstokes/kovasznaytestproblem.hh | 2 -- test/freeflow/navierstokes/navierstokesanalyticproblem.hh | 3 +-- .../navierstokes/test_channel_stokesni_convection.input | 1 + test/freeflow/navierstokes/test_navierstokes_1d.input | 1 + test/freeflow/navierstokes/test_navierstokes_angeli.input | 1 + .../freeflow/navierstokes/test_navierstokes_kovasznay.input | 1 + test/freeflow/navierstokes/test_stokes_donea.input | 1 + test/freeflow/navierstokesnc/channeltestproblem.hh | 1 - test/freeflow/navierstokesnc/densityflowproblem.hh | 6 ------ test/freeflow/navierstokesnc/msfreeflowtestproblem.hh | 2 -- test/freeflow/navierstokesnc/test_msfreeflow.input | 1 + .../navierstokesnc/test_stokes2c_densitydrivenflow.input | 1 + .../navierstokesnc/test_stokes2c_purediffusion.input | 1 + .../stokesdarcy/1p2c_1p2c/horizontalflow/stokesproblem.hh | 3 --- .../horizontalflow/test_stokes1p2cdarcy1p2chorizontal.input | 1 + .../stokesdarcy/1p2c_1p2c/verticalflow/stokesproblem.hh | 3 --- .../verticalflow/test_stokes1p2cdarcy1p2cvertical.input | 1 + .../test_stokes1p2cdarcy1p2cvertical_diffusion.input | 1 + .../boundary/stokesdarcy/1p2c_2p2c/stokesproblem.hh | 1 - .../1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.input | 1 + .../1p2c_2p2c/test_stokes1p2cnidarcy2p2cnihorizontal.input | 1 + .../stokesdarcy/1p_1p/horizontalflow/stokesproblem.hh | 6 ------ .../horizontalflow/test_stokes1pdarcy1phorizontal.input | 1 + .../stokesdarcy/1p_1p/verticalflow/stokesproblem.hh | 5 ----- .../1p_1p/verticalflow/test_stokes1pdarcy1pvertical.input | 1 + .../multidomain/boundary/stokesdarcy/1p_2p/stokesproblem.hh | 1 - .../stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.input | 1 + 29 files changed, 17 insertions(+), 39 deletions(-) diff --git a/test/freeflow/navierstokes/angelitestproblem.hh b/test/freeflow/navierstokes/angelitestproblem.hh index fe3ef82212..4774e38973 100644 --- a/test/freeflow/navierstokes/angelitestproblem.hh +++ b/test/freeflow/navierstokes/angelitestproblem.hh @@ -63,7 +63,6 @@ SET_BOOL_PROP(AngeliTestTypeTag, EnableFVGridGeometryCache, true); SET_BOOL_PROP(AngeliTestTypeTag, EnableGridFluxVariablesCache, true); SET_BOOL_PROP(AngeliTestTypeTag, EnableGridVolumeVariablesCache, true); -SET_BOOL_PROP(AngeliTestTypeTag, EnableInertiaTerms, true); } /*! diff --git a/test/freeflow/navierstokes/doneatestproblem.hh b/test/freeflow/navierstokes/doneatestproblem.hh index 8010fd045d..3c8b631306 100644 --- a/test/freeflow/navierstokes/doneatestproblem.hh +++ b/test/freeflow/navierstokes/doneatestproblem.hh @@ -65,12 +65,6 @@ SET_BOOL_PROP(DoneaTestTypeTag, EnableFVGridGeometryCache, ENABLECACHING); SET_BOOL_PROP(DoneaTestTypeTag, EnableGridFluxVariablesCache, ENABLECACHING); SET_BOOL_PROP(DoneaTestTypeTag, EnableGridVolumeVariablesCache, ENABLECACHING); SET_BOOL_PROP(DoneaTestTypeTag, EnableGridFaceVariablesCache, ENABLECACHING); - -#if ENABLE_NAVIERSTOKES -SET_BOOL_PROP(DoneaTestTypeTag, EnableInertiaTerms, true); -#else -SET_BOOL_PROP(DoneaTestTypeTag, EnableInertiaTerms, false); -#endif } /*! diff --git a/test/freeflow/navierstokes/kovasznaytestproblem.hh b/test/freeflow/navierstokes/kovasznaytestproblem.hh index e56c8a48bc..482931fba3 100644 --- a/test/freeflow/navierstokes/kovasznaytestproblem.hh +++ b/test/freeflow/navierstokes/kovasznaytestproblem.hh @@ -60,8 +60,6 @@ SET_BOOL_PROP(KovasznayTestTypeTag, EnableFVGridGeometryCache, true); SET_BOOL_PROP(KovasznayTestTypeTag, EnableGridFluxVariablesCache, true); SET_BOOL_PROP(KovasznayTestTypeTag, EnableGridVolumeVariablesCache, true); - -SET_BOOL_PROP(KovasznayTestTypeTag, EnableInertiaTerms, true); } /*! diff --git a/test/freeflow/navierstokes/navierstokesanalyticproblem.hh b/test/freeflow/navierstokes/navierstokesanalyticproblem.hh index 38833db5d1..e9e28a1dd2 100644 --- a/test/freeflow/navierstokes/navierstokesanalyticproblem.hh +++ b/test/freeflow/navierstokes/navierstokesanalyticproblem.hh @@ -64,7 +64,6 @@ SET_BOOL_PROP(NavierStokesAnalyticTypeTag, EnableFVGridGeometryCache, true); SET_BOOL_PROP(NavierStokesAnalyticTypeTag, EnableGridFluxVariablesCache, true); SET_BOOL_PROP(NavierStokesAnalyticTypeTag, EnableGridVolumeVariablesCache, true); -SET_BOOL_PROP(NavierStokesAnalyticTypeTag, EnableInertiaTerms, true); SET_BOOL_PROP(NavierStokesAnalyticTypeTag, NormalizePressure, false); } @@ -162,7 +161,7 @@ public: for (unsigned int dimIdx = 0; dimIdx < dimWorld; ++dimIdx) { // inertia term - if (GET_PROP_VALUE(TypeTag, EnableInertiaTerms)) + if (this->enableInertiaTerms()) source[Indices::velocity(velIdx)] += density_ * dv2dx(globalPos)[velIdx][dimIdx]; // viscous term (molecular) diff --git a/test/freeflow/navierstokes/test_channel_stokesni_convection.input b/test/freeflow/navierstokes/test_channel_stokesni_convection.input index 353c4b3582..4852cc98a0 100644 --- a/test/freeflow/navierstokes/test_channel_stokesni_convection.input +++ b/test/freeflow/navierstokes/test_channel_stokesni_convection.input @@ -10,6 +10,7 @@ Cells = 100 50 Name = test_channel_stokesni_convection # name passed to the output routines InletVelocity = 1e-2 EnableGravity = false +EnableInertiaTerms = false [ Newton ] MaxSteps = 10 diff --git a/test/freeflow/navierstokes/test_navierstokes_1d.input b/test/freeflow/navierstokes/test_navierstokes_1d.input index a6a61d8265..a4ae88d33c 100644 --- a/test/freeflow/navierstokes/test_navierstokes_1d.input +++ b/test/freeflow/navierstokes/test_navierstokes_1d.input @@ -5,6 +5,7 @@ Cells = 32 [Problem] Name = test_navierstokes_1d EnableGravity = false +EnableInertiaTerms = true PrintL2Error = true [Component] diff --git a/test/freeflow/navierstokes/test_navierstokes_angeli.input b/test/freeflow/navierstokes/test_navierstokes_angeli.input index 787d776fc0..a7f02d5582 100644 --- a/test/freeflow/navierstokes/test_navierstokes_angeli.input +++ b/test/freeflow/navierstokes/test_navierstokes_angeli.input @@ -11,6 +11,7 @@ Cells = 50 50 Name = test_angeli # name passed to the output routines EnableGravity = false PrintL2Error = false +EnableInertiaTerms = true [Component] LiquidDensity = 1 diff --git a/test/freeflow/navierstokes/test_navierstokes_kovasznay.input b/test/freeflow/navierstokes/test_navierstokes_kovasznay.input index 1ac0582f42..0f47acc145 100644 --- a/test/freeflow/navierstokes/test_navierstokes_kovasznay.input +++ b/test/freeflow/navierstokes/test_navierstokes_kovasznay.input @@ -7,6 +7,7 @@ Cells = 50 50 Name = test_kovasznay # name passed to the output routines EnableGravity = false PrintL2Error = false +EnableInertiaTerms = true [Component] LiquidDensity = 1 diff --git a/test/freeflow/navierstokes/test_stokes_donea.input b/test/freeflow/navierstokes/test_stokes_donea.input index cf34501bff..08c0f18b11 100644 --- a/test/freeflow/navierstokes/test_stokes_donea.input +++ b/test/freeflow/navierstokes/test_stokes_donea.input @@ -6,6 +6,7 @@ Cells = 40 40 Name = test_donea # name passed to the output routines EnableGravity = false PrintL2Error = false +EnableInertiaTerms = false [ Newton ] MaxSteps = 10 diff --git a/test/freeflow/navierstokesnc/channeltestproblem.hh b/test/freeflow/navierstokesnc/channeltestproblem.hh index ae5e3460ac..023a2e3af8 100644 --- a/test/freeflow/navierstokesnc/channeltestproblem.hh +++ b/test/freeflow/navierstokesnc/channeltestproblem.hh @@ -80,7 +80,6 @@ SET_BOOL_PROP(ChannelNCTestTypeTag, UseMoles, false); SET_BOOL_PROP(ChannelNCTestTypeTag, UseMoles, true); #endif -SET_BOOL_PROP(ChannelNCTestTypeTag, EnableInertiaTerms, true); } /*! diff --git a/test/freeflow/navierstokesnc/densityflowproblem.hh b/test/freeflow/navierstokesnc/densityflowproblem.hh index 759e7e6d30..329588d932 100644 --- a/test/freeflow/navierstokesnc/densityflowproblem.hh +++ b/test/freeflow/navierstokesnc/densityflowproblem.hh @@ -66,12 +66,6 @@ SET_BOOL_PROP(DensityDrivenFlowTypeTag, EnableGridFluxVariablesCache, true); SET_BOOL_PROP(DensityDrivenFlowTypeTag, EnableGridVolumeVariablesCache, true); SET_BOOL_PROP(DensityDrivenFlowTypeTag, UseMoles, true); - -#if ENABLE_NAVIERSTOKES -SET_BOOL_PROP(DensityDrivenFlowTypeTag, EnableInertiaTerms, true); -#else -SET_BOOL_PROP(DensityDrivenFlowTypeTag, EnableInertiaTerms, false); -#endif } /*! diff --git a/test/freeflow/navierstokesnc/msfreeflowtestproblem.hh b/test/freeflow/navierstokesnc/msfreeflowtestproblem.hh index 4195349bbd..20d850f9ac 100644 --- a/test/freeflow/navierstokesnc/msfreeflowtestproblem.hh +++ b/test/freeflow/navierstokesnc/msfreeflowtestproblem.hh @@ -61,8 +61,6 @@ SET_BOOL_PROP(MaxwellStefanNCTestTypeTag, EnableGridVolumeVariablesCache, true); SET_BOOL_PROP(MaxwellStefanNCTestTypeTag, UseMoles, true); -// #if ENABLE_NAVIERSTOKES -SET_BOOL_PROP(MaxwellStefanNCTestTypeTag, EnableInertiaTerms, false); //! Here we set FicksLaw or MaxwellStefansLaw SET_TYPE_PROP(MaxwellStefanNCTestTypeTag, MolecularDiffusionType, MaxwellStefansLaw); diff --git a/test/freeflow/navierstokesnc/test_msfreeflow.input b/test/freeflow/navierstokesnc/test_msfreeflow.input index c0eccab791..10e89416e4 100644 --- a/test/freeflow/navierstokesnc/test_msfreeflow.input +++ b/test/freeflow/navierstokesnc/test_msfreeflow.input @@ -10,6 +10,7 @@ Cells = 30 30 [Problem] Name = test_msfreeflow # name passed to the output routines EnableGravity = false +EnableInertiaTerms = false [Assembly] NumericDifference.BaseEpsilon = 1e-8 diff --git a/test/freeflow/navierstokesnc/test_stokes2c_densitydrivenflow.input b/test/freeflow/navierstokesnc/test_stokes2c_densitydrivenflow.input index e3dcd14f57..5ef4ec8e1e 100644 --- a/test/freeflow/navierstokesnc/test_stokes2c_densitydrivenflow.input +++ b/test/freeflow/navierstokesnc/test_stokes2c_densitydrivenflow.input @@ -10,6 +10,7 @@ Cells = 40 40 [Problem] Name = test_densitydrivenflow # name passed to the output routines EnableGravity = true +EnableInertiaTerms = false UseWholeLength = false [Assembly] diff --git a/test/freeflow/navierstokesnc/test_stokes2c_purediffusion.input b/test/freeflow/navierstokesnc/test_stokes2c_purediffusion.input index 4fa305b802..c974a39245 100644 --- a/test/freeflow/navierstokesnc/test_stokes2c_purediffusion.input +++ b/test/freeflow/navierstokesnc/test_stokes2c_purediffusion.input @@ -10,6 +10,7 @@ Cells = 50 10 Name = test_purediffusion # name passed to the output routines InletVelocity = 0 EnableGravity = false +EnableInertiaTerms = false [ Newton ] MaxSteps = 10 diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/stokesproblem.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/stokesproblem.hh index a3627d4896..831af14ecf 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/stokesproblem.hh +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/stokesproblem.hh @@ -60,9 +60,6 @@ SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableFVGridGeometryCache, true); SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableGridFluxVariablesCache, true); SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableGridVolumeVariablesCache, true); -// Do consider intertia terms -SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableInertiaTerms, true); - // Use moles SET_BOOL_PROP(StokesOnePTwoCTypeTag, UseMoles, 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..5e7d7becc0 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.input +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/test_stokes1p2cdarcy1p2chorizontal.input @@ -33,6 +33,7 @@ Tortuosity = 0.5 [Problem] Name = test_stokes1p2cdarcy1p2chorizontal EnableGravity = false +EnableInertiaTerms = true [Vtk] AddVelocity = 1 diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/stokesproblem.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/stokesproblem.hh index ade5e9b2e1..d4edcc7fcf 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/stokesproblem.hh +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/stokesproblem.hh @@ -61,9 +61,6 @@ SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableFVGridGeometryCache, true); SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableGridFluxVariablesCache, true); SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableGridVolumeVariablesCache, true); -// Do not consider intertia terms -SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableInertiaTerms, false); - // Use moles SET_BOOL_PROP(StokesOnePTwoCTypeTag, UseMoles, true); 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..21a53d3b2e 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.input +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/test_stokes1p2cdarcy1p2cvertical.input @@ -29,6 +29,7 @@ Tortuosity = 0.5 [Problem] Name = test_stokes1p2cdarcy1p2cvertical EnableGravity = false +EnableInertiaTerms = false [Vtk] AddVelocity = 1 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..5c9e75c74d 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,7 @@ Tortuosity = 1.0 Name = test_stokes1p2cdarcy1p2cvertical_diffusion EnableGravity = false OnlyDiffusion = true +EnableInertiaTerms = false [Vtk] AddVelocity = 1 diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/stokesproblem.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/stokesproblem.hh index dd402578eb..af1f0bacfa 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/stokesproblem.hh +++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/stokesproblem.hh @@ -70,7 +70,6 @@ SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableFVGridGeometryCache, true); SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableGridFluxVariablesCache, true); SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableGridVolumeVariablesCache, true); -SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableInertiaTerms, false); } /*! diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.input b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.input index 62dcb440c0..021d75a2c5 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.input +++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cdarcy2p2chorizontal.input @@ -46,6 +46,7 @@ VgN = 6.9 Name = test_stokes1p2cdarcy2p2chorizontal EnableGravity = true InterfaceDiffusionCoefficientAvg = FreeFlowOnly +EnableInertiaTerms = false [Vtk] AddVelocity = true diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cnidarcy2p2cnihorizontal.input b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cnidarcy2p2cnihorizontal.input index 0199afc02c..605981e244 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cnidarcy2p2cnihorizontal.input +++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/test_stokes1p2cnidarcy2p2cnihorizontal.input @@ -46,6 +46,7 @@ VgN = 6.9 Name = test_stokes1p2cnidarcy2p2cnihorizontal EnableGravity = true InterfaceDiffusionCoefficientAvg = FreeFlowOnly +EnableInertiaTerms = false [Vtk] AddVelocity = true diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/stokesproblem.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/stokesproblem.hh index ebac7abfb5..c5515e5c1c 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/stokesproblem.hh +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/stokesproblem.hh @@ -58,12 +58,6 @@ SET_TYPE_PROP(StokesOnePTypeTag, Problem, Dumux::StokesSubProblem ); SET_BOOL_PROP(StokesOnePTypeTag, EnableFVGridGeometryCache, true); SET_BOOL_PROP(StokesOnePTypeTag, EnableGridFluxVariablesCache, true); SET_BOOL_PROP(StokesOnePTypeTag, EnableGridVolumeVariablesCache, true); - -// #if ENABLE_NAVIERSTOKES -// SET_BOOL_PROP(StokesOnePTypeTag, EnableInertiaTerms, true); -// #else -SET_BOOL_PROP(StokesOnePTypeTag, EnableInertiaTerms, false); -// #endif } /*! 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..733159e0a5 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,7 @@ AlphaBeaversJoseph = 1.0 [Problem] Name = test_stokes1pdarcy1phorizontal EnableGravity = false +EnableInertiaTerms = false [Vtk] AddVelocity = 1 diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/stokesproblem.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/stokesproblem.hh index 0bb929504b..b3ed077d3c 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/stokesproblem.hh +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/stokesproblem.hh @@ -59,11 +59,6 @@ SET_BOOL_PROP(StokesOnePTypeTag, EnableFVGridGeometryCache, true); SET_BOOL_PROP(StokesOnePTypeTag, EnableGridFluxVariablesCache, true); SET_BOOL_PROP(StokesOnePTypeTag, EnableGridVolumeVariablesCache, true); -// #if ENABLE_NAVIERSTOKES -// SET_BOOL_PROP(StokesOnePTypeTag, EnableInertiaTerms, true); -// #else -SET_BOOL_PROP(StokesOnePTypeTag, EnableInertiaTerms, false); -// #endif } /*! 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..1668c9f102 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.input +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/test_stokes1pdarcy1pvertical.input @@ -22,6 +22,7 @@ AlphaBeaversJoseph = 1.0 [Problem] Name = test_stokes1pdarcy1pvertical EnableGravity = false +EnableInertiaTerms = false [Vtk] AddVelocity = 1 diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/stokesproblem.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/stokesproblem.hh index 48c5129c3d..5673009b91 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_2p/stokesproblem.hh +++ b/test/multidomain/boundary/stokesdarcy/1p_2p/stokesproblem.hh @@ -49,7 +49,6 @@ SET_BOOL_PROP(StokesOnePTypeTag, EnableFVGridGeometryCache, true); SET_BOOL_PROP(StokesOnePTypeTag, EnableGridFluxVariablesCache, true); SET_BOOL_PROP(StokesOnePTypeTag, EnableGridVolumeVariablesCache, true); -SET_BOOL_PROP(StokesOnePTypeTag, EnableInertiaTerms, false); } /*! diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.input b/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.input index 35fa237d71..7cb75e9002 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.input +++ b/test/multidomain/boundary/stokesdarcy/1p_2p/test_stokes1pdarcy2pvertical.input @@ -36,6 +36,7 @@ VgN = 8.0 [Problem] Name = test_stokes1pdarcy2pvertical EnableGravity = false +EnableInertiaTerms = false [Vtk] AddVelocity = 1 -- GitLab