From 9ed41968d827edb657e00a603c0809feeea824fb Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Thu, 8 Jun 2017 00:40:48 +0200
Subject: [PATCH] [PL] Change order of computeBMatrix arguments.
For easier reading.
---
ProcessLib/Deformation/LinearBMatrix.h | 4 ++--
ProcessLib/HydroMechanics/HydroMechanicsFEM.h | 4 ++--
.../LocalAssembler/HydroMechanicsLocalAssemblerMatrix-impl.h | 4 ++--
.../SmallDeformationLocalAssemblerMatrix-impl.h | 2 +-
.../SmallDeformationLocalAssemblerMatrixNearFracture-impl.h | 2 +-
ProcessLib/SmallDeformation/SmallDeformationFEM.h | 4 ++--
ProcessLib/SmallDeformationCommon/Common.h | 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ProcessLib/Deformation/LinearBMatrix.h b/ProcessLib/Deformation/LinearBMatrix.h
index 69c7cb78bf7..139d5c0c85c 100644
--- a/ProcessLib/Deformation/LinearBMatrix.h
+++ b/ProcessLib/Deformation/LinearBMatrix.h
@@ -37,9 +37,9 @@ template <int DisplacementDim,
typename N_Type,
typename DNDX_Type>
BMatrixType computeBMatrix(DNDX_Type const& dNdx,
- const bool is_axially_symmetric,
N_Type const& N,
- const double radius)
+ const double radius,
+ const bool is_axially_symmetric)
{
static_assert(0 < DisplacementDim && DisplacementDim <= 3,
"LinearBMatrix::computeBMatrix: DisplacementDim must be in "
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsFEM.h b/ProcessLib/HydroMechanics/HydroMechanicsFEM.h
index dfb8d61da8d..a265823988b 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsFEM.h
+++ b/ProcessLib/HydroMechanics/HydroMechanicsFEM.h
@@ -328,8 +328,8 @@ public:
N_u);
auto const B = LinearBMatrix::computeBMatrix<
DisplacementDim, ShapeFunctionDisplacement::NPOINTS,
- typename BMatricesType::BMatrixType>(
- dNdx_u, _is_axially_symmetric, N_u, x_coord);
+ typename BMatricesType::BMatrixType>(dNdx_u, N_u, x_coord,
+ _is_axially_symmetric);
auto& eps = _ip_data[ip].eps;
auto const& sigma_eff = _ip_data[ip].sigma_eff;
diff --git a/ProcessLib/LIE/HydroMechanics/LocalAssembler/HydroMechanicsLocalAssemblerMatrix-impl.h b/ProcessLib/LIE/HydroMechanics/LocalAssembler/HydroMechanicsLocalAssemblerMatrix-impl.h
index b096a5ac14f..e2cdc3eca41 100644
--- a/ProcessLib/LIE/HydroMechanics/LocalAssembler/HydroMechanicsLocalAssemblerMatrix-impl.h
+++ b/ProcessLib/LIE/HydroMechanics/LocalAssembler/HydroMechanicsLocalAssemblerMatrix-impl.h
@@ -201,7 +201,7 @@ assembleBlockMatricesWithJacobian(
LinearBMatrix::computeBMatrix<GlobalDim,
ShapeFunctionDisplacement::NPOINTS,
typename BMatricesType::BMatrixType>(
- dNdx_u, _is_axially_symmetric, N_u, x_coord);
+ dNdx_u, N_u, x_coord, _is_axially_symmetric);
auto const& eps_prev = ip_data.eps_prev;
auto const& sigma_eff_prev = ip_data.sigma_eff_prev;
@@ -346,7 +346,7 @@ computeSecondaryVariableConcreteWithBlockVectors(
LinearBMatrix::computeBMatrix<GlobalDim,
ShapeFunctionDisplacement::NPOINTS,
typename BMatricesType::BMatrixType>(
- dNdx_u, _is_axially_symmetric, N_u, x_coord);
+ dNdx_u, N_u, x_coord, _is_axially_symmetric);
eps.noalias() = B * u;
diff --git a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix-impl.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix-impl.h
index 28abf3710f1..3c9c657b3e2 100644
--- a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix-impl.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix-impl.h
@@ -130,7 +130,7 @@ assembleWithJacobian(
LinearBMatrix::computeBMatrix<DisplacementDim,
ShapeFunction::NPOINTS,
typename BMatricesType::BMatrixType>(
- dNdx, _is_axially_symmetric, N, x_coord);
+ dNdx, N, x_coord, _is_axially_symmetric);
auto const& eps_prev = _ip_data[ip]._eps_prev;
auto const& sigma_prev = _ip_data[ip]._sigma_prev;
diff --git a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture-impl.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture-impl.h
index ca4089d5cc0..3ff08e674ec 100644
--- a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture-impl.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture-impl.h
@@ -208,7 +208,7 @@ assembleWithJacobian(
LinearBMatrix::computeBMatrix<DisplacementDim,
ShapeFunction::NPOINTS,
typename BMatricesType::BMatrixType>(
- dNdx, _is_axially_symmetric, N, x_coord);
+ dNdx, N, x_coord, _is_axially_symmetric);
// strain, stress
auto const& eps_prev = ip_data._eps_prev;
diff --git a/ProcessLib/SmallDeformation/SmallDeformationFEM.h b/ProcessLib/SmallDeformation/SmallDeformationFEM.h
index 3fc66737c8e..d0e1d6d1a55 100644
--- a/ProcessLib/SmallDeformation/SmallDeformationFEM.h
+++ b/ProcessLib/SmallDeformation/SmallDeformationFEM.h
@@ -240,8 +240,8 @@ public:
_element, N);
auto const B = LinearBMatrix::computeBMatrix<
DisplacementDim, ShapeFunction::NPOINTS,
- typename BMatricesType::BMatrixType>(
- dNdx, _is_axially_symmetric, N, x_coord);
+ typename BMatricesType::BMatrixType>(dNdx, N, x_coord,
+ _is_axially_symmetric);
auto const& eps_prev = _ip_data[ip].eps_prev;
auto const& sigma_prev = _ip_data[ip].sigma_prev;
diff --git a/ProcessLib/SmallDeformationCommon/Common.h b/ProcessLib/SmallDeformationCommon/Common.h
index b121ed848b7..5b65b7e31ae 100644
--- a/ProcessLib/SmallDeformationCommon/Common.h
+++ b/ProcessLib/SmallDeformationCommon/Common.h
@@ -61,8 +61,8 @@ std::vector<double> const& getNodalForces(
auto const B =
LinearBMatrix::computeBMatrix<DisplacementDim,
ShapeFunction::NPOINTS, BMatrixType>(
- _ip_data[ip].dNdx, is_axially_symmetric, _ip_data[ip].N,
- x_coord);
+ _ip_data[ip].dNdx, _ip_data[ip].N, x_coord,
+ is_axially_symmetric);
auto& sigma = _ip_data[ip].sigma;
local_b.noalias() += B.transpose() * sigma * w;
--
GitLab