From c92ca0a780f43033ab18188fba4e23913b99872c Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Mon, 10 Apr 2017 11:19:41 +0200
Subject: [PATCH] [PL] HM: Clang-format.
---
.../CreateHydroMechanicsProcess.cpp | 31 ++++++-------------
.../HydroMechanics/CreateLocalAssemblers.h | 5 +--
ProcessLib/HydroMechanics/HydroMechanicsFEM.h | 16 +++++-----
.../HydroMechanics/HydroMechanicsProcess.cpp | 7 ++---
.../HydroMechanics/HydroMechanicsProcess.h | 11 +++----
.../HydroMechanics/LocalDataInitializer.h | 2 +-
6 files changed, 29 insertions(+), 43 deletions(-)
diff --git a/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp b/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp
index 58b3ccd1dd1..a4bede7634e 100644
--- a/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp
+++ b/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp
@@ -55,8 +55,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
DBUG("Associate displacement with process variable \'%s\'.",
process_variables[1].get().getName().c_str());
- if (process_variables[1].get().getNumberOfComponents() !=
- DisplacementDim)
+ if (process_variables[1].get().getNumberOfComponents() != DisplacementDim)
{
OGS_FATAL(
"Number of components of the process variable '%s' is different "
@@ -77,7 +76,6 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
process_variables[0].get().getNumberOfComponents());
}
-
// Constitutive relation.
// read type;
auto const constitutive_relation_config =
@@ -107,8 +105,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
auto& intrinsic_permeability = findParameter<double>(
config,
//! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS__intrinsic_permeability}
- "intrinsic_permeability",
- parameters, 1);
+ "intrinsic_permeability", parameters, 1);
DBUG("Use \'%s\' as intrinsic conductivity parameter.",
intrinsic_permeability.name.c_str());
@@ -126,8 +123,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
auto& fluid_viscosity = findParameter<double>(
config,
//! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS__fluid_viscosity}
- "fluid_viscosity",
- parameters, 1);
+ "fluid_viscosity", parameters, 1);
DBUG("Use \'%s\' as fluid viscosity parameter.",
fluid_viscosity.name.c_str());
@@ -135,17 +131,14 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
auto& fluid_density = findParameter<double>(
config,
//! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS__fluid_density}
- "fluid_density",
- parameters, 1);
- DBUG("Use \'%s\' as fluid density parameter.",
- fluid_density.name.c_str());
+ "fluid_density", parameters, 1);
+ DBUG("Use \'%s\' as fluid density parameter.", fluid_density.name.c_str());
// Biot coefficient
auto& biot_coefficient = findParameter<double>(
config,
//! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS__biot_coefficient}
- "biot_coefficient",
- parameters, 1);
+ "biot_coefficient", parameters, 1);
DBUG("Use \'%s\' as Biot coefficient parameter.",
biot_coefficient.name.c_str());
@@ -153,19 +146,15 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
auto& porosity = findParameter<double>(
config,
//! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS__porosity}
- "porosity",
- parameters, 1);
- DBUG("Use \'%s\' as porosity parameter.",
- porosity.name.c_str());
+ "porosity", parameters, 1);
+ DBUG("Use \'%s\' as porosity parameter.", porosity.name.c_str());
// Solid density
auto& solid_density = findParameter<double>(
config,
//! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS__solid_density}
- "solid_density",
- parameters, 1);
- DBUG("Use \'%s\' as solid density parameter.",
- solid_density.name.c_str());
+ "solid_density", parameters, 1);
+ DBUG("Use \'%s\' as solid density parameter.", solid_density.name.c_str());
// Specific body force
Eigen::Matrix<double, DisplacementDim, 1> specific_body_force;
diff --git a/ProcessLib/HydroMechanics/CreateLocalAssemblers.h b/ProcessLib/HydroMechanics/CreateLocalAssemblers.h
index 305e5744269..3201b94494c 100644
--- a/ProcessLib/HydroMechanics/CreateLocalAssemblers.h
+++ b/ProcessLib/HydroMechanics/CreateLocalAssemblers.h
@@ -64,8 +64,9 @@ void createLocalAssemblers(
* The first two template parameters cannot be deduced from the arguments.
* Therefore they always have to be provided manually.
*/
-template <int DisplacementDim, template <typename, typename, typename, unsigned, int>
- class LocalAssemblerImplementation,
+template <int DisplacementDim,
+ template <typename, typename, typename, unsigned, int>
+ class LocalAssemblerImplementation,
typename LocalAssemblerInterface, typename... ExtraCtorArgs>
void createLocalAssemblers(
const unsigned dimension,
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsFEM.h b/ProcessLib/HydroMechanics/HydroMechanicsFEM.h
index 0cb5c7bcb03..d4910688283 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsFEM.h
+++ b/ProcessLib/HydroMechanics/HydroMechanicsFEM.h
@@ -61,7 +61,7 @@ struct IntegrationPointData final
typename ShapeMatrixTypeDisplacement::template MatrixType<
DisplacementDim, NPoints * DisplacementDim>
N_u;
- //typename ShapeMatrixTypeDisplacement::NodalRowVectorType N_u;
+ // typename ShapeMatrixTypeDisplacement::NodalRowVectorType N_u;
typename BMatricesType::BMatrixType b_matrices;
typename BMatricesType::KelvinVectorType sigma_eff, sigma_eff_prev;
typename BMatricesType::KelvinVectorType eps, eps_prev;
@@ -207,8 +207,8 @@ public:
auto& ip_data = _ip_data[ip];
auto const& sm = shape_matrices_u[ip];
_ip_data[ip].integration_weight =
- _integration_method.getWeightedPoint(ip).getWeight() * sm.integralMeasure *
- shape_matrices_u[ip].detJ;
+ _integration_method.getWeightedPoint(ip).getWeight() *
+ sm.integralMeasure * shape_matrices_u[ip].detJ;
ip_data.b_matrices.resize(
kelvin_vector_size,
ShapeFunctionDisplacement::NPOINTS * DisplacementDim);
@@ -327,8 +327,7 @@ public:
auto const& C = _ip_data[ip].C;
- double const S =
- _process_data.specific_storage(t, x_position)[0];
+ double const S = _process_data.specific_storage(t, x_position)[0];
double const K_over_mu =
_process_data.intrinsic_permeability(t, x_position)[0] /
_process_data.fluid_viscosity(t, x_position)[0];
@@ -394,8 +393,7 @@ public:
.noalias() += Kup.transpose() / dt;
// pressure equation
- local_rhs.template segment<pressure_size>(pressure_index)
- .noalias() -=
+ local_rhs.template segment<pressure_size>(pressure_index).noalias() -=
laplace_p * p + storage_p * p_dot + Kup.transpose() * u_dot;
// displacement equation
@@ -604,7 +602,8 @@ private:
IntegrationMethod _integration_method;
MeshLib::Element const& _element;
- SecondaryData<typename ShapeMatricesTypeDisplacement::ShapeMatrices::ShapeType>
+ SecondaryData<
+ typename ShapeMatricesTypeDisplacement::ShapeMatrices::ShapeType>
_secondary_data;
std::vector<std::vector<double>> _darcy_velocities =
@@ -612,7 +611,6 @@ private:
DisplacementDim,
std::vector<double>(_integration_method.getNumberOfPoints()));
-
static const int pressure_index = 0;
static const int pressure_size = ShapeFunctionPressure::NPOINTS;
static const int displacement_index = ShapeFunctionPressure::NPOINTS;
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp b/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
index 5882b72e349..12614d40370 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
+++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
@@ -7,16 +7,15 @@
*
*/
-#include "HydroMechanicsProcess-fwd.h"
#include "HydroMechanicsProcess.h"
+#include "HydroMechanicsProcess-fwd.h"
namespace ProcessLib
{
namespace HydroMechanics
{
-
template class HydroMechanicsProcess<2>;
template class HydroMechanicsProcess<3>;
-} // namespace HydroMechanics
-} // namespace ProcessLib
+} // namespace HydroMechanics
+} // namespace ProcessLib
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess.h b/ProcessLib/HydroMechanics/HydroMechanicsProcess.h
index 45e3db37db7..4496c7fa41c 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsProcess.h
+++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess.h
@@ -139,7 +139,8 @@ private:
getExtrapolator(), _local_assemblers,
&HydroMechanicsLocalAssemblerInterface::getIntPtSigmaXY));
- if (DisplacementDim == 3) {
+ if (DisplacementDim == 3)
+ {
Base::_secondary_variables.addSecondaryVariable(
"sigma_xz", 1,
makeExtrapolator(
@@ -196,11 +197,9 @@ private:
getIntPtDarcyVelocityZ));
}
- void assembleConcreteProcess(const double t, GlobalVector const& x,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b,
- StaggeredCouplingTerm const&
- coupling_term) override
+ void assembleConcreteProcess(
+ const double t, GlobalVector const& x, GlobalMatrix& M, GlobalMatrix& K,
+ GlobalVector& b, StaggeredCouplingTerm const& coupling_term) override
{
DBUG("Assemble HydroMechanicsProcess.");
diff --git a/ProcessLib/HydroMechanics/LocalDataInitializer.h b/ProcessLib/HydroMechanics/LocalDataInitializer.h
index 2869c4cd017..d2b68e03be5 100644
--- a/ProcessLib/HydroMechanics/LocalDataInitializer.h
+++ b/ProcessLib/HydroMechanics/LocalDataInitializer.h
@@ -11,9 +11,9 @@
#include <functional>
#include <memory>
+#include <type_traits>
#include <typeindex>
#include <typeinfo>
-#include <type_traits>
#include <unordered_map>
#include "MeshLib/Elements/Elements.h"
--
GitLab