From c193fced5196e390b460fa3e464612e446047cf4 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Tue, 8 Apr 2014 16:55:23 +0000 Subject: [PATCH] psblas3: base/serial/impl/psb_c_mat_impl.F90 base/serial/impl/psb_d_mat_impl.F90 base/serial/impl/psb_s_mat_impl.F90 base/serial/impl/psb_z_mat_impl.F90 Silly mistake in UPDATE mode. --- base/serial/impl/psb_c_mat_impl.F90 | 2 +- base/serial/impl/psb_d_mat_impl.F90 | 2 +- base/serial/impl/psb_s_mat_impl.F90 | 2 +- base/serial/impl/psb_z_mat_impl.F90 | 2 +- test/pargen/runs/ppde.inp | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/serial/impl/psb_c_mat_impl.F90 b/base/serial/impl/psb_c_mat_impl.F90 index fd5d92b5..58b72563 100644 --- a/base/serial/impl/psb_c_mat_impl.F90 +++ b/base/serial/impl/psb_c_mat_impl.F90 @@ -748,7 +748,7 @@ subroutine psb_c_csput(nz,ia,ja,val,a,imin,imax,jmin,jmax,info,gtl) info = psb_success_ call psb_erractionsave(err_act) - if (.not.a%is_bld()) then + if (.not.(a%is_bld().or.a%is_upd())) then info = psb_err_invalid_mat_state_ call psb_errpush(info,name) goto 9999 diff --git a/base/serial/impl/psb_d_mat_impl.F90 b/base/serial/impl/psb_d_mat_impl.F90 index c18d669d..f3b70164 100644 --- a/base/serial/impl/psb_d_mat_impl.F90 +++ b/base/serial/impl/psb_d_mat_impl.F90 @@ -748,7 +748,7 @@ subroutine psb_d_csput(nz,ia,ja,val,a,imin,imax,jmin,jmax,info,gtl) info = psb_success_ call psb_erractionsave(err_act) - if (.not.a%is_bld()) then + if (.not.(a%is_bld().or.a%is_upd())) then info = psb_err_invalid_mat_state_ call psb_errpush(info,name) goto 9999 diff --git a/base/serial/impl/psb_s_mat_impl.F90 b/base/serial/impl/psb_s_mat_impl.F90 index b338faca..0899b12e 100644 --- a/base/serial/impl/psb_s_mat_impl.F90 +++ b/base/serial/impl/psb_s_mat_impl.F90 @@ -748,7 +748,7 @@ subroutine psb_s_csput(nz,ia,ja,val,a,imin,imax,jmin,jmax,info,gtl) info = psb_success_ call psb_erractionsave(err_act) - if (.not.a%is_bld()) then + if (.not.(a%is_bld().or.a%is_upd())) then info = psb_err_invalid_mat_state_ call psb_errpush(info,name) goto 9999 diff --git a/base/serial/impl/psb_z_mat_impl.F90 b/base/serial/impl/psb_z_mat_impl.F90 index b3ca37a6..7ddd1472 100644 --- a/base/serial/impl/psb_z_mat_impl.F90 +++ b/base/serial/impl/psb_z_mat_impl.F90 @@ -748,7 +748,7 @@ subroutine psb_z_csput(nz,ia,ja,val,a,imin,imax,jmin,jmax,info,gtl) info = psb_success_ call psb_erractionsave(err_act) - if (.not.a%is_bld()) then + if (.not.(a%is_bld().or.a%is_upd())) then info = psb_err_invalid_mat_state_ call psb_errpush(info,name) goto 9999 diff --git a/test/pargen/runs/ppde.inp b/test/pargen/runs/ppde.inp index d0dc36f5..41020e89 100644 --- a/test/pargen/runs/ppde.inp +++ b/test/pargen/runs/ppde.inp @@ -1,8 +1,8 @@ 7 Number of entries below this BICGSTAB Iterative method BICGSTAB CGS BICG BICGSTABL RGMRES -BJAC Preconditioner NONE DIAG BJAC +DIAG Preconditioner NONE DIAG BJAC CSR Storage format for matrix A: CSR COO JAD -100 Domain size (acutal system is this**3) +050 Domain size (acutal system is this**3) 2 Stopping criterion 1000 MAXIT -1 ITRACE