From 196941455961ba526ef5384dd03b99eca86a9f4d Mon Sep 17 00:00:00 2001
From: Thomas Fetzer <thomas.fetzer@iws.uni-stuttgart.de>
Date: Mon, 31 Oct 2016 14:41:44 +0100
Subject: [PATCH] [mulitdomain][localresiduals] Cleanup unused indices
---
.../2p2cnicouplinglocalresidual.hh | 15 ++-------------
.../2cstokes2p2c/2p2ccouplinglocalresidual.hh | 17 ++---------------
2 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/dumux/multidomain/2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh b/dumux/multidomain/2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh
index 21568b6541..f3422f812d 100644
--- a/dumux/multidomain/2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh
+++ b/dumux/multidomain/2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh
@@ -51,24 +51,13 @@ class TwoPTwoCNICouplingLocalResidual : public NILocalResidual<TypeTag>
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
- };
- enum {
- nPhaseIdx = Indices::nPhaseIdx
- };
+ enum { nPhaseIdx = Indices::nPhaseIdx };
+ enum { wCompIdx = Indices::wCompIdx, };
enum {
massBalanceIdx = GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx),
contiWEqIdx = Indices::contiWEqIdx,
energyEqIdx = Indices::energyEqIdx
};
- enum {
- wCompIdx = Indices::wCompIdx,
- nCompIdx = Indices::nCompIdx
- };
- enum { phaseIdx = nPhaseIdx }; // index of the phase for the phase flux calculation
- enum { compIdx = wCompIdx}; // index of the component for the phase flux calculation
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
diff --git a/dumux/multidomain/2cstokes2p2c/2p2ccouplinglocalresidual.hh b/dumux/multidomain/2cstokes2p2c/2p2ccouplinglocalresidual.hh
index 7b9a211688..9d9a480da3 100644
--- a/dumux/multidomain/2cstokes2p2c/2p2ccouplinglocalresidual.hh
+++ b/dumux/multidomain/2cstokes2p2c/2p2ccouplinglocalresidual.hh
@@ -48,26 +48,13 @@ class TwoPTwoCCouplingLocalResidual : public TwoPTwoCLocalResidual<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
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
- };
- enum {
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx
- };
+ enum { nPhaseIdx = Indices::nPhaseIdx };
+ enum { wCompIdx = Indices::wCompIdx };
enum {
massBalanceIdx = GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx),
contiWEqIdx = Indices::contiWEqIdx
};
- enum {
- wCompIdx = Indices::wCompIdx,
- nCompIdx = Indices::nCompIdx
- };
- enum { phaseIdx = nPhaseIdx }; // index of the phase for the phase flux calculation
- enum { compIdx = wCompIdx}; // index of the component for the phase flux calculation
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
--
GitLab