diff --git a/dumux/discretization/cellcentered/tpfa/globalfvgeometry.hh b/dumux/discretization/cellcentered/tpfa/globalfvgeometry.hh
index 88ac6b0eb2a41f1403e7958e2460469127bee04e..fa0ee62666e0ee2e8fb591dfb12438773847f007 100644
--- a/dumux/discretization/cellcentered/tpfa/globalfvgeometry.hh
+++ b/dumux/discretization/cellcentered/tpfa/globalfvgeometry.hh
@@ -166,7 +166,7 @@ public:
friend inline FVElementGeometry localView(const CCTpfaGlobalFVGeometry& global)
{ return FVElementGeometry(global); }
-private:
+//private:
//! Get a sub control volume with a global scv index
const SubControlVolume& scv(IndexType scvIdx) const
@@ -186,6 +186,7 @@ private:
return scvfIndicesOfScv_[scvIdx];
}
+private:
const Problem& problem_() const
{ return *problemPtr_; }
diff --git a/dumux/implicit/model.hh b/dumux/implicit/model.hh
index 3fdaf5169993f047da78842a599aebe421f4a1e8..fb14955585f92ff413c873e034b84387eca4f399 100644
--- a/dumux/implicit/model.hh
+++ b/dumux/implicit/model.hh
@@ -51,6 +51,10 @@ class ImplicitModel
// The local jacobian needs to be able to modify objects during the assembly
friend typename GET_PROP_TYPE(TypeTag, LocalJacobian);
+ // the primary variable need to modify the volume variables when global caching is enabled
+ friend class PrimaryVariableSwitch<TypeTag>;
+ friend typename GET_PROP_TYPE(TypeTag, PrimaryVariableSwitch);
+
using Implementation = typename GET_PROP_TYPE(TypeTag, Model);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
@@ -87,10 +91,11 @@ class ImplicitModel
enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
enum { dofCodim = isBox ? dim : 0 };
+public:
+
// copying a model is not a good idea
- ImplicitModel(const ImplicitModel &);
+ ImplicitModel(const ImplicitModel &) = delete;
-public:
/*!
* \brief The constructor.
*/
@@ -172,7 +177,7 @@ public:
if (isBox)
{
- for (int i = 0; i < element.subEntities(dim); ++i)
+ for (unsigned int i = 0; i < element.subEntities(dim); ++i)
{
int globalI = vertexMapper().subIndex(element, i, dim);
residual[globalI] += localResidual().residual(i);
diff --git a/dumux/implicit/properties.hh b/dumux/implicit/properties.hh
index a2e77749196378b6eccf88b2ba521718be1839dd..9d8014568e79c80a171beb47f00c716886d3637c 100644
--- a/dumux/implicit/properties.hh
+++ b/dumux/implicit/properties.hh
@@ -85,6 +85,7 @@ NEW_PROP_TAG(EnableGlobalFluxVariablesCache); //! specifies if data on flux vars
NEW_PROP_TAG(BoundaryVariables); //!< Data required to calculate fluxes over boundary faces in cc models(outflow)
NEW_PROP_TAG(ConstantBoundaryConditions); //!< boundary data is stored in case the BC are constant
NEW_PROP_TAG(DiscretizationMethod); //!< Property for the used discretization method
+NEW_PROP_TAG(PrimaryVariableSwitch); //!< The primary variable switch needed for compositional models
// Specify the forms of fluxes that should be considered in the model
// also, specify their corresponding flux variables
@@ -139,9 +140,6 @@ NEW_PROP_TAG(ImplicitMaxTimeStepDivisions);
//! indicate whether discretization is box or not
NEW_PROP_TAG(ImplicitIsBox);
-//! The type of primary variable switch for compositional models
-NEW_PROP_TAG(PrimaryVariableSwitch);
-
//! the local fem space used for the AMG backend
NEW_PROP_TAG(ImplicitLocalFemMap);
diff --git a/dumux/implicit/propertydefaults.hh b/dumux/implicit/propertydefaults.hh
index e49075d087a630c02bef24bf50218021ce57afaf..08d9fd97f2a34ff4070eec7dd0b69a7fb4450b31 100644
--- a/dumux/implicit/propertydefaults.hh
+++ b/dumux/implicit/propertydefaults.hh
@@ -38,6 +38,7 @@
#include <dumux/porousmediumflow/implicit/fluxvariables.hh>
#include <dumux/porousmediumflow/implicit/fluxvariablescache.hh>
#include <dumux/porousmediumflow/nonisothermal/implicit/localresidual.hh>
+#include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
#include <dumux/discretization/volumevariables.hh>
#include <dumux/discretization/darcyslaw.hh>
@@ -154,6 +155,8 @@ SET_BOOL_PROP(ImplicitBase, EnableGlobalFluxVariablesCache, false);
//! boundary conditions are not stationary by default
SET_BOOL_PROP(ImplicitBase, ConstantBoundaryConditions, false);
+SET_TYPE_PROP(ImplicitBase, PrimaryVariableSwitch, NoPrimaryVariableSwitch<TypeTag> );
+
//! Set the type of a global jacobian matrix from the solution types
SET_PROP(ImplicitBase, JacobianMatrix)
{
diff --git a/dumux/porousmediumflow/compositional/primaryvariableswitch.hh b/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
index 539ef151f14ec27183111af2dad62a6131417b33..e8b9a87d2f140c15749c07fb63a47cee66cb4723 100644
--- a/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
@@ -28,6 +28,14 @@
namespace Dumux
{
+/*!
+ * \ingroup ImplicitModel
+ * \brief Empty class for models without pri var switch
+ */
+template<class TypeTag>
+class NoPrimaryVariableSwitch
+{};
+
/*!
* \ingroup ImplicitModel
* \brief The primary variable switch controlling the phase presence state variable
@@ -115,7 +123,9 @@ public:
* \param problem The problem
* \param curSol The current solution to be updated / modified
*/
- bool update(Problem& problem, SolutionVector& curSol)
+ template<class T = TypeTag>
+ typename std::enable_if<!GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), bool>::type
+ update(Problem& problem, SolutionVector& curSol)
{
bool switched = false;
visited_.assign(phasePresence_.size(), false);
@@ -156,6 +166,48 @@ public:
return switched;
}
+ template<class T = TypeTag>
+ typename std::enable_if<GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), bool>::type
+ update(Problem& problem, SolutionVector& curSol)
+ {
+ bool switched = false;
+ visited_.assign(phasePresence_.size(), false);
+ for (const auto& element : elements(problem.gridView()))
+ {
+ // make sure FVElementGeometry is bound to the element
+ auto fvGeometry = localView(problem.model().globalFvGeometry());
+ fvGeometry.bindElement(element);
+
+ auto& curGlobalVolVars = problem.model().nonConstCurGlobalVolVars();
+
+ for (auto&& scv : scvs(fvGeometry))
+ {
+ auto dofIdxGlobal = scv.dofIndex();
+ if (!visited_[dofIdxGlobal])
+ {
+ // Note this implies that volume variables don't differ
+ // in any sub control volume associated with the dof!
+ visited_[dofIdxGlobal] = true;
+ // Compute temporary volVars on which grounds we decide
+ // if we need to switch the primary variables
+ curGlobalVolVars.volVars(dofIdxGlobal).update(curSol[dofIdxGlobal], problem, element, scv);
+ const auto& globalPos = scv.dofPosition();
+
+ if (asImp_().update_(curSol[dofIdxGlobal], curGlobalVolVars.volVars(dofIdxGlobal), dofIdxGlobal, globalPos))
+ switched = true;
+
+ }
+ }
+ }
+
+ // make sure that if there was a variable switch in an
+ // other partition we will also set the switch flag for our partition.
+ if (problem.gridView().comm().size() > 1)
+ switched = problem.gridView().comm().max(switched);
+
+ return switched;
+ }
+
protected:
//! return actual implementation (static polymorphism)