Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs-feliks
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Feliks Kiszkurno
ogs-feliks
Commits
c7bcc092
Commit
c7bcc092
authored
10 months ago
by
wenqing
Browse files
Options
Downloads
Patches
Plain Diff
[Process/SD] Changed the shape function variable name
parent
cf2a8e08
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ProcessLib/SmallDeformation/MaterialForces.h
+3
-3
3 additions, 3 deletions
ProcessLib/SmallDeformation/MaterialForces.h
ProcessLib/SmallDeformation/SmallDeformationFEM.h
+9
-9
9 additions, 9 deletions
ProcessLib/SmallDeformation/SmallDeformationFEM.h
with
12 additions
and
12 deletions
ProcessLib/SmallDeformation/MaterialForces.h
+
3
−
3
View file @
c7bcc092
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
ProcessLib/SmallDeformation/SmallDeformationFEM.h
+
9
−
9
View file @
c7bcc092
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment