Skip to content
Snippets Groups Projects
Commit 81df1fe8 authored by Max Kahnt's avatar Max Kahnt
Browse files

Iterator indices are size_t.

parent e1f066be
Branches
Tags 0.1.7
No related merge requests found
...@@ -208,7 +208,7 @@ namespace MatrixVector { ...@@ -208,7 +208,7 @@ namespace MatrixVector {
Dune::DiagonalMatrix<FieldType, n>& A, const TransformationMatrix& T1, Dune::DiagonalMatrix<FieldType, n>& A, const TransformationMatrix& T1,
const Dune::DiagonalMatrix<FieldType, n>& B, const Dune::DiagonalMatrix<FieldType, n>& B,
const TransformationMatrix& T2) { const TransformationMatrix& T2) {
for (int k = 0; k < n; k++) { for (size_t k = 0; k < n; k++) {
for (auto Tki = T1[k].begin(); Tki != T1[k].end(); ++Tki) for (auto Tki = T1[k].begin(); Tki != T1[k].end(); ++Tki)
A.diagonal(Tki.index()) += A.diagonal(Tki.index()) +=
(*Tki) * B.diagonal(k) * T2[k][Tki.index()]; (*Tki) * B.diagonal(k) * T2[k][Tki.index()];
...@@ -225,7 +225,7 @@ namespace MatrixVector { ...@@ -225,7 +225,7 @@ namespace MatrixVector {
const TransformationMatrix& T1, const TransformationMatrix& T1,
const Dune::ScaledIdentityMatrix<FieldType, n>& B, const Dune::ScaledIdentityMatrix<FieldType, n>& B,
const TransformationMatrix& T2) { const TransformationMatrix& T2) {
for (int k = 0; k < n; k++) for (size_t k = 0; k < n; k++)
A.scalar() += T1[k][0] * B.scalar() * T2[k][0]; A.scalar() += T1[k][0] * B.scalar() * T2[k][0];
} }
}; };
...@@ -278,13 +278,13 @@ namespace MatrixVector { ...@@ -278,13 +278,13 @@ namespace MatrixVector {
const TransformationMatrix& T2) { const TransformationMatrix& T2) {
transformMatrixPattern(A, T1, B, T2); transformMatrixPattern(A, T1, B, T2);
A = 0.0; A = 0.0;
for (int k = 0; k < B.N(); ++k) { for (size_t k = 0; k < B.N(); ++k) {
for (auto BklIt = B[k].begin(); BklIt != B[k].end(); ++BklIt) { for (auto BklIt = B[k].begin(); BklIt != B[k].end(); ++BklIt) {
int l = BklIt.index(); size_t l = BklIt.index();
for (auto T1kiIt = T1[k].begin(); T1kiIt != T1[k].end(); ++T1kiIt) { for (auto T1kiIt = T1[k].begin(); T1kiIt != T1[k].end(); ++T1kiIt) {
int i = T1kiIt.index(); size_t i = T1kiIt.index();
for (auto T2ljIt = T2[l].begin(); T2ljIt != T2[l].end(); ++T2ljIt) { for (auto T2ljIt = T2[l].begin(); T2ljIt != T2[l].end(); ++T2ljIt) {
int j = T2ljIt.index(); size_t j = T2ljIt.index();
MatrixBlockA Aij; MatrixBlockA Aij;
transformMatrix(Aij, *T1kiIt, *BklIt, *T2ljIt); transformMatrix(Aij, *T1kiIt, *BklIt, *T2ljIt);
A[i][j] += Aij; A[i][j] += Aij;
...@@ -300,13 +300,13 @@ namespace MatrixVector { ...@@ -300,13 +300,13 @@ namespace MatrixVector {
const MatrixB& B, const MatrixB& B,
const TransformationMatrix& T2) { const TransformationMatrix& T2) {
Dune::MatrixIndexSet indices(T1.M(), T2.M()); Dune::MatrixIndexSet indices(T1.M(), T2.M());
for (int k = 0; k < B.N(); ++k) { for (size_t k = 0; k < B.N(); ++k) {
for (auto BklIt = B[k].begin(); BklIt != B[k].end(); ++BklIt) { for (auto BklIt = B[k].begin(); BklIt != B[k].end(); ++BklIt) {
int l = BklIt.index(); size_t l = BklIt.index();
for (auto T1kiIt = T1[k].begin(); T1kiIt != T1[k].end(); ++T1kiIt) { for (auto T1kiIt = T1[k].begin(); T1kiIt != T1[k].end(); ++T1kiIt) {
int i = T1kiIt.index(); size_t i = T1kiIt.index();
for (auto T2ljIt = T2[l].begin(); T2ljIt != T2[l].end(); ++T2ljIt) { for (auto T2ljIt = T2[l].begin(); T2ljIt != T2[l].end(); ++T2ljIt) {
int j = T2ljIt.index(); size_t j = T2ljIt.index();
indices.add(i, j); indices.add(i, j);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment