Skip to content
Snippets Groups Projects
Commit 23f9134e authored by Sander, Oliver's avatar Sander, Oliver
Browse files

Use more 'double' instead of FieldMatrix<double,1,1>

That's easy for the element stiffness matrix.  For the other matrix
and vector types it has to wait, because not everything that we use
from dune-istl support BCRSMatrix<double> yet.
parent 8b4839b7
No related branches found
No related tags found
No related merge requests found
...@@ -28,16 +28,15 @@ public: ...@@ -28,16 +28,15 @@ public:
using GridView = typename Basis::GridView; using GridView = typename Basis::GridView;
using Domain = typename GridView::template Codim<0>::Geometry::GlobalCoordinate; using Domain = typename GridView::template Codim<0>::Geometry::GlobalCoordinate;
using ScalarRT = Dune::FieldVector< double, 1>;
using VectorRT = Dune::FieldVector< double, dimworld>; using VectorRT = Dune::FieldVector< double, dimworld>;
using MatrixRT = Dune::FieldMatrix< double, dimworld, 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 FuncVector = std::function< VectorRT(const Domain&) >;
using Func2Tensor = std::function< MatrixRT(const Domain&) >; using Func2Tensor = std::function< MatrixRT(const Domain&) >;
using Func2int = std::function< int(const Domain&) >; using Func2int = std::function< int(const Domain&) >;
using VectorCT = Dune::BlockVector<Dune::FieldVector<double,1> >; using VectorCT = Dune::BlockVector<Dune::FieldVector<double,1> >;
using MatrixCT = Dune::BCRSMatrix<Dune::FieldMatrix<double,1,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: protected:
//private: //private:
...@@ -679,7 +678,7 @@ public: ...@@ -679,7 +678,7 @@ public:
const int localPhiOffset = localView.size(); const int localPhiOffset = localView.size();
// Dune::Timer Time; // Dune::Timer Time;
//std::cout << "localPhiOffset : " << localPhiOffset << std::endl; //std::cout << "localPhiOffset : " << localPhiOffset << std::endl;
Dune::Matrix<Dune::FieldMatrix<double,1,1> > elementMatrix; ElementMatrixCT elementMatrix;
// computeElementStiffnessMatrix(localView, elementMatrix, muLocal, lambdaLocal); // computeElementStiffnessMatrix(localView, elementMatrix, muLocal, lambdaLocal);
computeElementStiffnessMatrix(localView, elementMatrix); computeElementStiffnessMatrix(localView, elementMatrix);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment