[volvars] Rename wettingPhaseIdx() -> wettingPhase()

dumux/io/plotthermalconductivitymodel.hh

@@ -122,9 +122,9 @@ private:
 
         using FluidSystem = typename PlotThermalConductivityModel::FluidSystem;
 
-        Scalar saturation(int phaseIdx) const
+        Scalar saturation(const int phaseIdx) const
         {
-            if (phaseIdx == wettingPhaseIdx())
+            if (phaseIdx == wettingPhase())
                 return saturation_;
             else
                 return 1.0 - saturation_;
@@ -132,14 +132,14 @@ private:
 
         Scalar fluidThermalConductivity(const int phaseIdx) const
         {
-            if (phaseIdx == wettingPhaseIdx())
+            if (phaseIdx == wettingPhase())
                 return lambdaW_;
             else
                 return lambdaN_;
         }
 
-        Scalar wettingPhaseIdx() const
-        { return phase0Idx;}
+        int wettingPhase() const
+        { return phase0Idx; }
 
         Scalar porosity() const
         { return porosity_; }

dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh

@@ -82,8 +82,8 @@ public:
         // TODO: there should be an assertion that the indices are correct and 0 is actually the wetting phase!
 
         const Scalar sw = volVars.saturation(volVars.wettingPhaseIdx());
-        const Scalar lambdaW = volVars.fluidThermalConductivity(volVars.wettingPhaseIdx());
-        const Scalar lambdaN = volVars.fluidThermalConductivity(1-volVars.wettingPhaseIdx());
+        const Scalar lambdaW = volVars.fluidThermalConductivity(volVars.wettingPhase());
+        const Scalar lambdaN = volVars.fluidThermalConductivity(1-volVars.wettingPhase());
         const Scalar lambdaSolid = volVars.solidThermalConductivity();
         const Scalar porosity = volVars.porosity();
         const Scalar rhoSolid = volVars.solidDensity();

dumux/porousmediumflow/2p/volumevariables.hh

@@ -287,7 +287,7 @@ public:
     /*!
      * \brief Returns the wetting phase index
      */
-    const int wettingPhaseIdx() const
+    int wettingPhase() const
     {  return wPhaseIdx_; }
 
 protected:

dumux/porousmediumflow/2p1c/volumevariables.hh

@@ -401,7 +401,7 @@ public:
     /*!
      * \brief Returns the wetting phase index
      */
-    const int wettingPhaseIdx() const
+    int wettingPhase() const
     {  return wPhaseIdx_; }
 
 protected:

dumux/porousmediumflow/2p2c/volumevariables.hh

@@ -406,7 +406,7 @@ public:
     /*!
      * \brief Returns the wetting phase index
      */
-    const int wettingPhaseIdx() const
+    int wettingPhase() const
     { return wPhaseIdx_; }
 
 private:

dumux/porousmediumflow/2pnc/volumevariables.hh

@@ -495,7 +495,7 @@ public:
     /*!
      * \brief Returns the wetting phase index
      */
-    const int wettingPhaseIdx() const
+    int wettingPhase() const
     {  return wPhaseIdx_; }
 
 protected:

dumux/porousmediumflow/co2/volumevariables.hh

@@ -491,10 +491,9 @@ public:
     /*!
      * \brief Returns the wetting phase index
      */
-    const int wettingPhaseIdx() const
+    int wettingPhase() const
     { return wPhaseIdx_; }
 
-
 private:
     int wPhaseIdx_;
     FluidState fluidState_;