diff --git a/ProcessLib/LargeDeformation/IntegrationPointData.h b/ProcessLib/LargeDeformation/IntegrationPointData.h index 371da4ecde82d945803d0d2d511fb9ccd2c0c912..03c1da273485bb26825e3c293fef18b87f37101f 100644 --- a/ProcessLib/LargeDeformation/IntegrationPointData.h +++ b/ProcessLib/LargeDeformation/IntegrationPointData.h @@ -17,8 +17,8 @@ template <typename BMatricesType, typename ShapeMatricesType, struct IntegrationPointData final { double integration_weight; - typename ShapeMatricesType::NodalRowVectorType N; - typename ShapeMatricesType::GlobalDimNodalMatrixType dNdx; + typename ShapeMatricesType::NodalRowVectorType N_u; + typename ShapeMatricesType::GlobalDimNodalMatrixType dNdx_u; EIGEN_MAKE_ALIGNED_OPERATOR_NEW; }; diff --git a/ProcessLib/LargeDeformation/LargeDeformationFEM.h b/ProcessLib/LargeDeformation/LargeDeformationFEM.h index af727c8143ea0caa28cc50e99712de7b7a8ba9a1..51b056a3d282e71b2481824db5abd760bd1e1c13 100644 --- a/ProcessLib/LargeDeformation/LargeDeformationFEM.h +++ b/ProcessLib/LargeDeformation/LargeDeformationFEM.h @@ -134,8 +134,8 @@ public: this->integration_method_.getWeightedPoint(ip).getWeight() * sm.integralMeasure * sm.detJ; - ip_data.N = sm.N; - ip_data.dNdx = sm.dNdx; + ip_data.N_u = sm.N; + ip_data.dNdx_u = sm.dNdx; _secondary_data.N[ip] = shape_matrices[ip].N; } @@ -154,7 +154,7 @@ public: MathLib::Point3d( NumLib::interpolateCoordinates<ShapeFunction, ShapeMatricesType>( - this->element_, ip_data.N))}; + this->element_, ip_data.N_u))}; /// Set initial stress from parameter. if (this->process_data_.initial_stress != nullptr) @@ -271,8 +271,8 @@ public: { 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, @@ -345,8 +345,8 @@ public: for (unsigned ip = 0; ip < n_integration_points; ip++) { x_position.setIntegrationPoint(ip); - 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>(