replace more std::vector with Dune::array

[[Imported from SVN: r7553]]

dune/gfe/geodesicfefunctionadaptor.hh

@@ -52,7 +52,7 @@ void geodesicFEFunctionAdaptor(GridType& grid, std::vector<TargetSpace>& x)
     for (; eIt!=eEndIt; ++eIt) {
 
         // Set up a local gfe function on the father element
-        std::vector<TargetSpace> coefficients(eIt->father()->template count<dim>());
+        Dune::array<TargetSpace,dim+1> coefficients;
 
         for (int i=0; i<eIt->father()->template count<dim>(); i++)
             coefficients[i] = dofMap.find(idSet.subId(*eIt->father(),i,dim))->second;

dune/gfe/harmonicenergystiffness.hh

@@ -30,18 +30,18 @@ public:
 
     /** \brief Assemble the energy for a single element */
     RT energy (const Entity& e,
-               const std::vector<TargetSpace>& localSolution) const;
+               const Dune::array<TargetSpace,gridDim+1>& localSolution) const;
 
 #ifndef HARMONIC_ENERGY_FD_GRADIENT
     // The finite difference gradient method is in the base class.
     // If the cpp macro is not set we overload it here.
     /** \brief Assemble the gradient of the energy functional on one element */
     virtual void assembleEmbeddedGradient(const Entity& element,
-                                  const std::vector<TargetSpace>& solution,
+                                  const Dune::array<TargetSpace,gridDim+1>& solution,
                                   std::vector<typename TargetSpace::EmbeddedTangentVector>& gradient) const;
                                     
     virtual void assembleGradient(const Entity& element,
-                                  const std::vector<TargetSpace>& localSolution,
+                                  const Dune::array<TargetSpace,gridDim+1>& localSolution,
                                   std::vector<typename TargetSpace::TangentVector>& localGradient) const;
 #endif
 };
@@ -49,7 +49,7 @@ public:
 template <class GridView, class TargetSpace>
 typename HarmonicEnergyLocalStiffness<GridView, TargetSpace>::RT HarmonicEnergyLocalStiffness<GridView, TargetSpace>::
 energy(const Entity& element,
-       const std::vector<TargetSpace>& localSolution) const
+       const Dune::array<TargetSpace,gridDim+1>& localSolution) const
 {
     RT energy = 0;
 
@@ -96,7 +96,7 @@ energy(const Entity& element,
 template <class GridView, class TargetSpace>
 void HarmonicEnergyLocalStiffness<GridView, TargetSpace>::
 assembleEmbeddedGradient(const Entity& element,
-                 const std::vector<TargetSpace>& localSolution,
+                 const Dune::array<TargetSpace,gridDim+1>& localSolution,
                  std::vector<typename TargetSpace::EmbeddedTangentVector>& localGradient) const
 {
     // initialize gradient
@@ -174,7 +174,7 @@ assembleEmbeddedGradient(const Entity& element,
 template <class GridView, class TargetSpace>
 void HarmonicEnergyLocalStiffness<GridView, TargetSpace>::
 assembleGradient(const Entity& element,
-                 const std::vector<TargetSpace>& localSolution,
+                 const Dune::array<TargetSpace,gridDim+1>& localSolution,
                  std::vector<typename TargetSpace::TangentVector>& localGradient) const
 {
     std::vector<typename TargetSpace::EmbeddedTangentVector> embeddedLocalGradient;

dune/gfe/localgeodesicfefunction.hh

@@ -133,7 +133,7 @@ private:
         return dFdw;
     }
     
-    Tensor3<ctype,embeddedDim,embeddedDim,embeddedDim> computeDqDqF(const std::vector<ctype>& w, const TargetSpace& q) const
+    Tensor3<ctype,embeddedDim,embeddedDim,embeddedDim> computeDqDqF(const Dune::array<ctype,dim+1>& w, const TargetSpace& q) const
     {
         Tensor3<ctype,embeddedDim,embeddedDim,embeddedDim> result;
         result = 0;
@@ -300,7 +300,7 @@ evaluateDerivativeOfValueWRTCoefficient(const Dune::FieldVector<ctype, dim>& loc
     TargetSpace q = evaluate(local);
 
     // dFdq
-    std::vector<ctype> w = barycentricCoordinates(local);
+    Dune::array<ctype,dim+1> w = barycentricCoordinates(local);
     AverageDistanceAssembler<TargetSpace,dim+1> assembler(coefficients_, w);
     
     Dune::FieldMatrix<ctype,embeddedDim,embeddedDim> dFdq(0);
@@ -403,7 +403,7 @@ evaluateDerivativeOfGradientWRTCoefficient(const Dune::FieldVector<ctype, dim>&
     Dune::FieldMatrix<ctype,embeddedDim,dim+1> dFdw = computeDFdw(q);
     
     // the actual system matrix
-    std::vector<ctype> w = barycentricCoordinates(local);
+    Dune::array<ctype,dim+1> w = barycentricCoordinates(local);
     AverageDistanceAssembler<TargetSpace,dim+1> assembler(coefficients_, w);
     
     Dune::FieldMatrix<ctype,embeddedDim,embeddedDim> dFdq(0);