Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
jonathan.drechsel_at_mailbox.tu-dresden.de
dune-elasticity
Commits
70f7ca3b
Commit
70f7ca3b
authored
May 27, 2020
by
Patrick Jaap
Browse files
Avoid direct calls of std:: namespaces
parent
b102a3fa
Changes
2
Hide whitespace changes
Inline
Side-by-side
dune/elasticity/materials/mooneyrivlindensity.hh
View file @
70f7ca3b
...
...
@@ -92,7 +92,10 @@ public:
field_type
strainEnergy
=
0
;
if
(
mooneyrivlin_energy
==
"ciarlet"
)
return
mooneyrivlin_a
*
normFSquared
+
mooneyrivlin_b
*
normFinvSquared
*
detF
+
mooneyrivlin_c
*
detF
*
detF
-
((
dim
-
1
)
*
mooneyrivlin_a
+
mooneyrivlin_b
+
2
*
mooneyrivlin_c
)
*
std
::
log
(
detF
);
{
using
std
::
log
;
return
mooneyrivlin_a
*
normFSquared
+
mooneyrivlin_b
*
normFinvSquared
*
detF
+
mooneyrivlin_c
*
detF
*
detF
-
((
dim
-
1
)
*
mooneyrivlin_a
+
mooneyrivlin_b
+
2
*
mooneyrivlin_c
)
*
log
(
detF
);
}
else
{
strainEnergy
=
mooneyrivlin_10
*
trCTildeMinus3
+
mooneyrivlin_01
*
c2TildeMinus3
+
...
...
@@ -104,7 +107,8 @@ public:
mooneyrivlin_12
*
trCTildeMinus3
*
c2TildeMinus3
*
c2TildeMinus3
+
mooneyrivlin_03
*
c2TildeMinus3
*
c2TildeMinus3
*
c2TildeMinus3
;
if
(
mooneyrivlin_energy
==
"log"
)
{
field_type
logDetF
=
std
::
log
(
detF
);
using
std
::
log
;
field_type
logDetF
=
log
(
detF
);
return
strainEnergy
+
0.5
*
mooneyrivlin_k
*
logDetF
*
logDetF
;
}
else
if
(
mooneyrivlin_energy
==
"square"
)
{
field_type
detFMinus1
=
detF
-
1
;
...
...
dune/elasticity/materials/neohookedensity.hh
View file @
70f7ca3b
...
...
@@ -50,15 +50,17 @@ public:
Dune
::
FieldVector
<
field_type
,
dim
>
sigmaSquared
;
FMatrixHelp
::
eigenValues
(
C
,
sigmaSquared
);
using
std
::
sqrt
;
// singular values of F, i.e., eigenvalues of U
std
::
array
<
field_type
,
dim
>
sigma
;
for
(
int
i
=
0
;
i
<
dim
;
i
++
)
sigma
[
i
]
=
std
::
sqrt
(
sigmaSquared
[
i
]);
sigma
[
i
]
=
sqrt
(
sigmaSquared
[
i
]);
field_type
detC
=
1.0
;
for
(
int
i
=
0
;
i
<
dim
;
i
++
)
detC
*=
sigmaSquared
[
i
];
field_type
detF
=
std
::
sqrt
(
detC
);
field_type
detF
=
sqrt
(
detC
);
// \tilde{C} = \tilde{F}^T\tilde{F} = \frac{1}{\det{F}^{2/3}}C
field_type
trCTilde
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment