-
Notifications
You must be signed in to change notification settings - Fork 90
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: MGR Strategy for ALM - Face Bubble Functions for Wedge Elements - Multipoint Integration Rules for Tetrahedra and Triangles #3395
Changes from 10 commits
00157b3
d9cd65e
7cf3f56
e8d69eb
5a85a40
c7d9186
69ab77a
b946e59
36c70c5
e5ff261
459aef6
5cd89d9
907dcae
37d2396
ab95729
9e0270f
53eed41
4f46983
aba0a41
8c87bc1
e80036d
31f145e
f642064
a87c9f2
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -125,7 +125,6 @@ class FrictionBaseUpdates | |
arraySlice1d< real64 const > const & dispJump, | ||
arraySlice1d< real64 const > const & penalty, | ||
arraySlice1d< real64 const > const & traction, | ||
real64 const faceArea, | ||
bool const symmetric, | ||
bool const fixedLimitTau, | ||
real64 const normalTractionTolerance, | ||
|
@@ -134,7 +133,7 @@ class FrictionBaseUpdates | |
real64 ( & tractionNew )[3], | ||
integer & fractureState ) const | ||
{ | ||
GEOS_UNUSED_VAR( oldDispJump, dispJump, penalty, traction, faceArea, symmetric, fixedLimitTau, | ||
GEOS_UNUSED_VAR( oldDispJump, dispJump, penalty, traction, symmetric, fixedLimitTau, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why is this function defined? |
||
normalTractionTolerance, tangentialTractionTolerance, | ||
dTraction_dDispJump, tractionNew, fractureState ); | ||
} | ||
|
@@ -153,9 +152,8 @@ class FrictionBaseUpdates | |
arraySlice1d< real64 const > const & deltaDispJump, | ||
arraySlice1d< real64 const > const & penalty, | ||
arraySlice1d< real64 const > const & traction, | ||
real64 const faceArea, | ||
arraySlice1d< real64 > const & tractionNew ) const | ||
{ GEOS_UNUSED_VAR( dispJump, deltaDispJump, penalty, traction, faceArea, tractionNew ); } | ||
{ GEOS_UNUSED_VAR( dispJump, deltaDispJump, penalty, traction, tractionNew ); } | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. or this one? why not a pure virtual? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. because these are device functions. I am pretty sure that nvcc throws an error if we use a pure virtual. We do this a lot in our |
||
|
||
/** | ||
* @brief Check for the constraint satisfaction | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so this "traction" is now a "traction"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, it is . Actually, it has always been a "traction". In the previous implementation,
dispJump
was multiplied byfaceArea
. Now thatdispJump
is as it should be, it is used in its original form.