Skip to content
Snippets Groups Projects
Commit c7bcc092 authored by wenqing's avatar wenqing
Browse files

[Process/SD] Changed the shape function variable name

parent cf2a8e08
No related branches found
No related tags found
No related merge requests found
...@@ -53,15 +53,15 @@ std::vector<double> const& getMaterialForces( ...@@ -53,15 +53,15 @@ std::vector<double> const& getMaterialForces(
for (unsigned ip = 0; ip < n_integration_points; ip++) for (unsigned ip = 0; ip < n_integration_points; ip++)
{ {
auto const& sigma = stress_data[ip].stress_data.sigma; auto const& sigma = stress_data[ip].stress_data.sigma;
auto const& N = _ip_data[ip].N; auto const& N = _ip_data[ip].N_u;
auto const& dNdx = _ip_data[ip].dNdx; auto const& dNdx = _ip_data[ip].dNdx_u;
auto const& psi = auto const& psi =
output_data[ip].free_energy_density_data.free_energy_density; output_data[ip].free_energy_density_data.free_energy_density;
auto const x_coord = auto const x_coord =
NumLib::interpolateXCoordinate<ShapeFunction, ShapeMatricesType>( NumLib::interpolateXCoordinate<ShapeFunction, ShapeMatricesType>(
element, _ip_data[ip].N); element, _ip_data[ip].N_u);
// For the 2D case the 33-component is needed (and the four entries // For the 2D case the 33-component is needed (and the four entries
// of the non-symmetric matrix); In 3d there are nine entries. // of the non-symmetric matrix); In 3d there are nine entries.
......
...@@ -41,8 +41,8 @@ template <typename BMatricesType, typename ShapeMatricesType, ...@@ -41,8 +41,8 @@ template <typename BMatricesType, typename ShapeMatricesType,
struct IntegrationPointData final struct IntegrationPointData final
{ {
double integration_weight; double integration_weight;
typename ShapeMatricesType::NodalRowVectorType N; typename ShapeMatricesType::NodalRowVectorType N_u;
typename ShapeMatricesType::GlobalDimNodalMatrixType dNdx; typename ShapeMatricesType::GlobalDimNodalMatrixType dNdx_u;
EIGEN_MAKE_ALIGNED_OPERATOR_NEW; EIGEN_MAKE_ALIGNED_OPERATOR_NEW;
}; };
...@@ -114,8 +114,8 @@ public: ...@@ -114,8 +114,8 @@ public:
this->integration_method_.getWeightedPoint(ip).getWeight() * this->integration_method_.getWeightedPoint(ip).getWeight() *
sm.integralMeasure * sm.detJ; sm.integralMeasure * sm.detJ;
ip_data.N = sm.N; ip_data.N_u = sm.N;
ip_data.dNdx = sm.dNdx; ip_data.dNdx_u = sm.dNdx;
_secondary_data.N[ip] = shape_matrices[ip].N; _secondary_data.N[ip] = shape_matrices[ip].N;
} }
...@@ -134,7 +134,7 @@ public: ...@@ -134,7 +134,7 @@ public:
MathLib::Point3d( MathLib::Point3d(
NumLib::interpolateCoordinates<ShapeFunction, NumLib::interpolateCoordinates<ShapeFunction,
ShapeMatricesType>( ShapeMatricesType>(
this->element_, ip_data.N))}; this->element_, ip_data.N_u))};
/// Set initial stress from parameter. /// Set initial stress from parameter.
if (this->process_data_.initial_stress != nullptr) if (this->process_data_.initial_stress != nullptr)
...@@ -180,8 +180,8 @@ public: ...@@ -180,8 +180,8 @@ public:
typename ConstitutiveRelations::OutputData<DisplacementDim>& typename ConstitutiveRelations::OutputData<DisplacementDim>&
output_data) const output_data) const
{ {
auto const& N = ip_data.N; auto const& N = ip_data.N_u;
auto const& dNdx = ip_data.dNdx; auto const& dNdx = ip_data.dNdx_u;
auto const x_coord = auto const x_coord =
NumLib::interpolateXCoordinate<ShapeFunction, ShapeMatricesType>( NumLib::interpolateXCoordinate<ShapeFunction, ShapeMatricesType>(
this->element_, N); this->element_, N);
...@@ -257,8 +257,8 @@ public: ...@@ -257,8 +257,8 @@ public:
{ {
x_position.setIntegrationPoint(ip); x_position.setIntegrationPoint(ip);
auto const& w = _ip_data[ip].integration_weight; auto const& w = _ip_data[ip].integration_weight;
auto const& N = _ip_data[ip].N; auto const& N = _ip_data[ip].N_u;
auto const& dNdx = _ip_data[ip].dNdx; auto const& dNdx = _ip_data[ip].dNdx_u;
auto const x_coord = auto const x_coord =
NumLib::interpolateXCoordinate<ShapeFunction, NumLib::interpolateXCoordinate<ShapeFunction,
......
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