From 7575218be4bd5b35a457738972e02db3a9574ea3 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Mon, 24 Jul 2017 18:21:18 +0200
Subject: [PATCH] [compositional][privarSwitch] Always update volVars in case
of caching
* The check for visited was too early
---
.../compositional/primaryvariableswitch.hh | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/dumux/porousmediumflow/compositional/primaryvariableswitch.hh b/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
index d8f507cba4..64bd67763f 100644
--- a/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
@@ -139,20 +139,21 @@ public:
for (auto&& scv : scvs(fvGeometry))
{
+ // Update volVars on which grounds we decide
+ // if we need to switch the primary variables
+ auto&& volVars = curGlobalVolVars.volVars(eIdx, scv.indexInElement());
+ volVars.update(curElemSol, problem, element, scv);
+
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
- auto&& volVars = curGlobalVolVars.volVars(eIdx, scv.indexInElement());
- volVars.update(curElemSol, problem, element, scv);
if (asImp_().update_(curSol[dofIdxGlobal], volVars, dofIdxGlobal, scv.dofPosition()))
switched = true;
-
}
}
}
--
GitLab