diff --git a/dune/istl/test/.gitignore b/dune/istl/test/.gitignore index 5ae4a2b02255735ee88176cb7d994c435dad7ed4..a24f40b325ec2d45e737499a7a55c45072bed997 100644 --- a/dune/istl/test/.gitignore +++ b/dune/istl/test/.gitignore @@ -26,3 +26,8 @@ basearraytest vbvectortest matrixredisttest matrixmarkettest +superluztest +testmat +testvec +superluctest +seqmatrixmarkettest diff --git a/dune/istl/test/matrixmarkettest.cc b/dune/istl/test/matrixmarkettest.cc index 0f29d46baed5ce03c5e0553fadd53465f3c7d2a4..ec14c58f95371ab8aa5a364b30cb57f1f233ea7d 100644 --- a/dune/istl/test/matrixmarkettest.cc +++ b/dune/istl/test/matrixmarkettest.cc @@ -1,23 +1,25 @@ // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- // vi: set et ts=4 sw=2 sts=2: #include "config.h" -#include <dune/istl/io.hh> -#include <dune/istl/bvector.hh> + +#include <iterator> + #include <dune/common/fmatrix.hh> #include <dune/common/fvector.hh> #include <dune/common/float_cmp.hh> + +#include <dune/istl/matrixmarket.hh> +#include <dune/istl/io.hh> +#include <dune/istl/bvector.hh> + #if HAVE_MPI #include <dune/istl/paamg/test/anisotropic.hh> #include "mpi.h" #include <dune/istl/schwarz.hh> #else #include <dune/istl/operators.hh> -#include <laplacian.hh> +#include "laplacian.hh" #endif -#include <dune/common/timer.hh> -#include <dune/istl/matrixmarket.hh> - -#include <iterator> int main(int argc, char** argv) { @@ -52,7 +54,6 @@ int main(int argc, char** argv) setupLaplacian(mat, N); #endif - BVector bv(mat.N()), cv(mat.N()); typedef BVector::iterator VIter; @@ -80,7 +81,6 @@ int main(int argc, char** argv) storeMatrixMarket(bv, std::string("testvec")); #endif - BCRSMat mat1; BVector bv1,cv1; diff --git a/dune/istl/test/superlutest.cc b/dune/istl/test/superlutest.cc index 58f24fc74eaee47f5f6c48ae7abf20450253809f..623ee9d5a5aa6f551ba6c3e703b2c6907e58780f 100644 --- a/dune/istl/test/superlutest.cc +++ b/dune/istl/test/superlutest.cc @@ -1,14 +1,18 @@ // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- // vi: set et ts=4 sw=2 sts=2: #include "config.h" -#include <dune/istl/bvector.hh> -#include <dune/istl/operators.hh> + +#include <complex> + #include <dune/common/fmatrix.hh> #include <dune/common/fvector.hh> -#include <laplacian.hh> #include <dune/common/timer.hh> + +#include <dune/istl/bvector.hh> +#include <dune/istl/operators.hh> #include <dune/istl/superlu.hh> -#include <complex> + +#include "laplacian.hh" #ifndef SUPERLU_NTYPE #define SUPERLU_NTYPE 1 @@ -22,19 +26,16 @@ typedef double FIELD_TYPE; typedef float FIELD_TYPE; #endif - #if SUPERLU_NTYPE==2 typedef std::complex<float> FIELD_TYPE; #endif - #if SUPERLU_NTYPE>=3 typedef std::complex<double> FIELD_TYPE; #endif int main(int argc, char** argv) { - const int BS=1; std::size_t N=100; @@ -77,5 +78,4 @@ int main(int argc, char** argv) std::cout<<"Defect reduction is "<<res.reduction<<std::endl; solver1.apply(x,b, res); - }