Commit ed87b407 authored by Oliver Sander's avatar Oliver Sander Committed by sander
Browse files

Left-overs from refactoring: LinearFunctionalAssembler wants a...

Left-overs from refactoring: LinearFunctionalAssembler wants a LocalFiniteElement as template parameter now

[[Imported from SVN: r12495]]
parent 701bf460
......@@ -38,9 +38,9 @@
* - \f$J\f$ the determinant of the deformation gradient
* - \f$\lambda\f$,\f$\mu\f$ material parameters
*/
template <class GridType>
template <class GridType, class TrialLocalFE>
class NeoHookeFunctionalAssembler :
public LocalFunctionalAssembler<GridType, Dune::FieldVector<typename GridType::ctype ,GridType::dimension> >
public LocalFunctionalAssembler<GridType, TrialLocalFE, Dune::FieldVector<typename GridType::ctype ,GridType::dimension> >
{
static const int dim = GridType::dimension;
......@@ -48,8 +48,8 @@ class NeoHookeFunctionalAssembler :
typedef typename Dune::FieldVector<ctype,GridType::dimension> T;
public:
typedef typename LocalFunctionalAssembler<GridType,T>::ElementPointer ElementPointer;
typedef typename LocalFunctionalAssembler<GridType,T>::LocalVector LocalVector;
typedef typename LocalFunctionalAssembler<GridType,TrialLocalFE,T>::ElementPointer ElementPointer;
typedef typename LocalFunctionalAssembler<GridType,TrialLocalFE,T>::LocalVector LocalVector;
typedef VirtualGridFunction<GridType, Dune::FieldVector<ctype,GridType::dimension> > GridFunction;
//! Create assembler from material parameters and a grid
......@@ -65,7 +65,6 @@ public:
mu_(mu)
{}
template <class TrialLocalFE>
void assemble(const ElementPointer& element, LocalVector& localVector, const TrialLocalFE& tFE) {
typedef typename Dune::FieldVector<ctype,dim> FVdim;
......
......@@ -22,7 +22,7 @@ public:
typedef typename Basis::GridView::Grid GridType;
typedef typename Basis::LocalFiniteElement Lfe;
typedef GeomNonlinElasticityFunctionalAssembler<GridType> LocalLinearization;
typedef GeomNonlinElasticityFunctionalAssembler<GridType,Lfe> LocalLinearization;
typedef GeomNonlinLinearizedStVenantAssembler<GridType, Lfe, Lfe> LocalHessian;
typedef Basis GlobalBasis;
......
......@@ -22,7 +22,7 @@ public:
typedef typename Basis::GridView::Grid GridType;
typedef typename Basis::LocalFiniteElement Lfe;
typedef NeoHookeFunctionalAssembler<GridType> LocalLinearization;
typedef NeoHookeFunctionalAssembler<GridType,Lfe> LocalLinearization;
typedef NeoHookeOperatorAssembler<GridType, Lfe, Lfe> LocalHessian;
typedef Basis GlobalBasis;
......
Markdown is supported
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