diff --git a/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.cpp b/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.cpp index 3d9496143162ebd8ddebea98fc3e5486f10a0095..cc363c422b50b69957823cbeacd0a369343eb943 100644 --- a/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.cpp +++ b/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.cpp @@ -157,10 +157,8 @@ std::unique_ptr<Process> createThermoHydroMechanicsProcess( &mesh); ThermoHydroMechanicsProcessData<DisplacementDim> process_data{ - materialIDs(mesh), - std::move(media_map), - std::move(solid_constitutive_relations), - initial_stress, + materialIDs(mesh), std::move(media_map), + std::move(solid_constitutive_relations), initial_stress, specific_body_force}; SecondaryVariableCollection secondary_variables; diff --git a/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.h b/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.h index 80e074aea83ff367e684bcf15ce0f1cf26476a6d..2f327f61148c7d55712d08556a26aa6c47e1eb5c 100644 --- a/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.h +++ b/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.h @@ -35,7 +35,7 @@ namespace ParameterLib { struct CoordinateSystem; struct ParameterBase; -} +} // namespace ParameterLib namespace ProcessLib { class AbstractJacobianAssembler; diff --git a/ProcessLib/ThermoHydroMechanics/LocalDataInitializer.h b/ProcessLib/ThermoHydroMechanics/LocalDataInitializer.h index e3c9dad66a49922fe787f124c68ffd02d0c6cafe..d1ef042cfa4c74756d6eb026594e772f6ac39bfc 100644 --- a/ProcessLib/ThermoHydroMechanics/LocalDataInitializer.h +++ b/ProcessLib/ThermoHydroMechanics/LocalDataInitializer.h @@ -340,7 +340,8 @@ private: { return [](MeshLib::Element const& e, std::size_t const local_matrix_size, - ConstructorArgs&&... args) { + ConstructorArgs&&... args) + { return LADataIntfPtr{new LAData<ShapeFunction, ShapeFunction>{ e, local_matrix_size, std::forward<ConstructorArgs>(args)...}}; @@ -352,7 +353,8 @@ private: typename NumLib::LowerDim<ShapeFunction>::type; return [](MeshLib::Element const& e, std::size_t const local_matrix_size, - ConstructorArgs&&... args) { + ConstructorArgs&&... args) + { return LADataIntfPtr{ new LAData<ShapeFunction, LowerOrderShapeFunction>{ e, local_matrix_size, diff --git a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp index f0f1b7f7fbefaa53b4606dd2b8d949f86e9148f8..4af3ac6f182f3fb147d39c007380b4bafe626d05 100644 --- a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp +++ b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp @@ -306,7 +306,8 @@ void ThermoHydroMechanicsProcess<DisplacementDim>:: _local_assemblers, pv.getActiveElementIDs(), dof_tables, t, dt, x, xdot, dxdot_dx, dx_dx, process_id, M, K, b, Jac); - auto copyRhs = [&](int const variable_id, auto& output_vector) { + auto copyRhs = [&](int const variable_id, auto& output_vector) + { if (_use_monolithic_scheme) { transformVariableFromGlobalVector(b, variable_id, dof_tables[0], diff --git a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcessData.h b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcessData.h index 62ebbfb827b337ed34bc6d5b153243a15429b9f9..1ffa2129597743e9d64618924de5739c6063de37 100644 --- a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcessData.h +++ b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcessData.h @@ -10,14 +10,12 @@ #pragma once -#include "ParameterLib/Parameter.h" - +#include <Eigen/Dense> #include <memory> #include <utility> -#include <Eigen/Dense> - #include "MaterialLib/MPL/MaterialSpatialDistributionMap.h" +#include "ParameterLib/Parameter.h" namespace MaterialLib { @@ -41,9 +39,8 @@ struct ThermoHydroMechanicsProcessData /// The constitutive relation for the mechanical part. /// \note Linear elasticity is the only supported one in the moment. - std::map< - int, - std::unique_ptr<MaterialLib::Solids::MechanicsBase<DisplacementDim>>> + std::map<int, std::unique_ptr< + MaterialLib::Solids::MechanicsBase<DisplacementDim>>> solid_materials; /// Optional, initial stress field. A symmetric tensor, short vector