diff --git a/ProcessLib/HT/CreateHTProcess.cpp b/ProcessLib/HT/CreateHTProcess.cpp index bdca201d8581830801ec1b25cdecbc6ddb78efbd..32a6dfece33fef08873477f9072e5d00af578be2 100644 --- a/ProcessLib/HT/CreateHTProcess.cpp +++ b/ProcessLib/HT/CreateHTProcess.cpp @@ -17,7 +17,7 @@ #include "ProcessLib/Utils/ProcessUtils.h" #include "HTProcess.h" -#include "HTProcessData.h" +#include "HTMaterialProperties.h" namespace ProcessLib { @@ -134,7 +134,7 @@ std::unique_ptr<Process> createHTProcess( std::copy_n(b.data(), b.size(), specific_body_force.data()); } - HTProcessData process_data{std::move(porous_media_properties), + HTMaterialProperties process_data{std::move(porous_media_properties), density_solid, fluid_reference_density, std::move(fluid_properties), diff --git a/ProcessLib/HT/HTFEM.h b/ProcessLib/HT/HTFEM.h index 31bd9d10d022da63d9f263b32f7112b49e91d320..0cfc29612caca7c9c6939325d56e07a3e57c8c60 100644 --- a/ProcessLib/HT/HTFEM.h +++ b/ProcessLib/HT/HTFEM.h @@ -13,7 +13,7 @@ #include <vector> -#include "HTProcessData.h" +#include "HTMaterialProperties.h" #include "MathLib/LinAlg/Eigen/EigenMapTools.h" #include "NumLib/DOF/DOFTableUtil.h" #include "NumLib/Extrapolation/ExtrapolatableElement.h" @@ -87,7 +87,7 @@ public: std::size_t const local_matrix_size, bool is_axially_symmetric, unsigned const integration_order, - HTProcessData const& process_data) + HTMaterialProperties const& process_data) : _element(element), _process_data(process_data), _integration_method(integration_order) @@ -342,7 +342,7 @@ public: private: MeshLib::Element const& _element; - HTProcessData const& _process_data; + HTMaterialProperties const& _process_data; IntegrationMethod const _integration_method; std::vector< diff --git a/ProcessLib/HT/HTProcessData.h b/ProcessLib/HT/HTMaterialProperties.h similarity index 92% rename from ProcessLib/HT/HTProcessData.h rename to ProcessLib/HT/HTMaterialProperties.h index d2cb72097c52720d2772f6130b013fb6f0769b89..fb056efbd8d09f76547ad6e3a27431e8236b2d73 100644 --- a/ProcessLib/HT/HTProcessData.h +++ b/ProcessLib/HT/HTMaterialProperties.h @@ -22,9 +22,9 @@ struct Parameter; namespace HT { -struct HTProcessData +struct HTMaterialProperties { - HTProcessData( + HTMaterialProperties( MaterialLib::PorousMedium::PorousMediaProperties&& porous_media_properties_, ProcessLib::Parameter<double> const& density_solid_, @@ -52,7 +52,7 @@ struct HTProcessData { } - HTProcessData(HTProcessData&& other) + HTMaterialProperties(HTMaterialProperties&& other) : porous_media_properties(std::move(other.porous_media_properties)), density_solid(other.density_solid), fluid_reference_density(other.fluid_reference_density), @@ -70,13 +70,13 @@ struct HTProcessData } //! Copies are forbidden. - HTProcessData(HTProcessData const&) = delete; + HTMaterialProperties(HTMaterialProperties const&) = delete; //! Assignments are not needed. - void operator=(HTProcessData const&) = delete; + void operator=(HTMaterialProperties const&) = delete; //! Assignments are not needed. - void operator=(HTProcessData&&) = delete; + void operator=(HTMaterialProperties&&) = delete; MaterialLib::PorousMedium::PorousMediaProperties porous_media_properties; Parameter<double> const& density_solid; diff --git a/ProcessLib/HT/HTProcess.cpp b/ProcessLib/HT/HTProcess.cpp index 307e9cc46fd64fc659823d6db160b2ae2c265f9c..eecbe436d746a2ab465b7d523f347d42824c2b56 100644 --- a/ProcessLib/HT/HTProcess.cpp +++ b/ProcessLib/HT/HTProcess.cpp @@ -23,7 +23,7 @@ HTProcess::HTProcess( std::vector<std::unique_ptr<ParameterBase>> const& parameters, unsigned const integration_order, std::vector<std::reference_wrapper<ProcessVariable>>&& process_variables, - HTProcessData&& process_data, + HTMaterialProperties&& process_data, SecondaryVariableCollection&& secondary_variables, NumLib::NamedFunctionCaller&& named_function_caller) : Process(mesh, std::move(jacobian_assembler), parameters, diff --git a/ProcessLib/HT/HTProcess.h b/ProcessLib/HT/HTProcess.h index 355dba18b5b6247ed94fac2eb8ba09fd0450502b..0361ed6ed0da6a3da69471ac645fc12a6e31962a 100644 --- a/ProcessLib/HT/HTProcess.h +++ b/ProcessLib/HT/HTProcess.h @@ -10,7 +10,7 @@ #pragma once #include "HTFEM.h" -#include "HTProcessData.h" +#include "HTMaterialProperties.h" #include "NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.h" #include "ProcessLib/Process.h" @@ -47,7 +47,7 @@ public: unsigned const integration_order, std::vector<std::reference_wrapper<ProcessVariable>>&& process_variables, - HTProcessData&& process_data, + HTMaterialProperties&& process_data, SecondaryVariableCollection&& secondary_variables, NumLib::NamedFunctionCaller&& named_function_caller); @@ -72,7 +72,7 @@ private: const double dxdot_dx, const double dx_dx, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b, GlobalMatrix& Jac) override; - HTProcessData _process_data; + HTMaterialProperties _process_data; std::vector<std::unique_ptr<HTLocalAssemblerInterface>> _local_assemblers; };