Remove more stuff that was deprecated before 2.9.

Also update CHANGELOG with current deprecations.

CHANGELOG.md

@@ -60,21 +60,29 @@ Differences Between DuMuX 2.9 and DuMuX 2.10
 
 * Deprecated PROPERTY and PARAMETER NAMES, to be removed after 2.10: BEWARE: The
   compiler will not print any warning if a deprecated property or parameter name
-  is used. However, a run-time warning should appear in the summary lines after
-  the corresponding run.
-    - The property `tau` was renamed to `TauTortuosity` to make the name more telling.
-      For the models 1p2c, 2p2c, 3p3c it got the default value 0.5.
+  is used. If possible, a run-time warning will appear in the summary lines
+  after the corresponding run.
+    - The pure run-time parameter `tau` has been renamed to the property and
+      run-time parameter `TauTortuosity`. For the models 1p2c, 2p2c, 3p3c it got
+      the default value 0.5.
 
 * Deprecated CLASSES/FILES, to be removed after 2.10:
     - The class `DiffusivityConstantTau<TypeTag, Scalar>` was renamed to
       `DiffusivityConstant<TypeTag>` and is located in a according new header. The
       old class, its header and the property `tau` are deprecated.
 
+    - `PointSourceHelper<TypeTag>` has been deprecated. Use
+      `BoundingBoxTreePointSourceHelper<TypeTag>` instead.
+
+    - The classes `Dumux::Liquid/GasPhase<Scalar, Component>` have been moved to
+      the namespace `Dumux::FluidSystems`.
+
 * Deprecated MEMBER FUNCTIONS, to be removed after 2.10:
+    - `checkEffectiveSaturation` of the classes `PlotMaterialLaw<TypeTag>` in
+      `dumux/io`.
 
-* Deprecated protected MEMBER VARIABLES, to be removed after 2.10: BEWARE: Older
-  compilers will not print any warning if a deprecated protected member variable
-  is used.
+    - `concentrationGrad` of the class `TwoPNCFluxVariables<TypeTag>`. Use
+      `moleFractionGrad` instead, with the obviously different physical meaning.
 
 * DELETED classes/files, property names, constants/enums,
   member functions, which have been deprecated in DuMuX 2.9:

dumux/material/chemistry/electrochemistry/electrochemistryni.hh

@@ -114,13 +114,6 @@ public:
         values[contiO2EqIdx]  = -currentDensity/(4*Constant::F);                 //O2-equation
         values[energyEqIdx] = (thermoneutralVoltage - cellVoltage)*currentDensity; //energy equation
     }
-
-    DUNE_DEPRECATED_MSG("First compute the currentDensity with calculateCurrentDensity(const VolumeVariables&) and then use the method reactionSource(PrimaryVariables&, Scalar) instead")
-    static void reactionSource(PrimaryVariables &values,
-                               const VolumeVariables &volVars)
-    {
-        reactionSource(values, ParentType::calculateCurrentDensity(volVars));
-    }
 };
 
 }// end namespace

dumux/material/fluidsystems/brineair.hh

@@ -273,18 +273,7 @@ public:
        return vaporPressure_(Temperature,salinity);
      }
 
-     /*!
-     * \brief Return the salt specific heat capacity \f$\mathrm{[J/(kg K)]}\f$.
-     *
-     * \param phaseIdx The index of the precipitated phase to consider
-     */
-     DUNE_DEPRECATED_MSG("saltSpecificHeatCapacity(int phaseIdx) is deprecated. Use precipitateSpecificHeatCapacity(int sPhaseIdx) instead.")
-     static Scalar saltSpecificHeatCapacity(int phaseIdx)//Specific heat capacity per unit mole of solid salt phase (J/Kkg)
-    {
-        return 36.79/molarMass(phaseIdx);
-    }
-
-     /*!
+    /*!
      * \brief Return the salt specific heat capacity \f$\mathrm{[J/molK]}\f$.
      *
      * \param phaseIdx The index of the precipitated phase to consider

dumux/porousmediumflow/1p/sequential/indices.hh

@@ -25,8 +25,6 @@
 #ifndef DUMUX_SEQUENTIAL_1P_INDICES_HH
 #define DUMUX_SEQUENTIAL_1P_INDICES_HH
 
-#include <dune/common/deprecated.hh>
-
 namespace Dumux
 {
 /*!
@@ -42,9 +40,6 @@ struct SequentialOnePCommonIndices
    static const int pressureEqIdx = 0;//!< Index of the pressure equation
 };
 
-struct DecoupledOnePCommonIndices : public SequentialOnePCommonIndices
-{} DUNE_DEPRECATED_MSG("Use SequentialOnePCommonIndices instead.");
-
 // \}
 } // namespace Dumux
 

dumux/porousmediumflow/1p/sequential/properties.hh

@@ -54,9 +54,6 @@ namespace Properties
 //! The type tag for the single-phase problem
 NEW_TYPE_TAG(SequentialOneP, INHERITS_FROM(SequentialModel));
 
-//! DEPRECATED Since compile-time detection is "impossible," a run-time check will be performed in start.hh
-NEW_TYPE_TAG(DecoupledOneP, INHERITS_FROM(SequentialOneP));
-
 //////////////////////////////////////////////////////////////////
 // Property tags
 //////////////////////////////////////////////////////////////////

dumux/porousmediumflow/2p/sequential/indices.hh

@@ -25,8 +25,6 @@
 #ifndef DUMUX_SEQUENTIAL_2P_INDICES_HH
 #define DUMUX_SEQUENTIAL_2P_INDICES_HH
 
-#include <dune/common/deprecated.hh>
-
 namespace Dumux
 {
 /*!
@@ -71,9 +69,6 @@ struct SequentialTwoPCommonIndices
     static const int velocityTotal = 2; //!<  Indicates total velocity
 };
 
-struct DecoupledTwoPCommonIndices : public SequentialTwoPCommonIndices
-{} DUNE_DEPRECATED_MSG("Use SequentialTwoPCommonIndices instead.");
-
 /*!
  * \brief The indices for the \f$p_w-S_n\f$ formulation of the
  *        isothermal two-phase model.
@@ -275,10 +270,6 @@ struct SequentialTwoPIndices<SequentialTwoPCommonIndices::pGlobalSn, PVOffset>
     static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
 };
 
-template <int formulation = SequentialTwoPCommonIndices::pwsn, int PVOffset = 0>
-struct DecoupledTwoPIndices : public SequentialTwoPIndices<formulation, PVOffset>
-{} DUNE_DEPRECATED_MSG("Use SequentialTwoPIndices instead.");
-
 // \}
 } // namespace Dumux
 

dumux/porousmediumflow/2p/sequential/properties.hh

@@ -55,9 +55,6 @@ namespace Properties
 //! The TypeTag for sequential two-phase problems
 NEW_TYPE_TAG(SequentialTwoP, INHERITS_FROM(SequentialModel));
 
-//! DEPRECATED Since compile-time detection is "impossible," a run-time check will be performed in start.hh
-NEW_TYPE_TAG(DecoupledTwoP, INHERITS_FROM(SequentialTwoP));
-
 //////////////////////////////////////////////////////////////////
 // Property tags
 //////////////////////////////////////////////////////////////////

dumux/porousmediumflow/2p2c/sequential/adaptiveproperties.hh

@@ -55,9 +55,6 @@ namespace Properties
 //! The type tag for the compositional two-phase problems
 NEW_TYPE_TAG(SequentialTwoPTwoCAdaptive, INHERITS_FROM(SequentialTwoPTwoC));
 
-//! DEPRECATED Since compile-time detection is "impossible," a run-time check will be performed in start.hh
-NEW_TYPE_TAG(DecoupledTwoPTwoCAdaptive, INHERITS_FROM(SequentialTwoPTwoCAdaptive));
-
 //////////////////////////////////////////////////////////////////
 // Property tags
 //////////////////////////////////////////////////////////////////
@@ -110,10 +107,6 @@ struct SequentialTwoPTwoCIndicesAdaptive : public SequentialTwoPTwoCIndices<Type
     static const int satEqIdx = 0;
 };
 
-template <class TypeTag>
-struct DecoupledTwoPTwoCIndicesAdaptive : public SequentialTwoPTwoCIndicesAdaptive<TypeTag>
-{} DUNE_DEPRECATED_MSG("Use SequentialTwoPTwoCIndicesAdaptive instead.");
-
 // \}
 
 }

dumux/porousmediumflow/2p2c/sequential/properties.hh

@@ -61,9 +61,6 @@ namespace Properties
 //! The type tag for the compositional two-phase problems
 NEW_TYPE_TAG(SequentialTwoPTwoC, INHERITS_FROM(Pressure, Transport, IMPET));
 
-//! DEPRECATED Since compile-time detection is "impossible," a run-time check will be performed in start.hh
-NEW_TYPE_TAG(DecoupledTwoPTwoC, INHERITS_FROM(SequentialTwoPTwoC));
-
 //////////////////////////////////////////////////////////////////
 // Property tags
 //////////////////////////////////////////////////////////////////
@@ -221,10 +218,6 @@ public:
     static const int permDependent = 1;
 };
 
-template <class TypeTag>
-struct DecoupledTwoPTwoCIndices : public SequentialTwoPTwoCIndices<TypeTag>
-{} DUNE_DEPRECATED_MSG("Use SequentialTwoPTwoCIndices instead.");
-
 // \}
 
 }

dumux/porousmediumflow/implicit/cpdarcyfluxvariables.hh

@@ -76,39 +76,6 @@ class CpDarcyFluxVariables
     typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
 
 public:
-    /*!
-     * \brief The old constructor
-     *
-     * \param problem The problem
-     * \param element The finite element
-     * \param fvGeometry The finite-volume geometry
-     * \param fIdx The local index of the SCV (sub-control-volume) face
-     * \param elemVolVars The volume variables of the current element
-     * \param onBoundary A boolean variable to specify whether the flux variables
-     * are calculated for interior SCV faces or boundary faces, default=false
-     */
-    DUNE_DEPRECATED_MSG("FluxVariables now have to be default constructed and updated.")
-    CpDarcyFluxVariables(const Problem &problem,
-                         const Element &element,
-                         const FVElementGeometry &fvGeometry,
-                         const int fIdx,
-                         const ElementVolumeVariables &elemVolVars,
-                         const bool onBoundary = false)
-    {
-        DUNE_THROW(Dune::InvalidStateException, "The FluxVariables now have to be default contructed. "
-                                                << "In case you have your own FluxVariables you have to make them default "
-                                                << " constructable too. All calls to the old constructor will throw this error. "
-                                                << "Everywhere you instantiate FluxVariables do this now by default constructing "
-                                                << "a FluxVariables object (FluxVariables fluxVars;) and then updating it where "
-                                                << "the update method has the same signature as the old constructor (fluxVars.update(...).)");
-    }
-
-    /*!
-     * \brief Default constructor
-     * \note This can be removed when the deprecated constructor is removed.
-     */
-    CpDarcyFluxVariables() = default;
-
     /*!
      * \brief Compute / update the flux variables
      *

dumux/porousmediumflow/implicit/darcyfluxvariables.hh

@@ -28,9 +28,6 @@
 
 #include <dune/common/float_cmp.hh>
 
-#include <dune/common/exceptions.hh>
-#include <dune/common/deprecated.hh>
-
 #include <dumux/common/math.hh>
 #include <dumux/common/parameters.hh>
 
@@ -78,39 +75,6 @@ class ImplicitDarcyFluxVariables
     typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
 
 public:
-    /*!
-     * \brief The old constructor
-     *
-     * \param problem The problem
-     * \param element The finite element
-     * \param fvGeometry The finite-volume geometry
-     * \param fIdx The local index of the SCV (sub-control-volume) face
-     * \param elemVolVars The volume variables of the current element
-     * \param onBoundary A boolean variable to specify whether the flux variables
-     * are calculated for interior SCV faces or boundary faces, default=false
-     */
-    DUNE_DEPRECATED_MSG("FluxVariables now have to be default constructed and updated.")
-    ImplicitDarcyFluxVariables(const Problem &problem,
-                               const Element &element,
-                               const FVElementGeometry &fvGeometry,
-                               const int fIdx,
-                               const ElementVolumeVariables &elemVolVars,
-                               const bool onBoundary = false)
-    {
-        DUNE_THROW(Dune::InvalidStateException, "The FluxVariables now have to be default contructed. "
-                                                << "In case you have your own FluxVariables you have to make them default "
-                                                << " constructable too. All calls to the old constructor will throw this error. "
-                                                << "Everywhere you instantiate FluxVariables do this now by default constructing "
-                                                << "a FluxVariables object (FluxVariables fluxVars;) and then updating it where "
-                                                << "the update method has the same signature as the old constructor (fluxVars.update(...).)");
-    }
-
-    /*!
-     * \brief Default constructor
-     * \note This can be removed when the deprecated constructor is removed.
-     */
-    ImplicitDarcyFluxVariables() = default;
-
     /*!
      * \brief Compute / update the flux variables
      *

dumux/porousmediumflow/implicit/forchheimerfluxvariables.hh

@@ -101,32 +101,6 @@ class ImplicitForchheimerFluxVariables
     typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
 
 public:
-    /*!
-     * \brief The old constructor
-     *
-     * \param problem The problem
-     * \param element The finite element
-     * \param fvGeometry The finite-volume geometry
-     * \param fIdx The local index of the SCV (sub-control-volume) face
-     * \param elemVolVars The volume variables of the current element
-     * \param onBoundary A boolean variable to specify whether the flux variables
-     * are calculated for interior SCV faces or boundary faces, default=false
-     */
-    DUNE_DEPRECATED_MSG("FluxVariables now have to be default constructed and updated.")
-    ImplicitForchheimerFluxVariables(const Problem &problem,
-                 const Element &element,
-                 const FVElementGeometry &fvGeometry,
-                 const unsigned int fIdx,
-                 const ElementVolumeVariables &elemVolVars,
-                 const bool onBoundary = false)
-        : ImplicitDarcyFluxVariables<TypeTag>(problem, element, fvGeometry, fIdx, elemVolVars, onBoundary) {}
-
-    /*!
-     * \brief Default constructor
-     * \note This can be removed when the deprecated constructor is removed.
-     */
-    ImplicitForchheimerFluxVariables() = default;
-
     /*! \copydoc ParentType::update() */
     void update(const Problem &problem,
                 const Element &element,

dumux/porousmediumflow/sequential/properties.hh

@@ -43,9 +43,6 @@ namespace Properties
 //! Create a type tag for all sequential models
 NEW_TYPE_TAG(SequentialModel, INHERITS_FROM(NumericModel, GridAdaptTypeTag));
 
-//! DEPRECATED Since compile-time detection is "impossible," a run-time check will be performed in start.hh
-NEW_TYPE_TAG(DecoupledModel, INHERITS_FROM(SequentialModel));
-
 //////////////////////////////////////////////////////////////////
 // Property tags
 //////////////////////////////////////////////////////////////////