Skip to content
Snippets Groups Projects
Commit 36c58abe authored by Dmitri Naumov's avatar Dmitri Naumov
Browse files

[PL/THM] clang-format.

parent ad71cb59
No related branches found
No related tags found
No related merge requests found
...@@ -157,10 +157,8 @@ std::unique_ptr<Process> createThermoHydroMechanicsProcess( ...@@ -157,10 +157,8 @@ std::unique_ptr<Process> createThermoHydroMechanicsProcess(
&mesh); &mesh);
ThermoHydroMechanicsProcessData<DisplacementDim> process_data{ ThermoHydroMechanicsProcessData<DisplacementDim> process_data{
materialIDs(mesh), materialIDs(mesh), std::move(media_map),
std::move(media_map), std::move(solid_constitutive_relations), initial_stress,
std::move(solid_constitutive_relations),
initial_stress,
specific_body_force}; specific_body_force};
SecondaryVariableCollection secondary_variables; SecondaryVariableCollection secondary_variables;
......
...@@ -35,7 +35,7 @@ namespace ParameterLib ...@@ -35,7 +35,7 @@ namespace ParameterLib
{ {
struct CoordinateSystem; struct CoordinateSystem;
struct ParameterBase; struct ParameterBase;
} } // namespace ParameterLib
namespace ProcessLib namespace ProcessLib
{ {
class AbstractJacobianAssembler; class AbstractJacobianAssembler;
......
...@@ -340,7 +340,8 @@ private: ...@@ -340,7 +340,8 @@ private:
{ {
return [](MeshLib::Element const& e, return [](MeshLib::Element const& e,
std::size_t const local_matrix_size, std::size_t const local_matrix_size,
ConstructorArgs&&... args) { ConstructorArgs&&... args)
{
return LADataIntfPtr{new LAData<ShapeFunction, ShapeFunction>{ return LADataIntfPtr{new LAData<ShapeFunction, ShapeFunction>{
e, local_matrix_size, e, local_matrix_size,
std::forward<ConstructorArgs>(args)...}}; std::forward<ConstructorArgs>(args)...}};
...@@ -352,7 +353,8 @@ private: ...@@ -352,7 +353,8 @@ private:
typename NumLib::LowerDim<ShapeFunction>::type; typename NumLib::LowerDim<ShapeFunction>::type;
return [](MeshLib::Element const& e, return [](MeshLib::Element const& e,
std::size_t const local_matrix_size, std::size_t const local_matrix_size,
ConstructorArgs&&... args) { ConstructorArgs&&... args)
{
return LADataIntfPtr{ return LADataIntfPtr{
new LAData<ShapeFunction, LowerOrderShapeFunction>{ new LAData<ShapeFunction, LowerOrderShapeFunction>{
e, local_matrix_size, e, local_matrix_size,
......
...@@ -306,7 +306,8 @@ void ThermoHydroMechanicsProcess<DisplacementDim>:: ...@@ -306,7 +306,8 @@ void ThermoHydroMechanicsProcess<DisplacementDim>::
_local_assemblers, pv.getActiveElementIDs(), dof_tables, t, dt, x, xdot, _local_assemblers, pv.getActiveElementIDs(), dof_tables, t, dt, x, xdot,
dxdot_dx, dx_dx, process_id, M, K, b, Jac); 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) if (_use_monolithic_scheme)
{ {
transformVariableFromGlobalVector(b, variable_id, dof_tables[0], transformVariableFromGlobalVector(b, variable_id, dof_tables[0],
......
...@@ -10,14 +10,12 @@ ...@@ -10,14 +10,12 @@
#pragma once #pragma once
#include "ParameterLib/Parameter.h" #include <Eigen/Dense>
#include <memory> #include <memory>
#include <utility> #include <utility>
#include <Eigen/Dense>
#include "MaterialLib/MPL/MaterialSpatialDistributionMap.h" #include "MaterialLib/MPL/MaterialSpatialDistributionMap.h"
#include "ParameterLib/Parameter.h"
namespace MaterialLib namespace MaterialLib
{ {
...@@ -41,9 +39,8 @@ struct ThermoHydroMechanicsProcessData ...@@ -41,9 +39,8 @@ struct ThermoHydroMechanicsProcessData
/// The constitutive relation for the mechanical part. /// The constitutive relation for the mechanical part.
/// \note Linear elasticity is the only supported one in the moment. /// \note Linear elasticity is the only supported one in the moment.
std::map< std::map<int, std::unique_ptr<
int, MaterialLib::Solids::MechanicsBase<DisplacementDim>>>
std::unique_ptr<MaterialLib::Solids::MechanicsBase<DisplacementDim>>>
solid_materials; solid_materials;
/// Optional, initial stress field. A symmetric tensor, short vector /// Optional, initial stress field. A symmetric tensor, short vector
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment