From bf06e610674382e70fc7a9252d6c84948eb45579 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Sat, 19 Feb 2011 11:31:31 +0000 Subject: [PATCH] psblas3: base/modules/psb_base_mat_mod.f90 base/modules/psb_c_base_mat_mod.f90 base/modules/psb_c_csc_mat_mod.f90 base/modules/psb_c_csr_mat_mod.f90 base/modules/psb_d_base_mat_mod.f90 base/modules/psb_d_csc_mat_mod.f90 base/modules/psb_d_csr_mat_mod.f90 base/modules/psb_gen_block_map_mod.f90 base/modules/psb_glist_map_mod.f90 base/modules/psb_hash_map_mod.f90 base/modules/psb_indx_map_mod.f90 base/modules/psb_list_map_mod.f90 base/modules/psb_repl_map_mod.f90 base/modules/psb_s_base_mat_mod.f90 base/modules/psb_s_csc_mat_mod.f90 base/modules/psb_s_csr_mat_mod.f90 base/modules/psb_z_base_mat_mod.f90 base/modules/psb_z_csc_mat_mod.f90 base/modules/psb_z_csr_mat_mod.f90 opt/psb_d_ell_mat_mod.f90 opt/psb_d_rsb_mat_mod.F90 Changed get_fmt() to a NOPASS method (but not for spmat_type). --- base/modules/psb_base_mat_mod.f90 | 5 ++--- base/modules/psb_c_base_mat_mod.f90 | 5 ++--- base/modules/psb_c_csc_mat_mod.f90 | 5 ++--- base/modules/psb_c_csr_mat_mod.f90 | 5 ++--- base/modules/psb_d_base_mat_mod.f90 | 5 ++--- base/modules/psb_d_csc_mat_mod.f90 | 5 ++--- base/modules/psb_d_csr_mat_mod.f90 | 5 ++--- base/modules/psb_gen_block_map_mod.f90 | 5 ++--- base/modules/psb_glist_map_mod.f90 | 5 ++--- base/modules/psb_hash_map_mod.f90 | 5 ++--- base/modules/psb_indx_map_mod.f90 | 5 ++--- base/modules/psb_list_map_mod.f90 | 5 ++--- base/modules/psb_repl_map_mod.f90 | 5 ++--- base/modules/psb_s_base_mat_mod.f90 | 5 ++--- base/modules/psb_s_csc_mat_mod.f90 | 5 ++--- base/modules/psb_s_csr_mat_mod.f90 | 5 ++--- base/modules/psb_z_base_mat_mod.f90 | 5 ++--- base/modules/psb_z_csc_mat_mod.f90 | 5 ++--- base/modules/psb_z_csr_mat_mod.f90 | 5 ++--- opt/psb_d_ell_mat_mod.f90 | 5 ++--- opt/psb_d_rsb_mat_mod.F90 | 5 ++--- 21 files changed, 42 insertions(+), 63 deletions(-) diff --git a/base/modules/psb_base_mat_mod.f90 b/base/modules/psb_base_mat_mod.f90 index 88552345..81878c81 100644 --- a/base/modules/psb_base_mat_mod.f90 +++ b/base/modules/psb_base_mat_mod.f90 @@ -87,7 +87,7 @@ module psb_base_mat_mod procedure, pass(a) :: get_size => psb_base_get_size procedure, pass(a) :: get_state => psb_base_get_state procedure, pass(a) :: get_dupl => psb_base_get_dupl - procedure, pass(a) :: get_fmt => psb_base_get_fmt + procedure, nopass :: get_fmt => psb_base_get_fmt procedure, pass(a) :: get_aux => psb_base_get_aux procedure, pass(a) :: is_null => psb_base_is_null procedure, pass(a) :: is_bld => psb_base_is_bld @@ -265,9 +265,8 @@ contains res = 8 end function psb_base_sizeof - function psb_base_get_fmt(a) result(res) + function psb_base_get_fmt() result(res) implicit none - class(psb_base_sparse_mat), intent(in) :: a character(len=5) :: res res = 'NULL' end function psb_base_get_fmt diff --git a/base/modules/psb_c_base_mat_mod.f90 b/base/modules/psb_c_base_mat_mod.f90 index 2c1806f2..2d364996 100644 --- a/base/modules/psb_c_base_mat_mod.f90 +++ b/base/modules/psb_c_base_mat_mod.f90 @@ -115,7 +115,7 @@ module psb_c_base_mat_mod procedure, pass(a) :: get_size => c_coo_get_size procedure, pass(a) :: get_nzeros => c_coo_get_nzeros procedure, pass(a) :: set_nzeros => c_coo_set_nzeros - procedure, pass(a) :: get_fmt => c_coo_get_fmt + procedure, nopass :: get_fmt => c_coo_get_fmt procedure, pass(a) :: sizeof => c_coo_sizeof procedure, pass(a) :: c_csmm => psb_c_coo_csmm procedure, pass(a) :: c_csmv => psb_c_coo_csmv @@ -798,9 +798,8 @@ contains end function c_coo_sizeof - function c_coo_get_fmt(a) result(res) + function c_coo_get_fmt() result(res) implicit none - class(psb_c_coo_sparse_mat), intent(in) :: a character(len=5) :: res res = 'COO' end function c_coo_get_fmt diff --git a/base/modules/psb_c_csc_mat_mod.f90 b/base/modules/psb_c_csc_mat_mod.f90 index 264d8ea8..2e86c6ed 100644 --- a/base/modules/psb_c_csc_mat_mod.f90 +++ b/base/modules/psb_c_csc_mat_mod.f90 @@ -51,7 +51,7 @@ module psb_c_csc_mat_mod contains procedure, pass(a) :: get_size => c_csc_get_size procedure, pass(a) :: get_nzeros => c_csc_get_nzeros - procedure, pass(a) :: get_fmt => c_csc_get_fmt + procedure, nopass :: get_fmt => c_csc_get_fmt procedure, pass(a) :: sizeof => c_csc_sizeof procedure, pass(a) :: c_csmm => psb_c_csc_csmm procedure, pass(a) :: c_csmv => psb_c_csc_csmv @@ -393,9 +393,8 @@ contains end function c_csc_sizeof - function c_csc_get_fmt(a) result(res) + function c_csc_get_fmt() result(res) implicit none - class(psb_c_csc_sparse_mat), intent(in) :: a character(len=5) :: res res = 'CSC' end function c_csc_get_fmt diff --git a/base/modules/psb_c_csr_mat_mod.f90 b/base/modules/psb_c_csr_mat_mod.f90 index 36d3b503..cf9d9801 100644 --- a/base/modules/psb_c_csr_mat_mod.f90 +++ b/base/modules/psb_c_csr_mat_mod.f90 @@ -50,7 +50,7 @@ module psb_c_csr_mat_mod contains procedure, pass(a) :: get_size => c_csr_get_size procedure, pass(a) :: get_nzeros => c_csr_get_nzeros - procedure, pass(a) :: get_fmt => c_csr_get_fmt + procedure, nopass :: get_fmt => c_csr_get_fmt procedure, pass(a) :: sizeof => c_csr_sizeof procedure, pass(a) :: c_csmm => psb_c_csr_csmm procedure, pass(a) :: c_csmv => psb_c_csr_csmv @@ -393,9 +393,8 @@ contains end function c_csr_sizeof - function c_csr_get_fmt(a) result(res) + function c_csr_get_fmt() result(res) implicit none - class(psb_c_csr_sparse_mat), intent(in) :: a character(len=5) :: res res = 'CSR' end function c_csr_get_fmt diff --git a/base/modules/psb_d_base_mat_mod.f90 b/base/modules/psb_d_base_mat_mod.f90 index 1d62a762..c3935cac 100644 --- a/base/modules/psb_d_base_mat_mod.f90 +++ b/base/modules/psb_d_base_mat_mod.f90 @@ -121,7 +121,7 @@ module psb_d_base_mat_mod procedure, pass(a) :: get_size => d_coo_get_size procedure, pass(a) :: get_nzeros => d_coo_get_nzeros procedure, pass(a) :: set_nzeros => d_coo_set_nzeros - procedure, pass(a) :: get_fmt => d_coo_get_fmt + procedure, nopass :: get_fmt => d_coo_get_fmt procedure, pass(a) :: sizeof => d_coo_sizeof procedure, pass(a) :: d_csmm => psb_d_coo_csmm procedure, pass(a) :: d_csmv => psb_d_coo_csmv @@ -892,9 +892,8 @@ contains end function d_coo_sizeof - function d_coo_get_fmt(a) result(res) + function d_coo_get_fmt() result(res) implicit none - class(psb_d_coo_sparse_mat), intent(in) :: a character(len=5) :: res res = 'COO' end function d_coo_get_fmt diff --git a/base/modules/psb_d_csc_mat_mod.f90 b/base/modules/psb_d_csc_mat_mod.f90 index 84795dd1..3d1a01e1 100644 --- a/base/modules/psb_d_csc_mat_mod.f90 +++ b/base/modules/psb_d_csc_mat_mod.f90 @@ -50,7 +50,7 @@ module psb_d_csc_mat_mod contains procedure, pass(a) :: get_size => d_csc_get_size procedure, pass(a) :: get_nzeros => d_csc_get_nzeros - procedure, pass(a) :: get_fmt => d_csc_get_fmt + procedure, nopass :: get_fmt => d_csc_get_fmt procedure, pass(a) :: sizeof => d_csc_sizeof procedure, pass(a) :: d_csmm => psb_d_csc_csmm procedure, pass(a) :: d_csmv => psb_d_csc_csmv @@ -437,9 +437,8 @@ contains end function d_csc_sizeof - function d_csc_get_fmt(a) result(res) + function d_csc_get_fmt() result(res) implicit none - class(psb_d_csc_sparse_mat), intent(in) :: a character(len=5) :: res res = 'CSC' end function d_csc_get_fmt diff --git a/base/modules/psb_d_csr_mat_mod.f90 b/base/modules/psb_d_csr_mat_mod.f90 index 9753792d..66a9f933 100644 --- a/base/modules/psb_d_csr_mat_mod.f90 +++ b/base/modules/psb_d_csr_mat_mod.f90 @@ -50,7 +50,7 @@ module psb_d_csr_mat_mod contains procedure, pass(a) :: get_size => d_csr_get_size procedure, pass(a) :: get_nzeros => d_csr_get_nzeros - procedure, pass(a) :: get_fmt => d_csr_get_fmt + procedure, nopass :: get_fmt => d_csr_get_fmt procedure, pass(a) :: sizeof => d_csr_sizeof procedure, pass(a) :: d_csmm => psb_d_csr_csmm procedure, pass(a) :: d_csmv => psb_d_csr_csmv @@ -438,9 +438,8 @@ contains end function d_csr_sizeof - function d_csr_get_fmt(a) result(res) + function d_csr_get_fmt() result(res) implicit none - class(psb_d_csr_sparse_mat), intent(in) :: a character(len=5) :: res res = 'CSR' end function d_csr_get_fmt diff --git a/base/modules/psb_gen_block_map_mod.f90 b/base/modules/psb_gen_block_map_mod.f90 index 359d113b..ebbe1391 100644 --- a/base/modules/psb_gen_block_map_mod.f90 +++ b/base/modules/psb_gen_block_map_mod.f90 @@ -62,7 +62,7 @@ module psb_gen_block_map_mod procedure, pass(idxmap) :: asb => block_asb procedure, pass(idxmap) :: free => block_free procedure, pass(idxmap) :: clone => block_clone - procedure, pass(idxmap) :: get_fmt => block_get_fmt + procedure, nopass :: get_fmt => block_get_fmt procedure, pass(idxmap) :: l2gs1 => block_l2gs1 procedure, pass(idxmap) :: l2gs2 => block_l2gs2 @@ -663,9 +663,8 @@ contains end subroutine block_asb - function block_get_fmt(idxmap) result(res) + function block_get_fmt() result(res) implicit none - class(psb_gen_block_map), intent(in) :: idxmap character(len=5) :: res res = 'BLOCK' end function block_get_fmt diff --git a/base/modules/psb_glist_map_mod.f90 b/base/modules/psb_glist_map_mod.f90 index f5414400..ebc286cf 100644 --- a/base/modules/psb_glist_map_mod.f90 +++ b/base/modules/psb_glist_map_mod.f90 @@ -53,7 +53,7 @@ module psb_glist_map_mod procedure, pass(idxmap) :: sizeof => glist_sizeof procedure, pass(idxmap) :: free => glist_free procedure, pass(idxmap) :: clone => glist_clone - procedure, pass(idxmap) :: get_fmt => glist_get_fmt + procedure, nopass :: get_fmt => glist_get_fmt procedure, pass(idxmap) :: fnd_owner => glist_fnd_owner end type psb_glist_map @@ -177,9 +177,8 @@ contains end subroutine glist_fnd_owner - function glist_get_fmt(idxmap) result(res) + function glist_get_fmt() result(res) implicit none - class(psb_glist_map), intent(in) :: idxmap character(len=5) :: res res = 'GLIST' end function glist_get_fmt diff --git a/base/modules/psb_hash_map_mod.f90 b/base/modules/psb_hash_map_mod.f90 index 91f3e3d0..d89d5a49 100644 --- a/base/modules/psb_hash_map_mod.f90 +++ b/base/modules/psb_hash_map_mod.f90 @@ -73,7 +73,7 @@ contains procedure, pass(idxmap) :: asb => hash_asb procedure, pass(idxmap) :: free => hash_free procedure, pass(idxmap) :: clone => hash_clone - procedure, pass(idxmap) :: get_fmt => hash_get_fmt + procedure, nopass :: get_fmt => hash_get_fmt procedure, pass(idxmap) :: row_extendable => hash_row_extendable @@ -947,9 +947,8 @@ subroutine hash_asb(idxmap,info) end subroutine hash_asb -function hash_get_fmt(idxmap) result(res) +function hash_get_fmt() result(res) implicit none - class(psb_hash_map), intent(in) :: idxmap character(len=5) :: res res = 'HASH' end function hash_get_fmt diff --git a/base/modules/psb_indx_map_mod.f90 b/base/modules/psb_indx_map_mod.f90 index 64f82fab..ed7880fc 100644 --- a/base/modules/psb_indx_map_mod.f90 +++ b/base/modules/psb_indx_map_mod.f90 @@ -124,7 +124,7 @@ module psb_indx_map_mod procedure, pass(idxmap) :: set_ctxt => base_set_ctxt procedure, pass(idxmap) :: set_mpic => base_set_mpic - procedure, pass(idxmap) :: get_fmt => base_get_fmt + procedure, nopass :: get_fmt => base_get_fmt procedure, pass(idxmap) :: asb => base_asb procedure, pass(idxmap) :: free => base_free @@ -181,9 +181,8 @@ module psb_indx_map_mod contains - function base_get_fmt(idxmap) result(res) + function base_get_fmt() result(res) implicit none - class(psb_indx_map), intent(in) :: idxmap character(len=5) :: res res = 'NULL' end function base_get_fmt diff --git a/base/modules/psb_list_map_mod.f90 b/base/modules/psb_list_map_mod.f90 index 27bd5e0f..efc8d8b2 100644 --- a/base/modules/psb_list_map_mod.f90 +++ b/base/modules/psb_list_map_mod.f90 @@ -54,7 +54,7 @@ module psb_list_map_mod procedure, pass(idxmap) :: asb => list_asb procedure, pass(idxmap) :: free => list_free procedure, pass(idxmap) :: clone => list_clone - procedure, pass(idxmap) :: get_fmt => list_get_fmt + procedure, nopass :: get_fmt => list_get_fmt procedure, pass(idxmap) :: row_extendable => list_row_extendable procedure, pass(idxmap) :: l2gs1 => list_l2gs1 @@ -624,9 +624,8 @@ contains end subroutine list_asb - function list_get_fmt(idxmap) result(res) + function list_get_fmt() result(res) implicit none - class(psb_list_map), intent(in) :: idxmap character(len=5) :: res res = 'LIST' end function list_get_fmt diff --git a/base/modules/psb_repl_map_mod.f90 b/base/modules/psb_repl_map_mod.f90 index 2c6c5571..d2cf155d 100644 --- a/base/modules/psb_repl_map_mod.f90 +++ b/base/modules/psb_repl_map_mod.f90 @@ -55,7 +55,7 @@ module psb_repl_map_mod procedure, pass(idxmap) :: asb => repl_asb procedure, pass(idxmap) :: free => repl_free procedure, pass(idxmap) :: clone => repl_clone - procedure, pass(idxmap) :: get_fmt => repl_get_fmt + procedure, nopass :: get_fmt => repl_get_fmt procedure, pass(idxmap) :: l2gs1 => repl_l2gs1 procedure, pass(idxmap) :: l2gs2 => repl_l2gs2 @@ -534,9 +534,8 @@ contains end subroutine repl_free - function repl_get_fmt(idxmap) result(res) + function repl_get_fmt() result(res) implicit none - class(psb_repl_map), intent(in) :: idxmap character(len=5) :: res res = 'REPL' end function repl_get_fmt diff --git a/base/modules/psb_s_base_mat_mod.f90 b/base/modules/psb_s_base_mat_mod.f90 index 78de33a6..2231dd0b 100644 --- a/base/modules/psb_s_base_mat_mod.f90 +++ b/base/modules/psb_s_base_mat_mod.f90 @@ -116,7 +116,7 @@ module psb_s_base_mat_mod procedure, pass(a) :: get_size => s_coo_get_size procedure, pass(a) :: get_nzeros => s_coo_get_nzeros procedure, pass(a) :: set_nzeros => s_coo_set_nzeros - procedure, pass(a) :: get_fmt => s_coo_get_fmt + procedure, nopass :: get_fmt => s_coo_get_fmt procedure, pass(a) :: sizeof => s_coo_sizeof procedure, pass(a) :: s_csmm => psb_s_coo_csmm procedure, pass(a) :: s_csmv => psb_s_coo_csmv @@ -800,9 +800,8 @@ contains end function s_coo_sizeof - function s_coo_get_fmt(a) result(res) + function s_coo_get_fmt() result(res) implicit none - class(psb_s_coo_sparse_mat), intent(in) :: a character(len=5) :: res res = 'COO' end function s_coo_get_fmt diff --git a/base/modules/psb_s_csc_mat_mod.f90 b/base/modules/psb_s_csc_mat_mod.f90 index e9d8083a..4f97a05a 100644 --- a/base/modules/psb_s_csc_mat_mod.f90 +++ b/base/modules/psb_s_csc_mat_mod.f90 @@ -50,7 +50,7 @@ module psb_s_csc_mat_mod contains procedure, pass(a) :: get_size => s_csc_get_size procedure, pass(a) :: get_nzeros => s_csc_get_nzeros - procedure, pass(a) :: get_fmt => s_csc_get_fmt + procedure, nopass :: get_fmt => s_csc_get_fmt procedure, pass(a) :: sizeof => s_csc_sizeof procedure, pass(a) :: s_csmm => psb_s_csc_csmm procedure, pass(a) :: s_csmv => psb_s_csc_csmv @@ -392,9 +392,8 @@ contains end function s_csc_sizeof - function s_csc_get_fmt(a) result(res) + function s_csc_get_fmt() result(res) implicit none - class(psb_s_csc_sparse_mat), intent(in) :: a character(len=5) :: res res = 'CSC' end function s_csc_get_fmt diff --git a/base/modules/psb_s_csr_mat_mod.f90 b/base/modules/psb_s_csr_mat_mod.f90 index c75b4812..25c5943e 100644 --- a/base/modules/psb_s_csr_mat_mod.f90 +++ b/base/modules/psb_s_csr_mat_mod.f90 @@ -50,7 +50,7 @@ module psb_s_csr_mat_mod contains procedure, pass(a) :: get_size => s_csr_get_size procedure, pass(a) :: get_nzeros => s_csr_get_nzeros - procedure, pass(a) :: get_fmt => s_csr_get_fmt + procedure, nopass :: get_fmt => s_csr_get_fmt procedure, pass(a) :: sizeof => s_csr_sizeof procedure, pass(a) :: s_csmm => psb_s_csr_csmm procedure, pass(a) :: s_csmv => psb_s_csr_csmv @@ -393,9 +393,8 @@ contains end function s_csr_sizeof - function s_csr_get_fmt(a) result(res) + function s_csr_get_fmt() result(res) implicit none - class(psb_s_csr_sparse_mat), intent(in) :: a character(len=5) :: res res = 'CSR' end function s_csr_get_fmt diff --git a/base/modules/psb_z_base_mat_mod.f90 b/base/modules/psb_z_base_mat_mod.f90 index 29cb0cd6..df74704b 100644 --- a/base/modules/psb_z_base_mat_mod.f90 +++ b/base/modules/psb_z_base_mat_mod.f90 @@ -117,7 +117,7 @@ module psb_z_base_mat_mod procedure, pass(a) :: get_size => z_coo_get_size procedure, pass(a) :: get_nzeros => z_coo_get_nzeros procedure, pass(a) :: set_nzeros => z_coo_set_nzeros - procedure, pass(a) :: get_fmt => z_coo_get_fmt + procedure, nopass :: get_fmt => z_coo_get_fmt procedure, pass(a) :: sizeof => z_coo_sizeof procedure, pass(a) :: z_csmm => psb_z_coo_csmm procedure, pass(a) :: z_csmv => psb_z_coo_csmv @@ -801,9 +801,8 @@ contains end function z_coo_sizeof - function z_coo_get_fmt(a) result(res) + function z_coo_get_fmt() result(res) implicit none - class(psb_z_coo_sparse_mat), intent(in) :: a character(len=5) :: res res = 'COO' end function z_coo_get_fmt diff --git a/base/modules/psb_z_csc_mat_mod.f90 b/base/modules/psb_z_csc_mat_mod.f90 index 072c8639..aca70aab 100644 --- a/base/modules/psb_z_csc_mat_mod.f90 +++ b/base/modules/psb_z_csc_mat_mod.f90 @@ -50,7 +50,7 @@ module psb_z_csc_mat_mod contains procedure, pass(a) :: get_size => z_csc_get_size procedure, pass(a) :: get_nzeros => z_csc_get_nzeros - procedure, pass(a) :: get_fmt => z_csc_get_fmt + procedure, nopass :: get_fmt => z_csc_get_fmt procedure, pass(a) :: sizeof => z_csc_sizeof procedure, pass(a) :: z_csmm => psb_z_csc_csmm procedure, pass(a) :: z_csmv => psb_z_csc_csmv @@ -392,9 +392,8 @@ contains end function z_csc_sizeof - function z_csc_get_fmt(a) result(res) + function z_csc_get_fmt() result(res) implicit none - class(psb_z_csc_sparse_mat), intent(in) :: a character(len=5) :: res res = 'CSC' end function z_csc_get_fmt diff --git a/base/modules/psb_z_csr_mat_mod.f90 b/base/modules/psb_z_csr_mat_mod.f90 index 3c9a6e7b..0bc1b801 100644 --- a/base/modules/psb_z_csr_mat_mod.f90 +++ b/base/modules/psb_z_csr_mat_mod.f90 @@ -50,7 +50,7 @@ module psb_z_csr_mat_mod contains procedure, pass(a) :: get_size => z_csr_get_size procedure, pass(a) :: get_nzeros => z_csr_get_nzeros - procedure, pass(a) :: get_fmt => z_csr_get_fmt + procedure, nopass :: get_fmt => z_csr_get_fmt procedure, pass(a) :: sizeof => z_csr_sizeof procedure, pass(a) :: z_csmm => psb_z_csr_csmm procedure, pass(a) :: z_csmv => psb_z_csr_csmv @@ -393,9 +393,8 @@ contains end function z_csr_sizeof - function z_csr_get_fmt(a) result(res) + function z_csr_get_fmt() result(res) implicit none - class(psb_z_csr_sparse_mat), intent(in) :: a character(len=5) :: res res = 'CSR' end function z_csr_get_fmt diff --git a/opt/psb_d_ell_mat_mod.f90 b/opt/psb_d_ell_mat_mod.f90 index 09e28cf5..f4f3223e 100644 --- a/opt/psb_d_ell_mat_mod.f90 +++ b/opt/psb_d_ell_mat_mod.f90 @@ -25,7 +25,7 @@ module psb_d_ell_mat_mod contains procedure, pass(a) :: get_size => d_ell_get_size procedure, pass(a) :: get_nzeros => d_ell_get_nzeros - procedure, pass(a) :: get_fmt => d_ell_get_fmt + procedure, nopass :: get_fmt => d_ell_get_fmt procedure, pass(a) :: sizeof => d_ell_sizeof procedure, pass(a) :: d_csmm => psb_d_ell_csmm procedure, pass(a) :: d_csmv => psb_d_ell_csmv @@ -414,9 +414,8 @@ contains end function d_ell_sizeof - function d_ell_get_fmt(a) result(res) + function d_ell_get_fmt() result(res) implicit none - class(psb_d_ell_sparse_mat), intent(in) :: a character(len=5) :: res res = 'ELL' end function d_ell_get_fmt diff --git a/opt/psb_d_rsb_mat_mod.F90 b/opt/psb_d_rsb_mat_mod.F90 index a2b59f58..de4c6c0d 100644 --- a/opt/psb_d_rsb_mat_mod.F90 +++ b/opt/psb_d_rsb_mat_mod.F90 @@ -40,7 +40,7 @@ module psb_d_rsb_mat_mod procedure, pass(a) :: get_nzeros => d_rsb_get_nzeros procedure, pass(a) :: get_ncols => d_rsb_get_ncols procedure, pass(a) :: get_nrows => d_rsb_get_nrows - procedure, pass(a) :: get_fmt => d_rsb_get_fmt + procedure, nopass :: get_fmt => d_rsb_get_fmt procedure, pass(a) :: sizeof => d_rsb_sizeof procedure, pass(a) :: d_csmm => psb_d_rsb_csmm !procedure, pass(a) :: d_csmv_nt => psb_d_rsb_csmv_nt ! FIXME: a placeholder for future memory @@ -157,9 +157,8 @@ module psb_d_rsb_mat_mod res=rsb_get_matrix_n_columns(a%rsbmptr) end function d_rsb_get_ncols - function d_rsb_get_fmt(a) result(res) + function d_rsb_get_fmt() result(res) implicit none - class(psb_d_rsb_sparse_mat), intent(in) :: a character(len=5) :: res !the following printout is harmful, here, if happening during a write :) (causes a deadlock) !PSBRSB_DEBUG('')