fdurastante
/
psblas3
mirror of https://github.com/sfilippone/psblas3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Corrected output of matrix cmp routines

Browse Source
merge-paraggr-newops
Cirdans-Home 5 years ago
parent 346ed5f8f8
commit ce6c04f508
5 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File

14
cbind/base/psb_c_psblas_cbind_mod.f90
Unescape Escape View File

@ -465,7 +465,7 @@ contains
function psb_c_cgecmpmat(ah,bh,tol,cdh) bind(c) result(res) function psb_c_cgecmpmat(ah,bh,tol,cdh) bind(c) result(res)
implicit none implicit none
logical :: res logical(c_bool) :: res
type(psb_c_cspmat) :: ah,bh type(psb_c_cspmat) :: ah,bh
type(psb_c_descriptor) :: cdh type(psb_c_descriptor) :: cdh
@ -474,6 +474,7 @@ contains
type(psb_cspmat_type), pointer :: ap,bp type(psb_cspmat_type), pointer :: ap,bp
integer(psb_c_ipk_) :: info integer(psb_c_ipk_) :: info
real(c_float_complex), value :: tol real(c_float_complex), value :: tol
logical :: isequal
if (c_associated(cdh%item)) then if (c_associated(cdh%item)) then
call c_f_pointer(cdh%item,descp) call c_f_pointer(cdh%item,descp)
@ -491,13 +492,15 @@ contains
return return
end if end if
call psb_gecmp(ap,bp,tol,descp,res,info) call psb_gecmp(ap,bp,tol,descp,isequal,info)
res = isequal
end function psb_c_cgecmpmat end function psb_c_cgecmpmat
function psb_c_cgecmpmat_val(ah,val,tol,cdh) bind(c) result(res) function psb_c_cgecmpmat_val(ah,val,tol,cdh) bind(c) result(res)
implicit none implicit none
logical :: res logical(c_bool) :: res
type(psb_c_cspmat) :: ah type(psb_c_cspmat) :: ah
type(psb_c_descriptor) :: cdh type(psb_c_descriptor) :: cdh
@ -507,6 +510,7 @@ contains
integer(psb_c_ipk_) :: info integer(psb_c_ipk_) :: info
complex(c_float_complex), value :: val complex(c_float_complex), value :: val
real(c_float_complex), value :: tol real(c_float_complex), value :: tol
logical :: isequal
if (c_associated(cdh%item)) then if (c_associated(cdh%item)) then
call c_f_pointer(cdh%item,descp) call c_f_pointer(cdh%item,descp)
@ -519,7 +523,9 @@ contains
return return
end if end if
call psb_gecmp(ap,val,tol,descp,res,info) call psb_gecmp(ap,val,tol,descp,isequal,info)
res = isequal
end function psb_c_cgecmpmat_val end function psb_c_cgecmpmat_val

14
cbind/base/psb_d_psblas_cbind_mod.f90
Unescape Escape View File

@ -465,7 +465,7 @@ contains
function psb_c_dgecmpmat(ah,bh,tol,cdh) bind(c) result(res) function psb_c_dgecmpmat(ah,bh,tol,cdh) bind(c) result(res)
implicit none implicit none
logical :: res logical(c_bool) :: res
type(psb_c_dspmat) :: ah,bh type(psb_c_dspmat) :: ah,bh
type(psb_c_descriptor) :: cdh type(psb_c_descriptor) :: cdh
@ -474,6 +474,7 @@ contains
type(psb_dspmat_type), pointer :: ap,bp type(psb_dspmat_type), pointer :: ap,bp
integer(psb_c_ipk_) :: info integer(psb_c_ipk_) :: info
real(c_double), value :: tol real(c_double), value :: tol
logical :: isequal
if (c_associated(cdh%item)) then if (c_associated(cdh%item)) then
call c_f_pointer(cdh%item,descp) call c_f_pointer(cdh%item,descp)
@ -491,13 +492,15 @@ contains
return return
end if end if
call psb_gecmp(ap,bp,tol,descp,res,info) call psb_gecmp(ap,bp,tol,descp,isequal,info)
res = isequal
end function psb_c_dgecmpmat end function psb_c_dgecmpmat
function psb_c_dgecmpmat_val(ah,val,tol,cdh) bind(c) result(res) function psb_c_dgecmpmat_val(ah,val,tol,cdh) bind(c) result(res)
implicit none implicit none
logical :: res logical(c_bool) :: res
type(psb_c_dspmat) :: ah type(psb_c_dspmat) :: ah
type(psb_c_descriptor) :: cdh type(psb_c_descriptor) :: cdh
@ -507,6 +510,7 @@ contains
integer(psb_c_ipk_) :: info integer(psb_c_ipk_) :: info
real(c_double), value :: val real(c_double), value :: val
real(c_double), value :: tol real(c_double), value :: tol
logical :: isequal
if (c_associated(cdh%item)) then if (c_associated(cdh%item)) then
call c_f_pointer(cdh%item,descp) call c_f_pointer(cdh%item,descp)
@ -519,7 +523,9 @@ contains
return return
end if end if
call psb_gecmp(ap,val,tol,descp,res,info) call psb_gecmp(ap,val,tol,descp,isequal,info)
res = isequal
end function psb_c_dgecmpmat_val end function psb_c_dgecmpmat_val

