diff --git a/dumux/freeflow/stokes2c/stokes2cindices.hh b/dumux/freeflow/stokes2c/stokes2cindices.hh index b38a27f3522e2302d8104c436bf1642b3ed2e5e8..7afff34ae25ee1d0562f64d95fda351b509ab1c2 100644 --- a/dumux/freeflow/stokes2c/stokes2cindices.hh +++ b/dumux/freeflow/stokes2c/stokes2cindices.hh @@ -47,28 +47,15 @@ public: // Phase index static const int phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx); //!< Index of the employed phase in case of a two-phase fluidsystem (set by default to nPhase) - static const int wPhaseIdx = FluidSystem::wPhaseIdx; //!< \deprecated use phaseIdx instead, only one phase employed - static const int nPhaseIdx = FluidSystem::nPhaseIdx; //!< \deprecated use phaseIdx instead, only one phase employed - static const int lPhaseIdx = wPhaseIdx; //!< \deprecated use phaseIdx instead, only one phase employed - static const int gPhaseIdx = nPhaseIdx; //!< \deprecated use phaseIdx instead, only one phase employed - // Component indices static const int phaseCompIdx = phaseIdx; //!< The index of the main component of the considered phase static const int transportCompIdx = (unsigned int)(1-phaseIdx); //!< The index of the transported (minor) component; ASSUMES phase indices of 0 and 1 - static const int comp1Idx = 0; //!< \deprecated Index of the wetting's primary component - static const int comp0Idx = 1; //!< \deprecated Index of the non-wetting's primary component - static const int lCompIdx = transportCompIdx; //!< \deprecated use transportComp instead - static const int gCompIdx = phaseCompIdx; //!< \deprecated use phaseCompIdx instead - // equation and primary variable indices static const int dim = StokesCommonIndices<TypeTag>::dim; static const int transportEqIdx = PVOffset + dim+1; //!< The index for the transport equation - static const int transportIdx = transportEqIdx; //!< \deprecated use transportEqIdx instead static const int massOrMoleFracIdx = transportEqIdx; //!< The index of the mass or mole fraction of the transported component in primary variable vectors - static const int massOrMoleFracIndex = massOrMoleFracIdx; //!< \deprecated use massOrMoleFracIdx instead - }; } // end namespace diff --git a/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh b/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh index 889464fa13e304fc24945a183af55e20ca23cbc8..b73d6cfeb754ca4dde8c9826023682b5e6f232e1 100644 --- a/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh +++ b/dumux/freeflow/stokes2cni/stokes2cnifluxvariables.hh @@ -79,13 +79,6 @@ public: const Scalar heatConductivity() const { return heatConductivity_; } - /*! - * \brief Returns the heat conductivity at the integration point. - */ - DUNE_DEPRECATED_MSG("use heatConductivity() instead") - Scalar heatConductivityAtIP() const - { return heatConductivity(); } - /*! * \brief Returns the temperature gradient at the integration point. */ @@ -98,13 +91,6 @@ public: const Scalar eddyConductivity() const { return 0; } - /*! - * \brief Returns the temperature gradient at the integration point. - */ - DUNE_DEPRECATED_MSG("use temperatureGrad() instead") - const DimVector &temperatureGradAtIP() const - { return temperatureGrad(); } - protected: void calculateValues_(const Problem &problem, const Element &element, diff --git a/dumux/freeflow/stokes2cni/stokes2cniindices.hh b/dumux/freeflow/stokes2cni/stokes2cniindices.hh index 40d9aeb4dc948fc8e501067c477731c278dfccc0..8e46c9126f5cb47e4b33fb5b7f97a6c2b14d39de 100644 --- a/dumux/freeflow/stokes2cni/stokes2cniindices.hh +++ b/dumux/freeflow/stokes2cni/stokes2cniindices.hh @@ -43,7 +43,6 @@ public: // number of dimensions static const int dim = StokesCommonIndices<TypeTag>::dim; static const int energyEqIdx = PVOffset + dim+2; //! The index for the energy balance equation - static const int energyIdx = energyEqIdx; // \deprecated Use energyEqIdx instaed static const int temperatureIdx = energyEqIdx; //! The index for temperature in primary variable vectors }; } // end namespace