fdurastante/psblas3
1
0
Fork 0
mirror of https://github.com/sfilippone/psblas3.git synced 2026-10-24 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

psblas3:

Browse Source 
base/modules/psb_const_mod.F90
 base/modules/psb_error_mod.F90
 base/modules/psb_realloc_mod.F90
 base/serial/f03/psb_c_base_mat_impl.f03
 base/serial/f03/psb_c_coo_impl.f03
 base/serial/f03/psb_c_csc_impl.f03
 base/serial/f03/psb_c_csr_impl.f03
 base/serial/f03/psb_c_mat_impl.f03
 base/serial/f03/psb_d_base_mat_impl.f03
 base/serial/f03/psb_d_coo_impl.f03
 base/serial/f03/psb_d_csc_impl.f03
 base/serial/f03/psb_d_csr_impl.f03
 base/serial/f03/psb_d_mat_impl.f03
 base/serial/f03/psb_s_base_mat_impl.f03
 base/serial/f03/psb_s_coo_impl.f03
 base/serial/f03/psb_s_csc_impl.f03
 base/serial/f03/psb_s_csr_impl.f03
 base/serial/f03/psb_s_mat_impl.f03
 base/serial/f03/psb_z_base_mat_impl.f03
 base/serial/f03/psb_z_coo_impl.f03
 base/serial/f03/psb_z_csc_impl.f03
 base/serial/f03/psb_z_csr_impl.f03
 base/serial/f03/psb_z_mat_impl.f03
 base/serial/psb_cnumbmm.f90
 base/serial/psb_csymbmm.f90
 base/serial/psb_dnumbmm.f90
 base/serial/psb_dsymbmm.f90
 base/serial/psb_snumbmm.f90
 base/serial/psb_ssymbmm.f90
 base/serial/psb_znumbmm.f90
 base/serial/psb_zsymbmm.f90
 test/serial/Makefile
 test/serial/d_matgen.f03
 test/serial/psb_d_cxx_impl.f03
 test/serial/psb_d_cxx_mat_mod.f03

