diff --git a/test/rodassemblertest.cc b/test/rodassemblertest.cc index aa737baf2f480b5b24a6c6b28c9f8f9112c5fbb8..61cb237383027791a494967816d9d4a23ba556be 100644 --- a/test/rodassemblertest.cc +++ b/test/rodassemblertest.cc @@ -1,5 +1,7 @@ #include <config.h> +#include <array> + #include <dune/grid/onedgrid.hh> #include <dune/istl/io.hh> @@ -28,7 +30,7 @@ void infinitesimalVariation(RigidBodyMotion<double,3>& c, double eps, int i) template <class GridType> void strainFD(const std::vector<RigidBodyMotion<double,3> >& x, double pos, - Dune::array<Dune::FieldMatrix<double,2,6>, 6>& fdStrainDerivatives, + std::array<FieldMatrix<double,2,6>, 6>& fdStrainDerivatives, const RodAssembler<GridType,3>& assembler) { assert(x.size()==2); @@ -73,8 +75,8 @@ void strainFD(const std::vector<RigidBodyMotion<double,3> >& x, template <class GridType> void strain2ndOrderFD(const std::vector<RigidBodyMotion<double,3> >& x, double pos, - Dune::array<Dune::Matrix<Dune::FieldMatrix<double,6,6> >, 3>& translationDer, - Dune::array<Dune::Matrix<Dune::FieldMatrix<double,3,3> >, 3>& rotationDer, + std::array<Matrix<FieldMatrix<double,6,6> >, 3>& translationDer, + std::array<Matrix<FieldMatrix<double,3,3> >, 3>& rotationDer, const RodAssembler<GridType,3>& assembler) { assert(x.size()==2); @@ -184,8 +186,8 @@ void strain2ndOrderFD2(const std::vector<RigidBodyMotion<double,3> >& x, double pos, Dune::FieldVector<double,1> shapeGrad[2], Dune::FieldVector<double,1> shapeFunction[2], - Dune::array<Dune::Matrix<Dune::FieldMatrix<double,6,6> >, 3>& translationDer, - Dune::array<Dune::Matrix<Dune::FieldMatrix<double,3,3> >, 3>& rotationDer, + std::array<Matrix<FieldMatrix<double,6,6> >, 3>& translationDer, + std::array<Matrix<FieldMatrix<double,3,3> >, 3>& rotationDer, const RodAssembler<GridType,3>& assembler) { assert(x.size()==2); @@ -214,10 +216,10 @@ void strain2ndOrderFD2(const std::vector<RigidBodyMotion<double,3> >& x, infinitesimalVariation(forwardSolution[k], eps, l+3); infinitesimalVariation(backwardSolution[k], -eps, l+3); - Dune::array<Dune::FieldMatrix<double,2,6>, 6> forwardStrainDer; + std::array<FieldMatrix<double,2,6>, 6> forwardStrainDer; assembler.strainDerivative(forwardSolution, pos, shapeGrad, shapeFunction, forwardStrainDer); - Dune::array<Dune::FieldMatrix<double,2,6>, 6> backwardStrainDer; + std::array<FieldMatrix<double,2,6>, 6> backwardStrainDer; assembler.strainDerivative(backwardSolution, pos, shapeGrad, shapeFunction, backwardStrainDer); for (int i=0; i<2; i++) {