diff --git a/ProcessLib/Deformation/LinearBMatrix.h b/ProcessLib/Deformation/LinearBMatrix.h index 69c7cb78bf7f4d74758032877c7041b49f2fa92a..139d5c0c85cd45c9e394682e1d291bbc2227c1b4 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 dfb8d61da8d2bfaecc5eb904416f848f79e85509..a265823988b4c3020dc98b45197c3daf564ea1f5 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 b096a5ac14f0cba2b6ab0913e2ffe15f4bc2fc39..e2cdc3eca41e577fa220cafc993eea637ccd55b7 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 28abf3710f1f5f39aae5c4b375679d97e3d923fb..3c9c657b3e20585a4ae094b00f53ee81d0e6b652 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 ca4089d5cc0f12f5fbd6d217519a153e550f5004..3ff08e674ecc3a95714cacebc57f9d35399ef5ec 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 3fc66737c8e1d2e604b6662f15a519ed3aecf706..d0e1d6d1a55f71c747285b11f6ad06e4a8be3022 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 b121ed848b7fdb1616176aba33e0492778bbdf39..5b65b7e31aed95cda56b1238d5d61fb1d11ba1f4 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;