14
cbind/base/psb_s_psblas_cbind_mod.f90
Unescape Escape View File

@ -465,7 +465,7 @@ contains
function psb_c_sgecmpmat(ah,bh,tol,cdh) bind(c) result(res) function psb_c_sgecmpmat(ah,bh,tol,cdh) bind(c) result(res)
implicit none implicit none
logical :: res logical(c_bool) :: res
type(psb_c_sspmat) :: ah,bh type(psb_c_sspmat) :: ah,bh
type(psb_c_descriptor) :: cdh type(psb_c_descriptor) :: cdh
@ -474,6 +474,7 @@ contains
type(psb_sspmat_type), pointer :: ap,bp type(psb_sspmat_type), pointer :: ap,bp
integer(psb_c_ipk_) :: info integer(psb_c_ipk_) :: info
real(c_float), value :: tol real(c_float), value :: tol
logical :: isequal
if (c_associated(cdh%item)) then if (c_associated(cdh%item)) then
call c_f_pointer(cdh%item,descp) call c_f_pointer(cdh%item,descp)
@ -491,13 +492,15 @@ contains
return return
end if end if
call psb_gecmp(ap,bp,tol,descp,res,info) call psb_gecmp(ap,bp,tol,descp,isequal,info)
res = isequal
end function psb_c_sgecmpmat end function psb_c_sgecmpmat
function psb_c_sgecmpmat_val(ah,val,tol,cdh) bind(c) result(res) function psb_c_sgecmpmat_val(ah,val,tol,cdh) bind(c) result(res)
implicit none implicit none
logical :: res logical(c_bool) :: res
type(psb_c_sspmat) :: ah type(psb_c_sspmat) :: ah
type(psb_c_descriptor) :: cdh type(psb_c_descriptor) :: cdh
@ -507,6 +510,7 @@ contains
integer(psb_c_ipk_) :: info integer(psb_c_ipk_) :: info
real(c_float), value :: val real(c_float), value :: val
real(c_float), value :: tol real(c_float), value :: tol
logical :: isequal
if (c_associated(cdh%item)) then if (c_associated(cdh%item)) then
call c_f_pointer(cdh%item,descp) call c_f_pointer(cdh%item,descp)
@ -519,7 +523,9 @@ contains
return return
end if end if
call psb_gecmp(ap,val,tol,descp,res,info) call psb_gecmp(ap,val,tol,descp,isequal,info)
res = isequal
end function psb_c_sgecmpmat_val end function psb_c_sgecmpmat_val

14
cbind/base/psb_z_psblas_cbind_mod.f90
Unescape Escape View File

@ -465,7 +465,7 @@ contains
function psb_c_zgecmpmat(ah,bh,tol,cdh) bind(c) result(res) function psb_c_zgecmpmat(ah,bh,tol,cdh) bind(c) result(res)
implicit none implicit none
logical :: res logical(c_bool) :: res
type(psb_c_zspmat) :: ah,bh type(psb_c_zspmat) :: ah,bh
type(psb_c_descriptor) :: cdh type(psb_c_descriptor) :: cdh
@ -474,6 +474,7 @@ contains
type(psb_zspmat_type), pointer :: ap,bp type(psb_zspmat_type), pointer :: ap,bp
integer(psb_c_ipk_) :: info integer(psb_c_ipk_) :: info
real(c_double_complex), value :: tol real(c_double_complex), value :: tol
logical :: isequal
if (c_associated(cdh%item)) then if (c_associated(cdh%item)) then
call c_f_pointer(cdh%item,descp) call c_f_pointer(cdh%item,descp)
@ -491,13 +492,15 @@ contains
return return
end if end if
call psb_gecmp(ap,bp,tol,descp,res,info) call psb_gecmp(ap,bp,tol,descp,isequal,info)
res = isequal
end function psb_c_zgecmpmat end function psb_c_zgecmpmat
function psb_c_zgecmpmat_val(ah,val,tol,cdh) bind(c) result(res) function psb_c_zgecmpmat_val(ah,val,tol,cdh) bind(c) result(res)
implicit none implicit none
logical :: res logical(c_bool) :: res
type(psb_c_zspmat) :: ah type(psb_c_zspmat) :: ah
type(psb_c_descriptor) :: cdh type(psb_c_descriptor) :: cdh
@ -507,6 +510,7 @@ contains
integer(psb_c_ipk_) :: info integer(psb_c_ipk_) :: info
complex(c_double_complex), value :: val complex(c_double_complex), value :: val
real(c_double_complex), value :: tol real(c_double_complex), value :: tol
logical :: isequal
if (c_associated(cdh%item)) then if (c_associated(cdh%item)) then
call c_f_pointer(cdh%item,descp) call c_f_pointer(cdh%item,descp)
@ -519,7 +523,9 @@ contains
return return
end if end if
call psb_gecmp(ap,val,tol,descp,res,info) call psb_gecmp(ap,val,tol,descp,isequal,info)
res = isequal
end function psb_c_zgecmpmat_val end function psb_c_zgecmpmat_val

Write Preview
Loading…
Cancel
Save