From ffef57b3f6aac48537d691d4ebf78c0997f99ae3 Mon Sep 17 00:00:00 2001
From: Timo Koch <timokoch@math.uio.no>
Date: Fri, 17 Mar 2023 19:53:20 +0100
Subject: [PATCH] [assembler] Use CFVE localassembler
---
dumux/assembly/fvassembler.hh | 24 ++++--------------------
1 file changed, 4 insertions(+), 20 deletions(-)
diff --git a/dumux/assembly/fvassembler.hh b/dumux/assembly/fvassembler.hh
index 13b298370a..ed9840745b 100644
--- a/dumux/assembly/fvassembler.hh
+++ b/dumux/assembly/fvassembler.hh
@@ -47,22 +47,20 @@
#include <dumux/parallel/multithreading.hh>
#include <dumux/parallel/parallel_for.hh>
-#include "boxlocalassembler.hh"
+#include "cvfelocalassembler.hh"
#include "cclocalassembler.hh"
#include "fclocalassembler.hh"
-#include "fcdiamondlocalassembler.hh"
-#include "pq1bubblelocalassembler.hh"
namespace Dumux::Detail {
template<class DiscretizationMethod>
struct LocalAssemblerChooser;
-template<>
-struct LocalAssemblerChooser<DiscretizationMethods::Box>
+template<class DM>
+struct LocalAssemblerChooser<DiscretizationMethods::CVFE<DM>>
{
template<class TypeTag, class Impl, DiffMethod diffMethod, bool isImplicit>
- using type = BoxLocalAssembler<TypeTag, Impl, diffMethod, isImplicit>;
+ using type = CVFELocalAssembler<TypeTag, Impl, diffMethod, isImplicit>;
};
template<>
@@ -86,20 +84,6 @@ struct LocalAssemblerChooser<DiscretizationMethods::FCStaggered>
using type = FaceCenteredLocalAssembler<TypeTag, Impl, diffMethod, isImplicit>;
};
-template<>
-struct LocalAssemblerChooser<DiscretizationMethods::FCDiamond>
-{
- template<class TypeTag, class Impl, DiffMethod diffMethod, bool isImplicit>
- using type = FaceCenteredDiamondLocalAssembler<TypeTag, Impl, diffMethod, isImplicit>;
-};
-
-template<>
-struct LocalAssemblerChooser<DiscretizationMethods::PQ1Bubble>
-{
- template<class TypeTag, class Impl, DiffMethod diffMethod, bool isImplicit>
- using type = PQ1BubbleLocalAssembler<TypeTag, Impl, diffMethod, isImplicit>;
-};
-
template<class TypeTag, class Impl, DiffMethod diffMethod, bool isImplicit>
using LocalAssemblerChooser_t = typename LocalAssemblerChooser<
typename GetPropType<TypeTag, Properties::GridGeometry>::DiscretizationMethod
--
GitLab