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
d1f00e91
Commit
d1f00e91
authored
11 years ago
by
Elias Pipping
Committed by
Elias Pipping
11 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[Cleanup] Use camelCase
parent
bd6d38b9
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/enum_state_model.cc
+2
-2
2 additions, 2 deletions
src/enum_state_model.cc
src/enums.hh
+1
-1
1 addition, 1 deletion
src/enums.hh
src/one-body-sample.cc
+3
-3
3 additions, 3 deletions
src/one-body-sample.cc
src/one-body-sample.parset
+2
-2
2 additions, 2 deletions
src/one-body-sample.parset
with
8 additions
and
8 deletions
src/enum_state_model.cc
+
2
−
2
View file @
d1f00e91
#include
<dune/common/exceptions.hh>
template
<
>
struct
StringToEnum
<
Config
::
state
_m
odel
>
{
static
Config
::
state
_m
odel
convert
(
std
::
string
const
&
s
)
{
template
<
>
struct
StringToEnum
<
Config
::
state
M
odel
>
{
static
Config
::
state
M
odel
convert
(
std
::
string
const
&
s
)
{
if
(
s
==
"Dieterich"
)
return
Config
::
Dieterich
;
...
...
This diff is collapsed.
Click to expand it.
src/enums.hh
+
1
−
1
View file @
d1f00e91
...
...
@@ -2,7 +2,7 @@
#define ENUMS_HH
struct
Config
{
enum
state
_m
odel
{
enum
state
M
odel
{
Dieterich
,
Ruina
};
...
...
This diff is collapsed.
Click to expand it.
src/one-body-sample.cc
+
3
−
3
View file @
d1f00e91
...
...
@@ -119,7 +119,7 @@ initTimeStepper(Config::scheme scheme,
template
<
class
SingletonVectorType
,
class
VectorType
>
Dune
::
shared_ptr
<
StateUpdater
<
SingletonVectorType
,
VectorType
>>
initStateUpdater
(
Config
::
state
_m
odel
model
,
initStateUpdater
(
Config
::
state
M
odel
model
,
SingletonVectorType
const
&
alpha_initial
,
Dune
::
BitSetVector
<
1
>
const
&
frictionalNodes
,
FrictionData
const
&
fd
)
{
...
...
@@ -347,7 +347,7 @@ int main(int argc, char *argv[]) {
// {{{ Initial conditions
SingletonVectorType
alpha_initial
(
finestSize
);
alpha_initial
=
std
::
log
(
parset
.
get
<
double
>
(
"boundary.friction.initial
_s
tate"
));
std
::
log
(
parset
.
get
<
double
>
(
"boundary.friction.initial
S
tate"
));
using
LinearFactoryType
=
SolverFactory
<
dims
,
BlockNonlinearTNNMGProblem
<
ConvexProblem
<
...
...
@@ -467,7 +467,7 @@ int main(int argc, char *argv[]) {
velocityDirichletFunction
,
velocityDirichletNodes
,
M
,
A
,
u_initial
,
v_initial
,
a_initial
);
auto
stateUpdater
=
initStateUpdater
<
SingletonVectorType
,
VectorType
>
(
parset
.
get
<
Config
::
state
_m
odel
>
(
"boundary.friction.state
_m
odel"
),
parset
.
get
<
Config
::
state
M
odel
>
(
"boundary.friction.state
M
odel"
),
alpha_initial
,
frictionalNodes
,
frictionData
);
auto
const
timesteps
=
parset
.
get
<
size_t
>
(
"timeSteps"
);
...
...
This diff is collapsed.
Click to expand it.
src/one-body-sample.parset
+
2
−
2
View file @
d1f00e91
...
...
@@ -52,5 +52,5 @@ a = 0.010
b
=
0
.
015
V0
=
1
e
-
6
L
=
1
e
-
5
initial
_s
tate
=
4
.
54
e
-
05
# exp(-10)
state
_m
odel
=
Dieterich
initial
S
tate
=
4
.
54
e
-
05
# exp(-10)
state
M
odel
=
Dieterich
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