From 48070b2cea224f04ffd4edde633a461d6df98e67 Mon Sep 17 00:00:00 2001 From: sfilippone Date: Thu, 15 Jan 2026 12:08:24 +0100 Subject: [PATCH] Further fixes for string_c2f --- cbind/base/psb_base_tools_cbind_mod.F90 | 3 +-- cbind/base/psb_c_comm_cbind_mod.f90 | 1 - cbind/base/psb_c_psblas_cbind_mod.f90 | 1 - cbind/base/psb_cpenv_mod.F90 | 6 +++--- cbind/base/psb_d_comm_cbind_mod.f90 | 1 - cbind/base/psb_d_psblas_cbind_mod.f90 | 1 - cbind/base/psb_s_comm_cbind_mod.f90 | 1 - cbind/base/psb_s_psblas_cbind_mod.f90 | 1 - cbind/base/psb_z_comm_cbind_mod.f90 | 1 - cbind/base/psb_z_psblas_cbind_mod.f90 | 1 - cbind/linsolve/psb_clinsolve_cbind_mod.f90 | 5 ----- cbind/linsolve/psb_dlinsolve_cbind_mod.f90 | 5 ----- cbind/linsolve/psb_slinsolve_cbind_mod.f90 | 5 ----- cbind/linsolve/psb_zlinsolve_cbind_mod.f90 | 5 ----- cbind/prec/psb_cprec_cbind_mod.f90 | 4 ---- cbind/prec/psb_dprec_cbind_mod.f90 | 4 ---- cbind/prec/psb_sprec_cbind_mod.f90 | 4 ---- cbind/prec/psb_zprec_cbind_mod.f90 | 4 ---- cbind/util/psb_c_util_cbind_mod.f90 | 4 ---- cbind/util/psb_d_util_cbind_mod.f90 | 4 ---- cbind/util/psb_s_util_cbind_mod.f90 | 4 ---- cbind/util/psb_z_util_cbind_mod.f90 | 4 ---- 22 files changed, 4 insertions(+), 65 deletions(-) diff --git a/cbind/base/psb_base_tools_cbind_mod.F90 b/cbind/base/psb_base_tools_cbind_mod.F90 index 70d4c742..8cb6b65c 100644 --- a/cbind/base/psb_base_tools_cbind_mod.F90 +++ b/cbind/base/psb_base_tools_cbind_mod.F90 @@ -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)) diff --git a/cbind/base/psb_c_comm_cbind_mod.f90 b/cbind/base/psb_c_comm_cbind_mod.f90 index 2e1d305b..9d5b9ef4 100644 --- a/cbind/base/psb_c_comm_cbind_mod.f90 +++ b/cbind/base/psb_c_comm_cbind_mod.f90 @@ -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 diff --git a/cbind/base/psb_c_psblas_cbind_mod.f90 b/cbind/base/psb_c_psblas_cbind_mod.f90 index aea9bad2..cad71657 100644 --- a/cbind/base/psb_c_psblas_cbind_mod.f90 +++ b/cbind/base/psb_c_psblas_cbind_mod.f90 @@ -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 diff --git a/cbind/base/psb_cpenv_mod.F90 b/cbind/base/psb_cpenv_mod.F90 index 394b8157..ccc59789 100644 --- a/cbind/base/psb_cpenv_mod.F90 +++ b/cbind/base/psb_cpenv_mod.F90 @@ -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 diff --git a/cbind/base/psb_d_comm_cbind_mod.f90 b/cbind/base/psb_d_comm_cbind_mod.f90 index 653a2484..49371e3a 100644 --- a/cbind/base/psb_d_comm_cbind_mod.f90 +++ b/cbind/base/psb_d_comm_cbind_mod.f90 @@ -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 diff --git a/cbind/base/psb_d_psblas_cbind_mod.f90 b/cbind/base/psb_d_psblas_cbind_mod.f90 index da5aa2e2..1a8874c5 100644 --- a/cbind/base/psb_d_psblas_cbind_mod.f90 +++ b/cbind/base/psb_d_psblas_cbind_mod.f90 @@ -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 diff --git a/cbind/base/psb_s_comm_cbind_mod.f90 b/cbind/base/psb_s_comm_cbind_mod.f90 index 8ad27124..c63d3ffb 100644 --- a/cbind/base/psb_s_comm_cbind_mod.f90 +++ b/cbind/base/psb_s_comm_cbind_mod.f90 @@ -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 diff --git a/cbind/base/psb_s_psblas_cbind_mod.f90 b/cbind/base/psb_s_psblas_cbind_mod.f90 index 97cc5284..eeabfdbc 100644 --- a/cbind/base/psb_s_psblas_cbind_mod.f90 +++ b/cbind/base/psb_s_psblas_cbind_mod.f90 @@ -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 diff --git a/cbind/base/psb_z_comm_cbind_mod.f90 b/cbind/base/psb_z_comm_cbind_mod.f90 index 44ee96c3..4e436951 100644 --- a/cbind/base/psb_z_comm_cbind_mod.f90 +++ b/cbind/base/psb_z_comm_cbind_mod.f90 @@ -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 diff --git a/cbind/base/psb_z_psblas_cbind_mod.f90 b/cbind/base/psb_z_psblas_cbind_mod.f90 index 0254860b..511b390f 100644 --- a/cbind/base/psb_z_psblas_cbind_mod.f90 +++ b/cbind/base/psb_z_psblas_cbind_mod.f90 @@ -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 diff --git a/cbind/linsolve/psb_clinsolve_cbind_mod.f90 b/cbind/linsolve/psb_clinsolve_cbind_mod.f90 index da75fa3c..1480f023 100644 --- a/cbind/linsolve/psb_clinsolve_cbind_mod.f90 +++ b/cbind/linsolve/psb_clinsolve_cbind_mod.f90 @@ -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 diff --git a/cbind/linsolve/psb_dlinsolve_cbind_mod.f90 b/cbind/linsolve/psb_dlinsolve_cbind_mod.f90 index 542a97e1..92cb02fa 100644 --- a/cbind/linsolve/psb_dlinsolve_cbind_mod.f90 +++ b/cbind/linsolve/psb_dlinsolve_cbind_mod.f90 @@ -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 diff --git a/cbind/linsolve/psb_slinsolve_cbind_mod.f90 b/cbind/linsolve/psb_slinsolve_cbind_mod.f90 index 2efa3afe..ed7c13e5 100644 --- a/cbind/linsolve/psb_slinsolve_cbind_mod.f90 +++ b/cbind/linsolve/psb_slinsolve_cbind_mod.f90 @@ -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 diff --git a/cbind/linsolve/psb_zlinsolve_cbind_mod.f90 b/cbind/linsolve/psb_zlinsolve_cbind_mod.f90 index fbf1be45..8a3312c1 100644 --- a/cbind/linsolve/psb_zlinsolve_cbind_mod.f90 +++ b/cbind/linsolve/psb_zlinsolve_cbind_mod.f90 @@ -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 diff --git a/cbind/prec/psb_cprec_cbind_mod.f90 b/cbind/prec/psb_cprec_cbind_mod.f90 index c7f1ec6f..6c950433 100644 --- a/cbind/prec/psb_cprec_cbind_mod.f90 +++ b/cbind/prec/psb_cprec_cbind_mod.f90 @@ -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 diff --git a/cbind/prec/psb_dprec_cbind_mod.f90 b/cbind/prec/psb_dprec_cbind_mod.f90 index 5e598a17..9aa1c7bc 100644 --- a/cbind/prec/psb_dprec_cbind_mod.f90 +++ b/cbind/prec/psb_dprec_cbind_mod.f90 @@ -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 diff --git a/cbind/prec/psb_sprec_cbind_mod.f90 b/cbind/prec/psb_sprec_cbind_mod.f90 index 6bdade31..dc404cd7 100644 --- a/cbind/prec/psb_sprec_cbind_mod.f90 +++ b/cbind/prec/psb_sprec_cbind_mod.f90 @@ -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 diff --git a/cbind/prec/psb_zprec_cbind_mod.f90 b/cbind/prec/psb_zprec_cbind_mod.f90 index 86b66ead..42a87a1a 100644 --- a/cbind/prec/psb_zprec_cbind_mod.f90 +++ b/cbind/prec/psb_zprec_cbind_mod.f90 @@ -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 diff --git a/cbind/util/psb_c_util_cbind_mod.f90 b/cbind/util/psb_c_util_cbind_mod.f90 index 1f8fc5be..712b9282 100644 --- a/cbind/util/psb_c_util_cbind_mod.f90 +++ b/cbind/util/psb_c_util_cbind_mod.f90 @@ -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 diff --git a/cbind/util/psb_d_util_cbind_mod.f90 b/cbind/util/psb_d_util_cbind_mod.f90 index 45eb8714..66b50b3c 100644 --- a/cbind/util/psb_d_util_cbind_mod.f90 +++ b/cbind/util/psb_d_util_cbind_mod.f90 @@ -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 diff --git a/cbind/util/psb_s_util_cbind_mod.f90 b/cbind/util/psb_s_util_cbind_mod.f90 index ab1fcabe..2fe32cb4 100644 --- a/cbind/util/psb_s_util_cbind_mod.f90 +++ b/cbind/util/psb_s_util_cbind_mod.f90 @@ -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 diff --git a/cbind/util/psb_z_util_cbind_mod.f90 b/cbind/util/psb_z_util_cbind_mod.f90 index 2f60e928..9d627d1e 100644 --- a/cbind/util/psb_z_util_cbind_mod.f90 +++ b/cbind/util/psb_z_util_cbind_mod.f90 @@ -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