Skip to content
Snippets Groups Projects
Commit 7c7b3060 authored by Steffen Müthing's avatar Steffen Müthing
Browse files

[Tests] Move tests to exercise MINRES and GMRes on complex matrices into separate executable 

The recently added tests for complex matrices added to complexrhstest
made that file really large and unwieldy, so this patch moves those
tests to a new file complexmatrixtest.
parent 5c6fbc18
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
dune/istl/test/CMakeLists.txt
+ 2
− 0
View file @ 7c7b3060
......@@ -3,6 +3,7 @@ set(NORMALTEST
bvectortest
bcrsbuildtest
bcrsimplicitbuildtest
complexmatrixtest
dotproducttest
iotest
inverseoperator2prectest
......@@ -51,6 +52,7 @@ include(DuneMPI)
# Provide source files
add_executable(basearraytest "basearraytest.cc")
add_executable(dotproducttest "dotproducttest.cc")
add_executable(complexmatrixtest "complexmatrixtest.cc")
add_executable(matrixutilstest "matrixutilstest.cc")
add_executable(matrixtest "matrixtest.cc")
add_executable(bvectortest "bvectortest.cc")
......
dune/istl/test/Makefile.am
+ 4
− 1
View file @ 7c7b3060
......@@ -25,6 +25,7 @@ NORMALTESTS = basearraytest \
bcrsbuildtest \
bcrsimplicitbuildtest \
bvectortest \
complexmatrixtest \
complexrhstest \
dotproducttest \
iotest \
......@@ -106,7 +107,9 @@ bcrsimplicitbuildtest_CPPFLAGS = $(AM_CPPFLAGS) -DDUNE_ISTL_WITH_CHECKING=1
bvectortest_SOURCES = bvectortest.cc
complexrhstest_SOURCES = complexrhstest.cc laplacian.hh assemble_random_matrix_vectors.hh
complexmatrixtest_SOURCES = complexmatrixtest.cc assemble_random_matrix_vectors.hh
complexrhstest_SOURCES = complexrhstest.cc laplacian.hh
complexrhstest_LDADD= $(SUPERLU_LIBS)
complexrhstest_LDFLAGS= $(AM_LDFLAGS) $(SUPERLU_LDFLAGS)
complexrhstest_CPPFLAGS=$(AM_CPPFLAGS) $(SUPERLU_CPPFLAGS) -DSUPERLU_NTYPE=3
......
dune/istl/test/complexmatrixtest.cc 0 → 100644
+ 137
− 0
View file @ 7c7b3060
// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
// vi: set et ts=4 sw=2 sts=2:
/**
* \author: Marian Piatkowski, Steffen Müthing
* \file
* \brief Test MINRES and GMRes for complex matrices and complex rhs.
*/
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <complex>
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
#include <dune/istl/operators.hh>
#include <dune/istl/solvers.hh>
#include <dune/istl/preconditioners.hh>
#include "assemble_random_matrix_vectors.hh"
typedef std::complex<double> FIELD_TYPE;
int main(int argc, char** argv)
{
try {
std::size_t N = 3;
const int maxIter = int(N*N*N*N);
const double reduction = 1e-16;
std::cout << "============================================" << '\n'
<< "starting solver tests with complex matrices and complex rhs... "
<< std::endl
<< std::endl;
std::cout << "============================================" << '\n'
<< "solving system with Hilbert matrix of size 10 times imaginary unit... "
<< std::endl
<< std::endl;
Dune::FieldMatrix<std::complex<double>,10,10> hilbertmatrix;
for(int i=0; i<10; i++) {
for(int j=0; j<10; j++) {
std::complex<double> temp(0.0,1./(i+j+1));
hilbertmatrix[i][j] = temp;
}
}
Dune::FieldVector<std::complex<double>,10> hilbertsol(1.0);
Dune::FieldVector<std::complex<double>,10> hilbertiter(0.0);
Dune::MatrixAdapter<Dune::FieldMatrix<std::complex<double>,10,10>,Dune::FieldVector<std::complex<double>,10>,Dune::FieldVector<std::complex<double>,10> > hilbertadapter(hilbertmatrix);
Dune::FieldVector<std::complex<double>,10> hilbertrhs(0.0);
hilbertadapter.apply(hilbertsol,hilbertrhs);
Dune::Richardson<Dune::FieldVector<std::complex<double>,10>,Dune::FieldVector<std::complex<double>,10> > noprec(1.0);
Dune::RestartedGMResSolver<Dune::FieldVector<std::complex<double>,10> > realgmrestest(hilbertadapter,noprec,reduction,maxIter,maxIter,2);
Dune::InverseOperatorResult stat;
realgmrestest.apply(hilbertiter,hilbertrhs,stat);
std::cout << hilbertiter << std::endl;
// error of solution
hilbertiter -= hilbertsol;
std::cout << "error of solution with GMRes:" << std::endl;
std::cout << hilbertiter.two_norm() << std::endl;
std::cout << "============================================" << '\n'
<< "solving system with complex matrix of size 10" << '\n'
<< "randomly generated with the Eigen library... "
<< std::endl << std::endl;
Dune::FieldMatrix<std::complex<double>,10,10> complexmatrix(0.0), hermitianmatrix(0.0);
Dune::FieldVector<std::complex<double>,10> complexsol, complexrhs(0.0), complexiter(0.0);
// assemble randomly generated matrices from Eigen
assemblecomplexmatrix(complexmatrix);
assemblecomplexsol(complexsol);
assemblehermitianmatrix(hermitianmatrix);
Dune::MatrixAdapter<Dune::FieldMatrix<std::complex<double>,10,10>,Dune::FieldVector<std::complex<double>,10>,Dune::FieldVector<std::complex<double>,10> > complexadapter(complexmatrix), hermitianadapter(hermitianmatrix);
Dune::SeqJac<Dune::FieldMatrix<std::complex<double>,10,10>,Dune::FieldVector<std::complex<double>,10>,Dune::FieldVector<std::complex<double>,10>,0> complexjacprec(complexmatrix,1,1.0);
Dune::Richardson<Dune::FieldVector<std::complex<double>,10>,Dune::FieldVector<std::complex<double>,10> > complexnoprec(1.0);
Dune::RestartedGMResSolver<Dune::FieldVector<std::complex<double>,10> > complexgmrestest(complexadapter,complexnoprec,1e-12,maxIter,maxIter*maxIter,2);
complexadapter.apply(complexsol,complexrhs);
complexgmrestest.apply(complexiter,complexrhs,stat);
std::cout << complexiter << std::endl;
// error of solution
complexiter -= complexsol;
std::cout << "error of solution with GMRes: " << complexiter.two_norm() << std::endl;
std::cout << "============================================" << '\n'
<< "solving system with hermitian matrix of size 10" << '\n'
<< "randomly generated with the Eigen libary... "
<< std::endl << std::endl;
Dune::RestartedGMResSolver<Dune::FieldVector<std::complex<double>,10> > hermitiangmrestest(hermitianadapter,complexnoprec,1e-12,maxIter,maxIter*maxIter,2);
Dune::MINRESSolver<Dune::FieldVector<std::complex<double>,10> > complexminrestest(hermitianadapter,complexnoprec,1e-12,maxIter,2);
complexiter = 0.0;
hermitianadapter.apply(complexsol,complexrhs);
hermitiangmrestest.apply(complexiter,complexrhs,stat);
std::cout << complexiter << std::endl;
// error of solution
complexiter -= complexsol;
std::cout << "error of solution with GMRes: " << complexiter.two_norm() << std::endl;
complexiter = 0.0;
hermitianadapter.apply(complexsol,complexrhs);
complexminrestest.apply(complexiter,complexrhs,stat);
std::cout << complexiter << std::endl;
// error of solution
complexiter-= complexsol;
std::cout << "error of solution with MinRes: " << complexiter.two_norm() << std::endl;
return 0;
} catch (Dune::Exception& e) {
std::cerr << "DUNE reported an exception: " << e << std::endl;
return 1;
} catch (std::exception& e) {
std::cerr << "C++ reported an exception: " << e.what() << std::endl;
return 2;
} catch (...) {
std::cerr << "Unknown exception encountered!" << std::endl;
return 3;
}
}
dune/istl/test/complexrhstest.cc
+ 0
− 92
View file @ 7c7b3060
......@@ -18,7 +18,6 @@
#include <dune/istl/solvers.hh>
#include <dune/istl/preconditioners.hh>
#include "laplacian.hh"
#include "assemble_random_matrix_vectors.hh"
#if HAVE_SUPERLU
#include <dune/istl/superlu.hh>
......@@ -247,96 +246,5 @@ int main(int argc, char** argv)
const int errorCount = solverTest.getNumFailures();
std::cout << "Tested " << testCount << " different solvers or preconditioners " << " for a laplacian with complex rhs. " << testCount - errorCount << " out of " << testCount << " solvers converged! " << std::endl << std::endl;
std::cout << "============================================" << '\n'
<< "starting solver tests with complex matrices and complex rhs... "
<< std::endl
<< std::endl;
std::cout << "============================================" << '\n'
<< "solving system with Hilbert matrix of size 10 times imaginary unit... "
<< std::endl
<< std::endl;
Dune::FieldMatrix<std::complex<double>,10,10> hilbertmatrix;
for(int i=0; i<10; i++) {
for(int j=0; j<10; j++) {
std::complex<double> temp(0.0,1./(i+j+1));
hilbertmatrix[i][j] = temp;
}
}
Dune::FieldVector<std::complex<double>,10> hilbertsol(1.0);
Dune::FieldVector<std::complex<double>,10> hilbertiter(0.0);
Dune::MatrixAdapter<Dune::FieldMatrix<std::complex<double>,10,10>,Dune::FieldVector<std::complex<double>,10>,Dune::FieldVector<std::complex<double>,10> > hilbertadapter(hilbertmatrix);
Dune::FieldVector<std::complex<double>,10> hilbertrhs(0.0);
hilbertadapter.apply(hilbertsol,hilbertrhs);
Dune::Richardson<Dune::FieldVector<std::complex<double>,10>,Dune::FieldVector<std::complex<double>,10> > noprec(1.0);
Dune::RestartedGMResSolver<Dune::FieldVector<std::complex<double>,10> > realgmrestest(hilbertadapter,noprec,reduction,maxIter,maxIter,2);
Dune::InverseOperatorResult stat;
realgmrestest.apply(hilbertiter,hilbertrhs,stat);
std::cout << hilbertiter << std::endl;
// error of solution
hilbertiter -= hilbertsol;
std::cout << "error of solution with GMRes:" << std::endl;
std::cout << hilbertiter.two_norm() << std::endl;
std::cout << "============================================" << '\n'
<< "solving system with complex matrix of size 10" << '\n'
<< "randomly generated with the Eigen library... "
<< std::endl << std::endl;
Dune::FieldMatrix<std::complex<double>,10,10> complexmatrix(0.0), hermitianmatrix(0.0);
Dune::FieldVector<std::complex<double>,10> complexsol, complexrhs(0.0), complexiter(0.0);
// assemble randomly generated matrices from Eigen
assemblecomplexmatrix(complexmatrix);
assemblecomplexsol(complexsol);
assemblehermitianmatrix(hermitianmatrix);
Dune::MatrixAdapter<Dune::FieldMatrix<std::complex<double>,10,10>,Dune::FieldVector<std::complex<double>,10>,Dune::FieldVector<std::complex<double>,10> > complexadapter(complexmatrix), hermitianadapter(hermitianmatrix);
Dune::SeqJac<Dune::FieldMatrix<std::complex<double>,10,10>,Dune::FieldVector<std::complex<double>,10>,Dune::FieldVector<std::complex<double>,10>,0> complexjacprec(complexmatrix,1,1.0);
Dune::Richardson<Dune::FieldVector<std::complex<double>,10>,Dune::FieldVector<std::complex<double>,10> > complexnoprec(1.0);
Dune::RestartedGMResSolver<Dune::FieldVector<std::complex<double>,10> > complexgmrestest(complexadapter,complexnoprec,1e-12,maxIter,maxIter*maxIter,2);
complexadapter.apply(complexsol,complexrhs);
complexgmrestest.apply(complexiter,complexrhs,stat);
std::cout << complexiter << std::endl;
// error of solution
complexiter -= complexsol;
std::cout << "error of solution with GMRes: " << complexiter.two_norm() << std::endl;
std::cout << "============================================" << '\n'
<< "solving system with hermitian matrix of size 10" << '\n'
<< "randomly generated with the Eigen libary... "
<< std::endl << std::endl;
Dune::RestartedGMResSolver<Dune::FieldVector<std::complex<double>,10> > hermitiangmrestest(hermitianadapter,complexnoprec,1e-12,maxIter,maxIter*maxIter,2);
Dune::MINRESSolver<Dune::FieldVector<std::complex<double>,10> > complexminrestest(hermitianadapter,complexnoprec,1e-12,maxIter,2);
complexiter = 0.0;
hermitianadapter.apply(complexsol,complexrhs);
hermitiangmrestest.apply(complexiter,complexrhs,stat);
std::cout << complexiter << std::endl;
// error of solution
complexiter -= complexsol;
std::cout << "error of solution with GMRes: " << complexiter.two_norm() << std::endl;
complexiter = 0.0;
hermitianadapter.apply(complexsol,complexrhs);
complexminrestest.apply(complexiter,complexrhs,stat);
std::cout << complexiter << std::endl;
// error of solution
complexiter-= complexsol;
std::cout << "error of solution with MinRes: " << complexiter.two_norm() << std::endl;
return errorCount;
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment