Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
lisa_julia.nebel_at_tu-dresden.de
dune-elasticity
Commits
d089a853
Commit
d089a853
authored
Oct 18, 2011
by
Elias Pipping
Committed by
pipping@FU-BERLIN.DE
Oct 18, 2011
Browse files
Make the parser happy
Transform C<T1<T2>> into C<T1<T2> >. [[Imported from SVN: r10833]]
parent
a149c7dc
Changes
2
Hide whitespace changes
Inline
Side-by-side
dune/elasticity/ogdenassembler.cc
View file @
d089a853
...
...
@@ -13,7 +13,7 @@ void OgdenMaterialLocalStiffness<GridType,TrialLocalFE,AnsatzLocalFE>::
assemble
(
const
Element
&
element
,
const
Dune
::
BlockVector
<
Dune
::
FieldVector
<
double
,
dim
>
>&
localSolution
,
LocalMatrix
&
localMatrix
,
Dune
::
BlockVector
<
Dune
::
FieldVector
<
double
,
dim
>>&
localRhs
,
Dune
::
BlockVector
<
Dune
::
FieldVector
<
double
,
dim
>
>&
localRhs
,
const
TrialLocalFE
&
tFE
,
const
AnsatzLocalFE
&
aFE
)
const
{
typedef
typename
TrialLocalFE
::
Traits
::
LocalBasisType
::
Traits
::
JacobianType
JacobianType
;
...
...
@@ -113,14 +113,14 @@ assemble(const Element& element,
Dune
::
FieldMatrix
<
double
,
dim
,
dim
>
fu
;
//it doesn't matter which basis we choose here since the function Ogden_du_tmpl doesn't depend on it
Dune
::
OgdenAssembler
<
P1NodalBasis
<
typename
GridType
::
LeafGridView
,
double
>
,
P1NodalBasis
<
typename
GridType
::
LeafGridView
,
double
>>::
Ogden_du_tmpl
(
parDer
,
d_
,
lambda_
,
mu_
,
fu
);
Dune
::
OgdenAssembler
<
P1NodalBasis
<
typename
GridType
::
LeafGridView
,
double
>
,
P1NodalBasis
<
typename
GridType
::
LeafGridView
,
double
>
>::
Ogden_du_tmpl
(
parDer
,
d_
,
lambda_
,
mu_
,
fu
);
/********************************************************/
/* Compute second derivative of Ogden Energy functional */
/********************************************************/
double
fuu
[
dim
][
dim
][
dim
][
dim
];
Dune
::
OgdenAssembler
<
P1NodalBasis
<
typename
GridType
::
LeafGridView
,
double
>
,
P1NodalBasis
<
typename
GridType
::
LeafGridView
,
double
>>::
Ogden_dudu_tmpl
(
parDer
,
d_
,
lambda_
,
mu_
,
fuu
);
Dune
::
OgdenAssembler
<
P1NodalBasis
<
typename
GridType
::
LeafGridView
,
double
>
,
P1NodalBasis
<
typename
GridType
::
LeafGridView
,
double
>
>::
Ogden_dudu_tmpl
(
parDer
,
d_
,
lambda_
,
mu_
,
fuu
);
// loop over all entries of the element stiffness matrix
...
...
@@ -187,7 +187,7 @@ assemble(const Element& element,
template
<
class
TrialBasis
,
class
AnsatzBasis
>
void
Dune
::
OgdenAssembler
<
TrialBasis
,
AnsatzBasis
>::
assembleProblem
(
BCRSMatrix
<
FieldMatrix
<
double
,
dim
,
dim
>>&
globalMatrix
,
assembleProblem
(
BCRSMatrix
<
FieldMatrix
<
double
,
dim
,
dim
>
>&
globalMatrix
,
const
BlockVector
<
FieldVector
<
double
,
dim
>
>&
sol
,
BlockVector
<
FieldVector
<
double
,
dim
>
>&
rhs
)
{
...
...
dune/elasticity/ogdenassembler.hh
View file @
d089a853
...
...
@@ -89,7 +89,7 @@ template <class GridType, class TrialLocalFE, class AnsatzLocalFE>
LocalMatrix
&
localMatrix
,
const
TrialLocalFE
&
tFE
,
const
AnsatzLocalFE
&
aFE
)
const
{
Dune
::
BlockVector
<
Dune
::
FieldVector
<
double
,
dim
>>
dummy
;
Dune
::
BlockVector
<
Dune
::
FieldVector
<
double
,
dim
>
>
dummy
;
dummy
=
0
;
assemble
(
element
,
localSolution
,
localMatrix
,
dummy
,
tFE
,
aFE
);
...
...
@@ -98,7 +98,7 @@ template <class GridType, class TrialLocalFE, class AnsatzLocalFE>
//this method is used by the OgdenAssembler to assemble the matrix and the right hand side
void
assemble
(
const
Element
&
element
,
const
Dune
::
BlockVector
<
Dune
::
FieldVector
<
double
,
dim
>
>&
localSolution
,
LocalMatrix
&
localMatrix
,
Dune
::
BlockVector
<
Dune
::
FieldVector
<
double
,
dim
>>&
localRhs
,
LocalMatrix
&
localMatrix
,
Dune
::
BlockVector
<
Dune
::
FieldVector
<
double
,
dim
>
>&
localRhs
,
const
TrialLocalFE
&
tFE
,
const
AnsatzLocalFE
&
aFE
)
const
;
...
...
@@ -157,7 +157,7 @@ template <class TrialBasis, class AnsatzBasis>
/** \brief Assemble the tangent stiffness matrix and the right hand side
*/
void
assembleProblem
(
BCRSMatrix
<
FieldMatrix
<
double
,
dim
,
dim
>>&
globalMatrix
,
void
assembleProblem
(
BCRSMatrix
<
FieldMatrix
<
double
,
dim
,
dim
>
>&
globalMatrix
,
const
BlockVector
<
FieldVector
<
double
,
dim
>
>&
sol
,
BlockVector
<
FieldVector
<
double
,
dim
>
>&
rhs
);
/* Not implemented and not used?
...
...
Write
Preview
Supports
Markdown
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