diff --git a/MaterialLib/MPL/Properties/CreateHeatConductionSaturation.cpp b/MaterialLib/MPL/Properties/CreateSaturationDependentHeatConduction.cpp similarity index 65% rename from MaterialLib/MPL/Properties/CreateHeatConductionSaturation.cpp rename to MaterialLib/MPL/Properties/CreateSaturationDependentHeatConduction.cpp index 04e060a482dd6e41b8b82c6e243e0db4200ecce3..8b77199e532edb8edfea0d418a2a3cde028eac44 100644 --- a/MaterialLib/MPL/Properties/CreateHeatConductionSaturation.cpp +++ b/MaterialLib/MPL/Properties/CreateSaturationDependentHeatConduction.cpp @@ -8,15 +8,15 @@ */ #include "BaseLib/ConfigTree.h" -#include "HeatConductionSaturation.h" +#include "SaturationDependentHeatConduction.h" namespace MaterialPropertyLib { -std::unique_ptr<HeatConductionSaturationDependent> -createHeatConductionSaturation(BaseLib::ConfigTree const& config) +std::unique_ptr<SaturationDependentHeatConduction> +createSaturationDependentHeatConduction(BaseLib::ConfigTree const& config) { //! \ogs_file_param{properties__property__type} - config.checkConfigParameter("type", "HeatConductionSaturationDependent"); + config.checkConfigParameter("type", "SaturationDependentHeatConduction"); // Second access for storage. //! \ogs_file_param{properties__property__name} @@ -26,15 +26,15 @@ createHeatConductionSaturation(BaseLib::ConfigTree const& config) property_name); auto const K_dry = - //! \ogs_file_param{properties__property__HeatConductionSaturationDependent__dry} + //! \ogs_file_param{properties__property__SaturationDependentHeatConduction__dry} config.getConfigParameter<double>("dry"); auto const K_wet = - //! \ogs_file_param{properties__property__HeatConductionSaturationDependent__wet} + //! \ogs_file_param{properties__property__SaturationDependentHeatConduction__wet} config.getConfigParameter<double>("wet"); return std::make_unique< - MaterialPropertyLib::HeatConductionSaturationDependent>( + MaterialPropertyLib::SaturationDependentHeatConduction>( std::move(property_name), K_dry, K_wet); } } // namespace MaterialPropertyLib diff --git a/MaterialLib/MPL/Properties/CreateHeatConductionSaturation.h b/MaterialLib/MPL/Properties/CreateSaturationDependentHeatConduction.h similarity index 72% rename from MaterialLib/MPL/Properties/CreateHeatConductionSaturation.h rename to MaterialLib/MPL/Properties/CreateSaturationDependentHeatConduction.h index 19b656baa9a5adf907246841af67907a7a4d2b36..d59dcf49d504a1a3d37211b61cb888ce4ed76bfb 100644 --- a/MaterialLib/MPL/Properties/CreateHeatConductionSaturation.h +++ b/MaterialLib/MPL/Properties/CreateSaturationDependentHeatConduction.h @@ -18,11 +18,11 @@ class ConfigTree; namespace MaterialPropertyLib { -class HeatConductionSaturationDependent; +class SaturationDependentHeatConduction; } namespace MaterialPropertyLib { -std::unique_ptr<HeatConductionSaturationDependent> -createHeatConductionSaturation(BaseLib::ConfigTree const& config); +std::unique_ptr<SaturationDependentHeatConduction> +createSaturationDependentHeatConduction(BaseLib::ConfigTree const& config); } // namespace MaterialPropertyLib diff --git a/MaterialLib/MPL/Properties/HeatConductionSaturation.cpp b/MaterialLib/MPL/Properties/SaturationDependentHeatConduction.cpp similarity index 75% rename from MaterialLib/MPL/Properties/HeatConductionSaturation.cpp rename to MaterialLib/MPL/Properties/SaturationDependentHeatConduction.cpp index 1702d3ff9e76d878b596647b7b82d8c5cd746a54..5edd50ba58e0ef3a08e879dd39eb7e6b057c3aa1 100644 --- a/MaterialLib/MPL/Properties/HeatConductionSaturation.cpp +++ b/MaterialLib/MPL/Properties/SaturationDependentHeatConduction.cpp @@ -7,30 +7,30 @@ * http://www.opengeosys.org/project/license */ -#include "HeatConductionSaturation.h" +#include "SaturationDependentHeatConduction.h" #include "MaterialLib/MPL/Medium.h" namespace MaterialPropertyLib { -HeatConductionSaturationDependent::HeatConductionSaturationDependent( +SaturationDependentHeatConduction::SaturationDependentHeatConduction( std::string name, double const K_dry, double const K_wet) : K_dry_(K_dry), K_wet_(K_wet) { name_ = std::move(name); } -void HeatConductionSaturationDependent::checkScale() const +void SaturationDependentHeatConduction::checkScale() const { if (!std::holds_alternative<Medium*>(scale_)) { OGS_FATAL( - "The property 'HeatConductionSaturationDependent' is " + "The property 'SaturationDependentHeatConduction' is " "implemented on the 'medium' scale only."); } } -PropertyDataType HeatConductionSaturationDependent::value( +PropertyDataType SaturationDependentHeatConduction::value( VariableArray const& variable_array, ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/, double const /*dt*/) const @@ -41,14 +41,14 @@ PropertyDataType HeatConductionSaturationDependent::value( return K_dry_ * (1 - S_L) + K_wet_ * S_L; } -PropertyDataType HeatConductionSaturationDependent::dValue( +PropertyDataType SaturationDependentHeatConduction::dValue( VariableArray const& /*variable_array*/, Variable const variable, ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/, double const /*dt*/) const { (void)variable; assert((variable == Variable::liquid_saturation) && - "HeatConductionSaturationDependent::dvalue is implemented for " + "SaturationDependentHeatConduction::dvalue is implemented for " "derivatives with " "respect to liquid saturation only."); diff --git a/MaterialLib/MPL/Properties/HeatConductionSaturation.h b/MaterialLib/MPL/Properties/SaturationDependentHeatConduction.h similarity index 87% rename from MaterialLib/MPL/Properties/HeatConductionSaturation.h rename to MaterialLib/MPL/Properties/SaturationDependentHeatConduction.h index 5cfa229399cc8f73d3d4ffa39da2594ebe3cc838..fb434d1668028d7c6753a1904b51c49d5a03eb11 100644 --- a/MaterialLib/MPL/Properties/HeatConductionSaturation.h +++ b/MaterialLib/MPL/Properties/SaturationDependentHeatConduction.h @@ -16,10 +16,11 @@ namespace MaterialPropertyLib /// \details This property must be a medium property, it /// computes the effetive heat conductivity based on a wet /// and a dry value -class HeatConductionSaturationDependent final : public Property +/// \f$ K_{\mathrm{eff}} = S K_{\mathrm{wet}} + (1-S) K_{\mathrm{dry}} \f$ +class SaturationDependentHeatConduction final : public Property { public: - HeatConductionSaturationDependent(std::string name, + SaturationDependentHeatConduction(std::string name, double const K_dry, double const K_wet);