Merge branch 'cleanup/frac-ex-streamline-param-names' into 'master'

[ex][fractures] streamline parameter names

See merge request !163

exercises/exercise-fractures/fracturespatialparams.hh

@@ -70,7 +70,7 @@ public:
     : ParentType(gridGeometry)
     , gridDataPtr_(gridData)
     , pcKrSwCurve_("Fracture.SpatialParams")
-    , barrierPcKrSwCurve_("Fracture.SpatialParams.Barrier")
+    , pcKrSwCurveBarrier_("Fracture.SpatialParams.Barrier")
     {
         porosity_ = getParamFromGroup<Scalar>(paramGroup, "SpatialParams.Porosity");
         porosityBarrier_ = getParamFromGroup<Scalar>(paramGroup, "SpatialParams.PorosityBarrier");
@@ -159,7 +159,7 @@ private:
     PermeabilityType permeability_;
     PermeabilityType permeabilityBarrier_;
     const PcKrSwCurve pcKrSwCurve_;
-    const PcKrSwCurve barrierPcKrSwCurve_;
+    const PcKrSwCurve pcKrSwCurveBarrier_;
 };
 
 } // end namespace Dumux

exercises/solution/exercise-fractures/fracturespatialparams.hh

@@ -74,7 +74,7 @@ public:
     , isExercisePartB_(getParamFromGroup<bool>(paramGroup, "Problem.IsExercisePartB"))
     , isExercisePartC_(getParamFromGroup<bool>(paramGroup, "Problem.IsExercisePartC"))
     , pcKrSwCurve_("Fracture.SpatialParams")
-    , barrierPcKrSwCurve_("Fracture.SpatialParams.Barrier")
+    , PcKrSwCurveBarrier_("Fracture.SpatialParams.Barrier")
     {
         porosity_ = getParamFromGroup<Scalar>(paramGroup, "SpatialParams.Porosity");
         porosityBarrier_ = getParamFromGroup<Scalar>(paramGroup, "SpatialParams.PorosityBarrier");
@@ -149,13 +149,13 @@ public:
 
         // in exercise part b always return the barrier parameters
         else if (isExercisePartB_)
-            return makeFluidMatrixInteraction(barrierPcKrSwCurve_);
+            return makeFluidMatrixInteraction(PcKrSwCurveBarrier_);
 
         // in exercise part 3 return parameters depending on domain marker
         else
         {
             if (getElementDomainMarker(element) == barriersDomainMarker)
-                return makeFluidMatrixInteraction(barrierPcKrSwCurve_);
+                return makeFluidMatrixInteraction(PcKrSwCurveBarrier_);
             else
                 return makeFluidMatrixInteraction(pcKrSwCurve_);
         }
@@ -201,7 +201,7 @@ private:
     bool isExercisePartC_;
 
     const PcKrSwCurve pcKrSwCurve_;
-    const PcKrSwCurve barrierPcKrSwCurve_;
+    const PcKrSwCurve PcKrSwCurveBarrier_;
 
     Scalar porosity_;
     Scalar porosityBarrier_;