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

Use std::array directly, instead of Dune::array

parent 1a19f1c1
No related branches found
No related tags found
No related merge requests found
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include <array>
#include "istlexception.hh" #include "istlexception.hh"
#include "operators.hh" #include "operators.hh"
#include "scalarproducts.hh" #include "scalarproducts.hh"
#include "solver.hh" #include "solver.hh"
#include "preconditioner.hh" #include "preconditioner.hh"
#include <dune/common/array.hh>
#include <dune/common/deprecated.hh> #include <dune/common/deprecated.hh>
#include <dune/common/timer.hh> #include <dune/common/timer.hh>
#include <dune/common/ftraits.hh> #include <dune/common/ftraits.hh>
...@@ -899,15 +899,15 @@ namespace Dune { ...@@ -899,15 +899,15 @@ namespace Dune {
// recurrence coefficients as computed in Lanczos algorithm // recurrence coefficients as computed in Lanczos algorithm
field_type alpha, beta; field_type alpha, beta;
// diagonal entries of givens rotation // diagonal entries of givens rotation
Dune::array<real_type,2> c{{0.0,0.0}}; std::array<real_type,2> c{{0.0,0.0}};
// off-diagonal entries of givens rotation // off-diagonal entries of givens rotation
Dune::array<field_type,2> s{{0.0,0.0}}; std::array<field_type,2> s{{0.0,0.0}};
// recurrence coefficients (column k of tridiag matrix T_k) // recurrence coefficients (column k of tridiag matrix T_k)
Dune::array<field_type,3> T{{0.0,0.0,0.0}}; std::array<field_type,3> T{{0.0,0.0,0.0}};
// the rhs vector of the min problem // the rhs vector of the min problem
Dune::array<field_type,2> xi{{1.0,0.0}}; std::array<field_type,2> xi{{1.0,0.0}};
// some temporary vectors // some temporary vectors
X z(b), dummy(b); X z(b), dummy(b);
...@@ -922,13 +922,13 @@ namespace Dune { ...@@ -922,13 +922,13 @@ namespace Dune {
field_type beta0 = beta; field_type beta0 = beta;
// the search directions // the search directions
Dune::array<X,3> p{{b,b,b}}; std::array<X,3> p{{b,b,b}};
p[0] = 0.0; p[0] = 0.0;
p[1] = 0.0; p[1] = 0.0;
p[2] = 0.0; p[2] = 0.0;
// orthonormal basis vectors (in unpreconditioned case) // orthonormal basis vectors (in unpreconditioned case)
Dune::array<X,3> q{{b,b,b}}; std::array<X,3> q{{b,b,b}};
q[0] = 0.0; q[0] = 0.0;
q[1] *= 1.0/beta; q[1] *= 1.0/beta;
q[2] = 0.0; q[2] = 0.0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment