diff --git a/dumux/multidomain/couplinglocalresiduals/stokesnccouplinglocalresidual.hh b/dumux/multidomain/couplinglocalresiduals/stokesnccouplinglocalresidual.hh index 356ad986d43f24d070870ce288ad278d23f7c855..33853f1f85d6d91e2b0fc768b5b9b73e183229da 100644 --- a/dumux/multidomain/couplinglocalresiduals/stokesnccouplinglocalresidual.hh +++ b/dumux/multidomain/couplinglocalresiduals/stokesnccouplinglocalresidual.hh @@ -304,9 +304,9 @@ protected: if (bcTypes.isCouplingOutflow(eqIdx)) { if(useMoles) - this->residual_[scvIdx][eqIdx] = volVars.moleFraction(phaseIdx, compIdx); + this->residual_[scvIdx][eqIdx] = volVars.moleFraction(compIdx); else - this->residual_[scvIdx][eqIdx] = volVars.massFraction(phaseIdx, compIdx); + this->residual_[scvIdx][eqIdx] = volVars.massFraction(compIdx); Valgrind::CheckDefined(this->residual_[scvIdx][eqIdx]); } } diff --git a/dumux/multidomain/couplinglocalresiduals/stokesncnicouplinglocalresidual.hh b/dumux/multidomain/couplinglocalresiduals/stokesncnicouplinglocalresidual.hh index 7b3533627822cf51a2de2208de422f445214c360..cc892c31b78a9326bc8e1eaf9b2335cbb8236a85 100644 --- a/dumux/multidomain/couplinglocalresiduals/stokesncnicouplinglocalresidual.hh +++ b/dumux/multidomain/couplinglocalresiduals/stokesncnicouplinglocalresidual.hh @@ -299,9 +299,9 @@ namespace Dumux if (bcTypes.isCouplingOutflow(eqIdx)) { if(useMoles) - this->residual_[scvIdx][eqIdx] = volVars.moleFraction(phaseIdx, compIdx); + this->residual_[scvIdx][eqIdx] = volVars.moleFraction(compIdx); else - this->residual_[scvIdx][eqIdx] = volVars.massFraction(phaseIdx, compIdx); + this->residual_[scvIdx][eqIdx] = volVars.massFraction(compIdx); Valgrind::CheckDefined(this->residual_[scvIdx][eqIdx]); } } diff --git a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh index 932b65263989ff8baec56df595dfa52a3238ae93..4da8293b12ee99cca169b73b0c19e47c1933d3d8 100644 --- a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh +++ b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh @@ -43,7 +43,9 @@ #include <dumux/multidomain/2cnistokes2p2cni/2cnistokes2p2cnilocaloperator.hh> //#include <dumux/linear/amgbackend.hh> #include <dumux/linear/seqsolverbackend.hh> +#ifdef HAVE_PARDISO #include <dumux/linear/pardisobackend.hh> +#endif // HAVE_PARDISO #include "2cnistokes2p2cnispatialparams.hh" #include <dumux/material/fluidsystems/h2oairfluidsystem.hh> @@ -68,6 +70,8 @@ SET_PROP(TwoCNIStokesTwoPTwoCNIProblem, Grid) typedef typename Dune::UGGrid<2> type; #elif HAVE_ALUGRID typedef typename Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming> type; +#else +#error Required UG or ALUGrid. #endif }; @@ -684,7 +688,7 @@ public: int vertInElem1) { Scalar advFlux = elemVolVars1[vertInElem1].density() * - elemVolVars1[vertInElem1].massFraction(phaseIdx, transportCompIdx1) * + elemVolVars1[vertInElem1].massFraction(transportCompIdx1) * boundaryVars1.normalVelocity(); return advFlux; } diff --git a/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh b/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh index c54e0018d0759e94470bc102b241d4fa625d3194..c8f72b56f2eaf0279139351addb4d79c7b4fa16c 100644 --- a/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh +++ b/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh @@ -42,7 +42,9 @@ #include <dumux/multidomain/2cstokes2p2c/2cstokes2p2clocaloperator.hh> #include <dumux/multidomain/2cstokes2p2c/2cstokes2p2cnewtoncontroller.hh> #include <dumux/material/fluidsystems/h2oairfluidsystem.hh> +#ifdef HAVE_PARDISO #include <dumux/linear/pardisobackend.hh> +#endif // HAVE_PARDISO #include "2cstokes2p2cspatialparams.hh" #include "stokes2csubproblem.hh" @@ -65,6 +67,8 @@ SET_PROP(TwoCStokesTwoPTwoCProblem, Grid) typedef typename Dune::UGGrid<2> type; #elif HAVE_ALUGRID typedef typename Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming> type; +#else +#error Required UG or ALUGrid. #endif }; @@ -654,7 +658,7 @@ public: int vertInElem1) { Scalar advFlux = elemVolVars1[vertInElem1].density() * - elemVolVars1[vertInElem1].massFraction(phaseIdx, transportCompIdx1) * + elemVolVars1[vertInElem1].massFraction(transportCompIdx1) * boundaryVars1.normalVelocity(); return advFlux; }