From 23f9134e518ace2042b60f27f12f37a25fa48567 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Mon, 10 Jul 2023 14:45:13 +0200
Subject: [PATCH] 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.
---
dune/microstructure/CorrectorComputer.hh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/dune/microstructure/CorrectorComputer.hh b/dune/microstructure/CorrectorComputer.hh
index 6cb9e601..58fb6b36 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);
--
GitLab