From 13ae371ef81b6383bffe681c6d725b56ca37f1ff Mon Sep 17 00:00:00 2001 From: Daniel Richtmann Date: Thu, 8 Feb 2018 17:33:10 +0100 Subject: [PATCH] Make solver parameters match in all MR|GMRES solver tests --- tests/solver/Test_staggered_fgmres_prec.cc | 4 ++-- tests/solver/Test_staggered_gmres_unprec.cc | 4 ++-- tests/solver/Test_staggered_mr_unprec.cc | 4 ++-- tests/solver/Test_wilson_cagmres_unprec.cc | 2 +- tests/solver/Test_wilson_fcagmres_prec.cc | 2 +- tests/solver/Test_wilson_fgmres_prec.cc | 2 +- tests/solver/Test_wilson_gmres_unprec.cc | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/solver/Test_staggered_fgmres_prec.cc b/tests/solver/Test_staggered_fgmres_prec.cc index 0c8dbc67..48eec1ce 100644 --- a/tests/solver/Test_staggered_fgmres_prec.cc +++ b/tests/solver/Test_staggered_fgmres_prec.cc @@ -58,14 +58,14 @@ int main (int argc, char ** argv) volume=volume*latt_size[mu]; } - RealD mass=0.1; + RealD mass=0.5; ImprovedStaggeredFermionR Ds(Umu,Umu,Grid,RBGrid,mass); MdagMLinearOperator HermOp(Ds); TrivialPrecon simple; - FlexibleGeneralisedMinimalResidual FGMRES(1.0e-6, 50, simple, 25); + FlexibleGeneralisedMinimalResidual FGMRES(1.0e-8, 10000, simple, 25); FGMRES(HermOp,src,result); Grid_finalize(); diff --git a/tests/solver/Test_staggered_gmres_unprec.cc b/tests/solver/Test_staggered_gmres_unprec.cc index f9a8744f..8b62eb78 100644 --- a/tests/solver/Test_staggered_gmres_unprec.cc +++ b/tests/solver/Test_staggered_gmres_unprec.cc @@ -58,11 +58,11 @@ int main (int argc, char ** argv) volume=volume*latt_size[mu]; } - RealD mass=0.1; + RealD mass=0.5; ImprovedStaggeredFermionR Ds(Umu,Umu,Grid,RBGrid,mass); MdagMLinearOperator HermOp(Ds); - GeneralisedMinimalResidual GMRES(1.0e-6, 50, 25); + GeneralisedMinimalResidual GMRES(1.0e-8, 10000, 25); GMRES(HermOp,src,result); Grid_finalize(); diff --git a/tests/solver/Test_staggered_mr_unprec.cc b/tests/solver/Test_staggered_mr_unprec.cc index 77f3090d..d29ec68d 100644 --- a/tests/solver/Test_staggered_mr_unprec.cc +++ b/tests/solver/Test_staggered_mr_unprec.cc @@ -58,11 +58,11 @@ int main (int argc, char ** argv) volume=volume*latt_size[mu]; } - RealD mass=0.1; + RealD mass=0.5; ImprovedStaggeredFermionR Ds(Umu,Umu,Grid,RBGrid,mass); MdagMLinearOperator HermOp(Ds); - MinimalResidual MR(1.0e-6,20000,0.8); + MinimalResidual MR(1.0e-8,10000,0.8); MR(HermOp,src,result); Grid_finalize(); diff --git a/tests/solver/Test_wilson_cagmres_unprec.cc b/tests/solver/Test_wilson_cagmres_unprec.cc index 067fc0c1..4f81b195 100644 --- a/tests/solver/Test_wilson_cagmres_unprec.cc +++ b/tests/solver/Test_wilson_cagmres_unprec.cc @@ -58,7 +58,7 @@ int main (int argc, char ** argv) WilsonFermionR Dw(Umu,Grid,RBGrid,mass); MdagMLinearOperator HermOp(Dw); - CommunicationAvoidingGeneralisedMinimalResidual CAGMRES(1.0e-8, 50, 25); + CommunicationAvoidingGeneralisedMinimalResidual CAGMRES(1.0e-8, 10000, 25); CAGMRES(HermOp,src,result); Grid_finalize(); diff --git a/tests/solver/Test_wilson_fcagmres_prec.cc b/tests/solver/Test_wilson_fcagmres_prec.cc index 59477f95..5ac9b87f 100644 --- a/tests/solver/Test_wilson_fcagmres_prec.cc +++ b/tests/solver/Test_wilson_fcagmres_prec.cc @@ -61,7 +61,7 @@ int main (int argc, char ** argv) TrivialPrecon simple; - FlexibleCommunicationAvoidingGeneralisedMinimalResidual FCAGMRES(1.0e-8, 50, simple, 25); + FlexibleCommunicationAvoidingGeneralisedMinimalResidual FCAGMRES(1.0e-8, 10000, simple, 25); FCAGMRES(HermOp,src,result); Grid_finalize(); diff --git a/tests/solver/Test_wilson_fgmres_prec.cc b/tests/solver/Test_wilson_fgmres_prec.cc index 2bdee58f..f9e1f352 100644 --- a/tests/solver/Test_wilson_fgmres_prec.cc +++ b/tests/solver/Test_wilson_fgmres_prec.cc @@ -61,7 +61,7 @@ int main (int argc, char ** argv) TrivialPrecon simple; - FlexibleGeneralisedMinimalResidual FGMRES(1.0e-8, 50, simple, 25); + FlexibleGeneralisedMinimalResidual FGMRES(1.0e-8, 10000, simple, 25); FGMRES(HermOp,src,result); Grid_finalize(); diff --git a/tests/solver/Test_wilson_gmres_unprec.cc b/tests/solver/Test_wilson_gmres_unprec.cc index 4df5f4e3..d4ec2ed0 100644 --- a/tests/solver/Test_wilson_gmres_unprec.cc +++ b/tests/solver/Test_wilson_gmres_unprec.cc @@ -58,7 +58,7 @@ int main (int argc, char ** argv) WilsonFermionR Dw(Umu,Grid,RBGrid,mass); MdagMLinearOperator HermOp(Dw); - GeneralisedMinimalResidual GMRES(1.0e-8, 50, 25); + GeneralisedMinimalResidual GMRES(1.0e-8, 10000, 25); GMRES(HermOp,src,result); Grid_finalize();