From aea26df61a74f73109d920b9798d924bd968ae5d Mon Sep 17 00:00:00 2001
From: Stefanie Kiemle <stefanie.kiemle@iws.uni-stuttgart.de>
Date: Wed, 22 Mar 2023 14:29:19 +0100
Subject: [PATCH] [cleanup] Remove deprecated type tag for momentum model
---
.../navierstokes/channel/3d_nonuniform/properties.hh | 7 +++----
.../navierstokes/channel/pipe/momentum/properties.hh | 7 +++----
test/freeflow/navierstokes/donea/CMakeLists.txt | 8 ++++----
test/freeflow/navierstokes/donea/properties_momentum.hh | 4 +---
4 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/test/freeflow/navierstokes/channel/3d_nonuniform/properties.hh b/test/freeflow/navierstokes/channel/3d_nonuniform/properties.hh
index fa4d709499..d63f4b5923 100644
--- a/test/freeflow/navierstokes/channel/3d_nonuniform/properties.hh
+++ b/test/freeflow/navierstokes/channel/3d_nonuniform/properties.hh
@@ -48,11 +48,10 @@
#include <dumux/discretization/box/subcontrolvolumeface.hh>
#include <dumux/discretization/box/fvgridgeometry.hh>
-#include <dumux/freeflow/navierstokes/momentum/diamond/model.hh>
-#include <dumux/freeflow/navierstokes/momentum/pq1bubble/model.hh>
#include <dumux/freeflow/navierstokes/mass/1p/model.hh>
#include <dumux/freeflow/navierstokes/momentum/problem.hh>
#include <dumux/freeflow/navierstokes/mass/problem.hh>
+#include <dumux/freeflow/navierstokes/momentum/cvfe/model.hh>
#include <dumux/material/components/constant.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
@@ -66,8 +65,8 @@ namespace Dumux::Properties {
// Create new type tags
namespace TTag {
struct ThreeDChannelTest {};
-struct ThreeDChannelTestMomentumDiamond { using InheritsFrom = std::tuple<ThreeDChannelTest, NavierStokesMomentumDiamond, FaceCenteredDiamondModel>; };
-struct ThreeDChannelTestMomentumPQ1Bubble { using InheritsFrom = std::tuple<ThreeDChannelTest, NavierStokesMomentumPQ1Bubble, PQ1BubbleModel>; };
+struct ThreeDChannelTestMomentumDiamond { using InheritsFrom = std::tuple<ThreeDChannelTest, NavierStokesMomentumCVFE, FaceCenteredDiamondModel>; };
+struct ThreeDChannelTestMomentumPQ1Bubble { using InheritsFrom = std::tuple<ThreeDChannelTest, NavierStokesMomentumCVFE, PQ1BubbleModel>; };
struct ThreeDChannelTestMassTpfa { using InheritsFrom = std::tuple<ThreeDChannelTest, NavierStokesMassOneP, CCTpfaModel>; };
struct ThreeDChannelTestMassBox { using InheritsFrom = std::tuple<ThreeDChannelTest, NavierStokesMassOneP, BoxModel>; };
} // end namespace TTag
diff --git a/test/freeflow/navierstokes/channel/pipe/momentum/properties.hh b/test/freeflow/navierstokes/channel/pipe/momentum/properties.hh
index 821063fb04..c2c852f0a0 100644
--- a/test/freeflow/navierstokes/channel/pipe/momentum/properties.hh
+++ b/test/freeflow/navierstokes/channel/pipe/momentum/properties.hh
@@ -27,8 +27,7 @@
#include <dune/grid/yaspgrid.hh>
-#include <dumux/freeflow/navierstokes/momentum/diamond/model.hh>
-#include <dumux/freeflow/navierstokes/momentum/pq1bubble/model.hh>
+#include <dumux/freeflow/navierstokes/momentum/cvfe/model.hh>
#include <dumux/freeflow/navierstokes/momentum/problem.hh>
#include <dumux/discretization/fcdiamond.hh>
@@ -44,8 +43,8 @@ namespace Dumux::Properties {
// Create new type tags
namespace TTag {
struct PipeFlow { };
-struct PipeFlowDiamond { using InheritsFrom = std::tuple<NavierStokesMomentumDiamond, FaceCenteredDiamondModel, PipeFlow>; };
-struct PipeFlowPQ1Bubble { using InheritsFrom = std::tuple<NavierStokesMomentumPQ1Bubble, PQ1BubbleModel, PipeFlow>; };
+struct PipeFlowDiamond { using InheritsFrom = std::tuple<NavierStokesMomentumCVFE, FaceCenteredDiamondModel, PipeFlow>; };
+struct PipeFlowPQ1Bubble { using InheritsFrom = std::tuple<NavierStokesMomentumCVFE, PQ1BubbleModel, PipeFlow>; };
} // end namespace TTag
// the fluid system
diff --git a/test/freeflow/navierstokes/donea/CMakeLists.txt b/test/freeflow/navierstokes/donea/CMakeLists.txt
index 79437cb809..97aca98c3b 100644
--- a/test/freeflow/navierstokes/donea/CMakeLists.txt
+++ b/test/freeflow/navierstokes/donea/CMakeLists.txt
@@ -119,7 +119,7 @@ dumux_add_test(NAME test_ff_stokes_donea_momentum_diamond_quad
CMAKE_GUARD "( HAVE_UMFPACK AND dune-alugrid_FOUND )"
COMPILE_DEFINITIONS GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming>
COMPILE_DEFINITIONS DISCRETIZATION_MODEL=FaceCenteredDiamondModel
- COMPILE_DEFINITIONS NAVIER_STOKES_MODEL=NavierStokesMomentumDiamond
+ COMPILE_DEFINITIONS NAVIER_STOKES_MODEL=NavierStokesMomentumCVFE
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_stokes_donea_momentum_diamond_quad-reference.vtu
@@ -144,7 +144,7 @@ dumux_add_test(NAME test_ff_stokes_donea_momentum_diamond_simplex
CMAKE_GUARD "( HAVE_UMFPACK AND dune-alugrid_FOUND )"
COMPILE_DEFINITIONS GRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::nonconforming>
COMPILE_DEFINITIONS DISCRETIZATION_MODEL=FaceCenteredDiamondModel
- COMPILE_DEFINITIONS NAVIER_STOKES_MODEL=NavierStokesMomentumDiamond
+ COMPILE_DEFINITIONS NAVIER_STOKES_MODEL=NavierStokesMomentumCVFE
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_stokes_donea_momentum_diamond_simplex-reference.vtu
@@ -170,7 +170,7 @@ dumux_add_test(NAME test_ff_stokes_donea_momentum_pq1bubble_quad
CMAKE_GUARD "( HAVE_UMFPACK AND dune-alugrid_FOUND )"
COMPILE_DEFINITIONS GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming>
COMPILE_DEFINITIONS DISCRETIZATION_MODEL=PQ1BubbleModel
- COMPILE_DEFINITIONS NAVIER_STOKES_MODEL=NavierStokesMomentumPQ1Bubble
+ COMPILE_DEFINITIONS NAVIER_STOKES_MODEL=NavierStokesMomentumCVFE
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_stokes_donea_momentum_pq1bubble_quad-reference.vtu
@@ -184,7 +184,7 @@ dumux_add_test(NAME test_ff_stokes_donea_momentum_pq1bubble_simplex
CMAKE_GUARD "( HAVE_UMFPACK AND dune-alugrid_FOUND )"
COMPILE_DEFINITIONS GRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::nonconforming>
COMPILE_DEFINITIONS DISCRETIZATION_MODEL=PQ1BubbleModel
- COMPILE_DEFINITIONS NAVIER_STOKES_MODEL=NavierStokesMomentumPQ1Bubble
+ COMPILE_DEFINITIONS NAVIER_STOKES_MODEL=NavierStokesMomentumCVFE
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_stokes_donea_momentum_pq1bubble_simplex-reference.vtu
diff --git a/test/freeflow/navierstokes/donea/properties_momentum.hh b/test/freeflow/navierstokes/donea/properties_momentum.hh
index 17455be604..637b29c38c 100644
--- a/test/freeflow/navierstokes/donea/properties_momentum.hh
+++ b/test/freeflow/navierstokes/donea/properties_momentum.hh
@@ -50,11 +50,9 @@
#include <dumux/freeflow/navierstokes/momentum/model.hh>
#include <dumux/freeflow/navierstokes/momentum/problem.hh>
#include <dumux/discretization/fcstaggered.hh>
+#include <dumux/freeflow/navierstokes/momentum/cvfe/model.hh>
-#include <dumux/freeflow/navierstokes/momentum/diamond/model.hh>
#include <dumux/discretization/fcdiamond.hh>
-
-#include <dumux/freeflow/navierstokes/momentum/pq1bubble/model.hh>
#include <dumux/discretization/pq1bubble.hh>
#include "problem.hh"
--
GitLab