[MPL] Rename ParameterProperty -> Parameter for consistency.

MaterialLib/MPL/Properties/CreateParameterProperty.cpp → MaterialLib/MPL/Properties/CreateParameter.cpp

@@ -10,17 +10,17 @@
  *              http://www.opengeosys.org/project/license
  */
 
-#include "CreateParameterProperty.h"
+#include "CreateParameter.h"
 
 #include "BaseLib/ConfigTree.h"
 #include "ParameterLib/Parameter.h"
 #include "ParameterLib/Utils.h"
 
-#include "ParameterProperty.h"
+#include "Parameter.h"
 
 namespace MaterialPropertyLib
 {
-std::unique_ptr<ParameterProperty> createParameterProperty(
+std::unique_ptr<Parameter> createParameterProperty(
     BaseLib::ConfigTree const& config,
     std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters)
 {
@@ -38,7 +38,7 @@ std::unique_ptr<ParameterProperty> createParameterProperty(
         config.getConfigParameter<std::string>("parameter_name");
     auto const& parameter = ParameterLib::findParameter<double>(
         parameter_name, parameters, 0, nullptr);
-    return std::make_unique<MaterialPropertyLib::ParameterProperty>(
+    return std::make_unique<MaterialPropertyLib::Parameter>(
         std::move(property_name), parameter);
 }
 }  // namespace MaterialPropertyLib

MaterialLib/MPL/Properties/CreateParameterProperty.h → MaterialLib/MPL/Properties/CreateParameter.h

@@ -22,7 +22,7 @@ class ConfigTree;
 
 namespace MaterialPropertyLib
 {
-class ParameterProperty;
+class Parameter;
 }
 
 namespace ParameterLib
@@ -32,7 +32,7 @@ struct ParameterBase;
 
 namespace MaterialPropertyLib
 {
-std::unique_ptr<ParameterProperty> createParameterProperty(
+std::unique_ptr<Parameter> createParameterProperty(
     BaseLib::ConfigTree const& config,
     std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const&
         parameters);

MaterialLib/MPL/Properties/CreateProperties.h

@@ -23,7 +23,7 @@
 #include "CreateExponential.h"
 #include "CreateIdealGasLaw.h"
 #include "CreateLinear.h"
-#include "CreateParameterProperty.h"
+#include "CreateParameter.h"
 #include "CreatePermeabilityOrthotropicPowerLaw.h"
 #include "CreatePorosityFromMassBalance.h"
 #include "CreateSaturationDependentSwelling.h"

MaterialLib/MPL/Properties/ParameterProperty.cpp → MaterialLib/MPL/Properties/Parameter.cpp

@@ -8,35 +8,34 @@
  *              http://www.opengeosys.org/project/license
  */
 
-#include "MaterialLib/MPL/Properties/ParameterProperty.h"
+#include "MaterialLib/MPL/Properties/Parameter.h"
 
 namespace MaterialPropertyLib
 {
-ParameterProperty::ParameterProperty(
-    std::string name, ParameterLib::Parameter<double> const& parameter)
+Parameter::Parameter(std::string name,
+                     ParameterLib::Parameter<double> const& parameter)
     : parameter_(parameter)
 {
     name_ = std::move(name);
 }
 
-PropertyDataType ParameterProperty::value(
-    VariableArray const& /*variable_array*/,
-    ParameterLib::SpatialPosition const& pos, double const t,
-    double const /*dt*/) const
+PropertyDataType Parameter::value(VariableArray const& /*variable_array*/,
+                                  ParameterLib::SpatialPosition const& pos,
+                                  double const t, double const /*dt*/) const
 {
     return fromVector(parameter_(t, pos));
 }
 
-PropertyDataType ParameterProperty::dValue(
-    VariableArray const& /*variable_array*/,
-    Variable const /*primary_variable*/,
-    ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/,
-    double const /*dt*/) const
+PropertyDataType Parameter::dValue(VariableArray const& /*variable_array*/,
+                                   Variable const /*primary_variable*/,
+                                   ParameterLib::SpatialPosition const& /*pos*/,
+                                   double const /*t*/,
+                                   double const /*dt*/) const
 {
     return double{};
 }
 
-PropertyDataType ParameterProperty::d2Value(
+PropertyDataType Parameter::d2Value(
     VariableArray const& /*variable_array*/, Variable const /*pv1*/,
     Variable const /*pv2*/, ParameterLib::SpatialPosition const& /*pos*/,
     double const /*t*/, double const /*dt*/) const

MaterialLib/MPL/Properties/ParameterProperty.h → MaterialLib/MPL/Properties/Parameter.h

@@ -19,11 +19,11 @@ namespace MaterialPropertyLib
 /// The parameter property class. The property reads the value from a parameter.
 /// The current implementation accepts only the double datatype defined in
 /// PropertyDataType.
-class ParameterProperty final : public Property
+class Parameter final : public Property
 {
 public:
-    ParameterProperty(std::string name,
-                      ParameterLib::Parameter<double> const& parameter);
+    Parameter(std::string name,
+              ParameterLib::Parameter<double> const& parameter);
 
     /// This method computes the value of a property depending linearly on
     /// the value of the given primary variable.

MaterialLib/MPL/Properties/Properties.h

@@ -22,7 +22,7 @@
 #include "Exponential.h"
 #include "IdealGasLaw.h"
 #include "Linear.h"
-#include "ParameterProperty.h"
+#include "Parameter.h"
 #include "PorosityFromMassBalance.h"
 #include "RelativePermeability/RelPermBrooksCorey.h"
 #include "RelativePermeability/RelPermLiakopoulos.h"