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
734aa557
Commit
734aa557
authored
13 years ago
by
Elias Pipping
Committed by
Elias Pipping
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Rely on FieldVector<double, 1><->double conversion
parent
850d5035
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dune/tectonic/globallaursennonlinearity.hh
+2
-2
2 additions, 2 deletions
dune/tectonic/globallaursennonlinearity.hh
dune/tectonic/globalruinanonlinearity.hh
+3
-3
3 additions, 3 deletions
dune/tectonic/globalruinanonlinearity.hh
src/one-body-sample.cc
+2
-2
2 additions, 2 deletions
src/one-body-sample.cc
with
7 additions
and
7 deletions
dune/tectonic/globallaursennonlinearity.hh
+
2
−
2
View file @
734aa557
...
@@ -50,13 +50,13 @@ class GlobalLaursenNonlinearity
...
@@ -50,13 +50,13 @@ class GlobalLaursenNonlinearity
sigma_n [id + mu id] = sigma_n (1 + mu) id
sigma_n [id + mu id] = sigma_n (1 + mu) id
*/
*/
virtual
shared_ptr
<
LocalNonlinearity
<
dim
>
const
>
restriction
(
int
i
)
const
{
virtual
shared_ptr
<
LocalNonlinearity
<
dim
>
const
>
restriction
(
int
i
)
const
{
if
((
*
nodalIntegrals
)[
i
]
[
0
]
==
0
)
if
((
*
nodalIntegrals
)[
i
]
==
0
)
return
trivialNonlinearity
;
return
trivialNonlinearity
;
if
(
restrictions
[
i
]
!=
nullptr
)
if
(
restrictions
[
i
]
!=
nullptr
)
return
restrictions
[
i
];
return
restrictions
[
i
];
double
coefficient
=
(
*
nodalIntegrals
)[
i
]
[
0
]
;
double
coefficient
=
(
*
nodalIntegrals
)[
i
];
coefficient
*=
(
*
normalStress
)[
i
];
coefficient
*=
(
*
normalStress
)[
i
];
coefficient
*=
1
+
(
*
mu
)[
i
];
coefficient
*=
1
+
(
*
mu
)[
i
];
...
...
This diff is collapsed.
Click to expand it.
dune/tectonic/globalruinanonlinearity.hh
+
3
−
3
View file @
734aa557
...
@@ -51,15 +51,15 @@ class GlobalRuinaNonlinearity
...
@@ -51,15 +51,15 @@ class GlobalRuinaNonlinearity
Return a restriction of the outer function to the i'th node.
Return a restriction of the outer function to the i'th node.
*/
*/
virtual
shared_ptr
<
LocalNonlinearity
<
dim
>
const
>
restriction
(
int
i
)
const
{
virtual
shared_ptr
<
LocalNonlinearity
<
dim
>
const
>
restriction
(
int
i
)
const
{
if
((
*
nodalIntegrals
)[
i
]
[
0
]
==
0
)
if
((
*
nodalIntegrals
)[
i
]
==
0
)
return
trivialNonlinearity
;
return
trivialNonlinearity
;
if
(
restrictions
[
i
]
!=
nullptr
)
if
(
restrictions
[
i
]
!=
nullptr
)
return
restrictions
[
i
];
return
restrictions
[
i
];
auto
const
func
=
make_shared
<
RuinaFunction
const
>
(
auto
const
func
=
make_shared
<
RuinaFunction
const
>
(
(
*
nodalIntegrals
)[
i
]
[
0
]
,
(
*
a
)[
i
]
[
0
]
,
(
*
mu
)[
i
]
[
0
]
,
(
*
eta
)[
i
]
[
0
],
(
*
nodalIntegrals
)[
i
],
(
*
a
)[
i
],
(
*
mu
)[
i
],
(
*
eta
)[
i
]
,
(
*
normalStress
)[
i
],
(
*
normalStress
)[
i
][
0
],
(
*
b
)[
i
]
[
0
]
,
(
*
state
)[
i
]
[
0
]
,
(
*
L
)[
i
]
[
0
]
,
h
);
(
*
b
)[
i
],
(
*
state
)[
i
],
(
*
L
)[
i
],
h
);
restrictions
[
i
]
=
make_shared
<
LocalNonlinearity
<
dim
>
const
>
(
func
);
restrictions
[
i
]
=
make_shared
<
LocalNonlinearity
<
dim
>
const
>
(
func
);
return
restrictions
[
i
];
return
restrictions
[
i
];
}
}
...
...
This diff is collapsed.
Click to expand it.
src/one-body-sample.cc
+
2
−
2
View file @
734aa557
...
@@ -311,7 +311,7 @@ int main(int argc, char *argv[]) {
...
@@ -311,7 +311,7 @@ int main(int argc, char *argv[]) {
double
const
L
=
parset
.
get
<
double
>
(
"boundary.friction.ruina.L"
);
double
const
L
=
parset
.
get
<
double
>
(
"boundary.friction.ruina.L"
);
double
const
unorm
=
u4_diff
[
i
].
two_norm
();
double
const
unorm
=
u4_diff
[
i
].
two_norm
();
(
*
s4_new
)[
i
]
[
0
]
=
compute_state_update
(
h
,
unorm
,
L
,
s4_old
[
i
]
[
0
]
);
(
*
s4_new
)[
i
]
=
compute_state_update
(
h
,
unorm
,
L
,
s4_old
[
i
]);
}
}
}
}
}
}
...
@@ -364,7 +364,7 @@ int main(int argc, char *argv[]) {
...
@@ -364,7 +364,7 @@ int main(int argc, char *argv[]) {
double
const
L
=
parset
.
get
<
double
>
(
"boundary.friction.ruina.L"
);
double
const
L
=
parset
.
get
<
double
>
(
"boundary.friction.ruina.L"
);
double
const
unorm
=
u5_diff
[
i
].
two_norm
();
double
const
unorm
=
u5_diff
[
i
].
two_norm
();
(
*
s5_new
)[
i
]
[
0
]
=
compute_state_update
(
h
,
unorm
,
L
,
s5_old
[
i
]
[
0
]
);
(
*
s5_new
)[
i
]
=
compute_state_update
(
h
,
unorm
,
L
,
s5_old
[
i
]);
}
}
}
}
}
}
...
...
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