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
47981e0e
Commit
47981e0e
authored
11 years ago
by
Elias Pipping
Committed by
Elias Pipping
11 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[Cleanup] Move fd.a out of coefficientProduct
parent
71025c09
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dune/tectonic/frictionpotential.hh
+5
-5
5 additions, 5 deletions
dune/tectonic/frictionpotential.hh
with
5 additions
and
5 deletions
dune/tectonic/frictionpotential.hh
+
5
−
5
View file @
47981e0e
...
@@ -32,7 +32,7 @@ class FrictionPotentialWrapper {
...
@@ -32,7 +32,7 @@ class FrictionPotentialWrapper {
class
FrictionPotential
:
public
FrictionPotentialWrapper
{
class
FrictionPotential
:
public
FrictionPotentialWrapper
{
public:
public:
FrictionPotential
(
double
coefficient
,
FrictionData
const
&
fd
)
FrictionPotential
(
double
coefficient
,
FrictionData
const
&
fd
)
:
fd
(
fd
),
coefficientProduct
(
coefficient
*
fd
.
a
*
fd
.
normalStress
)
{}
:
fd
(
fd
),
weightTimesNormalStress
(
coefficient
*
fd
.
normalStress
)
{}
double
evaluate
(
double
V
)
const
{
double
evaluate
(
double
V
)
const
{
assert
(
V
>=
0
);
assert
(
V
>=
0
);
...
@@ -40,7 +40,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
...
@@ -40,7 +40,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
return
0
;
return
0
;
// V log(V/V_m) - V + V_m
// V log(V/V_m) - V + V_m
return
coefficientProduct
*
(
V
*
std
::
log
(
V
/
V_m
)
-
V
+
V_m
);
return
weightTimesNormalStress
*
fd
.
a
*
(
V
*
std
::
log
(
V
/
V_m
)
-
V
+
V_m
);
}
}
// log(V/V_m) if V >= V_0
// log(V/V_m) if V >= V_0
...
@@ -50,7 +50,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
...
@@ -50,7 +50,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
if
(
V
<=
V_m
)
if
(
V
<=
V_m
)
return
0
;
return
0
;
return
coefficientProduct
*
std
::
log
(
V
/
V_m
);
return
weightTimesNormalStress
*
fd
.
a
*
std
::
log
(
V
/
V_m
);
}
}
// 1/V if V > V_0
// 1/V if V > V_0
...
@@ -61,7 +61,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
...
@@ -61,7 +61,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
if
(
V
<=
V_m
)
if
(
V
<=
V_m
)
return
0
;
return
0
;
return
coefficientProduct
/
V
;
return
weightTimesNormalStress
*
fd
.
a
/
V
;
}
}
double
regularity
(
double
V
)
const
{
double
regularity
(
double
V
)
const
{
...
@@ -83,7 +83,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
...
@@ -83,7 +83,7 @@ class FrictionPotential : public FrictionPotentialWrapper {
private
:
private
:
FrictionData
const
&
fd
;
FrictionData
const
&
fd
;
double
const
coefficientProduct
;
double
const
weightTimesNormalStress
;
double
V_m
;
double
V_m
;
};
};
...
...
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