From a4a8bae13d619e4da4070e006707385d1b7ded78 Mon Sep 17 00:00:00 2001
From: Thomas Fetzer <thomas.fetzer@iws.uni-stuttgart.de>
Date: Fri, 8 Jan 2016 09:36:02 +0100
Subject: [PATCH] [multidomain] Various small cleanups, remove
unnecessary/potentially buggy lines of code, add useMoles.
---
.../2p2cnicouplinglocalresidual.hh | 16 +++++++++++++---
.../stokesncnicouplinglocalresidual.hh | 19 ++++---------------
.../2cstokes2p2c/2cstokes2p2clocaloperator.hh | 2 +-
.../2cstokes2p2c/2p2ccouplinglocalresidual.hh | 16 +++++++++++++---
.../stokesnccouplinglocalresidual.hh | 5 +++--
.../common/multidomainassembler.hh | 2 --
6 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/dumux/multidomain/2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh b/dumux/multidomain/2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh
index bc12b54bce..20ce4baad6 100644
--- a/dumux/multidomain/2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh
+++ b/dumux/multidomain/2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh
@@ -51,6 +51,7 @@ class TwoPTwoCNICouplingLocalResidual : public NILocalResidual<TypeTag>
enum { dim = GridView::dimension };
enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
+ enum { useMoles = GET_PROP_VALUE(TypeTag, UseMoles) };
enum {
pressureIdx = Indices::pressureIdx,
temperatureIdx = Indices::temperatureIdx
@@ -122,13 +123,22 @@ public:
const VolumeVariables &volVars = this->curVolVars_()[scvIdx];
- // set pressure as part of the momentum coupling TODO is it potential bug to use nPhaseIdx?
+ // set pressure as part of the momentum coupling
+ static_assert(GET_PROP_VALUE(TypeTag, Formulation) == TwoPTwoCFormulation::pnsw,
+ "This coupling condition is only implemented for a pnsw formulation.");
if (this->bcTypes_(scvIdx).isCouplingDirichlet(massBalanceIdx))
this->residual_[scvIdx][massBalanceIdx] = volVars.pressure(nPhaseIdx);
- // set mass fraction TODO: add use of moles, check the function arguments: nPhaseIdx, wCompIdx
+ // set mass/mole fraction for transported component
+ static_assert(GET_PROP_VALUE(TypeTag, NumComponents) == 2,
+ "This coupling condition is only implemented for two components.");
if (this->bcTypes_(scvIdx).isCouplingDirichlet(contiWEqIdx))
- this->residual_[scvIdx][contiWEqIdx] = volVars.massFraction(nPhaseIdx, wCompIdx);
+ {
+ if (useMoles)
+ this->residual_[scvIdx][contiWEqIdx] = volVars.moleFraction(nPhaseIdx, wCompIdx);
+ else
+ this->residual_[scvIdx][contiWEqIdx] = volVars.massFraction(nPhaseIdx, wCompIdx);
+ }
// set temperature
if (this->bcTypes_(scvIdx).isCouplingDirichlet(energyEqIdx))
diff --git a/dumux/multidomain/2cnistokes2p2cni/stokesncnicouplinglocalresidual.hh b/dumux/multidomain/2cnistokes2p2cni/stokesncnicouplinglocalresidual.hh
index d12b78af3c..b359f4cc3d 100644
--- a/dumux/multidomain/2cnistokes2p2cni/stokesncnicouplinglocalresidual.hh
+++ b/dumux/multidomain/2cnistokes2p2cni/stokesncnicouplinglocalresidual.hh
@@ -61,24 +61,13 @@ class StokesncniCouplingLocalResidual : public StokesncniLocalResidual<TypeTag>
enum {
//indices of the equations
massBalanceIdx = Indices::massBalanceIdx, //!< Index of the mass balance
-
momentumXIdx = Indices::momentumXIdx, //!< Index of the x-component of the momentum balance
momentumYIdx = Indices::momentumYIdx, //!< Index of the y-component of the momentum balance
momentumZIdx = Indices::momentumZIdx, //!< Index of the z-component of the momentum balance
lastMomentumIdx = Indices::lastMomentumIdx, //!< Index of the last component of the momentum balance
- transportEqIdx = Indices::transportEqIdx,//!< Index of the transport equation
- energyEqIdx = Indices::energyEqIdx
- };
- enum {
- //indices of phase and transported component
- phaseIdx = Indices::phaseIdx,
- transportCompIdx = Indices::transportCompIdx,
- temperatureIdx = Indices::temperatureIdx
- };
- enum {
- dimXIdx = Indices::dimXIdx, //!< Index for the first component of a vector
- dimYIdx = Indices::dimYIdx, //!< Index for the second component of a vector
- dimZIdx = Indices::dimZIdx //!< Index for the third component of a vector
+ transportEqIdx = Indices::transportEqIdx, //!< Index of the transport equation
+ energyEqIdx = Indices::energyEqIdx, //!< Index of the energy equation
+ conti0EqIdx = Indices::conti0EqIdx
};
typedef typename GridView::ctype CoordScalar;
@@ -169,7 +158,7 @@ public:
// set mole fraction for the transported components
for (int compIdx = 0; compIdx < numComponents; compIdx++)
{
- int eqIdx = dim + compIdx; // TODO: ist das so richtig
+ int eqIdx = conti0EqIdx + compIdx;
if (eqIdx != massBalanceIdx)
{
if (bcTypes.isCouplingDirichlet(eqIdx))
diff --git a/dumux/multidomain/2cstokes2p2c/2cstokes2p2clocaloperator.hh b/dumux/multidomain/2cstokes2p2c/2cstokes2p2clocaloperator.hh
index c5a0b36bec..d2f8e4be1c 100644
--- a/dumux/multidomain/2cstokes2p2c/2cstokes2p2clocaloperator.hh
+++ b/dumux/multidomain/2cstokes2p2c/2cstokes2p2clocaloperator.hh
@@ -197,7 +197,7 @@ public:
enum { numPhases2 = GET_PROP_VALUE(TwoPTwoCTypeTag, NumPhases) };
enum { // equation indices
contiWEqIdx2 = TwoPTwoCIndices::contiWEqIdx, //!< Index of the continuity equation for water component
- massBalanceIdx2 = TwoPTwoCIndices::contiNEqIdx //!< Index of the total mass balance (if one comopnent balance is replaced)
+ massBalanceIdx2 = TwoPTwoCIndices::contiNEqIdx //!< Index of the total mass balance (if one component balance is replaced)
};
enum { // component indices
wCompIdx2 = TwoPTwoCIndices::wCompIdx, //!< Index of the liquids main component
diff --git a/dumux/multidomain/2cstokes2p2c/2p2ccouplinglocalresidual.hh b/dumux/multidomain/2cstokes2p2c/2p2ccouplinglocalresidual.hh
index 11b2c98e0c..4cf3b7688a 100644
--- a/dumux/multidomain/2cstokes2p2c/2p2ccouplinglocalresidual.hh
+++ b/dumux/multidomain/2cstokes2p2c/2p2ccouplinglocalresidual.hh
@@ -51,6 +51,7 @@ class TwoPTwoCCouplingLocalResidual : public TwoPTwoCLocalResidual<TypeTag>
enum { dim = GridView::dimension };
enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
+ enum { useMoles = GET_PROP_VALUE(TypeTag, UseMoles) };
enum {
pressureIdx = Indices::pressureIdx
};
@@ -122,13 +123,22 @@ public:
const VolumeVariables &volVars = this->curVolVars_()[scvIdx];
- // set pressure as part of the momentum coupling TODO is it potential bug to use nPhaseIdx?
+ // set pressure as part of the momentum coupling
+ static_assert(GET_PROP_VALUE(TypeTag, Formulation) == TwoPTwoCFormulation::pnsw,
+ "This coupling condition is only implemented for a pnsw formulation.");
if (this->bcTypes_(scvIdx).isCouplingDirichlet(massBalanceIdx))
this->residual_[scvIdx][massBalanceIdx] = volVars.pressure(nPhaseIdx);
- // set mass fraction TODO: add use of moles, check the function arguments: nPhaseIdx, wCompIdx
+ // set mass/mole fraction for transported component
+ static_assert(GET_PROP_VALUE(TypeTag, NumComponents) == 2,
+ "This coupling condition is only implemented for two components.");
if (this->bcTypes_(scvIdx).isCouplingDirichlet(contiWEqIdx))
- this->residual_[scvIdx][contiWEqIdx] = volVars.massFraction(nPhaseIdx, wCompIdx);
+ {
+ if (useMoles)
+ this->residual_[scvIdx][contiWEqIdx] = volVars.moleFraction(nPhaseIdx, wCompIdx);
+ else
+ this->residual_[scvIdx][contiWEqIdx] = volVars.massFraction(nPhaseIdx, wCompIdx);
+ }
}
}
}
diff --git a/dumux/multidomain/2cstokes2p2c/stokesnccouplinglocalresidual.hh b/dumux/multidomain/2cstokes2p2c/stokesnccouplinglocalresidual.hh
index 8a3701fb70..cfd97aed23 100644
--- a/dumux/multidomain/2cstokes2p2c/stokesnccouplinglocalresidual.hh
+++ b/dumux/multidomain/2cstokes2p2c/stokesnccouplinglocalresidual.hh
@@ -66,7 +66,8 @@ class StokesncCouplingLocalResidual : public StokesncLocalResidual<TypeTag>
momentumYIdx = Indices::momentumYIdx, //!< Index of the y-component of the momentum balance
momentumZIdx = Indices::momentumZIdx, //!< Index of the z-component of the momentum balance
lastMomentumIdx = Indices::lastMomentumIdx, //!< Index of the last component of the momentum balance
- transportEqIdx = Indices::transportEqIdx//!< Index of the transport equation
+ transportEqIdx = Indices::transportEqIdx, //!< Index of the transport equation
+ conti0EqIdx = Indices::conti0EqIdx
};
enum {
//indices of phase and transported component
@@ -167,7 +168,7 @@ public:
// set mole or mass fraction for the transported components
for (int compIdx = 0; compIdx < numComponents; compIdx++)
{
- int eqIdx = dim + compIdx; // TODO: ist das so richtig
+ int eqIdx = conti0EqIdx + compIdx;
if (eqIdx != massBalanceIdx)
{
if (bcTypes.isCouplingDirichlet(eqIdx))
diff --git a/dumux/multidomain/common/multidomainassembler.hh b/dumux/multidomain/common/multidomainassembler.hh
index 0794b0190d..b43099f5dd 100644
--- a/dumux/multidomain/common/multidomainassembler.hh
+++ b/dumux/multidomain/common/multidomainassembler.hh
@@ -129,8 +129,6 @@ public:
*mdSubProblem1_, *mdSubProblem2_, *mdCoupling_);
matrix_ = std::make_shared<JacobianMatrix>(*mdGridOperator_);
- *matrix_ = 0;
-
residual_ = std::make_shared<SolutionVector>(*mdGridFunctionSpace_);
}
--
GitLab