diff --git a/dumux/multidomain/2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh b/dumux/multidomain/2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh index 21568b654178fa6969b94862052819a15be7d33d..f3422f812ddda6061f52a8b3bf0fcba1ce79b612 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 7b9a2116882796c10419e6504d8a9c9f21233087..9d9a480da3b3b8ded2e421413809fc210067ab4b 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;