Skip to content
Snippets Groups Projects
Commit d3452a11 authored by wenqing's avatar wenqing Committed by Dmitri Naumov
Browse files

[LIE/M] Change the shape function variable names

from N, dNdx to N_u, dNdx_u, respectively.
parent 811848f3
No related branches found
No related tags found
No related merge requests found
......@@ -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()
{
......
......@@ -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);
......
......@@ -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(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment