fdurastante
/
psblas3
mirror of https://github.com/sfilippone/psblas3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix PREFIX in PREC%DESCR

Browse Source
tspmm
Salvatore Filippone 3 years ago
parent 12277b0163
commit 7fe4828099
20 changed files with 132 additions and 44 deletions
Show Stats Download Patch File Download Diff File

4
prec/psb_c_base_prec_mod.f90
Unescape Escape View File

@ -161,7 +161,7 @@ module psb_c_base_prec_mod
abstract interface abstract interface
subroutine psb_c_base_precdescr(prec,iout,root, verbosity) subroutine psb_c_base_precdescr(prec,iout,root, verbosity,prefix)
import psb_ipk_, psb_spk_, psb_desc_type, psb_c_vect_type, & import psb_ipk_, psb_spk_, psb_desc_type, psb_c_vect_type, &
& psb_c_base_vect_type, psb_cspmat_type, psb_c_base_prec_type,& & psb_c_base_vect_type, psb_cspmat_type, psb_c_base_prec_type,&
& psb_c_base_sparse_mat & psb_c_base_sparse_mat
@ -171,7 +171,7 @@ module psb_c_base_prec_mod
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
end subroutine psb_c_base_precdescr end subroutine psb_c_base_precdescr
end interface end interface

11
prec/psb_c_bjacprec.f90
Unescape Escape View File

@ -158,7 +158,7 @@ contains
! 0: normal ! 0: normal
! >1: increased details ! >1: increased details
! !
subroutine psb_c_bjac_precdescr(prec,iout,root, verbosity) subroutine psb_c_bjac_precdescr(prec,iout,root, verbosity,prefix)
use psb_penv_mod use psb_penv_mod
use psb_error_mod use psb_error_mod
implicit none implicit none
@ -167,11 +167,13 @@ contains
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
integer(psb_ipk_) :: err_act, nrow, info integer(psb_ipk_) :: err_act, nrow, info
character(len=20) :: name='c_bjac_precdescr' character(len=20) :: name='c_bjac_precdescr'
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_ integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_
character(1024) :: prefix_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
@ -194,6 +196,11 @@ contains
verbosity_ = 0 verbosity_ = 0
end if end if
if (verbosity_ < 0) goto 9998 if (verbosity_ < 0) goto 9998
if (present(prefix)) then
prefix_ = prefix
else
prefix_ = ""
end if
if (.not.allocated(prec%iprcparm)) then if (.not.allocated(prec%iprcparm)) then
info = 1124 info = 1124
@ -206,7 +213,7 @@ contains
if (root_ == -1) root_ = iam if (root_ == -1) root_ = iam
if (iam == root_) & if (iam == root_) &
& write(iout_,*) trim(prec%desc_prefix()),' ',& & write(iout_,*) trim(prefix_),' ', trim(prec%desc_prefix()),' ',&
& 'Block Jacobi with: ',& & 'Block Jacobi with: ',&
& fact_names(prec%iprcparm(psb_f_type_)) & fact_names(prec%iprcparm(psb_f_type_))

11
prec/psb_c_diagprec.f90
Unescape Escape View File

@ -167,7 +167,7 @@ contains
! 0: normal ! 0: normal
! >1: increased details ! >1: increased details
! !
subroutine psb_c_diag_precdescr(prec,iout,root, verbosity) subroutine psb_c_diag_precdescr(prec,iout,root, verbosity,prefix)
use psb_penv_mod use psb_penv_mod
use psb_error_mod use psb_error_mod
Implicit None Implicit None
@ -176,11 +176,13 @@ contains
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
integer(psb_ipk_) :: err_act, nrow, info integer(psb_ipk_) :: err_act, nrow, info
character(len=20) :: name='c_diag_precdescr' character(len=20) :: name='c_diag_precdescr'
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_ integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_
character(1024) :: prefix_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
@ -201,6 +203,11 @@ contains
else else
verbosity_ = 0 verbosity_ = 0
end if end if
if (present(prefix)) then
prefix_ = prefix
else
prefix_ = ""
end if
if (verbosity_ < 0) goto 9998 if (verbosity_ < 0) goto 9998
ctxt = prec%ctxt ctxt = prec%ctxt
@ -209,7 +216,7 @@ contains
if (root_ == -1) root_ = iam if (root_ == -1) root_ = iam
if (iam == root_) & if (iam == root_) &
& write(iout_,*) trim(prec%desc_prefix()),' ',& & write(iout_,*) trim(prefix_),' ', trim(prec%desc_prefix()),' ',&
& 'Diagonal scaling' & 'Diagonal scaling'
call psb_erractionsave(err_act) call psb_erractionsave(err_act)

11
prec/psb_c_nullprec.f90
Unescape Escape View File

@ -163,7 +163,7 @@ contains
! 0: normal ! 0: normal
! >1: increased details ! >1: increased details
! !
subroutine psb_c_null_precdescr(prec,iout,root, verbosity) subroutine psb_c_null_precdescr(prec,iout,root, verbosity,prefix)
use psb_penv_mod use psb_penv_mod
use psb_error_mod use psb_error_mod
@ -173,6 +173,7 @@ contains
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
integer(psb_ipk_) :: err_act, nrow, info integer(psb_ipk_) :: err_act, nrow, info
character(len=20) :: name='c_null_precset' character(len=20) :: name='c_null_precset'
@ -180,6 +181,7 @@ contains
integer(psb_ipk_) :: ni integer(psb_ipk_) :: ni
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_ integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_
character(1024) :: prefix_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
@ -195,6 +197,11 @@ contains
else else
root_ = psb_root_ root_ = psb_root_
end if end if
if (present(prefix)) then
prefix_ = prefix
else
prefix_ = ""
end if
if (present(verbosity)) then if (present(verbosity)) then
verbosity_ = verbosity verbosity_ = verbosity
else else
@ -207,7 +214,7 @@ contains
if (root_ == -1) root_ = iam if (root_ == -1) root_ = iam
if (iam == root_) & if (iam == root_) &
& write(iout_,*) trim(prec%desc_prefix()),' ',& & write(iout_,*) trim(prefix_),' ', trim(prec%desc_prefix()),' ',&
& 'No preconditioning' & 'No preconditioning'
9998 continue 9998 continue

5
prec/psb_c_prec_type.f90
Unescape Escape View File

@ -197,7 +197,7 @@ contains
! 0: normal ! 0: normal
! >1: increased details ! >1: increased details
! !
subroutine psb_cfile_prec_descr(prec,info,iout, root,verbosity) subroutine psb_cfile_prec_descr(prec,info,iout, root,verbosity,prefix)
use psb_base_mod use psb_base_mod
implicit none implicit none
class(psb_cprec_type), intent(in) :: prec class(psb_cprec_type), intent(in) :: prec
@ -205,6 +205,7 @@ contains
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
integer(psb_ipk_) :: iout_, verbosity_ integer(psb_ipk_) :: iout_, verbosity_
character(len=20) :: name='prec_descr' character(len=20) :: name='prec_descr'
@ -219,7 +220,7 @@ contains
info = 1124 info = 1124
call psb_errpush(info,name,a_err="preconditioner") call psb_errpush(info,name,a_err="preconditioner")
end if end if
call prec%prec%descr(iout=iout,root=root, verbosity=verbosity) call prec%prec%descr(iout=iout,root=root, verbosity=verbosity,prefix=prefix)
end subroutine psb_cfile_prec_descr end subroutine psb_cfile_prec_descr

4
prec/psb_d_base_prec_mod.f90
Unescape Escape View File

@ -161,7 +161,7 @@ module psb_d_base_prec_mod
abstract interface abstract interface
subroutine psb_d_base_precdescr(prec,iout,root, verbosity) subroutine psb_d_base_precdescr(prec,iout,root, verbosity,prefix)
import psb_ipk_, psb_dpk_, psb_desc_type, psb_d_vect_type, & import psb_ipk_, psb_dpk_, psb_desc_type, psb_d_vect_type, &
& psb_d_base_vect_type, psb_dspmat_type, psb_d_base_prec_type,& & psb_d_base_vect_type, psb_dspmat_type, psb_d_base_prec_type,&
& psb_d_base_sparse_mat & psb_d_base_sparse_mat
@ -171,7 +171,7 @@ module psb_d_base_prec_mod
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
end subroutine psb_d_base_precdescr end subroutine psb_d_base_precdescr
end interface end interface

11
prec/psb_d_bjacprec.f90
Unescape Escape View File

@ -158,7 +158,7 @@ contains
! 0: normal ! 0: normal
! >1: increased details ! >1: increased details
! !
subroutine psb_d_bjac_precdescr(prec,iout,root, verbosity) subroutine psb_d_bjac_precdescr(prec,iout,root, verbosity,prefix)
use psb_penv_mod use psb_penv_mod
use psb_error_mod use psb_error_mod
implicit none implicit none
@ -167,11 +167,13 @@ contains
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
integer(psb_ipk_) :: err_act, nrow, info integer(psb_ipk_) :: err_act, nrow, info
character(len=20) :: name='d_bjac_precdescr' character(len=20) :: name='d_bjac_precdescr'
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_ integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_
character(1024) :: prefix_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
@ -194,6 +196,11 @@ contains
verbosity_ = 0 verbosity_ = 0
end if end if
if (verbosity_ < 0) goto 9998 if (verbosity_ < 0) goto 9998
if (present(prefix)) then
prefix_ = prefix
else
prefix_ = ""
end if
if (.not.allocated(prec%iprcparm)) then if (.not.allocated(prec%iprcparm)) then
info = 1124 info = 1124
@ -206,7 +213,7 @@ contains
if (root_ == -1) root_ = iam if (root_ == -1) root_ = iam
if (iam == root_) & if (iam == root_) &
& write(iout_,*) trim(prec%desc_prefix()),' ',& & write(iout_,*) trim(prefix_),' ', trim(prec%desc_prefix()),' ',&
& 'Block Jacobi with: ',& & 'Block Jacobi with: ',&
& fact_names(prec%iprcparm(psb_f_type_)) & fact_names(prec%iprcparm(psb_f_type_))

11
prec/psb_d_diagprec.f90
Unescape Escape View File

@ -167,7 +167,7 @@ contains
! 0: normal ! 0: normal
! >1: increased details ! >1: increased details
! !
subroutine psb_d_diag_precdescr(prec,iout,root, verbosity) subroutine psb_d_diag_precdescr(prec,iout,root, verbosity,prefix)
use psb_penv_mod use psb_penv_mod
use psb_error_mod use psb_error_mod
Implicit None Implicit None
@ -176,11 +176,13 @@ contains
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
integer(psb_ipk_) :: err_act, nrow, info integer(psb_ipk_) :: err_act, nrow, info
character(len=20) :: name='d_diag_precdescr' character(len=20) :: name='d_diag_precdescr'
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_ integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_
character(1024) :: prefix_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
@ -201,6 +203,11 @@ contains
else else
verbosity_ = 0 verbosity_ = 0
end if end if
if (present(prefix)) then
prefix_ = prefix
else
prefix_ = ""
end if
if (verbosity_ < 0) goto 9998 if (verbosity_ < 0) goto 9998
ctxt = prec%ctxt ctxt = prec%ctxt
@ -209,7 +216,7 @@ contains
if (root_ == -1) root_ = iam if (root_ == -1) root_ = iam
if (iam == root_) & if (iam == root_) &
& write(iout_,*) trim(prec%desc_prefix()),' ',& & write(iout_,*) trim(prefix_),' ', trim(prec%desc_prefix()),' ',&
& 'Diagonal scaling' & 'Diagonal scaling'
call psb_erractionsave(err_act) call psb_erractionsave(err_act)

11
prec/psb_d_nullprec.f90
Unescape Escape View File

@ -163,7 +163,7 @@ contains
! 0: normal ! 0: normal
! >1: increased details ! >1: increased details
! !
subroutine psb_d_null_precdescr(prec,iout,root, verbosity) subroutine psb_d_null_precdescr(prec,iout,root, verbosity,prefix)
use psb_penv_mod use psb_penv_mod
use psb_error_mod use psb_error_mod
@ -173,6 +173,7 @@ contains
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
integer(psb_ipk_) :: err_act, nrow, info integer(psb_ipk_) :: err_act, nrow, info
character(len=20) :: name='d_null_precset' character(len=20) :: name='d_null_precset'
@ -180,6 +181,7 @@ contains
integer(psb_ipk_) :: ni integer(psb_ipk_) :: ni
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_ integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_
character(1024) :: prefix_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
@ -195,6 +197,11 @@ contains
else else
root_ = psb_root_ root_ = psb_root_
end if end if
if (present(prefix)) then
prefix_ = prefix
else
prefix_ = ""
end if
if (present(verbosity)) then if (present(verbosity)) then
verbosity_ = verbosity verbosity_ = verbosity
else else
@ -207,7 +214,7 @@ contains
if (root_ == -1) root_ = iam if (root_ == -1) root_ = iam
if (iam == root_) & if (iam == root_) &
& write(iout_,*) trim(prec%desc_prefix()),' ',& & write(iout_,*) trim(prefix_),' ', trim(prec%desc_prefix()),' ',&
& 'No preconditioning' & 'No preconditioning'
9998 continue 9998 continue

5
prec/psb_d_prec_type.f90
Unescape Escape View File

@ -197,7 +197,7 @@ contains
! 0: normal ! 0: normal
! >1: increased details ! >1: increased details
! !
subroutine psb_dfile_prec_descr(prec,info,iout, root,verbosity) subroutine psb_dfile_prec_descr(prec,info,iout, root,verbosity,prefix)
use psb_base_mod use psb_base_mod
implicit none implicit none
class(psb_dprec_type), intent(in) :: prec class(psb_dprec_type), intent(in) :: prec
@ -205,6 +205,7 @@ contains
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
integer(psb_ipk_) :: iout_, verbosity_ integer(psb_ipk_) :: iout_, verbosity_
character(len=20) :: name='prec_descr' character(len=20) :: name='prec_descr'
@ -219,7 +220,7 @@ contains
info = 1124 info = 1124
call psb_errpush(info,name,a_err="preconditioner") call psb_errpush(info,name,a_err="preconditioner")
end if end if
call prec%prec%descr(iout=iout,root=root, verbosity=verbosity) call prec%prec%descr(iout=iout,root=root, verbosity=verbosity,prefix=prefix)
end subroutine psb_dfile_prec_descr end subroutine psb_dfile_prec_descr

4
prec/psb_s_base_prec_mod.f90
Unescape Escape View File

@ -161,7 +161,7 @@ module psb_s_base_prec_mod
abstract interface abstract interface
subroutine psb_s_base_precdescr(prec,iout,root, verbosity) subroutine psb_s_base_precdescr(prec,iout,root, verbosity,prefix)
import psb_ipk_, psb_spk_, psb_desc_type, psb_s_vect_type, & import psb_ipk_, psb_spk_, psb_desc_type, psb_s_vect_type, &
& psb_s_base_vect_type, psb_sspmat_type, psb_s_base_prec_type,& & psb_s_base_vect_type, psb_sspmat_type, psb_s_base_prec_type,&
& psb_s_base_sparse_mat & psb_s_base_sparse_mat
@ -171,7 +171,7 @@ module psb_s_base_prec_mod
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
end subroutine psb_s_base_precdescr end subroutine psb_s_base_precdescr
end interface end interface

11
prec/psb_s_bjacprec.f90
Unescape Escape View File

@ -158,7 +158,7 @@ contains
! 0: normal ! 0: normal
! >1: increased details ! >1: increased details
! !
subroutine psb_s_bjac_precdescr(prec,iout,root, verbosity) subroutine psb_s_bjac_precdescr(prec,iout,root, verbosity,prefix)
use psb_penv_mod use psb_penv_mod
use psb_error_mod use psb_error_mod
implicit none implicit none
@ -167,11 +167,13 @@ contains
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
integer(psb_ipk_) :: err_act, nrow, info integer(psb_ipk_) :: err_act, nrow, info
character(len=20) :: name='s_bjac_precdescr' character(len=20) :: name='s_bjac_precdescr'
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_ integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_
character(1024) :: prefix_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
@ -194,6 +196,11 @@ contains
verbosity_ = 0 verbosity_ = 0
end if end if
if (verbosity_ < 0) goto 9998 if (verbosity_ < 0) goto 9998
if (present(prefix)) then
prefix_ = prefix
else
prefix_ = ""
end if
if (.not.allocated(prec%iprcparm)) then if (.not.allocated(prec%iprcparm)) then
info = 1124 info = 1124
@ -206,7 +213,7 @@ contains
if (root_ == -1) root_ = iam if (root_ == -1) root_ = iam
if (iam == root_) & if (iam == root_) &
& write(iout_,*) trim(prec%desc_prefix()),' ',& & write(iout_,*) trim(prefix_),' ', trim(prec%desc_prefix()),' ',&
& 'Block Jacobi with: ',& & 'Block Jacobi with: ',&
& fact_names(prec%iprcparm(psb_f_type_)) & fact_names(prec%iprcparm(psb_f_type_))

11
prec/psb_s_diagprec.f90
Unescape Escape View File

@ -167,7 +167,7 @@ contains
! 0: normal ! 0: normal
! >1: increased details ! >1: increased details
! !
subroutine psb_s_diag_precdescr(prec,iout,root, verbosity) subroutine psb_s_diag_precdescr(prec,iout,root, verbosity,prefix)
use psb_penv_mod use psb_penv_mod
use psb_error_mod use psb_error_mod
Implicit None Implicit None
@ -176,11 +176,13 @@ contains
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
integer(psb_ipk_) :: err_act, nrow, info integer(psb_ipk_) :: err_act, nrow, info
character(len=20) :: name='s_diag_precdescr' character(len=20) :: name='s_diag_precdescr'
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_ integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_
character(1024) :: prefix_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
@ -201,6 +203,11 @@ contains
else else
verbosity_ = 0 verbosity_ = 0
end if end if
if (present(prefix)) then
prefix_ = prefix
else
prefix_ = ""
end if
if (verbosity_ < 0) goto 9998 if (verbosity_ < 0) goto 9998
ctxt = prec%ctxt ctxt = prec%ctxt
@ -209,7 +216,7 @@ contains
if (root_ == -1) root_ = iam if (root_ == -1) root_ = iam
if (iam == root_) & if (iam == root_) &
& write(iout_,*) trim(prec%desc_prefix()),' ',& & write(iout_,*) trim(prefix_),' ', trim(prec%desc_prefix()),' ',&
& 'Diagonal scaling' & 'Diagonal scaling'
call psb_erractionsave(err_act) call psb_erractionsave(err_act)

11
prec/psb_s_nullprec.f90
Unescape Escape View File

@ -163,7 +163,7 @@ contains
! 0: normal ! 0: normal
! >1: increased details ! >1: increased details
! !
subroutine psb_s_null_precdescr(prec,iout,root, verbosity) subroutine psb_s_null_precdescr(prec,iout,root, verbosity,prefix)
use psb_penv_mod use psb_penv_mod
use psb_error_mod use psb_error_mod
@ -173,6 +173,7 @@ contains
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
integer(psb_ipk_) :: err_act, nrow, info integer(psb_ipk_) :: err_act, nrow, info
character(len=20) :: name='s_null_precset' character(len=20) :: name='s_null_precset'
@ -180,6 +181,7 @@ contains
integer(psb_ipk_) :: ni integer(psb_ipk_) :: ni
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_ integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_
character(1024) :: prefix_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
@ -195,6 +197,11 @@ contains
else else
root_ = psb_root_ root_ = psb_root_
end if end if
if (present(prefix)) then
prefix_ = prefix
else
prefix_ = ""
end if
if (present(verbosity)) then if (present(verbosity)) then
verbosity_ = verbosity verbosity_ = verbosity
else else
@ -207,7 +214,7 @@ contains
if (root_ == -1) root_ = iam if (root_ == -1) root_ = iam
if (iam == root_) & if (iam == root_) &
& write(iout_,*) trim(prec%desc_prefix()),' ',& & write(iout_,*) trim(prefix_),' ', trim(prec%desc_prefix()),' ',&
& 'No preconditioning' & 'No preconditioning'
9998 continue 9998 continue

5
prec/psb_s_prec_type.f90
Unescape Escape View File

@ -197,7 +197,7 @@ contains
! 0: normal ! 0: normal
! >1: increased details ! >1: increased details
! !
subroutine psb_sfile_prec_descr(prec,info,iout, root,verbosity) subroutine psb_sfile_prec_descr(prec,info,iout, root,verbosity,prefix)
use psb_base_mod use psb_base_mod
implicit none implicit none
class(psb_sprec_type), intent(in) :: prec class(psb_sprec_type), intent(in) :: prec
@ -205,6 +205,7 @@ contains
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
integer(psb_ipk_) :: iout_, verbosity_ integer(psb_ipk_) :: iout_, verbosity_
character(len=20) :: name='prec_descr' character(len=20) :: name='prec_descr'
@ -219,7 +220,7 @@ contains
info = 1124 info = 1124
call psb_errpush(info,name,a_err="preconditioner") call psb_errpush(info,name,a_err="preconditioner")
end if end if
call prec%prec%descr(iout=iout,root=root, verbosity=verbosity) call prec%prec%descr(iout=iout,root=root, verbosity=verbosity,prefix=prefix)
end subroutine psb_sfile_prec_descr end subroutine psb_sfile_prec_descr

4
prec/psb_z_base_prec_mod.f90
Unescape Escape View File

@ -161,7 +161,7 @@ module psb_z_base_prec_mod
abstract interface abstract interface
subroutine psb_z_base_precdescr(prec,iout,root, verbosity) subroutine psb_z_base_precdescr(prec,iout,root, verbosity,prefix)
import psb_ipk_, psb_dpk_, psb_desc_type, psb_z_vect_type, & import psb_ipk_, psb_dpk_, psb_desc_type, psb_z_vect_type, &
& psb_z_base_vect_type, psb_zspmat_type, psb_z_base_prec_type,& & psb_z_base_vect_type, psb_zspmat_type, psb_z_base_prec_type,&
& psb_z_base_sparse_mat & psb_z_base_sparse_mat
@ -171,7 +171,7 @@ module psb_z_base_prec_mod
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
end subroutine psb_z_base_precdescr end subroutine psb_z_base_precdescr
end interface end interface

11
prec/psb_z_bjacprec.f90
Unescape Escape View File

@ -158,7 +158,7 @@ contains
! 0: normal ! 0: normal
! >1: increased details ! >1: increased details
! !
subroutine psb_z_bjac_precdescr(prec,iout,root, verbosity) subroutine psb_z_bjac_precdescr(prec,iout,root, verbosity,prefix)
use psb_penv_mod use psb_penv_mod
use psb_error_mod use psb_error_mod
implicit none implicit none
@ -167,11 +167,13 @@ contains
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
integer(psb_ipk_) :: err_act, nrow, info integer(psb_ipk_) :: err_act, nrow, info
character(len=20) :: name='z_bjac_precdescr' character(len=20) :: name='z_bjac_precdescr'
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_ integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_
character(1024) :: prefix_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
@ -194,6 +196,11 @@ contains
verbosity_ = 0 verbosity_ = 0
end if end if
if (verbosity_ < 0) goto 9998 if (verbosity_ < 0) goto 9998
if (present(prefix)) then
prefix_ = prefix
else
prefix_ = ""
end if
if (.not.allocated(prec%iprcparm)) then if (.not.allocated(prec%iprcparm)) then
info = 1124 info = 1124
@ -206,7 +213,7 @@ contains
if (root_ == -1) root_ = iam if (root_ == -1) root_ = iam
if (iam == root_) & if (iam == root_) &
& write(iout_,*) trim(prec%desc_prefix()),' ',& & write(iout_,*) trim(prefix_),' ', trim(prec%desc_prefix()),' ',&
& 'Block Jacobi with: ',& & 'Block Jacobi with: ',&
& fact_names(prec%iprcparm(psb_f_type_)) & fact_names(prec%iprcparm(psb_f_type_))

11
prec/psb_z_diagprec.f90
Unescape Escape View File

@ -167,7 +167,7 @@ contains
! 0: normal ! 0: normal
! >1: increased details ! >1: increased details
! !
subroutine psb_z_diag_precdescr(prec,iout,root, verbosity) subroutine psb_z_diag_precdescr(prec,iout,root, verbosity,prefix)
use psb_penv_mod use psb_penv_mod
use psb_error_mod use psb_error_mod
Implicit None Implicit None
@ -176,11 +176,13 @@ contains
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
integer(psb_ipk_) :: err_act, nrow, info integer(psb_ipk_) :: err_act, nrow, info
character(len=20) :: name='z_diag_precdescr' character(len=20) :: name='z_diag_precdescr'
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_ integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_
character(1024) :: prefix_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
@ -201,6 +203,11 @@ contains
else else
verbosity_ = 0 verbosity_ = 0
end if end if
if (present(prefix)) then
prefix_ = prefix
else
prefix_ = ""
end if
if (verbosity_ < 0) goto 9998 if (verbosity_ < 0) goto 9998
ctxt = prec%ctxt ctxt = prec%ctxt
@ -209,7 +216,7 @@ contains
if (root_ == -1) root_ = iam if (root_ == -1) root_ = iam
if (iam == root_) & if (iam == root_) &
& write(iout_,*) trim(prec%desc_prefix()),' ',& & write(iout_,*) trim(prefix_),' ', trim(prec%desc_prefix()),' ',&
& 'Diagonal scaling' & 'Diagonal scaling'
call psb_erractionsave(err_act) call psb_erractionsave(err_act)

11
prec/psb_z_nullprec.f90
Unescape Escape View File

@ -163,7 +163,7 @@ contains
! 0: normal ! 0: normal
! >1: increased details ! >1: increased details
! !
subroutine psb_z_null_precdescr(prec,iout,root, verbosity) subroutine psb_z_null_precdescr(prec,iout,root, verbosity,prefix)
use psb_penv_mod use psb_penv_mod
use psb_error_mod use psb_error_mod
@ -173,6 +173,7 @@ contains
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
integer(psb_ipk_) :: err_act, nrow, info integer(psb_ipk_) :: err_act, nrow, info
character(len=20) :: name='z_null_precset' character(len=20) :: name='z_null_precset'
@ -180,6 +181,7 @@ contains
integer(psb_ipk_) :: ni integer(psb_ipk_) :: ni
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_ integer(psb_ipk_) :: iout_, iam, np, root_, verbosity_
character(1024) :: prefix_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
@ -195,6 +197,11 @@ contains
else else
root_ = psb_root_ root_ = psb_root_
end if end if
if (present(prefix)) then
prefix_ = prefix
else
prefix_ = ""
end if
if (present(verbosity)) then if (present(verbosity)) then
verbosity_ = verbosity verbosity_ = verbosity
else else
@ -207,7 +214,7 @@ contains
if (root_ == -1) root_ = iam if (root_ == -1) root_ = iam
if (iam == root_) & if (iam == root_) &
& write(iout_,*) trim(prec%desc_prefix()),' ',& & write(iout_,*) trim(prefix_),' ', trim(prec%desc_prefix()),' ',&
& 'No preconditioning' & 'No preconditioning'
9998 continue 9998 continue

5
prec/psb_z_prec_type.f90
Unescape Escape View File

@ -197,7 +197,7 @@ contains
! 0: normal ! 0: normal
! >1: increased details ! >1: increased details
! !
subroutine psb_zfile_prec_descr(prec,info,iout, root,verbosity) subroutine psb_zfile_prec_descr(prec,info,iout, root,verbosity,prefix)
use psb_base_mod use psb_base_mod
implicit none implicit none
class(psb_zprec_type), intent(in) :: prec class(psb_zprec_type), intent(in) :: prec
@ -205,6 +205,7 @@ contains
integer(psb_ipk_), intent(in), optional :: iout integer(psb_ipk_), intent(in), optional :: iout
integer(psb_ipk_), intent(in), optional :: root integer(psb_ipk_), intent(in), optional :: root
integer(psb_ipk_), intent(in), optional :: verbosity integer(psb_ipk_), intent(in), optional :: verbosity
character(len=*), intent(in), optional :: prefix
integer(psb_ipk_) :: iout_, verbosity_ integer(psb_ipk_) :: iout_, verbosity_
character(len=20) :: name='prec_descr' character(len=20) :: name='prec_descr'
@ -219,7 +220,7 @@ contains
info = 1124 info = 1124
call psb_errpush(info,name,a_err="preconditioner") call psb_errpush(info,name,a_err="preconditioner")
end if end if
call prec%prec%descr(iout=iout,root=root, verbosity=verbosity) call prec%prec%descr(iout=iout,root=root, verbosity=verbosity,prefix=prefix)
end subroutine psb_zfile_prec_descr end subroutine psb_zfile_prec_descr

Write Preview
Loading…
Cancel
Save