From 0b305a6068fffc4f0ba34977dedb3441216c2f88 Mon Sep 17 00:00:00 2001 From: DennisGlaeser <dennis.glaeser@iws.uni-stuttgart.de> Date: Fri, 26 Feb 2016 00:38:30 +0100 Subject: [PATCH] [LocalJacobian][Bug] Change deflected fluxes type to PrimaryVariables --- dumux/implicit/localjacobian.hh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dumux/implicit/localjacobian.hh b/dumux/implicit/localjacobian.hh index d6685dc879..550df00ba6 100644 --- a/dumux/implicit/localjacobian.hh +++ b/dumux/implicit/localjacobian.hh @@ -471,7 +471,7 @@ protected: auto origVolVarsJ = model_().curVolVars(scvJ); // calculate the flux in the undeflected state - Scalar origFlux = 0.0; + PrimaryVariables origFlux = 0.0; for (auto&& fluxVarIdx : fluxVarsJ) origFlux += localResidual().evalFlux_(fluxVarIdx); @@ -492,7 +492,7 @@ protected: // calculate the flux with the deflected primary variables // TODO: for solution dependent spatial params fluxVar update needed! - Scalar deflectFlux = 0.0; + PrimaryVariables deflectFlux = 0.0; for (auto&& fluxVarIdx : fluxVarsJ) deflectFlux += localResidual().evalFlux_(fluxVarIdx); @@ -504,7 +504,7 @@ protected: // we are using backward differences, i.e. we don't need // to calculate f(x + \epsilon) and we can recycle the // (already calculated) flux f(x) - partialDeriv = origFlux; + partialDeriv = PrimaryVariables; } if (numericDifferenceMethod_ <= 0) @@ -521,9 +521,9 @@ protected: // calculate the flux with the deflected primary variables // TODO: for solution dependent spatial params fluxVar update needed! - Scalar deflectFlux = 0.0; + PrimaryVariables deflectFlux = 0.0; for (auto&& fluxVarIdx : fluxVarsJ) - deflectFlux += localResidual().evalFlux_(fluxVarIdx); + PrimaryVariables += localResidual().evalFlux_(fluxVarIdx); // subtract the residual from the derivative storage partialDeriv -= deflectFlux -- GitLab