Skip to content
Snippets Groups Projects
Commit fa92f629 authored by Elias Pipping's avatar Elias Pipping
Browse files

StaticMatrix::axpy -> Arithmetic::addProduct

parent 81197ba4
No related branches found
No related tags found
No related merge requests found
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
#include <dune/istl/matrix.hh> #include <dune/istl/matrix.hh>
#include <dune/istl/matrixindexset.hh> #include <dune/istl/matrixindexset.hh>
#include "dune/fufem/arithmetic.hh"
#include "dune/fufem/functionspacebases/functionspacebasis.hh" #include "dune/fufem/functionspacebases/functionspacebasis.hh"
#include "dune/fufem/staticmatrixtools.hh"
//! Generic global assembler for operators on a gridview //! Generic global assembler for operators on a gridview
template <class TrialBasis, class AnsatzBasis> template <class TrialBasis, class AnsatzBasis>
...@@ -89,21 +89,21 @@ class IntegralOperatorAssembler ...@@ -89,21 +89,21 @@ class IntegralOperatorAssembler
for (size_t rw=0; rw<rowConstraints.size(); ++rw) for (size_t rw=0; rw<rowConstraints.size(); ++rw)
{ {
for (size_t cw=0; cw<colConstraints.size(); ++cw) for (size_t cw=0; cw<colConstraints.size(); ++cw)
StaticMatrix::axpy(A[rowConstraints[rw].index][colConstraints[cw].index], rowConstraints[rw].factor * colConstraints[cw].factor, localA[i][j]); Arithmetic::addProduct(A[rowConstraints[rw].index][colConstraints[cw].index], rowConstraints[rw].factor * colConstraints[cw].factor, localA[i][j]);
} }
} }
else if (rowIsConstrained) else if (rowIsConstrained)
{ {
for (size_t rw=0; rw<rowConstraints.size(); ++rw) for (size_t rw=0; rw<rowConstraints.size(); ++rw)
StaticMatrix::axpy(A[rowConstraints[rw].index][colIndex], rowConstraints[rw].factor, localA[i][j]); Arithmetic::addProduct(A[rowConstraints[rw].index][colIndex], rowConstraints[rw].factor, localA[i][j]);
} }
else if (colIsConstrained) else if (colIsConstrained)
{ {
for (size_t cw=0; cw<colConstraints.size(); ++cw) for (size_t cw=0; cw<colConstraints.size(); ++cw)
StaticMatrix::axpy(A[rowIndex][colConstraints[cw].index], colConstraints[cw].factor, localA[i][j]); Arithmetic::addProduct(A[rowIndex][colConstraints[cw].index], colConstraints[cw].factor, localA[i][j]);
} }
else else
StaticMatrix::axpy(A[rowIndex][colIndex], 1.0, localA[i][j]); Arithmetic::addProduct(A[rowIndex][colIndex], 1.0, localA[i][j]);
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment