Partially implements FS#180 - Inconsistent naming - special status of

saturation. In particular: 
NumPrimaryEnergyVars -> numPrimaryEnergyVars
NumPrimaryVars -> numPrimaryVars

Reviewed by Christoph.


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10759 2fb0f335-1f38-0410-981e-8018bf24f1b0

dumux/implicit/mpnc/energy/mpncindicesenergy.hh

@@ -47,7 +47,10 @@ public:
      * \brief This module does not define any primary variables in the
      *        isothermal case.
      */
-    static const unsigned int NumPrimaryVars = 0;
+    static const unsigned int numPrimaryVars = 0;
+
+    DUNE_DEPRECATED_MSG("use numPrimaryVars (uncapitalized 'n') instead") 
+    static const unsigned int NumPrimaryVars = numPrimaryVars; //!< \deprecated
 };
 
 /*!
@@ -62,7 +65,10 @@ public:
     /*!
      * \brief This module defines one new primary variable.
      */
-    static const unsigned int NumPrimaryVars = 1;
+    static const unsigned int numPrimaryVars = 1;
+
+    DUNE_DEPRECATED_MSG("use numPrimaryVars (uncapitalized 'n') instead") 
+    static const unsigned int NumPrimaryVars = numPrimaryVars; //!< \deprecated
 
     /*!
      * \brief Index for the temperature in a vector of primary

dumux/implicit/mpnc/energy/mpncvolumevariablesenergy.hh

@@ -119,7 +119,7 @@ class MPNCVolumeVariablesEnergy<TypeTag, /*enableEnergy=*/true, /*kineticEnergyT
     enum { numPhases        = GET_PROP_VALUE(TypeTag, NumPhases) };
     enum { numComponents    = GET_PROP_VALUE(TypeTag, NumComponents) };
     enum { temperatureIdx   = Indices::temperatureIdx };
-    enum { numEnergyEqs     = Indices::NumPrimaryEnergyVars};
+    enum { numEnergyEqs     = Indices::numPrimaryEnergyVars};
     enum { temperature0Idx = Indices::temperatureIdx };
 
     typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;

dumux/implicit/mpnc/mass/mpncindicesmass.hh

@@ -51,7 +51,10 @@ public:
     /*!
      * \brief This module defines one new primary variable.
      */
-    static const unsigned int NumPrimaryVars = numComponents;
+    static const unsigned int numPrimaryVars = numComponents;
+
+    DUNE_DEPRECATED_MSG("use numPrimaryVars (uncapitalized 'n') instead") 
+    static const unsigned int NumPrimaryVars = numPrimaryVars; //!< \deprecated
 
     /*!
      * \brief Index for the fugacity of the first component in the

dumux/implicit/mpnc/mpncindices.hh

@@ -55,7 +55,7 @@ struct MPNCIndices :
                                TypeTag,
                                GET_PROP_VALUE(TypeTag, EnableKinetic) >,
         public MPNCEnergyIndices<BasePVOffset +
-                                 MPNCMassIndices<0, TypeTag, GET_PROP_VALUE(TypeTag, EnableKinetic) >::NumPrimaryVars,
+                                 MPNCMassIndices<0, TypeTag, GET_PROP_VALUE(TypeTag, EnableKinetic) >::numPrimaryVars,
                                  GET_PROP_VALUE(TypeTag, EnableEnergy),
                                  GET_PROP_VALUE(TypeTag, EnableKineticEnergy)>
 {
@@ -67,23 +67,29 @@ private:
             enum { numPhases = FluidSystem::numPhases };
 
             typedef MPNCMassIndices<BasePVOffset, TypeTag, enableKinetic> MassIndices;
-            typedef MPNCEnergyIndices<BasePVOffset + MassIndices::NumPrimaryVars, enableEnergy, enableKineticEnergy> EnergyIndices;
+            typedef MPNCEnergyIndices<BasePVOffset + MassIndices::numPrimaryVars, enableEnergy, enableKineticEnergy> EnergyIndices;
 
 public:
     /*!
      * \brief The number of primary variables / equations.
      */
     // temperature + Mass Balance  + constraints for switch stuff
-    static const unsigned int NumPrimaryVars =
-        MassIndices::NumPrimaryVars +
-        EnergyIndices::NumPrimaryVars +
+    static const unsigned int numPrimaryVars =
+        MassIndices::numPrimaryVars +
+        EnergyIndices::numPrimaryVars +
         numPhases;
 
+    DUNE_DEPRECATED_MSG("use numPrimaryVars (uncapitalized 'n') instead") 
+    static const unsigned int NumPrimaryVars = numPrimaryVars; //!< \deprecated
+
     /*!
      * \brief The number of primary variables / equations of the energy module.
      */
-    static const unsigned int NumPrimaryEnergyVars =
-        EnergyIndices::NumPrimaryVars ;
+    static const unsigned int numPrimaryEnergyVars =
+        EnergyIndices::numPrimaryVars ;
+
+    DUNE_DEPRECATED_MSG("use numPrimaryEnergyVars (uncapitalized 'n') instead") 
+    static const unsigned int NumPrimaryEnergyVars = numPrimaryEnergyVars; //!< \deprecated
 
     /*!
      * \brief Index of the saturation of the first phase in a vector
@@ -93,8 +99,8 @@ public:
      * saturations for the phases [1, ..., numPhases - 1]
      */
     static const unsigned int s0Idx =
-        MassIndices::NumPrimaryVars +
-        EnergyIndices::NumPrimaryVars;
+        MassIndices::numPrimaryVars +
+        EnergyIndices::numPrimaryVars;
 
     DUNE_DEPRECATED_MSG("use s0Idx (uncapitalized 's') instead") 
     static const int S0Idx = s0Idx; //!< \deprecated index of the saturation of the first phase
@@ -104,8 +110,8 @@ public:
      *        primary variables.
      */
     static const unsigned int p0Idx =
-        MassIndices::NumPrimaryVars +
-        EnergyIndices::NumPrimaryVars +
+        MassIndices::numPrimaryVars +
+        EnergyIndices::numPrimaryVars +
         numPhases - 1;
 
     /*!
@@ -114,8 +120,8 @@ public:
      * The index for the remaining phases are consecutive.
      */
     static const unsigned int phase0NcpIdx =
-        MassIndices::NumPrimaryVars +
-        EnergyIndices::NumPrimaryVars;
+        MassIndices::numPrimaryVars +
+        EnergyIndices::numPrimaryVars;
 };
 
 }

dumux/implicit/mpnc/mpncpropertydefaults.hh

@@ -87,7 +87,7 @@ private:
     typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
 
 public:
-    static const unsigned int value = Indices::NumPrimaryVars;
+    static const unsigned int value = Indices::numPrimaryVars;
 };
 
 /*!