Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-tectonic
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
podlesny
dune-tectonic
Commits
7f316190
Commit
7f316190
authored
5 years ago
by
podlesny
Browse files
Options
Downloads
Patches
Plain Diff
evaluation of friction energy
parent
afbcb797
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dune/tectonic/frictionpotential.hh
+11
-0
11 additions, 0 deletions
dune/tectonic/frictionpotential.hh
dune/tectonic/localfriction.hh
+5
-0
5 additions, 0 deletions
dune/tectonic/localfriction.hh
with
16 additions
and
0 deletions
dune/tectonic/frictionpotential.hh
+
11
−
0
View file @
7f316190
...
@@ -58,6 +58,13 @@ class TruncatedRateState : public FrictionPotential {
...
@@ -58,6 +58,13 @@ class TruncatedRateState : public FrictionPotential {
return
std
::
abs
(
second_deriv
(
V
));
return
std
::
abs
(
second_deriv
(
V
));
}
}
double
evaluate
(
double
V
)
const
override
{
if
(
V
<=
Vmin
)
return
0.0
;
return
weight
*
fd
.
C
*
V
-
weightedNormalStress
*
fd
.
a
*
V
*
(
std
::
log
(
V
/
Vmin
)
-
1
);
}
void
updateAlpha
(
double
alpha
)
override
{
void
updateAlpha
(
double
alpha
)
override
{
double
const
logrest
=
(
fd
.
mu0
+
fd
.
b
*
alpha
)
/
fd
.
a
;
double
const
logrest
=
(
fd
.
mu0
+
fd
.
b
*
alpha
)
/
fd
.
a
;
Vmin
=
fd
.
V0
/
std
::
exp
(
logrest
);
Vmin
=
fd
.
V0
/
std
::
exp
(
logrest
);
...
@@ -92,6 +99,10 @@ class RegularisedRateState : public FrictionPotential {
...
@@ -92,6 +99,10 @@ class RegularisedRateState : public FrictionPotential {
return
std
::
abs
(
second_deriv
(
V
));
return
std
::
abs
(
second_deriv
(
V
));
}
}
double
evaluate
(
double
V
)
const
override
{
return
weight
*
fd
.
C
*
V
-
weightedNormalStress
*
4
*
fd
.
a
*
Vmin
*
std
::
pow
(
std
::
asinh
(
0.25
*
V
/
Vmin
),
2.0
);
}
void
updateAlpha
(
double
alpha
)
override
{
void
updateAlpha
(
double
alpha
)
override
{
double
const
logrest
=
(
fd
.
mu0
+
fd
.
b
*
alpha
)
/
fd
.
a
;
double
const
logrest
=
(
fd
.
mu0
+
fd
.
b
*
alpha
)
/
fd
.
a
;
Vmin
=
fd
.
V0
/
std
::
exp
(
logrest
);
Vmin
=
fd
.
V0
/
std
::
exp
(
logrest
);
...
...
This diff is collapsed.
Click to expand it.
dune/tectonic/localfriction.hh
+
5
−
0
View file @
7f316190
...
@@ -19,6 +19,7 @@ template <size_t dimension> class LocalFriction {
...
@@ -19,6 +19,7 @@ template <size_t dimension> class LocalFriction {
using
VectorType
=
Dune
::
FieldVector
<
double
,
dimension
>
;
using
VectorType
=
Dune
::
FieldVector
<
double
,
dimension
>
;
using
MatrixType
=
Dune
::
FieldMatrix
<
double
,
dimension
,
dimension
>
;
using
MatrixType
=
Dune
::
FieldMatrix
<
double
,
dimension
,
dimension
>
;
double
virtual
operator
()(
VectorType
const
&
x
)
const
=
0
;
void
virtual
updateAlpha
(
double
alpha
)
=
0
;
void
virtual
updateAlpha
(
double
alpha
)
=
0
;
double
virtual
regularity
(
VectorType
const
&
x
)
const
=
0
;
double
virtual
regularity
(
VectorType
const
&
x
)
const
=
0
;
double
virtual
coefficientOfFriction
(
VectorType
const
&
x
)
const
=
0
;
double
virtual
coefficientOfFriction
(
VectorType
const
&
x
)
const
=
0
;
...
@@ -44,6 +45,10 @@ class WrappedScalarFriction : public LocalFriction<dimension> {
...
@@ -44,6 +45,10 @@ class WrappedScalarFriction : public LocalFriction<dimension> {
WrappedScalarFriction
(
Args
...
args
)
WrappedScalarFriction
(
Args
...
args
)
:
func_
(
args
...)
{}
:
func_
(
args
...)
{}
double
operator
()(
VectorType
const
&
x
)
const
override
{
return
func_
.
evaluate
(
x
.
two_norm
());
}
void
updateAlpha
(
double
alpha
)
override
{
func_
.
updateAlpha
(
alpha
);
}
void
updateAlpha
(
double
alpha
)
override
{
func_
.
updateAlpha
(
alpha
);
}
double
regularity
(
VectorType
const
&
x
)
const
override
{
double
regularity
(
VectorType
const
&
x
)
const
override
{
...
...
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