Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
cm3Libraries
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cm3
cm3Libraries
Commits
9c8f4c22
Commit
9c8f4c22
authored
7 years ago
by
Van Dung NGUYEN
Browse files
Options
Downloads
Patches
Plain Diff
add some new ipvariable
parent
4913cad4
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
NonLinearSolver/internalPoints/ipField.cpp
+6
-0
6 additions, 0 deletions
NonLinearSolver/internalPoints/ipField.cpp
NonLinearSolver/internalPoints/ipField.h
+3
-1
3 additions, 1 deletion
NonLinearSolver/internalPoints/ipField.h
dG3D/src/dG3DIPVariable.cpp
+35
-0
35 additions, 0 deletions
dG3D/src/dG3DIPVariable.cpp
with
44 additions
and
1 deletion
NonLinearSolver/internalPoints/ipField.cpp
+
6
−
0
View file @
9c8f4c22
...
@@ -209,6 +209,12 @@ std::string IPField::ToString(const int i){
...
@@ -209,6 +209,12 @@ std::string IPField::ToString(const int i){
else
if
(
i
==
EXTRAFIELD_NORM
)
return
"EXTRAFIELD_NORM"
;
else
if
(
i
==
EXTRAFIELD_NORM
)
return
"EXTRAFIELD_NORM"
;
else
if
(
i
==
DELETED
)
return
"DELETED"
;
else
if
(
i
==
DELETED
)
return
"DELETED"
;
else
if
(
i
==
LOST_ELLIPTICITY
)
return
"LOST_ELLIPTICITY"
;
else
if
(
i
==
LOST_ELLIPTICITY
)
return
"LOST_ELLIPTICITY"
;
else
if
(
i
==
LOCAL_0
)
return
"LOCAL_0"
;
else
if
(
i
==
LOCAL_1
)
return
"LOCAL_1"
;
else
if
(
i
==
LOCAL_2
)
return
"LOCAL_2"
;
else
if
(
i
==
NONLOCAL_0
)
return
"NONLOCAL_0"
;
else
if
(
i
==
NONLOCAL_1
)
return
"NONLOCAL_1"
;
else
if
(
i
==
NONLOCAL_2
)
return
"NONLOCAL_2"
;
else
{
else
{
Msg
::
Warning
(
"This IP field %d is not defined in IPField::ToString(%d)"
,
i
,
i
);
Msg
::
Warning
(
"This IP field %d is not defined in IPField::ToString(%d)"
,
i
,
i
);
return
"UNDEFINED"
;
return
"UNDEFINED"
;
...
...
This diff is collapsed.
Click to expand it.
NonLinearSolver/internalPoints/ipField.h
+
3
−
1
View file @
9c8f4c22
...
@@ -85,7 +85,9 @@ class IPField : public elementsField {
...
@@ -85,7 +85,9 @@ class IPField : public elementsField {
MTX_STRAIN_XX
,
MTX_STRAIN_YY
,
MTX_STRAIN_ZZ
,
MTX_STRAIN_XY
,
MTX_STRAIN_YZ
,
MTX_STRAIN_XZ
,
MTX_STRAIN_XX
,
MTX_STRAIN_YY
,
MTX_STRAIN_ZZ
,
MTX_STRAIN_XY
,
MTX_STRAIN_YZ
,
MTX_STRAIN_XZ
,
INC_STRAIN_XX
,
INC_STRAIN_YY
,
INC_STRAIN_ZZ
,
INC_STRAIN_XY
,
INC_STRAIN_YZ
,
INC_STRAIN_XZ
,
INC_STRAIN_XX
,
INC_STRAIN_YY
,
INC_STRAIN_ZZ
,
INC_STRAIN_XY
,
INC_STRAIN_YZ
,
INC_STRAIN_XZ
,
EXTRAFIELD_1
,
EXTRAFIELD_2
,
EXTRAFIELD_3
,
EXTRAFIELD_4
,
EXTRAFIELD_5
,
EXTRAFIELD_6
,
EXTRAFIELD_7
,
EXTRAFIELD_8
,
EXTRAFIELD_9
,
EXTRAFIELD_1
,
EXTRAFIELD_2
,
EXTRAFIELD_3
,
EXTRAFIELD_4
,
EXTRAFIELD_5
,
EXTRAFIELD_6
,
EXTRAFIELD_7
,
EXTRAFIELD_8
,
EXTRAFIELD_9
,
EXTRAFIELD_NORM
,
DELETED
,
LOST_ELLIPTICITY
};
EXTRAFIELD_NORM
,
DELETED
,
LOST_ELLIPTICITY
,
LOCAL_0
,
LOCAL_1
,
LOCAL_2
,
NONLOCAL_0
,
NONLOCAL_1
,
NONLOCAL_2
};
enum
Operator
{
MEAN_VALUE
=
1
,
MIN_VALUE
,
MAX_VALUE
,
CRUDE_VALUE
};
enum
Operator
{
MEAN_VALUE
=
1
,
MIN_VALUE
,
MAX_VALUE
,
CRUDE_VALUE
};
#ifndef SWIG
#ifndef SWIG
// Struct for archiving
// Struct for archiving
...
...
This diff is collapsed.
Click to expand it.
dG3D/src/dG3DIPVariable.cpp
+
35
−
0
View file @
9c8f4c22
...
@@ -256,6 +256,41 @@ double dG3DIPVariable::get(const int comp) const
...
@@ -256,6 +256,41 @@ double dG3DIPVariable::get(const int comp) const
if
(
this
->
isDeleted
())
return
1.
;
if
(
this
->
isDeleted
())
return
1.
;
else
return
0.
;
else
return
0.
;
}
}
else
if
(
comp
==
IPField
::
LOCAL_0
){
if
(
getNumberNonLocalVariable
()
>
0
){
return
getConstRefToLocalVariable
(
0
);
}
else
return
0.
;
}
else
if
(
comp
==
IPField
::
LOCAL_1
){
if
(
getNumberNonLocalVariable
()
>
1
){
return
getConstRefToLocalVariable
(
1
);
}
else
return
0.
;
}
else
if
(
comp
==
IPField
::
LOCAL_2
){
if
(
getNumberNonLocalVariable
()
>
2
){
return
getConstRefToLocalVariable
(
2
);
}
else
return
0.
;
}
else
if
(
comp
==
IPField
::
NONLOCAL_0
){
if
(
getNumberNonLocalVariable
()
>
0
){
return
getConstRefToNonLocalVariable
(
0
);
}
else
return
0.
;
}
else
if
(
comp
==
IPField
::
NONLOCAL_1
){
if
(
getNumberNonLocalVariable
()
>
1
){
return
getConstRefToNonLocalVariable
(
0
);
}
else
return
0.
;
}
else
if
(
comp
==
IPField
::
NONLOCAL_2
){
if
(
getNumberNonLocalVariable
()
>
2
)
return
getConstRefToNonLocalVariable
(
0
);
else
return
0.
;
}
else
else
return
0.
;
return
0.
;
...
...
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