From aee1aaa72e45bac04439f223000c31dbbc0b7924 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Tue, 29 Jan 2019 16:41:40 +0000 Subject: [PATCH] Minor fixed from templates. --- cbind/base/psb_c_psblas_cbind_mod.f90 | 30 +++------------------------ cbind/base/psb_d_psblas_cbind_mod.f90 | 30 +++------------------------ cbind/base/psb_d_serial_cbind_mod.F90 | 4 +--- cbind/base/psb_s_psblas_cbind_mod.f90 | 30 +++------------------------ cbind/base/psb_z_psblas_cbind_mod.f90 | 30 +++------------------------ 5 files changed, 13 insertions(+), 111 deletions(-) diff --git a/cbind/base/psb_c_psblas_cbind_mod.f90 b/cbind/base/psb_c_psblas_cbind_mod.f90 index ac984562..4ed677bb 100644 --- a/cbind/base/psb_c_psblas_cbind_mod.f90 +++ b/cbind/base/psb_c_psblas_cbind_mod.f90 @@ -1,12 +1,12 @@ 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 function psb_c_cgeaxpby(alpha,xh,beta,yh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none integer(psb_c_int) :: res @@ -44,9 +44,6 @@ contains end function psb_c_cgeaxpby function psb_c_cgenrm2(xh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none real(c_float_complex) :: res @@ -74,9 +71,6 @@ contains end function psb_c_cgenrm2 function psb_c_cgeamax(xh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none real(c_float_complex) :: res @@ -103,9 +97,6 @@ contains end function psb_c_cgeamax function psb_c_cgeasum(xh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none real(c_float_complex) :: res @@ -134,9 +125,6 @@ contains function psb_c_cspnrmi(ah,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none real(c_float_complex) :: res @@ -163,9 +151,6 @@ contains end function psb_c_cspnrmi function psb_c_cgedot(xh,yh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none complex(c_float_complex) :: res @@ -197,9 +182,6 @@ contains function psb_c_cspmm(alpha,ah,xh,beta,yh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none integer(psb_c_int) :: res @@ -242,9 +224,6 @@ contains function psb_c_cspmm_opt(alpha,ah,xh,beta,yh,cdh,trans,doswap) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none integer(psb_c_int) :: res @@ -294,9 +273,6 @@ contains function psb_c_cspsm(alpha,ah,xh,beta,yh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none integer(psb_c_int) :: res diff --git a/cbind/base/psb_d_psblas_cbind_mod.f90 b/cbind/base/psb_d_psblas_cbind_mod.f90 index 76bdfb18..73f2f88e 100644 --- a/cbind/base/psb_d_psblas_cbind_mod.f90 +++ b/cbind/base/psb_d_psblas_cbind_mod.f90 @@ -1,12 +1,12 @@ 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 function psb_c_dgeaxpby(alpha,xh,beta,yh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none integer(psb_c_int) :: res @@ -44,9 +44,6 @@ contains end function psb_c_dgeaxpby function psb_c_dgenrm2(xh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none real(c_double) :: res @@ -74,9 +71,6 @@ contains end function psb_c_dgenrm2 function psb_c_dgeamax(xh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none real(c_double) :: res @@ -103,9 +97,6 @@ contains end function psb_c_dgeamax function psb_c_dgeasum(xh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none real(c_double) :: res @@ -134,9 +125,6 @@ contains function psb_c_dspnrmi(ah,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none real(c_double) :: res @@ -163,9 +151,6 @@ contains end function psb_c_dspnrmi function psb_c_dgedot(xh,yh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none real(c_double) :: res @@ -197,9 +182,6 @@ contains function psb_c_dspmm(alpha,ah,xh,beta,yh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none integer(psb_c_int) :: res @@ -242,9 +224,6 @@ contains function psb_c_dspmm_opt(alpha,ah,xh,beta,yh,cdh,trans,doswap) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none integer(psb_c_int) :: res @@ -294,9 +273,6 @@ contains function psb_c_dspsm(alpha,ah,xh,beta,yh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none integer(psb_c_int) :: res diff --git a/cbind/base/psb_d_serial_cbind_mod.F90 b/cbind/base/psb_d_serial_cbind_mod.F90 index 48314205..4f0a6bce 100644 --- a/cbind/base/psb_d_serial_cbind_mod.F90 +++ b/cbind/base/psb_d_serial_cbind_mod.F90 @@ -39,13 +39,11 @@ contains res = -1 - if (c_associated(xh%item)) then - res = 0 + if (c_associated(xh%item)) then call c_f_pointer(xh%item,vp) fv = vp%get_vect() sz = size(fv) v(1:sz) = fv(1:sz) - write(0,*) 'In dvect_f_get_cpy:',v(1),fv(1) end if end function psb_c_dvect_f_get_cpy diff --git a/cbind/base/psb_s_psblas_cbind_mod.f90 b/cbind/base/psb_s_psblas_cbind_mod.f90 index ea964ea7..0286fc12 100644 --- a/cbind/base/psb_s_psblas_cbind_mod.f90 +++ b/cbind/base/psb_s_psblas_cbind_mod.f90 @@ -1,12 +1,12 @@ 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 function psb_c_sgeaxpby(alpha,xh,beta,yh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none integer(psb_c_int) :: res @@ -44,9 +44,6 @@ contains end function psb_c_sgeaxpby function psb_c_sgenrm2(xh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none real(c_float) :: res @@ -74,9 +71,6 @@ contains end function psb_c_sgenrm2 function psb_c_sgeamax(xh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none real(c_float) :: res @@ -103,9 +97,6 @@ contains end function psb_c_sgeamax function psb_c_sgeasum(xh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none real(c_float) :: res @@ -134,9 +125,6 @@ contains function psb_c_sspnrmi(ah,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none real(c_float) :: res @@ -163,9 +151,6 @@ contains end function psb_c_sspnrmi function psb_c_sgedot(xh,yh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none real(c_float) :: res @@ -197,9 +182,6 @@ contains function psb_c_sspmm(alpha,ah,xh,beta,yh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none integer(psb_c_int) :: res @@ -242,9 +224,6 @@ contains function psb_c_sspmm_opt(alpha,ah,xh,beta,yh,cdh,trans,doswap) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none integer(psb_c_int) :: res @@ -294,9 +273,6 @@ contains function psb_c_sspsm(alpha,ah,xh,beta,yh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none integer(psb_c_int) :: res diff --git a/cbind/base/psb_z_psblas_cbind_mod.f90 b/cbind/base/psb_z_psblas_cbind_mod.f90 index 0a3cad53..34484d16 100644 --- a/cbind/base/psb_z_psblas_cbind_mod.f90 +++ b/cbind/base/psb_z_psblas_cbind_mod.f90 @@ -1,12 +1,12 @@ 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 function psb_c_zgeaxpby(alpha,xh,beta,yh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none integer(psb_c_int) :: res @@ -44,9 +44,6 @@ contains end function psb_c_zgeaxpby function psb_c_zgenrm2(xh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none real(c_double_complex) :: res @@ -74,9 +71,6 @@ contains end function psb_c_zgenrm2 function psb_c_zgeamax(xh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none real(c_double_complex) :: res @@ -103,9 +97,6 @@ contains end function psb_c_zgeamax function psb_c_zgeasum(xh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none real(c_double_complex) :: res @@ -134,9 +125,6 @@ contains function psb_c_zspnrmi(ah,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none real(c_double_complex) :: res @@ -163,9 +151,6 @@ contains end function psb_c_zspnrmi function psb_c_zgedot(xh,yh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none complex(c_double_complex) :: res @@ -197,9 +182,6 @@ contains function psb_c_zspmm(alpha,ah,xh,beta,yh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none integer(psb_c_int) :: res @@ -242,9 +224,6 @@ contains function psb_c_zspmm_opt(alpha,ah,xh,beta,yh,cdh,trans,doswap) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none integer(psb_c_int) :: res @@ -294,9 +273,6 @@ contains function psb_c_zspsm(alpha,ah,xh,beta,yh,cdh) bind(c) result(res) - use psb_base_mod - use psb_objhandle_mod - use psb_base_string_cbind_mod implicit none integer(psb_c_int) :: res