Commit 40865050 authored by Elias Pipping's avatar Elias Pipping Committed by pipping@FU-BERLIN.DE
Browse files

Make the parser happy

Transform C<T1<T2>> into C<T1<T2> >.

[[Imported from SVN: r10851]]
parent d089a853
......@@ -15,7 +15,7 @@ void NeoHookeLocalAssembler<GridType,TrialLocalFE,AnsatzLocalFE, polOrd>::
assemble(const ElementPointer& 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;
......@@ -252,7 +252,7 @@ assemble(const ElementPointer& element,
template <class TrialBasis,class AnsatzBasis,int polOrd>
void Dune::NeoHookeAssembler<TrialBasis, AnsatzBasis, polOrd>::
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)
{
......
......@@ -66,7 +66,7 @@ public:
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);
......@@ -75,7 +75,7 @@ public:
//this method is used by the OgdenAssembler to assemble the matrix and the right hand side
void assemble(const ElementPointer& 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;
};
......@@ -133,7 +133,7 @@ template <class TrialBasis, class AnsatzBasis, int polOrd>
/** \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);
......
......@@ -75,7 +75,7 @@ public:
invMassMatrix.invert();
#endif
BlockVector<SymmetricTensor<dim>> unscaledP1Stress(indexSet.size(dim));
BlockVector<SymmetricTensor<dim> > unscaledP1Stress(indexSet.size(dim));
unscaledP1Stress = 0;
LeafElementIterator eIt = grid_->template leafbegin<0>();
......@@ -156,7 +156,7 @@ public:
// compute stress
SymmetricTensor<dim> p0Stress = hookeTimesStrain(p0Strain);
std::vector<FieldVector<double,1>>values;
std::vector<FieldVector<double,1> >values;
finiteElement.localBasis().evaluateFunction(quadPos,values);
// loop over test function number
......@@ -180,7 +180,7 @@ public:
//
// /////////////////////////////////////////////////////////////
BlockVector<SymmetricTensor<dim>> elementP1Stress(indexSet.size(dim));
BlockVector<SymmetricTensor<dim> > elementP1Stress(indexSet.size(dim));
elementP1Stress = 0;
#ifdef LUMP_MATRIX
......@@ -188,20 +188,20 @@ public:
for (int i=0; i<baseSet.size(); i++)
elementP1Stress *= invMassMatrix[i][i];
*/
BlockVector<SymmetricTensor<dim>> tmp(indexSet.size(dim));
BlockVector<SymmetricTensor<dim> > tmp(indexSet.size(dim));
tmp = unscaledP1Stress;
invMassMatrix.mv(tmp,elementP1Stress);
#else
// Technicality: turn the matrix into a linear operator
MatrixAdapter<MassMatrixType, BlockVector<SymmetricTensor<dim>>, BlockVector<SymmetricTensor<dim>> > op(massMatrix);
MatrixAdapter<MassMatrixType, BlockVector<SymmetricTensor<dim> >, BlockVector<SymmetricTensor<dim>> > op(massMatrix);
// A preconditioner
SeqILU0<MassMatrixType, BlockVector<SymmetricTensor<dim>>, BlockVector<SymmetricTensor<dim>> > ilu0(massMatrix,1.0);
SeqILU0<MassMatrixType, BlockVector<SymmetricTensor<dim> >, BlockVector<SymmetricTensor<dim>> > ilu0(massMatrix,1.0);
// A preconditioned conjugate-gradient solver
int numIt = 100;
CGSolver<BlockVector<SymmetricTensor<dim>> > cg(op,ilu0,1E-16,numIt,0);
CGSolver<BlockVector<SymmetricTensor<dim> > > cg(op,ilu0,1E-16,numIt,0);
// Object storing some statistics about the solving process
InverseOperatorResult statistics;
......@@ -258,8 +258,8 @@ public:
SymmetricTensor<dim> p0Stress(0.0), p1Stress(0.0);
// evaluate gradients at Gauss points
std::vector<FieldMatrix<double,1,dim>>temp;
std::vector<FieldVector<double,1>>values;
std::vector<FieldMatrix<double,1,dim> >temp;
std::vector<FieldVector<double,1> >values;
FieldVector<double,dim> grad;
finiteElement.localBasis().evaluateJacobian(quadPos,temp);
......
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