<MPL> added several new MPL::VariableTypes and MPL::PropertyTypes

in preparation for TH2M Process

MaterialLib/MPL/PropertyType.h

@@ -84,6 +84,7 @@ enum PropertyType : int
     /// capillary pressure saturation relationship for microstructure.
     saturation_micro,
     specific_heat_capacity,
+    specific_latent_heat,
     storage,
     swelling_stress_rate,
     thermal_conductivity,
@@ -281,6 +282,10 @@ inline PropertyType convertStringToProperty(std::string const& inString)
     {
         return PropertyType::specific_heat_capacity;
     }
+    if (boost::iequals(inString, "specific_latent_heat"))
+    {
+        return PropertyType::specific_latent_heat;
+    }
     if (boost::iequals(inString, "storage"))
     {
         return PropertyType::storage;
@@ -390,6 +395,7 @@ static const std::array<std::string, PropertyType::number_of_properties>
                              "saturation",
                              "saturation_micro",
                              "specific_heat_capacity",
+                             "specific_latent_heat",
                              "storage",
                              "swelling_stress_rate",
                              "thermal_conductivity",

MaterialLib/MPL/VariableType.cpp

@@ -62,6 +62,10 @@ Variable convertStringToVariable(std::string const& input)
     {
         return Variable::solid_grain_pressure;
     }
+    if (boost::iequals(input, "vapour_pressure"))
+    {
+        return Variable::vapour_pressure;
+    }
 
     OGS_FATAL(
         "The variable name '{:s}' does not correspond to any known variable",

MaterialLib/MPL/VariableType.h

@@ -51,9 +51,11 @@ enum class Variable : int
     enthalpy_of_evaporation,
     equivalent_plastic_strain,
     grain_compressibility,
+    liquid_phase_pressure,
     liquid_saturation,
     mechanical_strain,
     molar_mass,
+    molar_fraction,
     phase_pressure,
     porosity,
     solid_grain_pressure,
@@ -62,6 +64,7 @@ enum class Variable : int
     total_strain,
     total_stress,
     transport_porosity,
+    vapour_pressure,
     volumetric_strain,
     number_of_variables
 };