fdurastante/psblas3
1
0
Fork 0
mirror of https://github.com/sfilippone/psblas3.git synced 2026-10-20 04:42:08 +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/serial/impl/psb_c_csc_impl.f90
 base/serial/impl/psb_c_csr_impl.f90
 base/serial/impl/psb_d_csc_impl.f90
 base/serial/impl/psb_d_csr_impl.f90
 base/serial/impl/psb_s_csc_impl.f90
 base/serial/impl/psb_s_csr_impl.f90
 base/serial/impl/psb_z_csc_impl.f90
 base/serial/impl/psb_z_csr_impl.f90
 base/serial/psb_csymbmm.f90
 base/serial/psb_dsymbmm.f90
 base/serial/psb_ssymbmm.f90
 base/serial/psb_zsymbmm.f90
 base/tools/psb_cdren.f90
 base/tools/psb_icdasb.F90

New error code.
This commit is contained in:
Salvatore Filippone
2016-11-02 12:02:13 +00:00
parent 7d2b1b9604
commit 2fde94dfe6
16 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/modules/psb_const_mod.F90
+1 -1
View File
@@ -217,9 +217,9 @@ module psb_const_mod
integer(psb_ipk_), parameter, public :: psb_err_arg_m_required_=582
integer(psb_ipk_), parameter, public :: psb_err_many_optional_arg_=583
integer(psb_ipk_), parameter, public :: psb_err_optional_arg_pair_=584
integer(psb_ipk_), parameter, public :: psb_err_spmat_invalid_state_=600
integer(psb_ipk_), parameter, public :: psb_err_missing_override_method_=700
integer(psb_ipk_), parameter, public :: psb_err_invalid_dynamic_type_=701
integer(psb_ipk_), parameter, public :: psb_err_invalid_matrix_sizes_=1119
integer(psb_ipk_), parameter, public :: psb_err_rectangular_mat_unsupported_=1120
integer(psb_ipk_), parameter, public :: psb_err_invalid_mat_state_=1121
integer(psb_ipk_), parameter, public :: psb_err_invalid_cd_state_=1122
base/modules/psb_error_mod.F90
+5 -7
View File
@@ -756,13 +756,6 @@ contains
achmsg(1) = tmpmsg
write(achmsg(2),'("Argument M is required when argument PARTS is specified")')
case(psb_err_spmat_invalid_state_)
allocate(achmsg(2))
achmsg(1) = tmpmsg
write(achmsg(2),&
& '("Sparse Matrix and descriptors are in an invalid state for this subroutine call: ",i0)')&
&i_e_d(1)
case(psb_err_missing_override_method_)
allocate(achmsg(2))
achmsg(1) = tmpmsg
@@ -800,6 +793,11 @@ contains
achmsg(1) = tmpmsg
write(achmsg(2),'("Invalid state for vector")')
case(psb_err_invalid_matrix_sizes_)
allocate(achmsg(2))
achmsg(1) = tmpmsg
write(achmsg(2),'("Invalid combination of matrix sizes")')
case(1125:1999)
allocate(achmsg(2))
achmsg(1) = tmpmsg
base/serial/impl/psb_c_csc_impl.f90
+3
View File
@@ -2855,6 +2855,9 @@ subroutine psb_ccscspspmm(a,b,c,info)
if ( mb /= na ) then
write(psb_err_unit,*) 'Mismatch in SPSPMM: ',ma,na,mb,nb
info = psb_err_invalid_matrix_sizes_
call psb_errpush(info,name)
goto 9999
endif
nza = a%get_nzeros()
nzb = b%get_nzeros()
base/serial/impl/psb_c_csr_impl.f90
+4
View File
@@ -3082,7 +3082,11 @@ subroutine psb_ccsrspspmm(a,b,c,info)
if ( mb /= na ) then
write(psb_err_unit,*) 'Mismatch in SPSPMM: ',ma,na,mb,nb
info = psb_err_invalid_matrix_sizes_
call psb_errpush(info,name)
goto 9999
endif
nza = a%get_nzeros()
nzb = b%get_nzeros()
nzc = 2*(nza+nzb)
base/serial/impl/psb_d_csc_impl.f90
+3
View File
@@ -2855,6 +2855,9 @@ subroutine psb_dcscspspmm(a,b,c,info)
if ( mb /= na ) then
write(psb_err_unit,*) 'Mismatch in SPSPMM: ',ma,na,mb,nb
info = psb_err_invalid_matrix_sizes_
call psb_errpush(info,name)
goto 9999
endif
nza = a%get_nzeros()
nzb = b%get_nzeros()
base/serial/impl/psb_d_csr_impl.f90
+4
View File
@@ -3082,7 +3082,11 @@ subroutine psb_dcsrspspmm(a,b,c,info)
if ( mb /= na ) then
write(psb_err_unit,*) 'Mismatch in SPSPMM: ',ma,na,mb,nb
info = psb_err_invalid_matrix_sizes_
call psb_errpush(info,name)
goto 9999
endif
nza = a%get_nzeros()
nzb = b%get_nzeros()
nzc = 2*(nza+nzb)
base/serial/impl/psb_s_csc_impl.f90
+3
View File
@@ -2855,6 +2855,9 @@ subroutine psb_scscspspmm(a,b,c,info)
if ( mb /= na ) then
write(psb_err_unit,*) 'Mismatch in SPSPMM: ',ma,na,mb,nb
info = psb_err_invalid_matrix_sizes_
call psb_errpush(info,name)
goto 9999
endif
nza = a%get_nzeros()
nzb = b%get_nzeros()
base/serial/impl/psb_s_csr_impl.f90
+4
View File
@@ -3082,7 +3082,11 @@ subroutine psb_scsrspspmm(a,b,c,info)
if ( mb /= na ) then
write(psb_err_unit,*) 'Mismatch in SPSPMM: ',ma,na,mb,nb
info = psb_err_invalid_matrix_sizes_
call psb_errpush(info,name)
goto 9999
endif
nza = a%get_nzeros()
nzb = b%get_nzeros()
nzc = 2*(nza+nzb)
base/serial/impl/psb_z_csc_impl.f90
+3
View File
@@ -2855,6 +2855,9 @@ subroutine psb_zcscspspmm(a,b,c,info)
if ( mb /= na ) then
write(psb_err_unit,*) 'Mismatch in SPSPMM: ',ma,na,mb,nb
info = psb_err_invalid_matrix_sizes_
call psb_errpush(info,name)
goto 9999
endif
nza = a%get_nzeros()
nzb = b%get_nzeros()
base/serial/impl/psb_z_csr_impl.f90
+4
View File
@@ -3082,7 +3082,11 @@ subroutine psb_zcsrspspmm(a,b,c,info)
if ( mb /= na ) then
write(psb_err_unit,*) 'Mismatch in SPSPMM: ',ma,na,mb,nb
info = psb_err_invalid_matrix_sizes_
call psb_errpush(info,name)
goto 9999
endif
nza = a%get_nzeros()
nzb = b%get_nzeros()
nzc = 2*(nza+nzb)
base/serial/psb_csymbmm.f90
+3
View File
@@ -105,6 +105,9 @@ subroutine psb_cbase_symbmm(a,b,c,info)
if ( mb /= na ) then
write(psb_err_unit,*) 'Mismatch in SYMBMM: ',ma,na,mb,nb
info = psb_err_invalid_matrix_sizes_
call psb_errpush(info,name)
goto 9999
endif
allocate(itemp(max(ma,na,mb,nb)),stat=info)
if (info /= psb_success_) then
base/serial/psb_dsymbmm.f90
+3
View File
@@ -105,6 +105,9 @@ subroutine psb_dbase_symbmm(a,b,c,info)
if ( mb /= na ) then
write(psb_err_unit,*) 'Mismatch in SYMBMM: ',ma,na,mb,nb
info = psb_err_invalid_matrix_sizes_
call psb_errpush(info,name)
goto 9999
endif
allocate(itemp(max(ma,na,mb,nb)),stat=info)
if (info /= psb_success_) then
base/serial/psb_ssymbmm.f90
+3
View File
@@ -105,6 +105,9 @@ subroutine psb_sbase_symbmm(a,b,c,info)
if ( mb /= na ) then
write(psb_err_unit,*) 'Mismatch in SYMBMM: ',ma,na,mb,nb
info = psb_err_invalid_matrix_sizes_
call psb_errpush(info,name)
goto 9999
endif
allocate(itemp(max(ma,na,mb,nb)),stat=info)
if (info /= psb_success_) then
base/serial/psb_zsymbmm.f90
+3
View File
@@ -105,6 +105,9 @@ subroutine psb_zbase_symbmm(a,b,c,info)
if ( mb /= na ) then
write(psb_err_unit,*) 'Mismatch in SYMBMM: ',ma,na,mb,nb
info = psb_err_invalid_matrix_sizes_
call psb_errpush(info,name)
goto 9999
endif
allocate(itemp(max(ma,na,mb,nb)),stat=info)
if (info /= psb_success_) then
base/tools/psb_cdren.f90
+1 -1
View File
@@ -83,7 +83,7 @@ subroutine psb_cdren(trans,iperm,desc_a,info)
endif
if (.not.psb_is_asb_desc(desc_a)) then
info = psb_err_spmat_invalid_state_
info = psb_err_invalid_cd_state_
int_err(1) = dectype
call psb_errpush(info,name,int_err)
goto 9999
base/tools/psb_icdasb.F90
+2 -2
View File
@@ -91,7 +91,7 @@ subroutine psb_icdasb(desc,info,ext_hv,mold)
endif
if (.not.desc%is_ok()) then
info = psb_err_spmat_invalid_state_
info = psb_err_invalid_cd_state_
int_err(1) = dectype
call psb_errpush(info,name)
goto 9999
@@ -156,7 +156,7 @@ subroutine psb_icdasb(desc,info,ext_hv,mold)
end if
else
info = psb_err_spmat_invalid_state_
info = psb_err_invalid_cd_state_
call psb_errpush(info,name)
goto 9999
endif