added tolerance of 0 to various regression tests and to CG smoother

This commit is contained in:
Ulrike Yang 2018-09-19 06:52:36 -07:00
parent a1ba97a4e4
commit 0edca6b55f
3 changed files with 10 additions and 9 deletions

View File

@ -718,6 +718,7 @@ HYPRE_Int hypre_ParCSRRelax_CG( HYPRE_Solver solver,
{
HYPRE_PCGSetMaxIter(solver, num_its); /* max iterations */
HYPRE_PCGSetTol(solver, 0.0); /* max iterations */
HYPRE_ParCSRPCGSolve(solver, (HYPRE_ParCSRMatrix)A, (HYPRE_ParVector)f, (HYPRE_ParVector)u);
#if 0

View File

@ -29,20 +29,20 @@ mpirun -np 2 ./ij -rhsrand -low_storage > matrix.out.2
mpirun -np 4 ./ij -fromfile A_tstoffd -rhsfromfile b_tstoffd > matrix.out.3
mpirun -np 2 ./ij -test_ij -solver 2 -max_iter 5 -chunk 1 -add 1 > matrix.out.4
mpirun -np 2 ./ij -test_ij -solver 2 -tol 0 -max_iter 5 -chunk 1 -add 1 > matrix.out.4
mpirun -np 2 ./ij -test_ij -solver 2 -max_iter 5 -chunk 1 -add 1 -off_proc 1 > matrix.out.5
mpirun -np 2 ./ij -test_ij -solver 2 -tol 0 -max_iter 5 -chunk 1 -add 1 -off_proc 1 > matrix.out.5
mpirun -np 2 ./ij -test_ij -solver 2 -max_iter 5 -chunk 1 -off_proc 1 > matrix.out.6
mpirun -np 2 ./ij -test_ij -solver 2 -tol 0 -max_iter 5 -chunk 1 -off_proc 1 > matrix.out.6
mpirun -np 2 ./ij -test_ij -solver 2 -max_iter 5 -chunk 1 -off_proc 1 -omp 1 > matrix.out.7
mpirun -np 2 ./ij -test_ij -solver 2 -tol 0 -max_iter 5 -chunk 1 -off_proc 1 -omp 1 > matrix.out.7
mpirun -np 2 ./ij -test_ij -solver 2 -max_iter 5 -chunk 1 -off_proc 1 -omp 1 -add 1 > matrix.out.8
mpirun -np 2 ./ij -test_ij -solver 2 -tol 0 -max_iter 5 -chunk 1 -off_proc 1 -omp 1 -add 1 > matrix.out.8
mpirun -np 2 ./ij -test_ij -solver 2 -max_iter 5 -chunk 1 -omp 1 -exact_size > matrix.out.9
mpirun -np 2 ./ij -test_ij -solver 2 -tol 0 -max_iter 5 -chunk 1 -omp 1 -exact_size > matrix.out.9
mpirun -np 2 ./ij -test_ij -solver 2 -max_iter 5 -chunk 1 -omp 1 > matrix.out.10
mpirun -np 2 ./ij -test_ij -solver 2 -tol 0 -max_iter 5 -chunk 1 -omp 1 > matrix.out.10
mpirun -np 3 ./ij -fromfile test.A -rhsfromfile test.b > matrix.out.11
mpirun -np 2 ./ij -test_ij -solver 2 -max_iter 5 -chunk 1 -add 1 -check_constant 1 > matrix.out.12
mpirun -np 2 ./ij -test_ij -solver 2 -tol 0 -max_iter 5 -chunk 1 -add 1 -check_constant 1 > matrix.out.12

View File

@ -61,7 +61,7 @@ mpirun -np 2 ./ij -lobpcg -seed 1 -pcgitr 0 > options.out.pcgitr.0
#default number of inner iterations (1)
mpirun -np 2 ./ij -lobpcg -seed 1 > options.out.pcgitr.1
#-pcgitr 2 : two inner iterations
mpirun -np 2 ./ij -lobpcg -seed 1 -pcgitr 2 > options.out.pcgitr.2
mpirun -np 2 ./ij -lobpcg -seed 1 -pcgitr 2 -pcgtol 0 > options.out.pcgitr.2
#default residual tolerance for inner iterations (0.01)
mpirun -np 2 ./ij -lobpcg -solver 2 -seed 1 -pcgitr 1000 > options.out.pcgtol.01