From 10bb9f788e8cec326a7f85a7432be5f0648077b4 Mon Sep 17 00:00:00 2001 From: Oliver Sander <sander@igpm.rwth-aachen.de> Date: Wed, 4 Jan 2012 11:30:59 +0000 Subject: [PATCH] fix some (but not all) compiler errors [[Imported from SVN: r8352]] --- test/harmonicenergytest.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/harmonicenergytest.cc b/test/harmonicenergytest.cc index 77190fa4..560d6552 100644 --- a/test/harmonicenergytest.cc +++ b/test/harmonicenergytest.cc @@ -12,7 +12,7 @@ const int dim = 2; -typedef UnitVector<3> TargetSpace; +typedef UnitVector<double,3> TargetSpace; using namespace Dune; @@ -30,7 +30,7 @@ void testEnergy(const GridType* grid, const std::vector<TargetSpace>& coefficien for (int i=0; i<10; i++) { - Rotation<3,double> rotation(FieldVector<double,3>(1), double(i)); + Rotation<double,3> rotation(FieldVector<double,3>(1), double(i)); FieldMatrix<double,3,3> matrix; rotation.matrix(matrix); @@ -46,6 +46,7 @@ void testEnergy(const GridType* grid, const std::vector<TargetSpace>& coefficien std::vector<typename TargetSpace::EmbeddedTangentVector> rotatedGradient; assembler.assembleEmbeddedGradient(*grid->template leafbegin<0>(), + feCache.get(grid->template leafbegin<0>()->type()), rotatedCoefficients, rotatedGradient); @@ -70,6 +71,7 @@ void testGradientOfEnergy(const GridType* grid, const std::vector<TargetSpace>& std::vector<typename TargetSpace::EmbeddedTangentVector> gradient; assembler.assembleEmbeddedGradient(*grid->template leafbegin<0>(), + feCache.get(grid->template leafbegin<0>()->type()), coefficients, gradient); @@ -79,6 +81,7 @@ void testGradientOfEnergy(const GridType* grid, const std::vector<TargetSpace>& std::vector<typename TargetSpace::EmbeddedTangentVector> fdGradient; assembler.assembleEmbeddedFDGradient(*grid->template leafbegin<0>(), + feCache.get(grid->template leafbegin<0>()->type()), coefficients, fdGradient); -- GitLab