From 551bf4adc62dc9620ea126281eb5ea5ca7a38893 Mon Sep 17 00:00:00 2001 From: Wenqing Wang <wenqing.wang@ufz.de> Date: Thu, 25 Mar 2021 10:53:09 +0100 Subject: [PATCH] [MPL] Changed the name of GeneralWaterVapourLatentHeat to WaterVapourLatentHeatWithCriticalTemperature --- .../c_GeneralWaterVapourLatentHeat.md | 1 - ...erVapourLatentHeatWithCriticalTemperature.md | 1 + .../images/general_latent_heat_water_vapour.png | Bin 5928 -> 0 bytes ...latent_heat_water_vapour_with_critical_T.png | Bin 0 -> 11320 bytes MaterialLib/MPL/CreateProperty.cpp | 5 +++-- MaterialLib/MPL/Properties/CreateProperties.h | 2 +- ...VapourLatentHeatWithCriticalTemperature.cpp} | 15 ++++++++------- ...erVapourLatentHeatWithCriticalTemperature.h} | 2 +- ...VapourLatentHeatWithCriticalTemperature.cpp} | 9 +++++---- ...erVapourLatentHeatWithCriticalTemperature.h} | 16 +++++++--------- MaterialLib/MPL/Properties/Properties.h | 2 +- ...VapourLatentHeatWithCriticalTemperature.cpp} | 9 +++++---- 12 files changed, 32 insertions(+), 30 deletions(-) delete mode 100644 Documentation/ProjectFile/properties/property/GeneralWaterVapourLatentHeat/c_GeneralWaterVapourLatentHeat.md create mode 100644 Documentation/ProjectFile/properties/property/WaterVapourLatentHeatWithCriticalTemperature/c_WaterVapourLatentHeatWithCriticalTemperature.md delete mode 100644 Documentation/images/general_latent_heat_water_vapour.png create mode 100644 Documentation/images/latent_heat_water_vapour_with_critical_T.png rename MaterialLib/MPL/Properties/Enthalpy/{CreateGeneralWaterVapourLatentHeat.cpp => CreateWaterVapourLatentHeatWithCriticalTemperature.cpp} (56%) rename MaterialLib/MPL/Properties/Enthalpy/{CreateGeneralWaterVapourLatentHeat.h => CreateWaterVapourLatentHeatWithCriticalTemperature.h} (86%) rename MaterialLib/MPL/Properties/Enthalpy/{GeneralWaterVapourLatentHeat.cpp => WaterVapourLatentHeatWithCriticalTemperature.cpp} (90%) rename MaterialLib/MPL/Properties/Enthalpy/{GeneralWaterVapourLatentHeat.h => WaterVapourLatentHeatWithCriticalTemperature.h} (85%) rename Tests/MaterialLib/{TestMPLGeneralWaterVapourLatentHeat.cpp => TestMPLWaterVapourLatentHeatWithCriticalTemperature.cpp} (93%) diff --git a/Documentation/ProjectFile/properties/property/GeneralWaterVapourLatentHeat/c_GeneralWaterVapourLatentHeat.md b/Documentation/ProjectFile/properties/property/GeneralWaterVapourLatentHeat/c_GeneralWaterVapourLatentHeat.md deleted file mode 100644 index b37b7225ae1..00000000000 --- a/Documentation/ProjectFile/properties/property/GeneralWaterVapourLatentHeat/c_GeneralWaterVapourLatentHeat.md +++ /dev/null @@ -1 +0,0 @@ -\copydoc MaterialPropertyLib::GeneralWaterVapourLatentHeat diff --git a/Documentation/ProjectFile/properties/property/WaterVapourLatentHeatWithCriticalTemperature/c_WaterVapourLatentHeatWithCriticalTemperature.md b/Documentation/ProjectFile/properties/property/WaterVapourLatentHeatWithCriticalTemperature/c_WaterVapourLatentHeatWithCriticalTemperature.md new file mode 100644 index 00000000000..4cac4c1fc2f --- /dev/null +++ b/Documentation/ProjectFile/properties/property/WaterVapourLatentHeatWithCriticalTemperature/c_WaterVapourLatentHeatWithCriticalTemperature.md @@ -0,0 +1 @@ +\copydoc MaterialPropertyLib::WaterVapourLatentHeatWithCriticalTemperature diff --git a/Documentation/images/general_latent_heat_water_vapour.png b/Documentation/images/general_latent_heat_water_vapour.png deleted file mode 100644 index 5c29724d82ba1055abbe53a04871eb2947b876c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5928 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 F{{tn`!h8S# diff --git a/Documentation/images/latent_heat_water_vapour_with_critical_T.png b/Documentation/images/latent_heat_water_vapour_with_critical_T.png new file mode 100644 index 0000000000000000000000000000000000000000..1560c9baaa0075a69654384cb5991dca21f8bfaa GIT binary patch literal 11320 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 NsImDU1qWTO|1aY53=;qV literal 0 HcmV?d00001 diff --git a/MaterialLib/MPL/CreateProperty.cpp b/MaterialLib/MPL/CreateProperty.cpp index 7c74fbc4aed..789572824f6 100644 --- a/MaterialLib/MPL/CreateProperty.cpp +++ b/MaterialLib/MPL/CreateProperty.cpp @@ -247,9 +247,10 @@ std::unique_ptr<MaterialPropertyLib::Property> createProperty( return createLinearWaterVapourLatentHeat(config); } - if (boost::iequals(property_type, "GeneralWaterVapourLatentHeat")) + if (boost::iequals(property_type, + "WaterVapourLatentHeatWithCriticalTemperature")) { - return createGeneralWaterVapourLatentHeat(config); + return createWaterVapourLatentHeatWithCriticalTemperature(config); } // If none of the above property types are found, OGS throws an error. diff --git a/MaterialLib/MPL/Properties/CreateProperties.h b/MaterialLib/MPL/Properties/CreateProperties.h index 7f1dd0449f0..705477492ac 100644 --- a/MaterialLib/MPL/Properties/CreateProperties.h +++ b/MaterialLib/MPL/Properties/CreateProperties.h @@ -39,8 +39,8 @@ #include "CreateStrainDependentPermeability.h" #include "CreateTransportPorosityFromMassBalance.h" #include "Density/CreateWaterVapourDensity.h" -#include "Enthalpy/CreateGeneralWaterVapourLatentHeat.h" #include "Enthalpy/CreateLinearWaterVapourLatentHeat.h" +#include "Enthalpy/CreateWaterVapourLatentHeatWithCriticalTemperature.h" #include "RelativePermeability/CreateRelPermBrooksCorey.h" #include "RelativePermeability/CreateRelPermBrooksCoreyNonwettingPhase.h" #include "RelativePermeability/CreateRelPermLiakopoulos.h" diff --git a/MaterialLib/MPL/Properties/Enthalpy/CreateGeneralWaterVapourLatentHeat.cpp b/MaterialLib/MPL/Properties/Enthalpy/CreateWaterVapourLatentHeatWithCriticalTemperature.cpp similarity index 56% rename from MaterialLib/MPL/Properties/Enthalpy/CreateGeneralWaterVapourLatentHeat.cpp rename to MaterialLib/MPL/Properties/Enthalpy/CreateWaterVapourLatentHeatWithCriticalTemperature.cpp index 23f007a400e..febe85594de 100644 --- a/MaterialLib/MPL/Properties/Enthalpy/CreateGeneralWaterVapourLatentHeat.cpp +++ b/MaterialLib/MPL/Properties/Enthalpy/CreateWaterVapourLatentHeatWithCriticalTemperature.cpp @@ -9,27 +9,28 @@ * Created on March 19, 2021, 11:51 AM */ -#include "CreateGeneralWaterVapourLatentHeat.h" +#include "CreateWaterVapourLatentHeatWithCriticalTemperature.h" #include "BaseLib/ConfigTree.h" -#include "GeneralWaterVapourLatentHeat.h" #include "MaterialLib/MPL/Property.h" +#include "WaterVapourLatentHeatWithCriticalTemperature.h" namespace MaterialPropertyLib { -std::unique_ptr<Property> createGeneralWaterVapourLatentHeat( +std::unique_ptr<Property> createWaterVapourLatentHeatWithCriticalTemperature( BaseLib::ConfigTree const& config) { //! \ogs_file_param{properties__property__type} - config.checkConfigParameter("type", "GeneralWaterVapourLatentHeat"); - DBUG("Create GeneralWaterVapourLatentHeat phase property"); + config.checkConfigParameter("type", + "WaterVapourLatentHeatWithCriticalTemperature"); + DBUG("Create WaterVapourLatentHeatWithCriticalTemperature phase property"); // Second access for storage. //! \ogs_file_param{properties__property__name} auto property_name = config.peekConfigParameter<std::string>("name"); - //! \ogs_file_param_special{properties__property__GeneralWaterVapourLatentHeat} - return std::make_unique<GeneralWaterVapourLatentHeat>( + //! \ogs_file_param_special{properties__property__WaterVapourLatentHeatWithCriticalTemperature} + return std::make_unique<WaterVapourLatentHeatWithCriticalTemperature>( std::move(property_name)); } } // namespace MaterialPropertyLib diff --git a/MaterialLib/MPL/Properties/Enthalpy/CreateGeneralWaterVapourLatentHeat.h b/MaterialLib/MPL/Properties/Enthalpy/CreateWaterVapourLatentHeatWithCriticalTemperature.h similarity index 86% rename from MaterialLib/MPL/Properties/Enthalpy/CreateGeneralWaterVapourLatentHeat.h rename to MaterialLib/MPL/Properties/Enthalpy/CreateWaterVapourLatentHeatWithCriticalTemperature.h index bc85416ca24..9fffea41420 100644 --- a/MaterialLib/MPL/Properties/Enthalpy/CreateGeneralWaterVapourLatentHeat.h +++ b/MaterialLib/MPL/Properties/Enthalpy/CreateWaterVapourLatentHeatWithCriticalTemperature.h @@ -21,6 +21,6 @@ class ConfigTree; namespace MaterialPropertyLib { class Property; -std::unique_ptr<Property> createGeneralWaterVapourLatentHeat( +std::unique_ptr<Property> createWaterVapourLatentHeatWithCriticalTemperature( BaseLib::ConfigTree const& config); } // namespace MaterialPropertyLib diff --git a/MaterialLib/MPL/Properties/Enthalpy/GeneralWaterVapourLatentHeat.cpp b/MaterialLib/MPL/Properties/Enthalpy/WaterVapourLatentHeatWithCriticalTemperature.cpp similarity index 90% rename from MaterialLib/MPL/Properties/Enthalpy/GeneralWaterVapourLatentHeat.cpp rename to MaterialLib/MPL/Properties/Enthalpy/WaterVapourLatentHeatWithCriticalTemperature.cpp index 44d13cb15d9..34755be300e 100644 --- a/MaterialLib/MPL/Properties/Enthalpy/GeneralWaterVapourLatentHeat.cpp +++ b/MaterialLib/MPL/Properties/Enthalpy/WaterVapourLatentHeatWithCriticalTemperature.cpp @@ -9,7 +9,7 @@ * Created on March 19, 2021, 11:49 AM */ -#include "GeneralWaterVapourLatentHeat.h" +#include "WaterVapourLatentHeatWithCriticalTemperature.h" #include <algorithm> #include <array> @@ -28,7 +28,7 @@ static std::array<double, 3> constexpr a_exp = {0.3333333333333333, 0.79, static std::array<double, 5> constexpr b = { -28989.28947, -19797.03646, 28403.32283, -30382.306422, 15210.380}; -PropertyDataType GeneralWaterVapourLatentHeat::value( +PropertyDataType WaterVapourLatentHeatWithCriticalTemperature::value( const VariableArray& variable_array, const ParameterLib::SpatialPosition& /*pos*/, const double /*t*/, const double /*dt*/) const @@ -60,7 +60,7 @@ PropertyDataType GeneralWaterVapourLatentHeat::value( return 1000.0 * L_w; } -PropertyDataType GeneralWaterVapourLatentHeat::dValue( +PropertyDataType WaterVapourLatentHeatWithCriticalTemperature::dValue( VariableArray const& variable_array, Variable const primary_variable, ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/, double const /*dt*/) const @@ -97,7 +97,8 @@ PropertyDataType GeneralWaterVapourLatentHeat::dValue( } OGS_FATAL( - "GeneralWaterVapourLatentHeat::dValue is implemented for " + "WaterVapourLatentHeatWithCriticalTemperature::dValue is implemented " + "for " "the derivative with respect to temperature only."); } diff --git a/MaterialLib/MPL/Properties/Enthalpy/GeneralWaterVapourLatentHeat.h b/MaterialLib/MPL/Properties/Enthalpy/WaterVapourLatentHeatWithCriticalTemperature.h similarity index 85% rename from MaterialLib/MPL/Properties/Enthalpy/GeneralWaterVapourLatentHeat.h rename to MaterialLib/MPL/Properties/Enthalpy/WaterVapourLatentHeatWithCriticalTemperature.h index 94a604b812d..fc148c8fe14 100644 --- a/MaterialLib/MPL/Properties/Enthalpy/GeneralWaterVapourLatentHeat.h +++ b/MaterialLib/MPL/Properties/Enthalpy/WaterVapourLatentHeatWithCriticalTemperature.h @@ -19,7 +19,8 @@ namespace MaterialPropertyLib class Phase; /** - * \brief A general latent heat model of vaporisation of water. + * \brief A latent heat model of vaporisation of water considering the critical + * temperature. * * The model uses an equation for a general expression of the latent heat of * vaporisation of water in the vicinity of and far away from the critical @@ -53,17 +54,13 @@ class Phase; * MaterialPropertyLib::LinearWaterVapourLatentHeat * is given in the following figure. * - * \image{inline} html general_latent_heat_water_vapour.png "" - * - * Based on the comparison, a conclusion can be drawn such that - * the linear model can be applied for the applications with temperature - * below 400 K. + * \image{inline} html latent_heat_water_vapour_with_critical_T.png "" * */ -class GeneralWaterVapourLatentHeat final : public Property +class WaterVapourLatentHeatWithCriticalTemperature final : public Property { public: - explicit GeneralWaterVapourLatentHeat(std::string name) + explicit WaterVapourLatentHeatWithCriticalTemperature(std::string name) { name_ = std::move(name); } @@ -73,7 +70,8 @@ public: if (!std::holds_alternative<Phase*>(scale_)) { OGS_FATAL( - "The property 'GeneralWaterVapourLatentHeat' is " + "The property 'WaterVapourLatentHeatWithCriticalTemperature' " + "is " "implemented on the 'phase' scale only."); } } diff --git a/MaterialLib/MPL/Properties/Properties.h b/MaterialLib/MPL/Properties/Properties.h index e85caf2d178..466e88f4073 100644 --- a/MaterialLib/MPL/Properties/Properties.h +++ b/MaterialLib/MPL/Properties/Properties.h @@ -24,8 +24,8 @@ #include "DupuitPermeability.h" #include "EffectiveThermalConductivityPorosityMixing.h" #include "EmbeddedFracturePermeability.h" -#include "Enthalpy/GeneralWaterVapourLatentHeat.h" #include "Enthalpy/LinearWaterVapourLatentHeat.h" +#include "Enthalpy/WaterVapourLatentHeatWithCriticalTemperature.h" #include "Exponential.h" #include "GasPressureDependentPermeability.h" #include "IdealGasLaw.h" diff --git a/Tests/MaterialLib/TestMPLGeneralWaterVapourLatentHeat.cpp b/Tests/MaterialLib/TestMPLWaterVapourLatentHeatWithCriticalTemperature.cpp similarity index 93% rename from Tests/MaterialLib/TestMPLGeneralWaterVapourLatentHeat.cpp rename to Tests/MaterialLib/TestMPLWaterVapourLatentHeatWithCriticalTemperature.cpp index 6982863accd..e62095115b4 100644 --- a/Tests/MaterialLib/TestMPLGeneralWaterVapourLatentHeat.cpp +++ b/Tests/MaterialLib/TestMPLWaterVapourLatentHeatWithCriticalTemperature.cpp @@ -15,21 +15,22 @@ #include <cmath> #include <limits> -#include "MaterialLib/MPL/Properties/Enthalpy/CreateGeneralWaterVapourLatentHeat.h" +#include "MaterialLib/MPL/Properties/Enthalpy/CreateWaterVapourLatentHeatWithCriticalTemperature.h" #include "MaterialLib/PhysicalConstant.h" #include "TestMPL.h" -TEST(MaterialPropertyLib, GeneralWaterVapourLatentHeat) +TEST(MaterialPropertyLib, WaterVapourLatentHeatWithCriticalTemperature) { char const xml[] = "<property>" " <name>latent_heat</name>" - " <type>GeneralWaterVapourLatentHeat</type>" + " <type>WaterVapourLatentHeatWithCriticalTemperature</type>" "</property>"; std::unique_ptr<MaterialPropertyLib::Property> const property_ptr = Tests::createTestProperty( - xml, MaterialPropertyLib::createGeneralWaterVapourLatentHeat); + xml, MaterialPropertyLib:: + createWaterVapourLatentHeatWithCriticalTemperature); MaterialPropertyLib::Property const& property = *property_ptr; MaterialPropertyLib::VariableArray variable_array; -- GitLab