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
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
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
agnumpde
dune-tectonic
Commits
9c6be6e7
Commit
9c6be6e7
authored
11 years ago
by
Elias Pipping
Browse files
Options
Downloads
Patches
Plain Diff
[Cleanup] Force mumin=0
parent
d3b316e5
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dune/tectonic/frictiondata.hh
+0
-2
0 additions, 2 deletions
dune/tectonic/frictiondata.hh
dune/tectonic/frictionpotential.hh
+5
-4
5 additions, 4 deletions
dune/tectonic/frictionpotential.hh
src/one-body-sample.parset
+0
-1
0 additions, 1 deletion
src/one-body-sample.parset
with
5 additions
and
7 deletions
dune/tectonic/frictiondata.hh
+
0
−
2
View file @
9c6be6e7
...
@@ -9,7 +9,6 @@ struct FrictionData {
...
@@ -9,7 +9,6 @@ struct FrictionData {
a
(
parset
.
get
<
double
>
(
"a"
)),
a
(
parset
.
get
<
double
>
(
"a"
)),
b
(
parset
.
get
<
double
>
(
"b"
)),
b
(
parset
.
get
<
double
>
(
"b"
)),
mu0
(
parset
.
get
<
double
>
(
"mu0"
)),
mu0
(
parset
.
get
<
double
>
(
"mu0"
)),
mumin
(
parset
.
get
<
double
>
(
"mumin"
)),
normalStress
(
normalStress
)
{}
normalStress
(
normalStress
)
{}
double
const
L
;
double
const
L
;
...
@@ -17,7 +16,6 @@ struct FrictionData {
...
@@ -17,7 +16,6 @@ struct FrictionData {
double
const
a
;
double
const
a
;
double
const
b
;
double
const
b
;
double
const
mu0
;
double
const
mu0
;
double
const
mumin
;
double
const
normalStress
;
double
const
normalStress
;
};
};
#endif
#endif
This diff is collapsed.
Click to expand it.
dune/tectonic/frictionpotential.hh
+
5
−
4
View file @
9c6be6e7
...
@@ -38,7 +38,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
...
@@ -38,7 +38,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
double
differential
(
double
V
)
const
{
double
differential
(
double
V
)
const
{
assert
(
V
>=
0.0
);
assert
(
V
>=
0.0
);
if
(
V
<=
V_cutoff
)
if
(
V
<=
V_cutoff
)
return
fd
.
mumin
;
return
0.0
;
return
weightTimesNormalStress
*
fd
.
a
*
(
std
::
log
(
V
)
-
logV_m
);
return
weightTimesNormalStress
*
fd
.
a
*
(
std
::
log
(
V
)
-
logV_m
);
}
}
...
@@ -62,9 +62,10 @@ class FrictionPotential : public FrictionPotentialWrapper {
...
@@ -62,9 +62,10 @@ class FrictionPotential : public FrictionPotentialWrapper {
}
}
void
updateLogState
(
double
logState
)
{
void
updateLogState
(
double
logState
)
{
logV_m
=
std
::
log
(
fd
.
V0
)
+
double
const
tmp
=
(
-
(
fd
.
mu0
+
fd
.
b
*
(
logState
+
std
::
log
(
fd
.
V0
/
fd
.
L
)))
/
fd
.
a
);
(
fd
.
mu0
+
fd
.
b
*
(
logState
+
std
::
log
(
fd
.
V0
/
fd
.
L
)))
/
fd
.
a
;
V_cutoff
=
std
::
exp
(
logV_m
+
fd
.
mumin
/
fd
.
a
);
logV_m
=
std
::
log
(
fd
.
V0
)
-
tmp
;
V_cutoff
=
fd
.
V0
/
std
::
exp
(
tmp
);
}
}
private
:
private
:
...
...
This diff is collapsed.
Click to expand it.
src/one-body-sample.parset
+
0
−
1
View file @
9c6be6e7
...
@@ -17,7 +17,6 @@ bulkViscosity = 0
...
@@ -17,7 +17,6 @@ bulkViscosity = 0
[
boundary
.
friction
]
[
boundary
.
friction
]
mu0
=
0
.
6
mu0
=
0
.
6
mumin
=
0
.
0
a
=
0
.
010
a
=
0
.
010
b
=
0
.
015
b
=
0
.
015
V0
=
1
e
-
6
V0
=
1
e
-
6
...
...
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