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
a149c7dc
Commit
a149c7dc
authored
Oct 04, 2011
by
Oliver Sander
Committed by
sander@FU-BERLIN.DE
Oct 04, 2011
Browse files
use Element instead of ElementPointer
[[Imported from SVN: r10815]]
parent
1c72dc25
Changes
2
Hide whitespace changes
Inline
Side-by-side
dune/elasticity/ogdenassembler.cc
View file @
a149c7dc
...
...
@@ -10,7 +10,7 @@
template
<
class
GridType
,
class
TrialLocalFE
,
class
AnsatzLocalFE
>
void
OgdenMaterialLocalStiffness
<
GridType
,
TrialLocalFE
,
AnsatzLocalFE
>::
assemble
(
const
Element
Pointer
&
element
,
assemble
(
const
Element
&
element
,
const
Dune
::
BlockVector
<
Dune
::
FieldVector
<
double
,
dim
>
>&
localSolution
,
LocalMatrix
&
localMatrix
,
Dune
::
BlockVector
<
Dune
::
FieldVector
<
double
,
dim
>>&
localRhs
,
...
...
@@ -35,7 +35,7 @@ assemble(const ElementPointer& element,
int
polOrd
=
3
;
// Get quadrature rule
const
Dune
::
QuadratureRule
<
double
,
dim
>&
quad
=
Dune
::
QuadratureRules
<
double
,
dim
>::
rule
(
element
->
type
(),
polOrd
);
const
Dune
::
QuadratureRule
<
double
,
dim
>&
quad
=
Dune
::
QuadratureRules
<
double
,
dim
>::
rule
(
element
.
type
(),
polOrd
);
// store gradients of shape functions and base functions
std
::
vector
<
JacobianType
>
referenceGradients
(
tFE
.
localBasis
().
size
());
...
...
@@ -48,8 +48,8 @@ assemble(const ElementPointer& element,
const
Dune
::
FieldVector
<
double
,
dim
>
quadPos
=
quad
[
ip
].
position
();
// calc Jacobian inverse before integration element is evaluated
const
Dune
::
FieldMatrix
<
double
,
dim
,
dim
>&
inv
=
element
->
geometry
().
jacobianInverseTransposed
(
quadPos
);
const
double
integrationElement
=
element
->
geometry
().
integrationElement
(
quadPos
);
const
Dune
::
FieldMatrix
<
double
,
dim
,
dim
>&
inv
=
element
.
geometry
().
jacobianInverseTransposed
(
quadPos
);
const
double
integrationElement
=
element
.
geometry
().
integrationElement
(
quadPos
);
/* Compute the weight of the current integration point */
double
weight
=
quad
[
ip
].
weight
()
*
integrationElement
;
...
...
dune/elasticity/ogdenassembler.hh
View file @
a149c7dc
...
...
@@ -30,8 +30,8 @@
Lagrange shape functions
\tparam GridType a DUNE grid type
\tparam T
i
ralLocalFE a local finite element of the trial space
\tparam AnsatzLocalFE a local finite element of the
trial
space
\tparam Tr
i
alLocalFE a local finite element of the trial space
\tparam AnsatzLocalFE a local finite element of the
ansatz
space
*/
template
<
class
GridType
,
class
TrialLocalFE
,
class
AnsatzLocalFE
>
class
OgdenMaterialLocalStiffness
...
...
@@ -40,7 +40,7 @@ template <class GridType, class TrialLocalFE, class AnsatzLocalFE>
public:
typedef
typename
Dune
::
FieldMatrix
<
double
,
GridType
::
dimension
,
GridType
::
dimension
>
T
;
typedef
typename
LocalAssembler
<
GridType
,
TrialLocalFE
,
AnsatzLocalFE
,
T
>::
Element
Pointer
Element
Pointer
;
typedef
typename
LocalAssembler
<
GridType
,
TrialLocalFE
,
AnsatzLocalFE
,
T
>::
Element
Element
;
typedef
typename
LocalAssembler
<
GridType
,
TrialLocalFE
,
AnsatzLocalFE
,
T
>::
BoolMatrix
BoolMatrix
;
typedef
typename
LocalAssembler
<
GridType
,
TrialLocalFE
,
AnsatzLocalFE
,
T
>::
LocalMatrix
LocalMatrix
;
...
...
@@ -79,12 +79,12 @@ template <class GridType, class TrialLocalFE, class AnsatzLocalFE>
d_
=
d
;
}
void
indices
(
const
Element
Pointer
&
element
,
BoolMatrix
&
isNonZero
,
const
TrialLocalFE
&
tFE
,
const
AnsatzLocalFE
&
aFE
)
const
void
indices
(
const
Element
&
element
,
BoolMatrix
&
isNonZero
,
const
TrialLocalFE
&
tFE
,
const
AnsatzLocalFE
&
aFE
)
const
{
isNonZero
=
true
;
}
void
assemble
(
const
Element
Pointer
&
element
,
void
assemble
(
const
Element
&
element
,
const
Dune
::
BlockVector
<
Dune
::
FieldVector
<
double
,
dim
>
>&
localSolution
,
LocalMatrix
&
localMatrix
,
const
TrialLocalFE
&
tFE
,
const
AnsatzLocalFE
&
aFE
)
const
...
...
@@ -96,7 +96,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
Pointer
&
element
,
void
assemble
(
const
Element
&
element
,
const
Dune
::
BlockVector
<
Dune
::
FieldVector
<
double
,
dim
>
>&
localSolution
,
LocalMatrix
&
localMatrix
,
Dune
::
BlockVector
<
Dune
::
FieldVector
<
double
,
dim
>>&
localRhs
,
const
TrialLocalFE
&
tFE
,
const
AnsatzLocalFE
&
aFE
)
const
;
...
...
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