From b0711210df40076b86d6402058eaab73ff48fb78 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Mon, 6 Nov 2017 08:47:03 +0100
Subject: [PATCH] [staggered][faceVars] First step towards caching = off
---
dumux/assembly/staggeredlocalassembler.hh | 3 +-
.../staggered/elementfacevariables.hh | 47 ++++++++++++++++++-
dumux/discretization/staggered/properties.hh | 5 +-
3 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/dumux/assembly/staggeredlocalassembler.hh b/dumux/assembly/staggeredlocalassembler.hh
index a7debdde3d..488ff6d968 100644
--- a/dumux/assembly/staggeredlocalassembler.hh
+++ b/dumux/assembly/staggeredlocalassembler.hh
@@ -70,6 +70,7 @@ class StaggeredLocalAssembler<TypeTag,
using NumFaceEqVector = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
using FaceSolutionVector = typename GET_PROP_TYPE(TypeTag, FaceSolutionVector);
+ using FaceSolution = typename GET_PROP_TYPE(TypeTag, StaggeredFaceSolution);
enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
@@ -516,7 +517,7 @@ static void dFacedFace_(Assembler& assembler,
for(auto pvIdx : PriVarIndices(faceIdx))
{
- auto faceSolution = StaggeredFaceSolution<TypeTag>(scvf, curSol[faceIdx], assembler.fvGridGeometry());
+ auto faceSolution = FaceSolution(scvf, curSol[faceIdx], assembler.fvGridGeometry());
const Scalar eps = numericEpsilon(faceSolution[globalJ][pvIdx], faceIdx, faceIdx);
diff --git a/dumux/discretization/staggered/elementfacevariables.hh b/dumux/discretization/staggered/elementfacevariables.hh
index ee142f93e2..6bc7002358 100644
--- a/dumux/discretization/staggered/elementfacevariables.hh
+++ b/dumux/discretization/staggered/elementfacevariables.hh
@@ -28,9 +28,17 @@
namespace Dumux
{
+/*!
+ * \ingroup ImplicitModel
+ * \brief Base class for the face variables vector
+ */
+template<class TypeTag, bool enableGlobalFaceVarsCache>
+class StaggeredElementFaceVariables
+{};
+
template<class TypeTag>
-class StaggeredElementFaceVariables
+class StaggeredElementFaceVariables<TypeTag, /*enableGlobalFaceVarsCache*/true>
{
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
@@ -71,6 +79,43 @@ private:
const GlobalFaceVars* globalFaceVarsPtr_;
};
+template<class TypeTag>
+class StaggeredElementFaceVariables<TypeTag, /*enableGlobalFaceVarsCache*/false>
+{
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+ using GlobalFaceVars = typename GET_PROP_TYPE(TypeTag, GlobalFaceVars);
+ using FaceVariables = typename GET_PROP_TYPE(TypeTag, FaceVariables);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using IndexType = typename GridView::IndexSet::IndexType;
+
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ typename DofTypeIndices::FaceIdx faceIdx;
+
+public:
+ //! For compatibility reasons with the case of not storing the vol vars.
+ //! function to be called before assembling an element, preparing the vol vars within the stencil
+ void bind(const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const SolutionVector& sol)
+ {
+ faceVariables_.resize(fvGeometry.numScvf());
+
+ for(auto&& scvf : scvfs(fvGeometry))
+ {
+ // TODO: do proper update
+ // faceVariables_[scvf.localFaceIdx()].update(sol[faceIdx], problem_(), element, fvGeometry, scvf)
+
+ }
+ }
+private:
+ std::vector<IndexType> faceVarIndices_;
+ std::vector<FaceVariables> faceVariables_;
+};
+
} // end namespace
#endif
diff --git a/dumux/discretization/staggered/properties.hh b/dumux/discretization/staggered/properties.hh
index 15f153ebee..eee1b8aade 100644
--- a/dumux/discretization/staggered/properties.hh
+++ b/dumux/discretization/staggered/properties.hh
@@ -64,6 +64,7 @@ NEW_PROP_TAG(CellCenterSolutionVector);
NEW_PROP_TAG(FaceSolutionVector);
NEW_PROP_TAG(StaggeredFaceSolution);
NEW_PROP_TAG(ElementFaceVariables);
+NEW_PROP_TAG(EnableGlobalFaceVariablesCache);
//! Type tag for the box scheme.
NEW_TYPE_TAG(StaggeredModel, INHERITS_FROM(FiniteVolumeModel, NumericModel));
@@ -115,7 +116,9 @@ SET_TYPE_PROP(StaggeredModel, IntersectionMapper, Dumux::ConformingGridIntersect
SET_TYPE_PROP(StaggeredModel, StaggeredFaceSolution, StaggeredFaceSolution<TypeTag>);
-SET_TYPE_PROP(StaggeredModel, ElementFaceVariables, StaggeredElementFaceVariables<TypeTag>);
+SET_TYPE_PROP(StaggeredModel, ElementFaceVariables, StaggeredElementFaceVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFaceVariablesCache)>);
+
+SET_BOOL_PROP(StaggeredModel, EnableGlobalFaceVariablesCache, true);
//! Definition of the indices for cell center and face dofs in the global solution vector
SET_PROP(StaggeredModel, DofTypeIndices)
--
GitLab