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
1dd0e9e2
Commit
1dd0e9e2
authored
10 years ago
by
Elias Pipping
Browse files
Options
Downloads
Patches
Plain Diff
[Cleanup] Rename: FrictionPotential{Wrapper -> }
parent
127b792e
No related branches found
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
+4
-4
4 additions, 4 deletions
dune/tectonic/frictionpotential.hh
dune/tectonic/localfriction.hh
+2
-2
2 additions, 2 deletions
dune/tectonic/localfriction.hh
with
6 additions
and
6 deletions
dune/tectonic/frictionpotential.hh
+
4
−
4
View file @
1dd0e9e2
...
...
@@ -11,9 +11,9 @@
#include
"frictiondata.hh"
class
FrictionPotential
Wrapper
{
class
FrictionPotential
{
public:
virtual
~
FrictionPotential
Wrapper
()
{}
virtual
~
FrictionPotential
()
{}
double
virtual
differential
(
double
s
)
const
=
0
;
double
virtual
second_deriv
(
double
x
)
const
=
0
;
...
...
@@ -27,7 +27,7 @@ class FrictionPotentialWrapper {
void
virtual
updateAlpha
(
double
)
=
0
;
};
class
TruncatedRateState
:
public
FrictionPotential
Wrapper
{
class
TruncatedRateState
:
public
FrictionPotential
{
public:
TruncatedRateState
(
double
coefficient
,
double
_normalStress
,
FrictionData
_fd
)
:
fd
(
_fd
),
weight
(
coefficient
),
normalStress
(
_normalStress
)
{}
...
...
@@ -69,7 +69,7 @@ class TruncatedRateState : public FrictionPotentialWrapper {
double
Vmin
;
};
class
TrivialFunction
:
public
FrictionPotential
Wrapper
{
class
TrivialFunction
:
public
FrictionPotential
{
public:
double
evaluate
(
double
)
const
{
return
0
;
}
...
...
This diff is collapsed.
Click to expand it.
dune/tectonic/localfriction.hh
+
2
−
2
View file @
1dd0e9e2
...
...
@@ -17,7 +17,7 @@ template <size_t dimension> class LocalFriction {
using
VectorType
=
Dune
::
FieldVector
<
double
,
dimension
>
;
using
MatrixType
=
Dune
::
FieldMatrix
<
double
,
dimension
,
dimension
>
;
explicit
LocalFriction
(
std
::
shared_ptr
<
FrictionPotential
Wrapper
>
func
)
explicit
LocalFriction
(
std
::
shared_ptr
<
FrictionPotential
>
func
)
:
func
(
func
)
{}
double
operator
()(
VectorType
const
&
x
)
const
{
...
...
@@ -106,6 +106,6 @@ template <size_t dimension> class LocalFriction {
}
private
:
std
::
shared_ptr
<
FrictionPotential
Wrapper
>
const
func
;
std
::
shared_ptr
<
FrictionPotential
>
const
func
;
};
#endif
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