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
3a1ddbe2
Commit
3a1ddbe2
authored
10 years ago
by
Elias Pipping
Browse files
Options
Downloads
Patches
Plain Diff
[Cleanup] Rename: Global{RuinaN. -> RateStateF.}
parent
c6a767fd
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/globalratestatefriction.hh
+4
-4
4 additions, 4 deletions
dune/tectonic/globalratestatefriction.hh
src/assemblers.cc
+2
-2
2 additions, 2 deletions
src/assemblers.cc
src/assemblers.hh
+2
-2
2 additions, 2 deletions
src/assemblers.hh
with
8 additions
and
8 deletions
dune/tectonic/globalr
uinanonlinearity
.hh
→
dune/tectonic/globalr
atestatefriction
.hh
+
4
−
4
View file @
3a1ddbe2
#ifndef DUNE_TECTONIC_GLOBALR
UINANONLINEARITY
_HH
#ifndef DUNE_TECTONIC_GLOBALR
ATESTATEFRICTION
_HH
#define DUNE_TECTONIC_GLOBALR
UINANONLINEARITY
_HH
#define DUNE_TECTONIC_GLOBALR
ATESTATEFRICTION
_HH
#include
<vector>
#include
<vector>
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
#include
"frictionpotential.hh"
#include
"frictionpotential.hh"
template
<
class
Matrix
,
class
Vector
,
class
GridView
>
template
<
class
Matrix
,
class
Vector
,
class
GridView
>
class
GlobalR
uinaNonlinearity
:
public
GlobalFriction
<
Matrix
,
Vector
>
{
class
GlobalR
ateStateFriction
:
public
GlobalFriction
<
Matrix
,
Vector
>
{
public:
public:
using
GlobalFriction
<
Matrix
,
Vector
>::
block_size
;
using
GlobalFriction
<
Matrix
,
Vector
>::
block_size
;
using
typename
GlobalFriction
<
Matrix
,
Vector
>::
Friction
;
using
typename
GlobalFriction
<
Matrix
,
Vector
>::
Friction
;
...
@@ -25,7 +25,7 @@ class GlobalRuinaNonlinearity : public GlobalFriction<Matrix, Vector> {
...
@@ -25,7 +25,7 @@ class GlobalRuinaNonlinearity : public GlobalFriction<Matrix, Vector> {
using
typename
GlobalFriction
<
Matrix
,
Vector
>::
ScalarVector
;
using
typename
GlobalFriction
<
Matrix
,
Vector
>::
ScalarVector
;
public:
public:
GlobalR
uinaNonlinearity
(
BoundaryPatch
<
GridView
>
const
&
frictionalBoundary
,
GlobalR
ateStateFriction
(
BoundaryPatch
<
GridView
>
const
&
frictionalBoundary
,
GridView
const
&
gridView
,
GridView
const
&
gridView
,
GlobalFrictionData
<
block_size
>
const
&
frictionInfo
,
GlobalFrictionData
<
block_size
>
const
&
frictionInfo
,
// Note: passing the following two makes no sense
// Note: passing the following two makes no sense
...
...
This diff is collapsed.
Click to expand it.
src/assemblers.cc
+
2
−
2
View file @
3a1ddbe2
...
@@ -122,7 +122,7 @@ auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity(
...
@@ -122,7 +122,7 @@ auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity(
BoundaryPatch
<
GridView
>
const
&
frictionalBoundary
,
BoundaryPatch
<
GridView
>
const
&
frictionalBoundary
,
GlobalFrictionData
<
dimension
>
const
&
frictionInfo
,
GlobalFrictionData
<
dimension
>
const
&
frictionInfo
,
ScalarVector
const
&
normalStress
)
ScalarVector
const
&
normalStress
)
->
std
::
shared_ptr
<
GlobalR
uinaNonlinearity
<
Matrix
,
Vector
,
GridView
>>
{
->
std
::
shared_ptr
<
GlobalR
ateStateFriction
<
Matrix
,
Vector
,
GridView
>>
{
// Lump negative normal stress (kludge)
// Lump negative normal stress (kludge)
ScalarVector
weights
;
ScalarVector
weights
;
{
{
...
@@ -133,7 +133,7 @@ auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity(
...
@@ -133,7 +133,7 @@ auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity(
vertexAssembler
.
assembleBoundaryFunctional
(
frictionalBoundaryAssembler
,
vertexAssembler
.
assembleBoundaryFunctional
(
frictionalBoundaryAssembler
,
weights
,
frictionalBoundary
);
weights
,
frictionalBoundary
);
}
}
return
std
::
make_shared
<
GlobalR
uinaNonlinearity
<
Matrix
,
Vector
,
GridView
>>
(
return
std
::
make_shared
<
GlobalR
ateStateFriction
<
Matrix
,
Vector
,
GridView
>>
(
frictionalBoundary
,
gridView
,
frictionInfo
,
weights
,
normalStress
);
frictionalBoundary
,
gridView
,
frictionInfo
,
weights
,
normalStress
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/assemblers.hh
+
2
−
2
View file @
3a1ddbe2
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
#include
<dune/fufem/functionspacebases/p1nodalbasis.hh>
#include
<dune/fufem/functionspacebases/p1nodalbasis.hh>
#include
<dune/tectonic/globalfrictiondata.hh>
#include
<dune/tectonic/globalfrictiondata.hh>
#include
<dune/tectonic/globalr
uinanonlinearity
.hh>
#include
<dune/tectonic/globalr
atestatefriction
.hh>
template
<
class
GridView
,
int
dimension
>
class
MyAssembler
{
template
<
class
GridView
,
int
dimension
>
class
MyAssembler
{
public:
public:
...
@@ -75,7 +75,7 @@ template <class GridView, int dimension> class MyAssembler {
...
@@ -75,7 +75,7 @@ template <class GridView, int dimension> class MyAssembler {
ScalarVector
&
normalStress
,
double
youngModulus
,
ScalarVector
&
normalStress
,
double
youngModulus
,
double
poissonRatio
,
Vector
const
&
displacement
);
double
poissonRatio
,
Vector
const
&
displacement
);
std
::
shared_ptr
<
GlobalR
uinaNonlinearity
<
Matrix
,
Vector
,
GridView
>>
std
::
shared_ptr
<
GlobalR
ateStateFriction
<
Matrix
,
Vector
,
GridView
>>
assembleFrictionNonlinearity
(
assembleFrictionNonlinearity
(
BoundaryPatch
<
GridView
>
const
&
frictionalBoundary
,
BoundaryPatch
<
GridView
>
const
&
frictionalBoundary
,
GlobalFrictionData
<
dimension
>
const
&
frictionInfo
,
GlobalFrictionData
<
dimension
>
const
&
frictionInfo
,
...
...
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