From f63de6cb24950c1c695be24a9838fd26cfee9289 Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Wed, 26 Aug 2015 13:20:29 +0000 Subject: [PATCH] [bugfix,2pnc] Fix the 2pnc model/test. A volVars update got deleted by accident causing wrong vtu output. git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@15382 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- dumux/implicit/2pnc/2pncmodel.hh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dumux/implicit/2pnc/2pncmodel.hh b/dumux/implicit/2pnc/2pncmodel.hh index 5a39b4e54c..adb9b8360b 100644 --- a/dumux/implicit/2pnc/2pncmodel.hh +++ b/dumux/implicit/2pnc/2pncmodel.hh @@ -235,9 +235,9 @@ public: { if(eIt->partitionType() == Dune::InteriorEntity) { - this->localResidual().evalPhaseStorage(*eIt, phaseIdx); + this->localResidual().evalPhaseStorage(*eIt, phaseIdx); - for (unsigned int i = 0; i < this->localResidual().storageTerm().size(); ++i) + for (unsigned int i = 0; i < this->localResidual().storageTerm().size(); ++i) storage += this->localResidual().storageTerm()[i]; } } @@ -308,7 +308,7 @@ public: { typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > ScalarField; - typedef Dune::BlockVector<Dune::FieldVector<double, dim> > VectorField; + typedef Dune::BlockVector<Dune::FieldVector<Scalar, dim> > VectorField; // get the number of degrees of freedom unsigned numDofs = this->numDofs(); @@ -385,6 +385,12 @@ public: #else int dofIdxGlobal = this->dofMapper().map(*eIt, scvIdx, dofCodim); #endif + volVars.update(sol[dofIdxGlobal], + this->problem_(), + *eIt, + fvGeometry, + scvIdx, + false); GlobalPosition globalPos = fvGeometry.subContVol[scvIdx].global; (*Sg)[dofIdxGlobal] = elemVolVars[scvIdx].saturation(nPhaseIdx); -- GitLab