From a2b414f17fcffa977ebe54974cb0ccf42f2bd6f2 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 15 Jul 2010 14:43:03 +0000 Subject: [PATCH] psblas3: base/modules/psb_c_mat_mod.f03 base/modules/psb_d_mat_mod.f03 base/modules/psb_s_mat_mod.f03 base/modules/psb_z_mat_mod.f03 configure.ac configure Cosmetic fixes for X_mat_mod. Configure: fix action on PAC_HAVE_GFORTRAN --- base/modules/psb_c_mat_mod.f03 | 104 ++++++++++++++++----------------- base/modules/psb_d_mat_mod.f03 | 104 ++++++++++++++++----------------- base/modules/psb_s_mat_mod.f03 | 104 ++++++++++++++++----------------- base/modules/psb_z_mat_mod.f03 | 104 ++++++++++++++++----------------- configure | 3 - configure.ac | 3 +- 6 files changed, 209 insertions(+), 213 deletions(-) diff --git a/base/modules/psb_c_mat_mod.f03 b/base/modules/psb_c_mat_mod.f03 index 68aa7caf..fa1bc990 100644 --- a/base/modules/psb_c_mat_mod.f03 +++ b/base/modules/psb_c_mat_mod.f03 @@ -10,24 +10,24 @@ module psb_c_mat_mod contains ! Getters - procedure, pass(a) :: get_nrows => psb_c_get_nrows - procedure, pass(a) :: get_ncols => psb_c_get_ncols - procedure, pass(a) :: get_nzeros => psb_c_get_nzeros - procedure, pass(a) :: get_nz_row => psb_c_get_nz_row - procedure, pass(a) :: get_size => psb_c_get_size - procedure, pass(a) :: get_state => psb_c_get_state - procedure, pass(a) :: get_dupl => psb_c_get_dupl - procedure, pass(a) :: is_null => psb_c_is_null - procedure, pass(a) :: is_bld => psb_c_is_bld - procedure, pass(a) :: is_upd => psb_c_is_upd - procedure, pass(a) :: is_asb => psb_c_is_asb - procedure, pass(a) :: is_sorted => psb_c_is_sorted - procedure, pass(a) :: is_upper => psb_c_is_upper - procedure, pass(a) :: is_lower => psb_c_is_lower + procedure, pass(a) :: get_nrows => psb_c_get_nrows + procedure, pass(a) :: get_ncols => psb_c_get_ncols + procedure, pass(a) :: get_nzeros => psb_c_get_nzeros + procedure, pass(a) :: get_nz_row => psb_c_get_nz_row + procedure, pass(a) :: get_size => psb_c_get_size + procedure, pass(a) :: get_state => psb_c_get_state + procedure, pass(a) :: get_dupl => psb_c_get_dupl + procedure, pass(a) :: is_null => psb_c_is_null + procedure, pass(a) :: is_bld => psb_c_is_bld + procedure, pass(a) :: is_upd => psb_c_is_upd + procedure, pass(a) :: is_asb => psb_c_is_asb + procedure, pass(a) :: is_sorted => psb_c_is_sorted + procedure, pass(a) :: is_upper => psb_c_is_upper + procedure, pass(a) :: is_lower => psb_c_is_lower procedure, pass(a) :: is_triangle => psb_c_is_triangle - procedure, pass(a) :: is_unit => psb_c_is_unit - procedure, pass(a) :: get_fmt => psb_c_get_fmt - procedure, pass(a) :: sizeof => psb_c_sizeof + procedure, pass(a) :: is_unit => psb_c_is_unit + procedure, pass(a) :: get_fmt => psb_c_get_fmt + procedure, pass(a) :: sizeof => psb_c_sizeof ! Setters procedure, pass(a) :: set_nrows => psb_c_set_nrows @@ -45,42 +45,42 @@ module psb_c_mat_mod procedure, pass(a) :: set_unit => psb_c_set_unit ! Memory/data management - procedure, pass(a) :: csall => psb_c_csall - procedure, pass(a) :: free => psb_c_free - procedure, pass(a) :: trim => psb_c_trim - procedure, pass(a) :: csput => psb_c_csput - procedure, pass(a) :: c_csgetptn => psb_c_csgetptn - procedure, pass(a) :: c_csgetrow => psb_c_csgetrow - procedure, pass(a) :: c_csgetblk => psb_c_csgetblk - generic, public :: csget => c_csgetptn, c_csgetrow, c_csgetblk - procedure, pass(a) :: c_csclip => psb_c_csclip - procedure, pass(a) :: c_b_csclip => psb_c_b_csclip - generic, public :: csclip => c_b_csclip, c_csclip - procedure, pass(a) :: c_clip_d_ip => psb_c_clip_d_ip - procedure, pass(a) :: c_clip_d => psb_c_clip_d - generic, public :: clip_diag => c_clip_d_ip, c_clip_d - procedure, pass(a) :: reall => psb_c_reallocate_nz - procedure, pass(a) :: get_neigh => psb_c_get_neigh - procedure, pass(a) :: c_cscnv => psb_c_cscnv - procedure, pass(a) :: c_cscnv_ip => psb_c_cscnv_ip - procedure, pass(a) :: c_cscnv_base => psb_c_cscnv_base - generic, public :: cscnv => c_cscnv, c_cscnv_ip, c_cscnv_base - procedure, pass(a) :: reinit => psb_c_reinit - procedure, pass(a) :: print => psb_c_sparse_print - procedure, pass(a) :: c_mv_from => psb_c_mv_from - generic, public :: mv_from => c_mv_from - procedure, pass(a) :: c_mv_to => psb_c_mv_to - generic, public :: mv_to => c_mv_to - procedure, pass(a) :: c_cp_from => psb_c_cp_from - generic, public :: cp_from => c_cp_from - procedure, pass(a) :: c_cp_to => psb_c_cp_to - generic, public :: cp_to => c_cp_to + procedure, pass(a) :: csall => psb_c_csall + procedure, pass(a) :: free => psb_c_free + procedure, pass(a) :: trim => psb_c_trim + procedure, pass(a) :: csput => psb_c_csput + procedure, pass(a) :: c_csgetptn => psb_c_csgetptn + procedure, pass(a) :: c_csgetrow => psb_c_csgetrow + procedure, pass(a) :: c_csgetblk => psb_c_csgetblk + generic, public :: csget => c_csgetptn, c_csgetrow, c_csgetblk + procedure, pass(a) :: c_csclip => psb_c_csclip + procedure, pass(a) :: c_b_csclip => psb_c_b_csclip + generic, public :: csclip => c_b_csclip, c_csclip + procedure, pass(a) :: c_clip_d_ip => psb_c_clip_d_ip + procedure, pass(a) :: c_clip_d => psb_c_clip_d + generic, public :: clip_diag => c_clip_d_ip, c_clip_d + procedure, pass(a) :: reall => psb_c_reallocate_nz + procedure, pass(a) :: get_neigh => psb_c_get_neigh + procedure, pass(a) :: c_cscnv => psb_c_cscnv + procedure, pass(a) :: c_cscnv_ip => psb_c_cscnv_ip + procedure, pass(a) :: c_cscnv_base => psb_c_cscnv_base + generic, public :: cscnv => c_cscnv, c_cscnv_ip, c_cscnv_base + procedure, pass(a) :: reinit => psb_c_reinit + procedure, pass(a) :: print => psb_c_sparse_print + procedure, pass(a) :: c_mv_from => psb_c_mv_from + generic, public :: mv_from => c_mv_from + procedure, pass(a) :: c_mv_to => psb_c_mv_to + generic, public :: mv_to => c_mv_to + procedure, pass(a) :: c_cp_from => psb_c_cp_from + generic, public :: cp_from => c_cp_from + procedure, pass(a) :: c_cp_to => psb_c_cp_to + generic, public :: cp_to => c_cp_to procedure, pass(a) :: c_transp_1mat => psb_c_transp_1mat procedure, pass(a) :: c_transp_2mat => psb_c_transp_2mat - generic, public :: transp => c_transp_1mat, c_transp_2mat + generic, public :: transp => c_transp_1mat, c_transp_2mat procedure, pass(a) :: c_transc_1mat => psb_c_transc_1mat procedure, pass(a) :: c_transc_2mat => psb_c_transc_2mat - generic, public :: transc => c_transc_1mat, c_transc_2mat + generic, public :: transc => c_transc_1mat, c_transc_2mat @@ -89,13 +89,13 @@ module psb_c_mat_mod procedure, pass(a) :: csnmi => psb_c_csnmi procedure, pass(a) :: c_csmv => psb_c_csmv procedure, pass(a) :: c_csmm => psb_c_csmm - generic, public :: csmm => c_csmm, c_csmv + generic, public :: csmm => c_csmm, c_csmv procedure, pass(a) :: c_scals => psb_c_scals procedure, pass(a) :: c_scal => psb_c_scal - generic, public :: scal => c_scals, c_scal + generic, public :: scal => c_scals, c_scal procedure, pass(a) :: c_cssv => psb_c_cssv procedure, pass(a) :: c_cssm => psb_c_cssm - generic, public :: cssm => c_cssm, c_cssv + generic, public :: cssm => c_cssm, c_cssv end type psb_c_sparse_mat diff --git a/base/modules/psb_d_mat_mod.f03 b/base/modules/psb_d_mat_mod.f03 index b13d50dd..fb070eb0 100644 --- a/base/modules/psb_d_mat_mod.f03 +++ b/base/modules/psb_d_mat_mod.f03 @@ -10,24 +10,24 @@ module psb_d_mat_mod contains ! Getters - procedure, pass(a) :: get_nrows => psb_d_get_nrows - procedure, pass(a) :: get_ncols => psb_d_get_ncols - procedure, pass(a) :: get_nzeros => psb_d_get_nzeros - procedure, pass(a) :: get_nz_row => psb_d_get_nz_row - procedure, pass(a) :: get_size => psb_d_get_size - procedure, pass(a) :: get_state => psb_d_get_state - procedure, pass(a) :: get_dupl => psb_d_get_dupl - procedure, pass(a) :: is_null => psb_d_is_null - procedure, pass(a) :: is_bld => psb_d_is_bld - procedure, pass(a) :: is_upd => psb_d_is_upd - procedure, pass(a) :: is_asb => psb_d_is_asb - procedure, pass(a) :: is_sorted => psb_d_is_sorted - procedure, pass(a) :: is_upper => psb_d_is_upper - procedure, pass(a) :: is_lower => psb_d_is_lower + procedure, pass(a) :: get_nrows => psb_d_get_nrows + procedure, pass(a) :: get_ncols => psb_d_get_ncols + procedure, pass(a) :: get_nzeros => psb_d_get_nzeros + procedure, pass(a) :: get_nz_row => psb_d_get_nz_row + procedure, pass(a) :: get_size => psb_d_get_size + procedure, pass(a) :: get_state => psb_d_get_state + procedure, pass(a) :: get_dupl => psb_d_get_dupl + procedure, pass(a) :: is_null => psb_d_is_null + procedure, pass(a) :: is_bld => psb_d_is_bld + procedure, pass(a) :: is_upd => psb_d_is_upd + procedure, pass(a) :: is_asb => psb_d_is_asb + procedure, pass(a) :: is_sorted => psb_d_is_sorted + procedure, pass(a) :: is_upper => psb_d_is_upper + procedure, pass(a) :: is_lower => psb_d_is_lower procedure, pass(a) :: is_triangle => psb_d_is_triangle - procedure, pass(a) :: is_unit => psb_d_is_unit - procedure, pass(a) :: get_fmt => psb_d_get_fmt - procedure, pass(a) :: sizeof => psb_d_sizeof + procedure, pass(a) :: is_unit => psb_d_is_unit + procedure, pass(a) :: get_fmt => psb_d_get_fmt + procedure, pass(a) :: sizeof => psb_d_sizeof ! Setters procedure, pass(a) :: set_nrows => psb_d_set_nrows @@ -45,42 +45,42 @@ module psb_d_mat_mod procedure, pass(a) :: set_unit => psb_d_set_unit ! Memory/data management - procedure, pass(a) :: csall => psb_d_csall - procedure, pass(a) :: free => psb_d_free - procedure, pass(a) :: trim => psb_d_trim - procedure, pass(a) :: csput => psb_d_csput - procedure, pass(a) :: d_csgetptn => psb_d_csgetptn - procedure, pass(a) :: d_csgetrow => psb_d_csgetrow - procedure, pass(a) :: d_csgetblk => psb_d_csgetblk - generic, public :: csget => d_csgetptn, d_csgetrow, d_csgetblk - procedure, pass(a) :: d_csclip => psb_d_csclip - procedure, pass(a) :: d_b_csclip => psb_d_b_csclip - generic, public :: csclip => d_b_csclip, d_csclip - procedure, pass(a) :: d_clip_d_ip => psb_d_clip_d_ip - procedure, pass(a) :: d_clip_d => psb_d_clip_d - generic, public :: clip_diag => d_clip_d_ip, d_clip_d - procedure, pass(a) :: reall => psb_d_reallocate_nz - procedure, pass(a) :: get_neigh => psb_d_get_neigh - procedure, pass(a) :: d_cscnv => psb_d_cscnv - procedure, pass(a) :: d_cscnv_ip => psb_d_cscnv_ip - procedure, pass(a) :: d_cscnv_base => psb_d_cscnv_base - generic, public :: cscnv => d_cscnv, d_cscnv_ip, d_cscnv_base - procedure, pass(a) :: reinit => psb_d_reinit - procedure, pass(a) :: print => psb_d_sparse_print - procedure, pass(a) :: d_mv_from => psb_d_mv_from - generic, public :: mv_from => d_mv_from - procedure, pass(a) :: d_mv_to => psb_d_mv_to - generic, public :: mv_to => d_mv_to - procedure, pass(a) :: d_cp_from => psb_d_cp_from - generic, public :: cp_from => d_cp_from - procedure, pass(a) :: d_cp_to => psb_d_cp_to - generic, public :: cp_to => d_cp_to + procedure, pass(a) :: csall => psb_d_csall + procedure, pass(a) :: free => psb_d_free + procedure, pass(a) :: trim => psb_d_trim + procedure, pass(a) :: csput => psb_d_csput + procedure, pass(a) :: d_csgetptn => psb_d_csgetptn + procedure, pass(a) :: d_csgetrow => psb_d_csgetrow + procedure, pass(a) :: d_csgetblk => psb_d_csgetblk + generic, public :: csget => d_csgetptn, d_csgetrow, d_csgetblk + procedure, pass(a) :: d_csclip => psb_d_csclip + procedure, pass(a) :: d_b_csclip => psb_d_b_csclip + generic, public :: csclip => d_b_csclip, d_csclip + procedure, pass(a) :: d_clip_d_ip => psb_d_clip_d_ip + procedure, pass(a) :: d_clip_d => psb_d_clip_d + generic, public :: clip_diag => d_clip_d_ip, d_clip_d + procedure, pass(a) :: reall => psb_d_reallocate_nz + procedure, pass(a) :: get_neigh => psb_d_get_neigh + procedure, pass(a) :: d_cscnv => psb_d_cscnv + procedure, pass(a) :: d_cscnv_ip => psb_d_cscnv_ip + procedure, pass(a) :: d_cscnv_base => psb_d_cscnv_base + generic, public :: cscnv => d_cscnv, d_cscnv_ip, d_cscnv_base + procedure, pass(a) :: reinit => psb_d_reinit + procedure, pass(a) :: print => psb_d_sparse_print + procedure, pass(a) :: d_mv_from => psb_d_mv_from + generic, public :: mv_from => d_mv_from + procedure, pass(a) :: d_mv_to => psb_d_mv_to + generic, public :: mv_to => d_mv_to + procedure, pass(a) :: d_cp_from => psb_d_cp_from + generic, public :: cp_from => d_cp_from + procedure, pass(a) :: d_cp_to => psb_d_cp_to + generic, public :: cp_to => d_cp_to procedure, pass(a) :: d_transp_1mat => psb_d_transp_1mat procedure, pass(a) :: d_transp_2mat => psb_d_transp_2mat - generic, public :: transp => d_transp_1mat, d_transp_2mat + generic, public :: transp => d_transp_1mat, d_transp_2mat procedure, pass(a) :: d_transc_1mat => psb_d_transc_1mat procedure, pass(a) :: d_transc_2mat => psb_d_transc_2mat - generic, public :: transc => d_transc_1mat, d_transc_2mat + generic, public :: transc => d_transc_1mat, d_transc_2mat @@ -94,13 +94,13 @@ module psb_d_mat_mod procedure, pass(a) :: aclsum => psb_d_aclsum procedure, pass(a) :: d_csmv => psb_d_csmv procedure, pass(a) :: d_csmm => psb_d_csmm - generic, public :: csmm => d_csmm, d_csmv + generic, public :: csmm => d_csmm, d_csmv procedure, pass(a) :: d_scals => psb_d_scals procedure, pass(a) :: d_scal => psb_d_scal - generic, public :: scal => d_scals, d_scal + generic, public :: scal => d_scals, d_scal procedure, pass(a) :: d_cssv => psb_d_cssv procedure, pass(a) :: d_cssm => psb_d_cssm - generic, public :: cssm => d_cssm, d_cssv + generic, public :: cssm => d_cssm, d_cssv end type psb_d_sparse_mat diff --git a/base/modules/psb_s_mat_mod.f03 b/base/modules/psb_s_mat_mod.f03 index 324b5012..4d55dde1 100644 --- a/base/modules/psb_s_mat_mod.f03 +++ b/base/modules/psb_s_mat_mod.f03 @@ -10,24 +10,24 @@ module psb_s_mat_mod contains ! Getters - procedure, pass(a) :: get_nrows => psb_s_get_nrows - procedure, pass(a) :: get_ncols => psb_s_get_ncols - procedure, pass(a) :: get_nzeros => psb_s_get_nzeros - procedure, pass(a) :: get_nz_row => psb_s_get_nz_row - procedure, pass(a) :: get_size => psb_s_get_size - procedure, pass(a) :: get_state => psb_s_get_state - procedure, pass(a) :: get_dupl => psb_s_get_dupl - procedure, pass(a) :: is_null => psb_s_is_null - procedure, pass(a) :: is_bld => psb_s_is_bld - procedure, pass(a) :: is_upd => psb_s_is_upd - procedure, pass(a) :: is_asb => psb_s_is_asb - procedure, pass(a) :: is_sorted => psb_s_is_sorted - procedure, pass(a) :: is_upper => psb_s_is_upper - procedure, pass(a) :: is_lower => psb_s_is_lower + procedure, pass(a) :: get_nrows => psb_s_get_nrows + procedure, pass(a) :: get_ncols => psb_s_get_ncols + procedure, pass(a) :: get_nzeros => psb_s_get_nzeros + procedure, pass(a) :: get_nz_row => psb_s_get_nz_row + procedure, pass(a) :: get_size => psb_s_get_size + procedure, pass(a) :: get_state => psb_s_get_state + procedure, pass(a) :: get_dupl => psb_s_get_dupl + procedure, pass(a) :: is_null => psb_s_is_null + procedure, pass(a) :: is_bld => psb_s_is_bld + procedure, pass(a) :: is_upd => psb_s_is_upd + procedure, pass(a) :: is_asb => psb_s_is_asb + procedure, pass(a) :: is_sorted => psb_s_is_sorted + procedure, pass(a) :: is_upper => psb_s_is_upper + procedure, pass(a) :: is_lower => psb_s_is_lower procedure, pass(a) :: is_triangle => psb_s_is_triangle - procedure, pass(a) :: is_unit => psb_s_is_unit - procedure, pass(a) :: get_fmt => psb_s_get_fmt - procedure, pass(a) :: sizeof => psb_s_sizeof + procedure, pass(a) :: is_unit => psb_s_is_unit + procedure, pass(a) :: get_fmt => psb_s_get_fmt + procedure, pass(a) :: sizeof => psb_s_sizeof ! Setters procedure, pass(a) :: set_nrows => psb_s_set_nrows @@ -45,42 +45,42 @@ module psb_s_mat_mod procedure, pass(a) :: set_unit => psb_s_set_unit ! Memory/data management - procedure, pass(a) :: csall => psb_s_csall - procedure, pass(a) :: free => psb_s_free - procedure, pass(a) :: trim => psb_s_trim - procedure, pass(a) :: csput => psb_s_csput - procedure, pass(a) :: s_csgetptn => psb_s_csgetptn - procedure, pass(a) :: s_csgetrow => psb_s_csgetrow - procedure, pass(a) :: s_csgetblk => psb_s_csgetblk - generic, public :: csget => s_csgetptn, s_csgetrow, s_csgetblk - procedure, pass(a) :: s_csclip => psb_s_csclip - procedure, pass(a) :: s_b_csclip => psb_s_b_csclip - generic, public :: csclip => s_b_csclip, s_csclip - procedure, pass(a) :: s_clip_d_ip => psb_s_clip_d_ip - procedure, pass(a) :: s_clip_d => psb_s_clip_d - generic, public :: clip_diag => s_clip_d_ip, s_clip_d - procedure, pass(a) :: reall => psb_s_reallocate_nz - procedure, pass(a) :: get_neigh => psb_s_get_neigh - procedure, pass(a) :: s_cscnv => psb_s_cscnv - procedure, pass(a) :: s_cscnv_ip => psb_s_cscnv_ip - procedure, pass(a) :: s_cscnv_base => psb_s_cscnv_base - generic, public :: cscnv => s_cscnv, s_cscnv_ip, s_cscnv_base - procedure, pass(a) :: reinit => psb_s_reinit - procedure, pass(a) :: print => psb_s_sparse_print - procedure, pass(a) :: s_mv_from => psb_s_mv_from - generic, public :: mv_from => s_mv_from - procedure, pass(a) :: s_mv_to => psb_s_mv_to - generic, public :: mv_to => s_mv_to - procedure, pass(a) :: s_cp_from => psb_s_cp_from - generic, public :: cp_from => s_cp_from - procedure, pass(a) :: s_cp_to => psb_s_cp_to - generic, public :: cp_to => s_cp_to + procedure, pass(a) :: csall => psb_s_csall + procedure, pass(a) :: free => psb_s_free + procedure, pass(a) :: trim => psb_s_trim + procedure, pass(a) :: csput => psb_s_csput + procedure, pass(a) :: s_csgetptn => psb_s_csgetptn + procedure, pass(a) :: s_csgetrow => psb_s_csgetrow + procedure, pass(a) :: s_csgetblk => psb_s_csgetblk + generic, public :: csget => s_csgetptn, s_csgetrow, s_csgetblk + procedure, pass(a) :: s_csclip => psb_s_csclip + procedure, pass(a) :: s_b_csclip => psb_s_b_csclip + generic, public :: csclip => s_b_csclip, s_csclip + procedure, pass(a) :: s_clip_d_ip => psb_s_clip_d_ip + procedure, pass(a) :: s_clip_d => psb_s_clip_d + generic, public :: clip_diag => s_clip_d_ip, s_clip_d + procedure, pass(a) :: reall => psb_s_reallocate_nz + procedure, pass(a) :: get_neigh => psb_s_get_neigh + procedure, pass(a) :: s_cscnv => psb_s_cscnv + procedure, pass(a) :: s_cscnv_ip => psb_s_cscnv_ip + procedure, pass(a) :: s_cscnv_base => psb_s_cscnv_base + generic, public :: cscnv => s_cscnv, s_cscnv_ip, s_cscnv_base + procedure, pass(a) :: reinit => psb_s_reinit + procedure, pass(a) :: print => psb_s_sparse_print + procedure, pass(a) :: s_mv_from => psb_s_mv_from + generic, public :: mv_from => s_mv_from + procedure, pass(a) :: s_mv_to => psb_s_mv_to + generic, public :: mv_to => s_mv_to + procedure, pass(a) :: s_cp_from => psb_s_cp_from + generic, public :: cp_from => s_cp_from + procedure, pass(a) :: s_cp_to => psb_s_cp_to + generic, public :: cp_to => s_cp_to procedure, pass(a) :: s_transp_1mat => psb_s_transp_1mat procedure, pass(a) :: s_transp_2mat => psb_s_transp_2mat - generic, public :: transp => s_transp_1mat, s_transp_2mat + generic, public :: transp => s_transp_1mat, s_transp_2mat procedure, pass(a) :: s_transc_1mat => psb_s_transc_1mat procedure, pass(a) :: s_transc_2mat => psb_s_transc_2mat - generic, public :: transc => s_transc_1mat, s_transc_2mat + generic, public :: transc => s_transc_1mat, s_transc_2mat @@ -89,13 +89,13 @@ module psb_s_mat_mod procedure, pass(a) :: csnmi => psb_s_csnmi procedure, pass(a) :: s_csmv => psb_s_csmv procedure, pass(a) :: s_csmm => psb_s_csmm - generic, public :: csmm => s_csmm, s_csmv + generic, public :: csmm => s_csmm, s_csmv procedure, pass(a) :: s_scals => psb_s_scals procedure, pass(a) :: s_scal => psb_s_scal - generic, public :: scal => s_scals, s_scal + generic, public :: scal => s_scals, s_scal procedure, pass(a) :: s_cssv => psb_s_cssv procedure, pass(a) :: s_cssm => psb_s_cssm - generic, public :: cssm => s_cssm, s_cssv + generic, public :: cssm => s_cssm, s_cssv end type psb_s_sparse_mat diff --git a/base/modules/psb_z_mat_mod.f03 b/base/modules/psb_z_mat_mod.f03 index 1963a857..cb8ff928 100644 --- a/base/modules/psb_z_mat_mod.f03 +++ b/base/modules/psb_z_mat_mod.f03 @@ -10,24 +10,24 @@ module psb_z_mat_mod contains ! Getters - procedure, pass(a) :: get_nrows => psb_z_get_nrows - procedure, pass(a) :: get_ncols => psb_z_get_ncols - procedure, pass(a) :: get_nzeros => psb_z_get_nzeros - procedure, pass(a) :: get_nz_row => psb_z_get_nz_row - procedure, pass(a) :: get_size => psb_z_get_size - procedure, pass(a) :: get_state => psb_z_get_state - procedure, pass(a) :: get_dupl => psb_z_get_dupl - procedure, pass(a) :: is_null => psb_z_is_null - procedure, pass(a) :: is_bld => psb_z_is_bld - procedure, pass(a) :: is_upd => psb_z_is_upd - procedure, pass(a) :: is_asb => psb_z_is_asb - procedure, pass(a) :: is_sorted => psb_z_is_sorted - procedure, pass(a) :: is_upper => psb_z_is_upper - procedure, pass(a) :: is_lower => psb_z_is_lower + procedure, pass(a) :: get_nrows => psb_z_get_nrows + procedure, pass(a) :: get_ncols => psb_z_get_ncols + procedure, pass(a) :: get_nzeros => psb_z_get_nzeros + procedure, pass(a) :: get_nz_row => psb_z_get_nz_row + procedure, pass(a) :: get_size => psb_z_get_size + procedure, pass(a) :: get_state => psb_z_get_state + procedure, pass(a) :: get_dupl => psb_z_get_dupl + procedure, pass(a) :: is_null => psb_z_is_null + procedure, pass(a) :: is_bld => psb_z_is_bld + procedure, pass(a) :: is_upd => psb_z_is_upd + procedure, pass(a) :: is_asb => psb_z_is_asb + procedure, pass(a) :: is_sorted => psb_z_is_sorted + procedure, pass(a) :: is_upper => psb_z_is_upper + procedure, pass(a) :: is_lower => psb_z_is_lower procedure, pass(a) :: is_triangle => psb_z_is_triangle - procedure, pass(a) :: is_unit => psb_z_is_unit - procedure, pass(a) :: get_fmt => psb_z_get_fmt - procedure, pass(a) :: sizeof => psb_z_sizeof + procedure, pass(a) :: is_unit => psb_z_is_unit + procedure, pass(a) :: get_fmt => psb_z_get_fmt + procedure, pass(a) :: sizeof => psb_z_sizeof ! Setters procedure, pass(a) :: set_nrows => psb_z_set_nrows @@ -45,42 +45,42 @@ module psb_z_mat_mod procedure, pass(a) :: set_unit => psb_z_set_unit ! Memory/data management - procedure, pass(a) :: csall => psb_z_csall - procedure, pass(a) :: free => psb_z_free - procedure, pass(a) :: trim => psb_z_trim - procedure, pass(a) :: csput => psb_z_csput - procedure, pass(a) :: z_csgetptn => psb_z_csgetptn - procedure, pass(a) :: z_csgetrow => psb_z_csgetrow - procedure, pass(a) :: z_csgetblk => psb_z_csgetblk - generic, public :: csget => z_csgetptn, z_csgetrow, z_csgetblk - procedure, pass(a) :: z_csclip => psb_z_csclip - procedure, pass(a) :: z_b_csclip => psb_z_b_csclip - generic, public :: csclip => z_b_csclip, z_csclip - procedure, pass(a) :: z_clip_d_ip => psb_z_clip_d_ip - procedure, pass(a) :: z_clip_d => psb_z_clip_d - generic, public :: clip_diag => z_clip_d_ip, z_clip_d - procedure, pass(a) :: reall => psb_z_reallocate_nz - procedure, pass(a) :: get_neigh => psb_z_get_neigh - procedure, pass(a) :: z_cscnv => psb_z_cscnv - procedure, pass(a) :: z_cscnv_ip => psb_z_cscnv_ip - procedure, pass(a) :: z_cscnv_base => psb_z_cscnv_base - generic, public :: cscnv => z_cscnv, z_cscnv_ip, z_cscnv_base - procedure, pass(a) :: reinit => psb_z_reinit - procedure, pass(a) :: print => psb_z_sparse_print - procedure, pass(a) :: z_mv_from => psb_z_mv_from - generic, public :: mv_from => z_mv_from - procedure, pass(a) :: z_mv_to => psb_z_mv_to - generic, public :: mv_to => z_mv_to - procedure, pass(a) :: z_cp_from => psb_z_cp_from - generic, public :: cp_from => z_cp_from - procedure, pass(a) :: z_cp_to => psb_z_cp_to - generic, public :: cp_to => z_cp_to + procedure, pass(a) :: csall => psb_z_csall + procedure, pass(a) :: free => psb_z_free + procedure, pass(a) :: trim => psb_z_trim + procedure, pass(a) :: csput => psb_z_csput + procedure, pass(a) :: z_csgetptn => psb_z_csgetptn + procedure, pass(a) :: z_csgetrow => psb_z_csgetrow + procedure, pass(a) :: z_csgetblk => psb_z_csgetblk + generic, public :: csget => z_csgetptn, z_csgetrow, z_csgetblk + procedure, pass(a) :: z_csclip => psb_z_csclip + procedure, pass(a) :: z_b_csclip => psb_z_b_csclip + generic, public :: csclip => z_b_csclip, z_csclip + procedure, pass(a) :: z_clip_d_ip => psb_z_clip_d_ip + procedure, pass(a) :: z_clip_d => psb_z_clip_d + generic, public :: clip_diag => z_clip_d_ip, z_clip_d + procedure, pass(a) :: reall => psb_z_reallocate_nz + procedure, pass(a) :: get_neigh => psb_z_get_neigh + procedure, pass(a) :: z_cscnv => psb_z_cscnv + procedure, pass(a) :: z_cscnv_ip => psb_z_cscnv_ip + procedure, pass(a) :: z_cscnv_base => psb_z_cscnv_base + generic, public :: cscnv => z_cscnv, z_cscnv_ip, z_cscnv_base + procedure, pass(a) :: reinit => psb_z_reinit + procedure, pass(a) :: print => psb_z_sparse_print + procedure, pass(a) :: z_mv_from => psb_z_mv_from + generic, public :: mv_from => z_mv_from + procedure, pass(a) :: z_mv_to => psb_z_mv_to + generic, public :: mv_to => z_mv_to + procedure, pass(a) :: z_cp_from => psb_z_cp_from + generic, public :: cp_from => z_cp_from + procedure, pass(a) :: z_cp_to => psb_z_cp_to + generic, public :: cp_to => z_cp_to procedure, pass(a) :: z_transp_1mat => psb_z_transp_1mat procedure, pass(a) :: z_transp_2mat => psb_z_transp_2mat - generic, public :: transp => z_transp_1mat, z_transp_2mat + generic, public :: transp => z_transp_1mat, z_transp_2mat procedure, pass(a) :: z_transc_1mat => psb_z_transc_1mat procedure, pass(a) :: z_transc_2mat => psb_z_transc_2mat - generic, public :: transc => z_transc_1mat, z_transc_2mat + generic, public :: transc => z_transc_1mat, z_transc_2mat @@ -89,13 +89,13 @@ module psb_z_mat_mod procedure, pass(a) :: csnmi => psb_z_csnmi procedure, pass(a) :: z_csmv => psb_z_csmv procedure, pass(a) :: z_csmm => psb_z_csmm - generic, public :: csmm => z_csmm, z_csmv + generic, public :: csmm => z_csmm, z_csmv procedure, pass(a) :: z_scals => psb_z_scals procedure, pass(a) :: z_scal => psb_z_scal - generic, public :: scal => z_scals, z_scal + generic, public :: scal => z_scals, z_scal procedure, pass(a) :: z_cssv => psb_z_cssv procedure, pass(a) :: z_cssm => psb_z_cssm - generic, public :: cssm => z_cssm, z_cssv + generic, public :: cssm => z_cssm, z_cssv end type psb_z_sparse_mat diff --git a/configure b/configure index b44aaf8a..2257c8e8 100755 --- a/configure +++ b/configure @@ -5596,9 +5596,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - - fi rm -f conftest* diff --git a/configure.ac b/configure.ac index 9891b761..8bee7066 100755 --- a/configure.ac +++ b/configure.ac @@ -210,8 +210,7 @@ dnl Do we use gfortran & co ? Compiler identification. dnl NOTE : in /autoconf/autoconf/fortran.m4 there are plenty of better tests! PAC_CHECK_HAVE_GFORTRAN( - psblas_cv_fc="gcc", - [] + [psblas_cv_fc="gcc"], ) if test x"$psblas_cv_fc" == "x" ; then