From e9e124538c3409502d31d70bdff7b927e515776a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Gl=C3=A4ser?= <dennis.glaeser@iws.uni-stuttgart.de>
Date: Tue, 20 Nov 2018 14:03:11 +0100
Subject: [PATCH] [mpfa] export local assembler type in iv traits
That makes it possible to overload the local assembler class while
reusing an interaction volume.
---
.../cellcentered/mpfa/CMakeLists.txt | 2 +-
.../mpfa/fluxvariablescachefiller.hh | 13 ++++++-------
.../cellcentered/mpfa/interactionvolumebase.hh | 2 ++
...{localassembler.hh => localassemblerbase.hh} | 17 +++--------------
.../mpfa/omethod/interactionvolume.hh | 5 +++++
.../cellcentered/mpfa/omethod/localassembler.hh | 4 ++--
.../mpfa/omethod/staticinteractionvolume.hh | 5 +++++
7 files changed, 24 insertions(+), 24 deletions(-)
rename dumux/discretization/cellcentered/mpfa/{localassembler.hh => localassemblerbase.hh} (95%)
diff --git a/dumux/discretization/cellcentered/mpfa/CMakeLists.txt b/dumux/discretization/cellcentered/mpfa/CMakeLists.txt
index d1940659e2..51527f79f9 100644
--- a/dumux/discretization/cellcentered/mpfa/CMakeLists.txt
+++ b/dumux/discretization/cellcentered/mpfa/CMakeLists.txt
@@ -19,7 +19,7 @@ gridvolumevariables.hh
helper.hh
interactionvolumebase.hh
interactionvolumedatahandle.hh
-localassembler.hh
+localassemblerbase.hh
localfacedata.hh
methods.hh
properties.hh
diff --git a/dumux/discretization/cellcentered/mpfa/fluxvariablescachefiller.hh b/dumux/discretization/cellcentered/mpfa/fluxvariablescachefiller.hh
index 8ec7bfc63e..a95a31c84f 100644
--- a/dumux/discretization/cellcentered/mpfa/fluxvariablescachefiller.hh
+++ b/dumux/discretization/cellcentered/mpfa/fluxvariablescachefiller.hh
@@ -29,7 +29,6 @@
#include <dumux/discretization/method.hh>
#include <dumux/discretization/cellcentered/mpfa/tensorlambdafactory.hh>
-#include <dumux/discretization/cellcentered/mpfa/localassembler.hh>
namespace Dumux
{
@@ -437,8 +436,8 @@ private:
using LambdaFactory = TensorLambdaFactory<DiscretizationMethod::ccmpfa>;
// get instance of the interaction volume-local assembler
- static constexpr MpfaMethods M = InteractionVolume::MpfaMethod;
- using IvLocalAssembler = InteractionVolumeAssembler< Problem, FVElementGeometry, ElementVolumeVariables, M >;
+ using Traits = typename InteractionVolume::Traits;
+ using IvLocalAssembler = typename Traits::template LocalAssembler<Problem, FVElementGeometry, ElementVolumeVariables>;
IvLocalAssembler localAssembler(problem(), fvGeometry(), elemVolVars());
// Assemble T only if permeability is sol-dependent or if update is forced
@@ -476,8 +475,8 @@ private:
using LambdaFactory = TensorLambdaFactory<DiscretizationMethod::ccmpfa>;
// get instance of the interaction volume-local assembler
- static constexpr MpfaMethods M = InteractionVolume::MpfaMethod;
- using IvLocalAssembler = InteractionVolumeAssembler< Problem, FVElementGeometry, ElementVolumeVariables, M >;
+ using Traits = typename InteractionVolume::Traits;
+ using IvLocalAssembler = typename Traits::template LocalAssembler<Problem, FVElementGeometry, ElementVolumeVariables>;
IvLocalAssembler localAssembler(problem(), fvGeometry(), elemVolVars());
// maybe (re-)assemble matrices
@@ -502,8 +501,8 @@ private:
using ThermCondModel = GetPropType<TypeTag, Properties::ThermalConductivityModel>;
// get instance of the interaction volume-local assembler
- static constexpr MpfaMethods M = InteractionVolume::MpfaMethod;
- using IvLocalAssembler = InteractionVolumeAssembler< Problem, FVElementGeometry, ElementVolumeVariables, M >;
+ using Traits = typename InteractionVolume::Traits;
+ using IvLocalAssembler = typename Traits::template LocalAssembler<Problem, FVElementGeometry, ElementVolumeVariables>;
IvLocalAssembler localAssembler(problem(), fvGeometry(), elemVolVars());
// maybe (re-)assemble matrices (TODO: USE CORRECT SOLDEPENDENT FLAG!)
diff --git a/dumux/discretization/cellcentered/mpfa/interactionvolumebase.hh b/dumux/discretization/cellcentered/mpfa/interactionvolumebase.hh
index 423c0381ed..dbaf61141d 100644
--- a/dumux/discretization/cellcentered/mpfa/interactionvolumebase.hh
+++ b/dumux/discretization/cellcentered/mpfa/interactionvolumebase.hh
@@ -51,6 +51,8 @@ namespace Dumux
* using LocalFaceData = ...;
* //! export the matrix/vector type traits to be used by the iv
* using MatVecTraits = ...;
+ * //! export the type used for the assembly of the iv's local eq system
+ * using LocalAssembler = ...;
* \endcode
*/
diff --git a/dumux/discretization/cellcentered/mpfa/localassembler.hh b/dumux/discretization/cellcentered/mpfa/localassemblerbase.hh
similarity index 95%
rename from dumux/discretization/cellcentered/mpfa/localassembler.hh
rename to dumux/discretization/cellcentered/mpfa/localassemblerbase.hh
index 40948a54a3..20cbb2a1cc 100644
--- a/dumux/discretization/cellcentered/mpfa/localassembler.hh
+++ b/dumux/discretization/cellcentered/mpfa/localassemblerbase.hh
@@ -21,25 +21,17 @@
* \ingroup CCMpfaDiscretization
* \brief Defines the general interface of classes used for the assembly
* of the local systems of equations involved in the transmissibility
- * computaion in mpfa schemes.
+ * computation in mpfa schemes.
*/
-#ifndef DUMUX_DISCRETIZATION_CC_MPFA_LOCAL_ASSEMBLER_HH
-#define DUMUX_DISCRETIZATION_CC_MPFA_LOCAL_ASSEMBLER_HH
+#ifndef DUMUX_DISCRETIZATION_CC_MPFA_LOCAL_ASSEMBLER_BASE_HH
+#define DUMUX_DISCRETIZATION_CC_MPFA_LOCAL_ASSEMBLER_BASE_HH
#include <type_traits>
#include <dune/common/exceptions.hh>
-#include <dumux/discretization/cellcentered/mpfa/methods.hh>
namespace Dumux
{
-//! Forward declaration of the implementation
-template< class P, class EG, class EV, MpfaMethods M > class InteractionVolumeAssemblerImpl;
-
-//! Alias to select the right implementation.
-template< class P, class EG, class EV, MpfaMethods M >
-using InteractionVolumeAssembler = InteractionVolumeAssemblerImpl< P, EG, EV, M >;
-
/*!
* \ingroup CCMpfaDiscretization
* \brief Defines the general interface of the local assembler
@@ -330,7 +322,4 @@ private:
} // end namespace Dumux
-//! include all specializations for different mpfa schemes
-#include <dumux/discretization/cellcentered/mpfa/omethod/localassembler.hh>
-
#endif
diff --git a/dumux/discretization/cellcentered/mpfa/omethod/interactionvolume.hh b/dumux/discretization/cellcentered/mpfa/omethod/interactionvolume.hh
index ab52179d16..cf45a0ca5b 100644
--- a/dumux/discretization/cellcentered/mpfa/omethod/interactionvolume.hh
+++ b/dumux/discretization/cellcentered/mpfa/omethod/interactionvolume.hh
@@ -38,6 +38,7 @@
#include <dumux/discretization/cellcentered/mpfa/localfacedata.hh>
#include <dumux/discretization/cellcentered/mpfa/methods.hh>
+#include "localassembler.hh"
#include "localsubcontrolentities.hh"
#include "interactionvolumeindexset.hh"
@@ -91,6 +92,10 @@ public:
using LocalFaceData = InteractionVolumeLocalFaceData<GridIndexType, LocalIndexType>;
//! export the matrix/vector traits to be used by the iv
using MatVecTraits = MVTraits;
+
+ //! the type of assembler used for the o-method's iv-local eq systems
+ template<class Problem, class FVElementGeometry, class ElemVolVars>
+ using LocalAssembler = MpfaOInteractionVolumeAssembler<Problem, FVElementGeometry, ElemVolVars>;
};
/*!
diff --git a/dumux/discretization/cellcentered/mpfa/omethod/localassembler.hh b/dumux/discretization/cellcentered/mpfa/omethod/localassembler.hh
index 4828fc0cff..dafa103d8c 100644
--- a/dumux/discretization/cellcentered/mpfa/omethod/localassembler.hh
+++ b/dumux/discretization/cellcentered/mpfa/omethod/localassembler.hh
@@ -29,7 +29,7 @@
#include <dumux/common/math.hh>
#include <dumux/discretization/cellcentered/mpfa/methods.hh>
-#include <dumux/discretization/cellcentered/mpfa/localassembler.hh>
+#include <dumux/discretization/cellcentered/mpfa/localassemblerbase.hh>
#include <dumux/discretization/cellcentered/mpfa/computetransmissibility.hh>
namespace Dumux
@@ -45,7 +45,7 @@ namespace Dumux
* \tparam EV The element volume variables type
*/
template< class P, class EG, class EV >
-class InteractionVolumeAssemblerImpl< P, EG, EV, MpfaMethods::oMethod >
+class MpfaOInteractionVolumeAssembler
: public InteractionVolumeAssemblerBase< P, EG, EV >
{
using ParentType = InteractionVolumeAssemblerBase< P, EG, EV >;
diff --git a/dumux/discretization/cellcentered/mpfa/omethod/staticinteractionvolume.hh b/dumux/discretization/cellcentered/mpfa/omethod/staticinteractionvolume.hh
index 60f78d6d68..a0df661d3c 100644
--- a/dumux/discretization/cellcentered/mpfa/omethod/staticinteractionvolume.hh
+++ b/dumux/discretization/cellcentered/mpfa/omethod/staticinteractionvolume.hh
@@ -37,6 +37,7 @@
#include <dumux/discretization/cellcentered/mpfa/methods.hh>
#include <dumux/discretization/cellcentered/mpfa/omethod/interactionvolume.hh>
+#include "localassembler.hh"
#include "localsubcontrolentities.hh"
#include "interactionvolumeindexset.hh"
@@ -96,6 +97,10 @@ public:
static constexpr int numScvs = C;
//! export the number of scvfs in the interaction volumes
static constexpr int numScvfs = F;
+
+ //! the type of assembler used for the o-method's iv-local eq systems
+ template<class Problem, class FVElementGeometry, class ElemVolVars>
+ using LocalAssembler = MpfaOInteractionVolumeAssembler<Problem, FVElementGeometry, ElemVolVars>;
};
/*!
--
GitLab