diff --git a/ProcessLib/LIE/SmallDeformation/LocalAssembler/IntegrationPointDataMatrix.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/IntegrationPointDataMatrix.h index 985b16a753477c058ebaccdd94444777b3cf6984..dd5d7a79060ebaed1301f804dfff9d25d9c195c0 100644 --- a/ProcessLib/LIE/SmallDeformation/LocalAssembler/IntegrationPointDataMatrix.h +++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/IntegrationPointDataMatrix.h @@ -44,8 +44,8 @@ struct IntegrationPointDataMatrix final typename BMatricesType::KelvinMatrixType _C; double integration_weight; - typename ShapeMatricesType::NodalRowVectorType N; - typename ShapeMatricesType::GlobalDimNodalMatrixType dNdx; + typename ShapeMatricesType::NodalRowVectorType N_u; + typename ShapeMatricesType::GlobalDimNodalMatrixType dNdx_u; void pushBackState() { diff --git a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix-impl.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix-impl.h index ac303ab98f267d8944aa7b0bb2076a39e979558a..18d2478e8db3a72d2698bb4ec50d9ab74244490a 100644 --- a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix-impl.h +++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix-impl.h @@ -67,8 +67,8 @@ SmallDeformationLocalAssemblerMatrix<ShapeFunction, DisplacementDim>:: _ip_data.emplace_back(solid_material); auto& ip_data = _ip_data[ip]; auto const& sm = shape_matrices[ip]; - ip_data.N = sm.N; - ip_data.dNdx = sm.dNdx; + ip_data.N_u = sm.N; + ip_data.dNdx_u = sm.dNdx; ip_data.integration_weight = _integration_method.getWeightedPoint(ip).getWeight() * sm.integralMeasure * sm.detJ; @@ -120,8 +120,8 @@ void SmallDeformationLocalAssemblerMatrix<ShapeFunction, DisplacementDim>:: x_position.setIntegrationPoint(ip); auto const& w = _ip_data[ip].integration_weight; - auto const& N = _ip_data[ip].N; - auto const& dNdx = _ip_data[ip].dNdx; + auto const& N = _ip_data[ip].N_u; + auto const& dNdx = _ip_data[ip].dNdx_u; auto const x_coord = NumLib::interpolateXCoordinate<ShapeFunction, ShapeMatricesType>( _element, N); diff --git a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture-impl.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture-impl.h index 00ad793ba9f3a6d6f4fbd5b415abc81479cfc01d..d5a037d0207429b2924bb60c8127d45e5f2f49e4 100644 --- a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture-impl.h +++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture-impl.h @@ -82,8 +82,8 @@ SmallDeformationLocalAssemblerMatrixNearFracture<ShapeFunction, _ip_data.emplace_back(solid_material); auto& ip_data = _ip_data[ip]; auto const& sm = shape_matrices[ip]; - ip_data.N = sm.N; - ip_data.dNdx = sm.dNdx; + ip_data.N_u = sm.N; + ip_data.dNdx_u = sm.dNdx; ip_data.integration_weight = _integration_method.getWeightedPoint(ip).getWeight() * sm.integralMeasure * sm.detJ; @@ -208,8 +208,8 @@ void SmallDeformationLocalAssemblerMatrixNearFracture< auto& ip_data = _ip_data[ip]; auto const& w = _ip_data[ip].integration_weight; - auto const& N = ip_data.N; - auto const& dNdx = ip_data.dNdx; + auto const& N = ip_data.N_u; + auto const& dNdx = ip_data.dNdx_u; // levelset functions Eigen::Vector3d const ip_physical_coords(