New psb_err_invalid_mat_state_ and error message. 
Debug statements REMEMBER TO TAKE THEM OUT!!
This commit is contained in:
Salvatore Filippone
2010-07-16 15:43:34 +00:00
parent 18ecc8983c
commit de705a3dc6
35 changed files with 395 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/serial/Makefile
+2 -2
View File
@@ -17,10 +17,10 @@ EXEDIR=./runs
all: d_coo_matgen d_matgen
d_coo_matgen: d_coo_matgen.o
$(F90LINK) d_coo_matgen.o -o d_coo_matgen $(PSBLAS_LIB) $(LDLIBS)
$(F90LINK) $(LINKOPT) d_coo_matgen.o -o d_coo_matgen $(PSBLAS_LIB) $(LDLIBS)
/bin/mv d_coo_matgen $(EXEDIR)
d_matgen: d_matgen.o psb_d_cxx_mat_mod.o psb_d_cxx_impl.o
$(F90LINK) d_matgen.o psb_d_cxx_mat_mod.o psb_d_cxx_impl.o -o d_matgen $(PSBLAS_LIB) $(LDLIBS)
$(F90LINK) $(LINKOPT) d_matgen.o psb_d_cxx_mat_mod.o psb_d_cxx_impl.o -o d_matgen $(PSBLAS_LIB) $(LDLIBS)
/bin/mv d_matgen $(EXEDIR)
d_matgen.o: psb_d_cxx_mat_mod.o
test/serial/d_matgen.f03
+3
View File
@@ -212,6 +212,8 @@ contains
goto 9999
end if
write(0,*) 'After allocate ',a_n%is_null()
! we build an auxiliary matrix consisting of one row at a
! time; just a small matrix. might be extended to generate
! a bunch of rows per call.
@@ -368,6 +370,7 @@ contains
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
write(0,*) 'After insert ',a_n%is_null()
!!$ call a_n%print(19)
t1 = psb_wtime()
call a_n%cscnv(info,mold=acsr)
test/serial/psb_d_cxx_impl.f03
+9 -9
View File
@@ -41,7 +41,7 @@ subroutine d_cxx_csmv_impl(alpha,a,x,beta,y,info,trans)
end if
if (.not.a%is_asb()) then
info = 1121
info = psb_err_invalid_mat_state_
call psb_errpush(info,name)
goto 9999
endif
@@ -326,7 +326,7 @@ subroutine d_cxx_csmm_impl(alpha,a,x,beta,y,info,trans)
end if
if (.not.a%is_asb()) then
info = 1121
info = psb_err_invalid_mat_state_
call psb_errpush(info,name)
goto 9999
endif
@@ -615,7 +615,7 @@ subroutine d_cxx_cssv_impl(alpha,a,x,beta,y,info,trans)
trans_ = 'N'
end if
if (.not.a%is_asb()) then
info = 1121
info = psb_err_invalid_mat_state_
call psb_errpush(info,name)
goto 9999
endif
@@ -624,7 +624,7 @@ subroutine d_cxx_cssv_impl(alpha,a,x,beta,y,info,trans)
m = a%get_nrows()
if (.not. (a%is_triangle())) then
info = 1121
info = psb_err_invalid_mat_state_
call psb_errpush(info,name)
goto 9999
end if
@@ -832,7 +832,7 @@ subroutine d_cxx_cssm_impl(alpha,a,x,beta,y,info,trans)
trans_ = 'N'
end if
if (.not.a%is_asb()) then
info = 1121
info = psb_err_invalid_mat_state_
call psb_errpush(info,name)
goto 9999
endif
@@ -844,7 +844,7 @@ subroutine d_cxx_cssm_impl(alpha,a,x,beta,y,info,trans)
nc = min(size(x,2) , size(y,2))
if (.not. (a%is_triangle())) then
info = 1121
info = psb_err_invalid_mat_state_
call psb_errpush(info,name)
goto 9999
end if
@@ -1439,7 +1439,7 @@ subroutine d_cxx_csput_impl(nz,ia,ja,val,a,imin,imax,jmin,jmax,info,gtl)
if (a%is_bld()) then
! Build phase should only ever be in COO
info = 1121
info = psb_err_invalid_mat_state_
else if (a%is_upd()) then
call d_cxx_srch_upd(nz,ia,ja,val,a,&
@@ -1447,12 +1447,12 @@ subroutine d_cxx_csput_impl(nz,ia,ja,val,a,imin,imax,jmin,jmax,info,gtl)
if (info /= psb_success_) then
info = 1121
info = psb_err_invalid_mat_state_
end if
else
! State is wrong.
info = 1121
info = psb_err_invalid_mat_state_
end if
if (info /= psb_success_) then
call psb_errpush(info,name)
test/serial/psb_d_cxx_mat_mod.f03
+6 -6
View File
@@ -726,7 +726,7 @@ contains
if (clear_) a%val(:) = dzero
call a%set_upd()
else
info = 1121
info = psb_err_invalid_mat_state_
call psb_errpush(info,name)
goto 9999
end if
@@ -1290,7 +1290,7 @@ contains
call psb_erractionsave(err_act)
if (.not.a%is_asb()) then
info = 1121
info = psb_err_invalid_mat_state_
call psb_errpush(info,name)
goto 9999
endif
@@ -1375,14 +1375,14 @@ contains
call psb_erractionsave(err_act)
if (.not.a%is_asb()) then
info = 1121
info = psb_err_invalid_mat_state_
call psb_errpush(info,name)
goto 9999
endif
if (.not. (a%is_triangle())) then
info = 1121
info = psb_err_invalid_mat_state_
call psb_errpush(info,name)
goto 9999
end if
@@ -1428,14 +1428,14 @@ contains
call psb_erractionsave(err_act)
if (.not.a%is_asb()) then
info = 1121
info = psb_err_invalid_mat_state_
call psb_errpush(info,name)
goto 9999
endif
if (.not. (a%is_triangle())) then
info = 1121
info = psb_err_invalid_mat_state_
call psb_errpush(info,name)
goto 9999
end if