Further fixes for string_c2f

This commit is contained in:
sfilippone
2026-01-15 12:08:24 +01:00
parent d7b22f0538
commit 48070b2cea
22 changed files with 4 additions and 65 deletions
+1 -2
View File
@@ -272,7 +272,6 @@ contains
end function psb_c_cdasb
function psb_c_cdasb_format(cdh,format) bind(c,name='psb_c_cdasb_format') result(res)
use psb_base_string_cbind_mod, only: stringc2f
implicit none
! Takes as input the desired format bewten CPU or GPU, and assembles accordingly
! via the mold parameter of psb_cdasb
@@ -292,7 +291,7 @@ contains
type(psb_i_base_vect_type), target :: ivect
class(psb_i_base_vect_type), pointer :: imold
call stringc2f(format,fformat)
call psb_stringc2f(format,fformat)
res = -1
select case (psb_toupper(fformat))
-1
View File
@@ -2,7 +2,6 @@ module psb_c_comm_cbind_mod
use iso_c_binding
use psb_base_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
contains
-1
View File
@@ -2,7 +2,6 @@ module psb_c_psblas_cbind_mod
use iso_c_binding
use psb_base_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
contains
+3 -3
View File
@@ -444,8 +444,8 @@ contains
end subroutine psb_c_hbcast
function psb_c_f2c_errmsg(cmesg,len) bind(c) result(res)
use psb_base_mod, only : psb_errpop,psb_max_errmsg_len_, psb_ctxt_type
use psb_base_string_cbind_mod
use psb_base_mod, only : psb_errpop,psb_max_errmsg_len_, &
& psb_ctxt_type, psb_stringc2f
implicit none
character(c_char), intent(inout) :: cmesg(*)
integer(psb_c_ipk_), intent(in), value :: len
@@ -464,7 +464,7 @@ contains
il = len_trim(tmp)
il = min(il,len-ll)
!write(0,*) 'loop f2c_errmsg: ', ll,il
call stringf2c(tmp(1:il),cmesg(ll:ll+il))
call psb_stringf2c(tmp(1:il),cmesg(ll:ll+il))
cmesg(ll+il)=c_new_line
ll = ll+il+1
end do
-1
View File
@@ -2,7 +2,6 @@ module psb_d_comm_cbind_mod
use iso_c_binding
use psb_base_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
contains
-1
View File
@@ -2,7 +2,6 @@ module psb_d_psblas_cbind_mod
use iso_c_binding
use psb_base_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
contains
-1
View File
@@ -2,7 +2,6 @@ module psb_s_comm_cbind_mod
use iso_c_binding
use psb_base_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
contains
-1
View File
@@ -2,7 +2,6 @@ module psb_s_psblas_cbind_mod
use iso_c_binding
use psb_base_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
contains
-1
View File
@@ -2,7 +2,6 @@ module psb_z_comm_cbind_mod
use iso_c_binding
use psb_base_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
contains
-1
View File
@@ -2,7 +2,6 @@ module psb_z_psblas_cbind_mod
use iso_c_binding
use psb_base_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
contains
@@ -11,7 +11,6 @@ contains
use psb_linsolve_mod
use psb_objhandle_mod
use psb_prec_cbind_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_cspmat) :: ah
@@ -36,7 +35,6 @@ contains
use psb_linsolve_mod
use psb_objhandle_mod
use psb_prec_cbind_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_cspmat) :: ah
@@ -108,7 +106,6 @@ contains
use psb_linsolve_mod
use psb_objhandle_mod
use psb_prec_cbind_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_cspmat) :: ah
@@ -124,7 +121,6 @@ contains
end function psb_c_crichardson
function psb_c_crichardson_opt(ah,ph,bh,xh,eps,cdh,&
& itmax,iter,err,itrace,irst,istop) bind(c) result(res)
use psb_base_mod
@@ -132,7 +128,6 @@ contains
use psb_linsolve_mod
use psb_objhandle_mod
use psb_prec_cbind_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_cspmat) :: ah
@@ -11,7 +11,6 @@ contains
use psb_linsolve_mod
use psb_objhandle_mod
use psb_prec_cbind_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_dspmat) :: ah
@@ -36,7 +35,6 @@ contains
use psb_linsolve_mod
use psb_objhandle_mod
use psb_prec_cbind_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_dspmat) :: ah
@@ -108,7 +106,6 @@ contains
use psb_linsolve_mod
use psb_objhandle_mod
use psb_prec_cbind_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_dspmat) :: ah
@@ -124,7 +121,6 @@ contains
end function psb_c_drichardson
function psb_c_drichardson_opt(ah,ph,bh,xh,eps,cdh,&
& itmax,iter,err,itrace,irst,istop) bind(c) result(res)
use psb_base_mod
@@ -132,7 +128,6 @@ contains
use psb_linsolve_mod
use psb_objhandle_mod
use psb_prec_cbind_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_dspmat) :: ah
@@ -11,7 +11,6 @@ contains
use psb_linsolve_mod
use psb_objhandle_mod
use psb_prec_cbind_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_sspmat) :: ah
@@ -36,7 +35,6 @@ contains
use psb_linsolve_mod
use psb_objhandle_mod
use psb_prec_cbind_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_sspmat) :: ah
@@ -108,7 +106,6 @@ contains
use psb_linsolve_mod
use psb_objhandle_mod
use psb_prec_cbind_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_sspmat) :: ah
@@ -124,7 +121,6 @@ contains
end function psb_c_srichardson
function psb_c_srichardson_opt(ah,ph,bh,xh,eps,cdh,&
& itmax,iter,err,itrace,irst,istop) bind(c) result(res)
use psb_base_mod
@@ -132,7 +128,6 @@ contains
use psb_linsolve_mod
use psb_objhandle_mod
use psb_prec_cbind_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_sspmat) :: ah
@@ -11,7 +11,6 @@ contains
use psb_linsolve_mod
use psb_objhandle_mod
use psb_prec_cbind_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_zspmat) :: ah
@@ -36,7 +35,6 @@ contains
use psb_linsolve_mod
use psb_objhandle_mod
use psb_prec_cbind_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_zspmat) :: ah
@@ -108,7 +106,6 @@ contains
use psb_linsolve_mod
use psb_objhandle_mod
use psb_prec_cbind_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_zspmat) :: ah
@@ -124,7 +121,6 @@ contains
end function psb_c_zrichardson
function psb_c_zrichardson_opt(ah,ph,bh,xh,eps,cdh,&
& itmax,iter,err,itrace,irst,istop) bind(c) result(res)
use psb_base_mod
@@ -132,7 +128,6 @@ contains
use psb_linsolve_mod
use psb_objhandle_mod
use psb_prec_cbind_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_zspmat) :: ah
-4
View File
@@ -3,7 +3,6 @@ module psb_cprec_cbind_mod
use iso_c_binding
use psb_prec_mod, only : psb_cprec_type
use psb_objhandle_mod
use psb_base_string_cbind_mod
type, bind(c) :: psb_c_cprec
type(c_ptr) :: item = c_null_ptr
@@ -16,7 +15,6 @@ contains
use psb_base_mod
use psb_prec_mod
use psb_cpenv_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_object_type), value :: cctxt
@@ -53,7 +51,6 @@ contains
use psb_base_mod
use psb_prec_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
@@ -95,7 +92,6 @@ contains
use psb_base_mod
use psb_prec_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
-4
View File
@@ -3,7 +3,6 @@ module psb_dprec_cbind_mod
use iso_c_binding
use psb_prec_mod, only : psb_dprec_type
use psb_objhandle_mod
use psb_base_string_cbind_mod
type, bind(c) :: psb_c_dprec
type(c_ptr) :: item = c_null_ptr
@@ -16,7 +15,6 @@ contains
use psb_base_mod
use psb_prec_mod
use psb_cpenv_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_object_type), value :: cctxt
@@ -53,7 +51,6 @@ contains
use psb_base_mod
use psb_prec_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
@@ -95,7 +92,6 @@ contains
use psb_base_mod
use psb_prec_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
-4
View File
@@ -3,7 +3,6 @@ module psb_sprec_cbind_mod
use iso_c_binding
use psb_prec_mod, only : psb_sprec_type
use psb_objhandle_mod
use psb_base_string_cbind_mod
type, bind(c) :: psb_c_sprec
type(c_ptr) :: item = c_null_ptr
@@ -16,7 +15,6 @@ contains
use psb_base_mod
use psb_prec_mod
use psb_cpenv_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_object_type), value :: cctxt
@@ -53,7 +51,6 @@ contains
use psb_base_mod
use psb_prec_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
@@ -95,7 +92,6 @@ contains
use psb_base_mod
use psb_prec_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
-4
View File
@@ -3,7 +3,6 @@ module psb_zprec_cbind_mod
use iso_c_binding
use psb_prec_mod, only : psb_zprec_type
use psb_objhandle_mod
use psb_base_string_cbind_mod
type, bind(c) :: psb_c_zprec
type(c_ptr) :: item = c_null_ptr
@@ -16,7 +15,6 @@ contains
use psb_base_mod
use psb_prec_mod
use psb_cpenv_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
type(psb_c_object_type), value :: cctxt
@@ -53,7 +51,6 @@ contains
use psb_base_mod
use psb_prec_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
@@ -95,7 +92,6 @@ contains
use psb_base_mod
use psb_prec_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
-4
View File
@@ -4,14 +4,12 @@ module psb_cutil_cbind_mod
use psb_util_mod
use psb_base_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
contains
function psb_c_cmm_mat_write(ah,matrixtitle,filename) bind(c) result(res)
use psb_base_mod
use psb_util_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
@@ -44,7 +42,6 @@ contains
function psb_c_cglobal_mat_write(ah,cdh) bind(c) result(res)
use psb_base_mod
use psb_util_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
@@ -87,7 +84,6 @@ contains
function psb_c_cglobal_vec_write(vh,cdh) bind(c) result(res)
use psb_base_mod
use psb_util_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
-4
View File
@@ -4,14 +4,12 @@ module psb_dutil_cbind_mod
use psb_util_mod
use psb_base_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
contains
function psb_c_dmm_mat_write(ah,matrixtitle,filename) bind(c) result(res)
use psb_base_mod
use psb_util_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
@@ -44,7 +42,6 @@ contains
function psb_c_dglobal_mat_write(ah,cdh) bind(c) result(res)
use psb_base_mod
use psb_util_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
@@ -87,7 +84,6 @@ contains
function psb_c_dglobal_vec_write(vh,cdh) bind(c) result(res)
use psb_base_mod
use psb_util_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
-4
View File
@@ -4,14 +4,12 @@ module psb_sutil_cbind_mod
use psb_util_mod
use psb_base_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
contains
function psb_c_smm_mat_write(ah,matrixtitle,filename) bind(c) result(res)
use psb_base_mod
use psb_util_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
@@ -44,7 +42,6 @@ contains
function psb_c_sglobal_mat_write(ah,cdh) bind(c) result(res)
use psb_base_mod
use psb_util_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
@@ -87,7 +84,6 @@ contains
function psb_c_sglobal_vec_write(vh,cdh) bind(c) result(res)
use psb_base_mod
use psb_util_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
-4
View File
@@ -4,14 +4,12 @@ module psb_zutil_cbind_mod
use psb_util_mod
use psb_base_mod
use psb_objhandle_mod
use psb_base_string_cbind_mod
contains
function psb_c_zmm_mat_write(ah,matrixtitle,filename) bind(c) result(res)
use psb_base_mod
use psb_util_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
@@ -44,7 +42,6 @@ contains
function psb_c_zglobal_mat_write(ah,cdh) bind(c) result(res)
use psb_base_mod
use psb_util_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res
@@ -87,7 +84,6 @@ contains
function psb_c_zglobal_vec_write(vh,cdh) bind(c) result(res)
use psb_base_mod
use psb_util_mod
use psb_base_string_cbind_mod
implicit none
integer(psb_c_ipk_) :: res