diff --git a/dune/microstructure/CorrectorComputer.hh b/dune/microstructure/CorrectorComputer.hh index 6cb9e601797ef884f84e6693c922df29dfe59d4f..58fb6b3608894e0072b0ef14e86366d027c2f703 100644 --- a/dune/microstructure/CorrectorComputer.hh +++ b/dune/microstructure/CorrectorComputer.hh @@ -28,16 +28,15 @@ public: using GridView = typename Basis::GridView; using Domain = typename GridView::template Codim<0>::Geometry::GlobalCoordinate; - using ScalarRT = Dune::FieldVector< double, 1>; using VectorRT = Dune::FieldVector< double, dimworld>; using MatrixRT = Dune::FieldMatrix< double, dimworld, dimworld>; - using FuncScalar = std::function< ScalarRT(const Domain&) >; + using FuncScalar = std::function< double(const Domain&) >; using FuncVector = std::function< VectorRT(const Domain&) >; using Func2Tensor = std::function< MatrixRT(const Domain&) >; using Func2int = std::function< int(const Domain&) >; using VectorCT = Dune::BlockVector<Dune::FieldVector<double,1> >; using MatrixCT = Dune::BCRSMatrix<Dune::FieldMatrix<double,1,1> >; - using ElementMatrixCT = Dune::Matrix<Dune::FieldMatrix<double,1,1> >; + using ElementMatrixCT = Dune::Matrix<double>; protected: //private: @@ -679,7 +678,7 @@ public: const int localPhiOffset = localView.size(); // Dune::Timer Time; //std::cout << "localPhiOffset : " << localPhiOffset << std::endl; - Dune::Matrix<Dune::FieldMatrix<double,1,1> > elementMatrix; + ElementMatrixCT elementMatrix; // computeElementStiffnessMatrix(localView, elementMatrix, muLocal, lambdaLocal); computeElementStiffnessMatrix(localView, elementMatrix);