From 0b204bc3a10fc21bfc5c9f0ef1bd02a2cd47d8b6 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 28 Jul 2021 11:51:17 +0200
Subject: [PATCH] [PL/RM] clang-format.
---
.../RichardsMechanics/ComputeMicroPorosity.h | 18 +++----
.../CreateRichardsMechanicsProcess.h | 2 +-
.../RichardsMechanics/IntegrationPointData.h | 4 +-
.../RichardsMechanics/LocalDataInitializer.h | 6 ++-
.../RichardsMechanicsFEM-impl.h | 47 ++++++++++---------
.../RichardsMechanicsProcess.cpp | 46 +++++++++++-------
.../RichardsMechanicsProcess.h | 4 +-
.../RichardsMechanicsProcessData.h | 6 +--
8 files changed, 74 insertions(+), 59 deletions(-)
diff --git a/ProcessLib/RichardsMechanics/ComputeMicroPorosity.h b/ProcessLib/RichardsMechanics/ComputeMicroPorosity.h
index d83b137791b..3bbdabf99db 100644
--- a/ProcessLib/RichardsMechanics/ComputeMicroPorosity.h
+++ b/ProcessLib/RichardsMechanics/ComputeMicroPorosity.h
@@ -27,7 +27,7 @@ struct MicroPorosityStateSpace
double p_L_m;
MathLib::KelvinVector::KelvinVectorType<DisplacementDim> sigma_sw;
- MicroPorosityStateSpace& operator += (MicroPorosityStateSpace const& state)
+ MicroPorosityStateSpace& operator+=(MicroPorosityStateSpace const& state)
{
phi_m += state.phi_m;
e_sw += state.e_sw;
@@ -106,7 +106,8 @@ MicroPorosityStateSpace<DisplacementDim> computeMicroPorosity(
double const alpha_bar =
micro_porosity_parameters.mass_exchange_coefficient;
- auto const update_residual = [&](ResidualVectorType& residual) {
+ auto const update_residual = [&](ResidualVectorType& residual)
+ {
double const delta_phi_m = solution[i_phi_m];
double const delta_e_sw = solution[i_e_sw];
auto const& delta_sigma_sw =
@@ -129,7 +130,6 @@ MicroPorosityStateSpace<DisplacementDim> computeMicroPorosity(
variables[static_cast<int>(MPL::Variable::liquid_saturation)] = S_L_m;
double const delta_S_L_m = S_L_m - S_L_m_prev;
-
auto const sigma_sw_dot =
MathLib::KelvinVector::tensorToKelvin<DisplacementDim>(
swelling_stress_rate.template value<Eigen::Matrix3d>(
@@ -148,7 +148,8 @@ MicroPorosityStateSpace<DisplacementDim> computeMicroPorosity(
(p_L - p_L_m) * dt;
};
- auto const update_jacobian = [&](JacobianMatrix& jacobian) {
+ auto const update_jacobian = [&](JacobianMatrix& jacobian)
+ {
jacobian = JacobianMatrix::Identity();
double const delta_phi_m = solution[i_phi_m];
@@ -183,8 +184,8 @@ MicroPorosityStateSpace<DisplacementDim> computeMicroPorosity(
jacobian.template block<1, kelvin_vector_size>(i_e_sw, i_sigma_sw) =
I_2_C_el_inverse.transpose();
- jacobian.template block<kelvin_vector_size, 1>(
- i_sigma_sw, i_p_L_m) = -dsigma_sw_dS_L_m * dS_L_m_dp_cap_m;
+ jacobian.template block<kelvin_vector_size, 1>(i_sigma_sw, i_p_L_m) =
+ -dsigma_sw_dS_L_m * dS_L_m_dp_cap_m;
jacobian(i_p_L_m, i_phi_m) =
rho_LR_m * (delta_S_L_m + S_L_m * delta_e_sw);
@@ -197,9 +198,8 @@ MicroPorosityStateSpace<DisplacementDim> computeMicroPorosity(
dS_L_m_dp_cap_m;
};
- auto const update_solution = [&](ResidualVectorType const& increment) {
- solution += increment;
- };
+ auto const update_solution = [&](ResidualVectorType const& increment)
+ { solution += increment; };
auto newton_solver =
NumLib::NewtonRaphson<decltype(linear_solver), JacobianMatrix,
diff --git a/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.h b/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.h
index a54ca25c572..40ff0e0dc15 100644
--- a/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.h
+++ b/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.h
@@ -36,7 +36,7 @@ namespace ParameterLib
{
struct CoordinateSystem;
struct ParameterBase;
-}
+} // namespace ParameterLib
namespace ProcessLib
{
class AbstractJacobianAssembler;
diff --git a/ProcessLib/RichardsMechanics/IntegrationPointData.h b/ProcessLib/RichardsMechanics/IntegrationPointData.h
index 4390d50a4ee..6ed1e4f192d 100644
--- a/ProcessLib/RichardsMechanics/IntegrationPointData.h
+++ b/ProcessLib/RichardsMechanics/IntegrationPointData.h
@@ -111,8 +111,8 @@ struct IntegrationPointData final
using KV = MathLib::KelvinVector::KelvinVectorType<DisplacementDim>;
- variable_array[static_cast<int>(MPL::Variable::stress)]
- .emplace<KV>(KV::Zero());
+ variable_array[static_cast<int>(MPL::Variable::stress)].emplace<KV>(
+ KV::Zero());
variable_array[static_cast<int>(MPL::Variable::mechanical_strain)]
.emplace<KV>(KV::Zero());
variable_array[static_cast<int>(MPL::Variable::temperature)]
diff --git a/ProcessLib/RichardsMechanics/LocalDataInitializer.h b/ProcessLib/RichardsMechanics/LocalDataInitializer.h
index 8e28131f69b..4ef74865281 100644
--- a/ProcessLib/RichardsMechanics/LocalDataInitializer.h
+++ b/ProcessLib/RichardsMechanics/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/RichardsMechanics/RichardsMechanicsFEM-impl.h b/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h
index 8ccc7edd74a..82cf97988ff 100644
--- a/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h
+++ b/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h
@@ -275,9 +275,8 @@ std::size_t RichardsMechanicsLocalAssembler<
_ip_data[0].solid_material.getInternalVariables();
if (auto const iv =
std::find_if(begin(internal_variables), end(internal_variables),
- [&variable_name](auto const& iv) {
- return iv.name == variable_name;
- });
+ [&variable_name](auto const& iv)
+ { return iv.name == variable_name; });
iv != end(internal_variables))
{
return ProcessLib::setIntegrationPointDataMaterialStateVariables(
@@ -513,10 +512,12 @@ void RichardsMechanicsLocalAssembler<
x_position, t, dt);
// secant derivative from time discretization for storage
// use tangent, if secant is not available
- double const DeltaS_L_Deltap_cap = (p_cap_dot_ip == 0) ? dS_L_dp_cap :
- (S_L - S_L_prev) / (dt * p_cap_dot_ip);
+ double const DeltaS_L_Deltap_cap =
+ (p_cap_dot_ip == 0) ? dS_L_dp_cap
+ : (S_L - S_L_prev) / (dt * p_cap_dot_ip);
- auto const chi = [medium, x_position, t, dt](double const S_L) {
+ auto const chi = [medium, x_position, t, dt](double const S_L)
+ {
MPL::VariableArray vs;
vs[static_cast<int>(MPL::Variable::liquid_saturation)] = S_L;
return medium->property(MPL::PropertyType::bishops_effective_stress)
@@ -680,7 +681,8 @@ void RichardsMechanicsLocalAssembler<
double const a0 = S_L * (alpha - phi) * beta_SR;
// Volumetric average specific storage of the solid and fluid phases.
double const specific_storage =
- DeltaS_L_Deltap_cap * (p_cap_ip * a0 - phi) + S_L * (phi * beta_LR + a0);
+ DeltaS_L_Deltap_cap * (p_cap_ip * a0 - phi) +
+ S_L * (phi * beta_LR + a0);
M.template block<pressure_size, pressure_size>(pressure_index,
pressure_index)
.noalias() += N_p.transpose() * rho_LR * specific_storage * N_p * w;
@@ -881,10 +883,12 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
x_position, t, dt);
// secant derivative from time discretization for storage
// use tangent, if secant is not available
- double const DeltaS_L_Deltap_cap = (p_cap_dot_ip == 0) ? dS_L_dp_cap :
- (S_L - S_L_prev) / (dt * p_cap_dot_ip);
+ double const DeltaS_L_Deltap_cap =
+ (p_cap_dot_ip == 0) ? dS_L_dp_cap
+ : (S_L - S_L_prev) / (dt * p_cap_dot_ip);
- auto const chi = [medium, x_position, t, dt](double const S_L) {
+ auto const chi = [medium, x_position, t, dt](double const S_L)
+ {
MPL::VariableArray vs;
vs[static_cast<int>(MPL::Variable::liquid_saturation)] = S_L;
return medium->property(MPL::PropertyType::bishops_effective_stress)
@@ -1102,9 +1106,8 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
N_p.transpose() * rho_LR * specific_storage_a_p * N_p * w;
storage_p_a_S.noalias() -= N_p.transpose() * rho_LR *
- specific_storage_a_S *
- DeltaS_L_Deltap_cap * N_p * w;
-
+ specific_storage_a_S * DeltaS_L_Deltap_cap *
+ N_p * w;
local_Jac
.template block<pressure_size, pressure_size>(pressure_index,
@@ -1235,9 +1238,8 @@ std::vector<double> RichardsMechanicsLocalAssembler<
MathLib::KelvinVector::kelvin_vector_dimensions(DisplacementDim);
return transposeInPlace<kelvin_vector_size>(
- [this](std::vector<double>& values) {
- return getIntPtSigma(0, {}, {}, values);
- });
+ [this](std::vector<double>& values)
+ { return getIntPtSigma(0, {}, {}, values); });
}
template <typename ShapeFunctionDisplacement, typename ShapeFunctionPressure,
@@ -1265,9 +1267,8 @@ std::vector<double> RichardsMechanicsLocalAssembler<
MathLib::KelvinVector::kelvin_vector_dimensions(DisplacementDim);
return transposeInPlace<kelvin_vector_size>(
- [this](std::vector<double>& values) {
- return getIntPtSwellingStress(0, {}, {}, values);
- });
+ [this](std::vector<double>& values)
+ { return getIntPtSwellingStress(0, {}, {}, values); });
}
template <typename ShapeFunctionDisplacement, typename ShapeFunctionPressure,
@@ -1310,9 +1311,8 @@ std::vector<double> RichardsMechanicsLocalAssembler<
MathLib::KelvinVector::kelvin_vector_dimensions(DisplacementDim);
return transposeInPlace<kelvin_vector_size>(
- [this](std::vector<double>& values) {
- return getIntPtEpsilon(0, {}, {}, values);
- });
+ [this](std::vector<double>& values)
+ { return getIntPtEpsilon(0, {}, {}, values); });
}
template <typename ShapeFunctionDisplacement, typename ShapeFunctionPressure,
@@ -1661,7 +1661,8 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
variables_prev[static_cast<int>(MPL::Variable::liquid_saturation)] =
S_L_prev;
- auto const chi = [medium, x_position, t, dt](double const S_L) {
+ auto const chi = [medium, x_position, t, dt](double const S_L)
+ {
MPL::VariableArray vs;
vs.fill(std::numeric_limits<double>::quiet_NaN());
vs[static_cast<int>(MPL::Variable::liquid_saturation)] = S_L;
diff --git a/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp b/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp
index 2ab34656052..39dd41a6a63 100644
--- a/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp
+++ b/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp
@@ -53,7 +53,9 @@ RichardsMechanicsProcess<DisplacementDim>::RichardsMechanicsProcess(
std::make_unique<IntegrationPointWriter>(
"sigma_ip",
static_cast<int>(mesh.getDimension() == 2 ? 4 : 6) /*n components*/,
- integration_order, [this]() {
+ integration_order,
+ [this]()
+ {
// Result containing integration point data for each local
// assembler.
std::vector<std::vector<double>> result;
@@ -70,7 +72,9 @@ RichardsMechanicsProcess<DisplacementDim>::RichardsMechanicsProcess(
_integration_point_writer.emplace_back(
std::make_unique<IntegrationPointWriter>(
- "saturation_ip", 1 /*n components*/, integration_order, [this]() {
+ "saturation_ip", 1 /*n components*/, integration_order,
+ [this]()
+ {
// Result containing integration point data for each local
// assembler.
std::vector<std::vector<double>> result;
@@ -87,7 +91,9 @@ RichardsMechanicsProcess<DisplacementDim>::RichardsMechanicsProcess(
_integration_point_writer.emplace_back(
std::make_unique<IntegrationPointWriter>(
- "porosity_ip", 1 /*n components*/, integration_order, [this]() {
+ "porosity_ip", 1 /*n components*/, integration_order,
+ [this]()
+ {
// Result containing integration point data for each local
// assembler.
std::vector<std::vector<double>> result;
@@ -105,7 +111,8 @@ RichardsMechanicsProcess<DisplacementDim>::RichardsMechanicsProcess(
_integration_point_writer.emplace_back(
std::make_unique<IntegrationPointWriter>(
"transport_porosity_ip", 1 /*n components*/, integration_order,
- [this]() {
+ [this]()
+ {
// Result containing integration point data for each local
// assembler.
std::vector<std::vector<double>> result;
@@ -124,7 +131,9 @@ RichardsMechanicsProcess<DisplacementDim>::RichardsMechanicsProcess(
std::make_unique<IntegrationPointWriter>(
"swelling_stress_ip",
static_cast<int>(mesh.getDimension() == 2 ? 4 : 6) /*n components*/,
- integration_order, [this]() {
+ integration_order,
+ [this]()
+ {
// Result containing integration point data for each local
// assembler.
std::vector<std::vector<double>> result;
@@ -143,7 +152,9 @@ RichardsMechanicsProcess<DisplacementDim>::RichardsMechanicsProcess(
std::make_unique<IntegrationPointWriter>(
"epsilon_ip",
static_cast<int>(mesh.getDimension() == 2 ? 4 : 6) /*n components*/,
- integration_order, [this]() {
+ integration_order,
+ [this]()
+ {
// Result containing integration point data for each local
// assembler.
std::vector<std::vector<double>> result;
@@ -284,7 +295,8 @@ void RichardsMechanicsProcess<DisplacementDim>::initializeConcreteProcess(
auto add_secondary_variable = [&](std::string const& name,
int const num_components,
- auto get_ip_values_function) {
+ auto get_ip_values_function)
+ {
_secondary_variables.addSecondaryVariable(
name,
makeExtrapolator(num_components, getExtrapolator(),
@@ -307,8 +319,8 @@ void RichardsMechanicsProcess<DisplacementDim>::initializeConcreteProcess(
DisplacementDim>::RowsAtCompileTime,
&LocalAssemblerIF::getIntPtEpsilon);
- add_secondary_variable(
- "velocity", DisplacementDim, &LocalAssemblerIF::getIntPtDarcyVelocity);
+ add_secondary_variable("velocity", DisplacementDim,
+ &LocalAssemblerIF::getIntPtDarcyVelocity);
add_secondary_variable("saturation", 1,
&LocalAssemblerIF::getIntPtSaturation);
@@ -335,12 +347,13 @@ void RichardsMechanicsProcess<DisplacementDim>::initializeConcreteProcess(
add_secondary_variable);
auto add_integration_point_writer =
- [&](std::string const& name, int const n_components, auto function) {
- _integration_point_writer.emplace_back(
- std::make_unique<IntegrationPointWriter>(
- "material_state_variable_" + name + "_ip", n_components,
- integration_order, function));
- };
+ [&](std::string const& name, int const n_components, auto function)
+ {
+ _integration_point_writer.emplace_back(
+ std::make_unique<IntegrationPointWriter>(
+ "material_state_variable_" + name + "_ip", n_components,
+ integration_order, function));
+ };
// Assume all materials have same internal variables.
ProcessLib::Deformation::
@@ -532,7 +545,8 @@ void RichardsMechanicsProcess<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/RichardsMechanics/RichardsMechanicsProcess.h b/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.h
index 287bfafcf38..256e2b5ed0c 100644
--- a/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.h
+++ b/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.h
@@ -90,8 +90,8 @@ private:
GlobalMatrix& K, GlobalVector& b, GlobalMatrix& Jac) override;
void postTimestepConcreteProcess(std::vector<GlobalVector*> const& x,
- double const t, double const dt,
- const int process_id) override;
+ double const t, double const dt,
+ const int process_id) override;
NumLib::LocalToGlobalIndexMap const& getDOFTable(
const int process_id) const override;
diff --git a/ProcessLib/RichardsMechanics/RichardsMechanicsProcessData.h b/ProcessLib/RichardsMechanics/RichardsMechanicsProcessData.h
index 85dc20c4ce5..556530109d3 100644
--- a/ProcessLib/RichardsMechanics/RichardsMechanicsProcessData.h
+++ b/ProcessLib/RichardsMechanics/RichardsMechanicsProcessData.h
@@ -33,16 +33,14 @@ namespace RichardsMechanics
template <int DisplacementDim>
struct RichardsMechanicsProcessData
{
-
MeshLib::PropertyVector<int> const* const material_ids = nullptr;
std::unique_ptr<MaterialPropertyLib::MaterialSpatialDistributionMap>
media_map = nullptr;
/// The constitutive relation for the mechanical part.
- 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
--
GitLab