Merge branch 'fix/2p2c-nonequil-paramnames' into 'master'

[test][2p2cnonequil] Fix parameter names to comply with naming conventions

See merge request !1574

test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/params.input

@@ -12,11 +12,11 @@ Name = chemicalnonequilibrium
 EnableGravity = false
 
 [SpatialParams]
-aWettingNonWettingA1 = -1.603e-01
-aWettingNonWettingA2 = 1.429e-05
-aWettingNonWettingA3 = 1.915e-01
-meanPoreSize = 5e-4
-factorMassTransfer = 0.5
+WettingNonWettingAreaA1 = -1.603e-01
+WettingNonWettingAreaA2 = 1.429e-05
+WettingNonWettingAreaA3 = 1.915e-01
+MeanPoreSize = 5e-4
+MassTransferFactor = 0.5
 
 [Component]
 SolidDensity = 2700

test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh

@@ -90,9 +90,9 @@ public:
         coarseMaterialParams_.setPe(1e4);
         coarseMaterialParams_.setLambda(2.0);
 
-        aWettingNonWettingA1_ = getParam<Scalar>("SpatialParams.aWettingNonWettingA1");
-        aWettingNonWettingA2_ = getParam<Scalar>("SpatialParams.aWettingNonWettingA2");
-        aWettingNonWettingA3_ = getParam<Scalar>("SpatialParams.aWettingNonWettingA3");
+        aWettingNonWettingA1_ = getParam<Scalar>("SpatialParams.WettingNonWettingAreaA1");
+        aWettingNonWettingA2_ = getParam<Scalar>("SpatialParams.WettingNonWettingAreaA2");
+        aWettingNonWettingA3_ = getParam<Scalar>("SpatialParams.WettingNonWettingAreaA3");
 
         // wetting-non wetting: surface which goes to zero on the edges, but is a polynomial
         aWettingNonWettingSurfaceParams_.setA1(aWettingNonWettingA1_);
@@ -102,8 +102,8 @@ public:
         using TwoPLaw = EffToAbsLaw<RegularizedBrooksCorey<Scalar>>;
         pcMax_ = TwoPLaw::pc(coarseMaterialParams_, /*sw = */0.0);
         aWettingNonWettingSurfaceParams_.setPcMax(pcMax_);
-        characteristicLength_ =getParam<Scalar>("SpatialParams.meanPoreSize");
-        factorMassTransfer_ = getParam<Scalar>("SpatialParams.factorMassTransfer");
+        characteristicLength_ =getParam<Scalar>("SpatialParams.MeanPoreSize");
+        factorMassTransfer_ = getParam<Scalar>("SpatialParams.MassTransferFactor");
     }
 
     template<class ElementSolution>