mirror of
https://github.com/sfilippone/psblas3.git
synced 2026-10-16 10:52:08 +00:00
psblas3:
prec/psb_c_base_prec_mod.f90 prec/psb_c_bjacprec.f90 prec/psb_c_diagprec.f90 prec/psb_c_nullprec.f90 prec/psb_c_prec_type.f90 prec/psb_d_base_prec_mod.f90 prec/psb_d_bjacprec.f90 prec/psb_d_diagprec.f90 prec/psb_d_nullprec.f90 prec/psb_d_prec_type.f90 prec/psb_s_base_prec_mod.f90 prec/psb_s_bjacprec.f90 prec/psb_s_diagprec.f90 prec/psb_s_nullprec.f90 prec/psb_s_prec_type.f90 prec/psb_z_base_prec_mod.f90 prec/psb_z_bjacprec.f90 prec/psb_z_diagprec.f90 prec/psb_z_nullprec.f90 prec/psb_z_prec_type.f90 Fix intent of X in precapply.
This commit is contained in:
@@ -69,7 +69,7 @@ contains
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
class(psb_c_base_prec_type), intent(in) :: prec
|
||||
complex(psb_spk_),intent(in) :: alpha, beta
|
||||
complex(psb_spk_),intent(in) :: x(:)
|
||||
complex(psb_spk_),intent(inout) :: x(:)
|
||||
complex(psb_spk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
character(len=1), optional :: trans
|
||||
|
||||
@@ -35,7 +35,7 @@ contains
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
class(psb_c_bjac_prec_type), intent(in) :: prec
|
||||
complex(psb_spk_),intent(in) :: alpha,beta
|
||||
complex(psb_spk_),intent(in) :: x(:)
|
||||
complex(psb_spk_),intent(inout) :: x(:)
|
||||
complex(psb_spk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
character(len=1), optional :: trans
|
||||
|
||||
@@ -28,7 +28,7 @@ contains
|
||||
use psb_base_mod
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
class(psb_c_diag_prec_type), intent(in) :: prec
|
||||
complex(psb_spk_),intent(in) :: x(:)
|
||||
complex(psb_spk_),intent(inout) :: x(:)
|
||||
complex(psb_spk_),intent(in) :: alpha, beta
|
||||
complex(psb_spk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
|
||||
@@ -26,7 +26,7 @@ contains
|
||||
use psb_base_mod
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
class(psb_c_null_prec_type), intent(in) :: prec
|
||||
complex(psb_spk_),intent(in) :: x(:)
|
||||
complex(psb_spk_),intent(inout) :: x(:)
|
||||
complex(psb_spk_),intent(in) :: alpha, beta
|
||||
complex(psb_spk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
|
||||
@@ -68,30 +68,6 @@ module psb_c_prec_type
|
||||
module procedure psb_cprec_sizeof
|
||||
end interface
|
||||
|
||||
interface psb_precaply
|
||||
subroutine psb_cprc_aply(prec,x,y,desc_data,info,trans,work)
|
||||
use psb_base_mod, only : psb_desc_type, psb_spk_
|
||||
import :: psb_cprec_type
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
type(psb_cprec_type), intent(in) :: prec
|
||||
complex(psb_spk_),intent(in) :: x(:)
|
||||
complex(psb_spk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
character(len=1), optional :: trans
|
||||
complex(psb_spk_),intent(inout), optional, target :: work(:)
|
||||
end subroutine psb_cprc_aply
|
||||
subroutine psb_cprc_aply1(prec,x,desc_data,info,trans)
|
||||
use psb_base_mod, only : psb_desc_type, psb_spk_
|
||||
import :: psb_cprec_type
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
type(psb_cprec_type), intent(in) :: prec
|
||||
complex(psb_spk_),intent(inout) :: x(:)
|
||||
integer, intent(out) :: info
|
||||
character(len=1), optional :: trans
|
||||
end subroutine psb_cprc_aply1
|
||||
end interface
|
||||
|
||||
|
||||
contains
|
||||
|
||||
|
||||
|
||||
@@ -75,7 +75,7 @@ contains
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
class(psb_d_base_prec_type), intent(in) :: prec
|
||||
real(psb_dpk_),intent(in) :: alpha, beta
|
||||
real(psb_dpk_),intent(in) :: x(:)
|
||||
real(psb_dpk_),intent(inout) :: x(:)
|
||||
real(psb_dpk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
character(len=1), optional :: trans
|
||||
|
||||
@@ -36,7 +36,7 @@ contains
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
class(psb_d_bjac_prec_type), intent(in) :: prec
|
||||
real(psb_dpk_),intent(in) :: alpha,beta
|
||||
real(psb_dpk_),intent(in) :: x(:)
|
||||
real(psb_dpk_),intent(inout) :: x(:)
|
||||
real(psb_dpk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
character(len=1), optional :: trans
|
||||
|
||||
@@ -28,7 +28,7 @@ contains
|
||||
use psb_base_mod
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
class(psb_d_diag_prec_type), intent(in) :: prec
|
||||
real(psb_dpk_),intent(in) :: x(:)
|
||||
real(psb_dpk_),intent(inout) :: x(:)
|
||||
real(psb_dpk_),intent(in) :: alpha, beta
|
||||
real(psb_dpk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
|
||||
@@ -26,7 +26,7 @@ contains
|
||||
use psb_base_mod
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
class(psb_d_null_prec_type), intent(in) :: prec
|
||||
real(psb_dpk_),intent(in) :: x(:)
|
||||
real(psb_dpk_),intent(inout) :: x(:)
|
||||
real(psb_dpk_),intent(in) :: alpha, beta
|
||||
real(psb_dpk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
|
||||
@@ -74,29 +74,6 @@ module psb_d_prec_type
|
||||
module procedure psb_dprec_sizeof
|
||||
end interface
|
||||
|
||||
interface psb_precaply
|
||||
subroutine psb_dprc_aply(prec,x,y,desc_data,info,trans,work)
|
||||
use psb_base_mod, only : psb_desc_type, psb_dpk_
|
||||
import :: psb_dprec_type
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
type(psb_dprec_type), intent(in) :: prec
|
||||
real(psb_dpk_),intent(in) :: x(:)
|
||||
real(psb_dpk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
character(len=1), optional :: trans
|
||||
real(psb_dpk_),intent(inout), optional, target :: work(:)
|
||||
end subroutine psb_dprc_aply
|
||||
subroutine psb_dprc_aply1(prec,x,desc_data,info,trans)
|
||||
use psb_base_mod, only : psb_desc_type, psb_dpk_
|
||||
import :: psb_dprec_type
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
type(psb_dprec_type), intent(in) :: prec
|
||||
real(psb_dpk_),intent(inout) :: x(:)
|
||||
integer, intent(out) :: info
|
||||
character(len=1), optional :: trans
|
||||
end subroutine psb_dprc_aply1
|
||||
end interface
|
||||
|
||||
|
||||
contains
|
||||
|
||||
@@ -220,7 +197,7 @@ contains
|
||||
call psb_info(ictxt, me, np)
|
||||
|
||||
if (present(trans)) then
|
||||
trans_=trans
|
||||
trans_=psb_toupper(trans)
|
||||
else
|
||||
trans_='N'
|
||||
end if
|
||||
@@ -242,7 +219,7 @@ contains
|
||||
call psb_errpush(info,name,a_err="preconditioner")
|
||||
goto 9999
|
||||
end if
|
||||
call prec%prec%apply(done,x,dzero,y,desc_data,info,trans_,work=work_)
|
||||
call prec%prec%apply(done,x,dzero,y,desc_data,info,trans=trans_,work=work_)
|
||||
if (present(work)) then
|
||||
else
|
||||
deallocate(work_,stat=info)
|
||||
@@ -302,7 +279,7 @@ contains
|
||||
call psb_errpush(info,name,a_err='Allocate')
|
||||
goto 9999
|
||||
end if
|
||||
call prec%prec%apply(done,x,dzero,ww,desc_data,info,trans_,work=w1)
|
||||
call prec%prec%apply(done,x,dzero,ww,desc_data,info,trans=trans_,work=w1)
|
||||
if(info /= psb_success_) goto 9999
|
||||
x(:) = ww(:)
|
||||
deallocate(ww,W1,stat=info)
|
||||
|
||||
@@ -69,7 +69,7 @@ contains
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
class(psb_s_base_prec_type), intent(in) :: prec
|
||||
real(psb_spk_),intent(in) :: alpha, beta
|
||||
real(psb_spk_),intent(in) :: x(:)
|
||||
real(psb_spk_),intent(inout) :: x(:)
|
||||
real(psb_spk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
character(len=1), optional :: trans
|
||||
|
||||
@@ -4,7 +4,7 @@ module psb_s_bjacprec
|
||||
|
||||
type, extends(psb_s_base_prec_type) :: psb_s_bjac_prec_type
|
||||
integer, allocatable :: iprcparm(:)
|
||||
type(psb_sspmat_type), allocatable :: av(:)
|
||||
type(psb_sspmat_type), allocatable :: av(:)
|
||||
real(psb_spk_), allocatable :: d(:)
|
||||
contains
|
||||
procedure, pass(prec) :: apply => psb_s_bjac_apply
|
||||
@@ -35,7 +35,7 @@ contains
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
class(psb_s_bjac_prec_type), intent(in) :: prec
|
||||
real(psb_spk_),intent(in) :: alpha,beta
|
||||
real(psb_spk_),intent(in) :: x(:)
|
||||
real(psb_spk_),intent(inout) :: x(:)
|
||||
real(psb_spk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
character(len=1), optional :: trans
|
||||
|
||||
@@ -28,7 +28,7 @@ contains
|
||||
use psb_base_mod
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
class(psb_s_diag_prec_type), intent(in) :: prec
|
||||
real(psb_spk_),intent(in) :: x(:)
|
||||
real(psb_spk_),intent(inout) :: x(:)
|
||||
real(psb_spk_),intent(in) :: alpha, beta
|
||||
real(psb_spk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
|
||||
@@ -26,7 +26,7 @@ contains
|
||||
use psb_base_mod
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
class(psb_s_null_prec_type), intent(in) :: prec
|
||||
real(psb_spk_),intent(in) :: x(:)
|
||||
real(psb_spk_),intent(inout) :: x(:)
|
||||
real(psb_spk_),intent(in) :: alpha, beta
|
||||
real(psb_spk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
|
||||
@@ -69,28 +69,6 @@ module psb_s_prec_type
|
||||
module procedure psb_sprec_sizeof
|
||||
end interface
|
||||
|
||||
interface psb_precaply
|
||||
subroutine psb_sprc_aply(prec,x,y,desc_data,info,trans,work)
|
||||
use psb_base_mod, only : psb_desc_type, psb_spk_
|
||||
import :: psb_sprec_type
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
type(psb_sprec_type), intent(in) :: prec
|
||||
real(psb_spk_),intent(in) :: x(:)
|
||||
real(psb_spk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
character(len=1), optional :: trans
|
||||
real(psb_spk_),intent(inout), optional, target :: work(:)
|
||||
end subroutine psb_sprc_aply
|
||||
subroutine psb_sprc_aply1(prec,x,desc_data,info,trans)
|
||||
use psb_base_mod, only : psb_desc_type, psb_spk_
|
||||
import :: psb_sprec_type
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
type(psb_sprec_type), intent(in) :: prec
|
||||
real(psb_spk_),intent(inout) :: x(:)
|
||||
integer, intent(out) :: info
|
||||
character(len=1), optional :: trans
|
||||
end subroutine psb_sprc_aply1
|
||||
end interface
|
||||
|
||||
|
||||
contains
|
||||
|
||||
@@ -70,7 +70,7 @@ contains
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
class(psb_z_base_prec_type), intent(in) :: prec
|
||||
complex(psb_dpk_),intent(in) :: alpha, beta
|
||||
complex(psb_dpk_),intent(in) :: x(:)
|
||||
complex(psb_dpk_),intent(inout) :: x(:)
|
||||
complex(psb_dpk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
character(len=1), optional :: trans
|
||||
|
||||
@@ -35,7 +35,7 @@ contains
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
class(psb_z_bjac_prec_type), intent(in) :: prec
|
||||
complex(psb_dpk_),intent(in) :: alpha,beta
|
||||
complex(psb_dpk_),intent(in) :: x(:)
|
||||
complex(psb_dpk_),intent(inout) :: x(:)
|
||||
complex(psb_dpk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
character(len=1), optional :: trans
|
||||
|
||||
@@ -28,7 +28,7 @@ contains
|
||||
use psb_base_mod
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
class(psb_z_diag_prec_type), intent(in) :: prec
|
||||
complex(psb_dpk_),intent(in) :: x(:)
|
||||
complex(psb_dpk_),intent(inout) :: x(:)
|
||||
complex(psb_dpk_),intent(in) :: alpha, beta
|
||||
complex(psb_dpk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
|
||||
@@ -27,7 +27,7 @@ contains
|
||||
use psb_base_mod
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
class(psb_z_null_prec_type), intent(in) :: prec
|
||||
complex(psb_dpk_),intent(in) :: x(:)
|
||||
complex(psb_dpk_),intent(inout) :: x(:)
|
||||
complex(psb_dpk_),intent(in) :: alpha, beta
|
||||
complex(psb_dpk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
|
||||
@@ -68,29 +68,6 @@ module psb_z_prec_type
|
||||
module procedure psb_zprec_sizeof
|
||||
end interface
|
||||
|
||||
interface psb_precaply
|
||||
subroutine psb_zprc_aply(prec,x,y,desc_data,info,trans,work)
|
||||
use psb_base_mod, only : psb_desc_type, psb_dpk_
|
||||
import :: psb_zprec_type
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
type(psb_zprec_type), intent(in) :: prec
|
||||
complex(psb_dpk_),intent(in) :: x(:)
|
||||
complex(psb_dpk_),intent(inout) :: y(:)
|
||||
integer, intent(out) :: info
|
||||
character(len=1), optional :: trans
|
||||
complex(psb_dpk_),intent(inout), optional, target :: work(:)
|
||||
end subroutine psb_zprc_aply
|
||||
subroutine psb_zprc_aply1(prec,x,desc_data,info,trans)
|
||||
use psb_base_mod, only : psb_desc_type, psb_dpk_
|
||||
import :: psb_zprec_type
|
||||
type(psb_desc_type),intent(in) :: desc_data
|
||||
type(psb_zprec_type), intent(in) :: prec
|
||||
complex(psb_dpk_),intent(inout) :: x(:)
|
||||
integer, intent(out) :: info
|
||||
character(len=1), optional :: trans
|
||||
end subroutine psb_zprc_aply1
|
||||
end interface
|
||||
|
||||
|
||||
contains
|
||||
|
||||
|
||||
Reference in New Issue
Block a user