Commit a149c7dc authored by Oliver Sander's avatar Oliver Sander Committed by sander@FU-BERLIN.DE
Browse files

use Element instead of ElementPointer

[[Imported from SVN: r10815]]
parent 1c72dc25
......@@ -10,7 +10,7 @@
template <class GridType, class TrialLocalFE, class AnsatzLocalFE>
void OgdenMaterialLocalStiffness<GridType,TrialLocalFE,AnsatzLocalFE>::
assemble(const ElementPointer& 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;
......
......@@ -30,8 +30,8 @@
Lagrange shape functions
\tparam GridType a DUNE grid type
\tparam TiralLocalFE a local finite element of the trial space
\tparam AnsatzLocalFE a local finite element of the trial space
\tparam TrialLocalFE 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 >::ElementPointer ElementPointer;
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 ElementPointer& 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 ElementPointer& 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 ElementPointer& 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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment