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

Added new optional arguments to TRIL and TRIU. Document same.

Browse Source
pull/1/head
Salvatore Filippone 8 years ago
parent a0a0e96a96
commit 7218ae86d6
19 changed files with 816 additions and 354 deletions
Show Stats Download Patch File Download Diff File

21
base/modules/serial/psb_c_base_mat_mod.f90
Unescape Escape View File

@ -416,7 +416,7 @@ module psb_c_base_mat_mod
!! IMIN<=I<=IMAX !! IMIN<=I<=IMAX
!! JMIN<=J<=JMAX !! JMIN<=J<=JMAX
!! !!
!! \param b the output (sub)matrix !! \param l the output (sub)matrix
!! \param info return code !! \param info return code
!! \param diag [0] the last diagonal (J-I) to be considered. !! \param diag [0] the last diagonal (J-I) to be considered.
!! \param imin [1] the minimum row index we are interested in !! \param imin [1] the minimum row index we are interested in
@ -429,17 +429,19 @@ module psb_c_base_mat_mod
!! ( iren cannot be specified with rscale/cscale) !! ( iren cannot be specified with rscale/cscale)
!! \param append [false] append to ia,ja !! \param append [false] append to ia,ja
!! \param nzin [none] if append, then first new entry should go in entry nzin+1 !! \param nzin [none] if append, then first new entry should go in entry nzin+1
!! \param u [none] copy of the complementary triangle
!! !!
! !
interface interface
subroutine psb_c_base_tril(a,b,info,diag,imin,imax,& subroutine psb_c_base_tril(a,l,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,u)
import :: psb_ipk_, psb_c_base_sparse_mat, psb_c_coo_sparse_mat, psb_spk_ import :: psb_ipk_, psb_c_base_sparse_mat, psb_c_coo_sparse_mat, psb_spk_
class(psb_c_base_sparse_mat), intent(in) :: a class(psb_c_base_sparse_mat), intent(in) :: a
class(psb_c_coo_sparse_mat), intent(out) :: b class(psb_c_coo_sparse_mat), intent(out) :: l
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_c_coo_sparse_mat), optional, intent(out) :: u
end subroutine psb_c_base_tril end subroutine psb_c_base_tril
end interface end interface
@ -456,8 +458,9 @@ module psb_c_base_mat_mod
!! Moreover, apply a clipping by copying entries A(I,J) only if !! Moreover, apply a clipping by copying entries A(I,J) only if
!! IMIN<=I<=IMAX !! IMIN<=I<=IMAX
!! JMIN<=J<=JMAX !! JMIN<=J<=JMAX
!! Optionally copies the lower triangle at the same time
!! !!
!! \param b the output (sub)matrix !! \param u the output (sub)matrix
!! \param info return code !! \param info return code
!! \param diag [0] the last diagonal (J-I) to be considered. !! \param diag [0] the last diagonal (J-I) to be considered.
!! \param imin [1] the minimum row index we are interested in !! \param imin [1] the minimum row index we are interested in
@ -470,17 +473,19 @@ module psb_c_base_mat_mod
!! ( iren cannot be specified with rscale/cscale) !! ( iren cannot be specified with rscale/cscale)
!! \param append [false] append to ia,ja !! \param append [false] append to ia,ja
!! \param nzin [none] if append, then first new entry should go in entry nzin+1 !! \param nzin [none] if append, then first new entry should go in entry nzin+1
!! \param l [none] copy of the complementary triangle
!! !!
! !
interface interface
subroutine psb_c_base_triu(a,b,info,diag,imin,imax,& subroutine psb_c_base_triu(a,u,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,l)
import :: psb_ipk_, psb_c_base_sparse_mat, psb_c_coo_sparse_mat, psb_spk_ import :: psb_ipk_, psb_c_base_sparse_mat, psb_c_coo_sparse_mat, psb_spk_
class(psb_c_base_sparse_mat), intent(in) :: a class(psb_c_base_sparse_mat), intent(in) :: a
class(psb_c_coo_sparse_mat), intent(out) :: b class(psb_c_coo_sparse_mat), intent(out) :: u
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_c_coo_sparse_mat), optional, intent(out) :: l
end subroutine psb_c_base_triu end subroutine psb_c_base_triu
end interface end interface

14
base/modules/serial/psb_c_mat_mod.f90
Unescape Escape View File

@ -481,26 +481,28 @@ module psb_c_mat_mod
end interface end interface
interface interface
subroutine psb_c_tril(a,b,info,diag,imin,imax,& subroutine psb_c_tril(a,l,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,u)
import :: psb_ipk_, psb_cspmat_type, psb_spk_ import :: psb_ipk_, psb_cspmat_type, psb_spk_
class(psb_cspmat_type), intent(in) :: a class(psb_cspmat_type), intent(in) :: a
class(psb_cspmat_type), intent(inout) :: b class(psb_cspmat_type), intent(inout) :: l
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_cspmat_type), optional, intent(inout) :: u
end subroutine psb_c_tril end subroutine psb_c_tril
end interface end interface
interface interface
subroutine psb_c_triu(a,b,info,diag,imin,imax,& subroutine psb_c_triu(a,u,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,l)
import :: psb_ipk_, psb_cspmat_type, psb_spk_ import :: psb_ipk_, psb_cspmat_type, psb_spk_
class(psb_cspmat_type), intent(in) :: a class(psb_cspmat_type), intent(in) :: a
class(psb_cspmat_type), intent(inout) :: b class(psb_cspmat_type), intent(inout) :: u
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_cspmat_type), optional, intent(inout) :: l
end subroutine psb_c_triu end subroutine psb_c_triu
end interface end interface

21
base/modules/serial/psb_d_base_mat_mod.f90
Unescape Escape View File

@ -416,7 +416,7 @@ module psb_d_base_mat_mod
!! IMIN<=I<=IMAX !! IMIN<=I<=IMAX
!! JMIN<=J<=JMAX !! JMIN<=J<=JMAX
!! !!
!! \param b the output (sub)matrix !! \param l the output (sub)matrix
!! \param info return code !! \param info return code
!! \param diag [0] the last diagonal (J-I) to be considered. !! \param diag [0] the last diagonal (J-I) to be considered.
!! \param imin [1] the minimum row index we are interested in !! \param imin [1] the minimum row index we are interested in
@ -429,17 +429,19 @@ module psb_d_base_mat_mod
!! ( iren cannot be specified with rscale/cscale) !! ( iren cannot be specified with rscale/cscale)
!! \param append [false] append to ia,ja !! \param append [false] append to ia,ja
!! \param nzin [none] if append, then first new entry should go in entry nzin+1 !! \param nzin [none] if append, then first new entry should go in entry nzin+1
!! \param u [none] copy of the complementary triangle
!! !!
! !
interface interface
subroutine psb_d_base_tril(a,b,info,diag,imin,imax,& subroutine psb_d_base_tril(a,l,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,u)
import :: psb_ipk_, psb_d_base_sparse_mat, psb_d_coo_sparse_mat, psb_dpk_ import :: psb_ipk_, psb_d_base_sparse_mat, psb_d_coo_sparse_mat, psb_dpk_
class(psb_d_base_sparse_mat), intent(in) :: a class(psb_d_base_sparse_mat), intent(in) :: a
class(psb_d_coo_sparse_mat), intent(out) :: b class(psb_d_coo_sparse_mat), intent(out) :: l
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_d_coo_sparse_mat), optional, intent(out) :: u
end subroutine psb_d_base_tril end subroutine psb_d_base_tril
end interface end interface
@ -456,8 +458,9 @@ module psb_d_base_mat_mod
!! Moreover, apply a clipping by copying entries A(I,J) only if !! Moreover, apply a clipping by copying entries A(I,J) only if
!! IMIN<=I<=IMAX !! IMIN<=I<=IMAX
!! JMIN<=J<=JMAX !! JMIN<=J<=JMAX
!! Optionally copies the lower triangle at the same time
!! !!
!! \param b the output (sub)matrix !! \param u the output (sub)matrix
!! \param info return code !! \param info return code
!! \param diag [0] the last diagonal (J-I) to be considered. !! \param diag [0] the last diagonal (J-I) to be considered.
!! \param imin [1] the minimum row index we are interested in !! \param imin [1] the minimum row index we are interested in
@ -470,17 +473,19 @@ module psb_d_base_mat_mod
!! ( iren cannot be specified with rscale/cscale) !! ( iren cannot be specified with rscale/cscale)
!! \param append [false] append to ia,ja !! \param append [false] append to ia,ja
!! \param nzin [none] if append, then first new entry should go in entry nzin+1 !! \param nzin [none] if append, then first new entry should go in entry nzin+1
!! \param l [none] copy of the complementary triangle
!! !!
! !
interface interface
subroutine psb_d_base_triu(a,b,info,diag,imin,imax,& subroutine psb_d_base_triu(a,u,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,l)
import :: psb_ipk_, psb_d_base_sparse_mat, psb_d_coo_sparse_mat, psb_dpk_ import :: psb_ipk_, psb_d_base_sparse_mat, psb_d_coo_sparse_mat, psb_dpk_
class(psb_d_base_sparse_mat), intent(in) :: a class(psb_d_base_sparse_mat), intent(in) :: a
class(psb_d_coo_sparse_mat), intent(out) :: b class(psb_d_coo_sparse_mat), intent(out) :: u
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_d_coo_sparse_mat), optional, intent(out) :: l
end subroutine psb_d_base_triu end subroutine psb_d_base_triu
end interface end interface

14
base/modules/serial/psb_d_mat_mod.f90
Unescape Escape View File

@ -481,26 +481,28 @@ module psb_d_mat_mod
end interface end interface
interface interface
subroutine psb_d_tril(a,b,info,diag,imin,imax,& subroutine psb_d_tril(a,l,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,u)
import :: psb_ipk_, psb_dspmat_type, psb_dpk_ import :: psb_ipk_, psb_dspmat_type, psb_dpk_
class(psb_dspmat_type), intent(in) :: a class(psb_dspmat_type), intent(in) :: a
class(psb_dspmat_type), intent(inout) :: b class(psb_dspmat_type), intent(inout) :: l
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_dspmat_type), optional, intent(inout) :: u
end subroutine psb_d_tril end subroutine psb_d_tril
end interface end interface
interface interface
subroutine psb_d_triu(a,b,info,diag,imin,imax,& subroutine psb_d_triu(a,u,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,l)
import :: psb_ipk_, psb_dspmat_type, psb_dpk_ import :: psb_ipk_, psb_dspmat_type, psb_dpk_
class(psb_dspmat_type), intent(in) :: a class(psb_dspmat_type), intent(in) :: a
class(psb_dspmat_type), intent(inout) :: b class(psb_dspmat_type), intent(inout) :: u
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_dspmat_type), optional, intent(inout) :: l
end subroutine psb_d_triu end subroutine psb_d_triu
end interface end interface

21
base/modules/serial/psb_s_base_mat_mod.f90
Unescape Escape View File

@ -416,7 +416,7 @@ module psb_s_base_mat_mod
!! IMIN<=I<=IMAX !! IMIN<=I<=IMAX
!! JMIN<=J<=JMAX !! JMIN<=J<=JMAX
!! !!
!! \param b the output (sub)matrix !! \param l the output (sub)matrix
!! \param info return code !! \param info return code
!! \param diag [0] the last diagonal (J-I) to be considered. !! \param diag [0] the last diagonal (J-I) to be considered.
!! \param imin [1] the minimum row index we are interested in !! \param imin [1] the minimum row index we are interested in
@ -429,17 +429,19 @@ module psb_s_base_mat_mod
!! ( iren cannot be specified with rscale/cscale) !! ( iren cannot be specified with rscale/cscale)
!! \param append [false] append to ia,ja !! \param append [false] append to ia,ja
!! \param nzin [none] if append, then first new entry should go in entry nzin+1 !! \param nzin [none] if append, then first new entry should go in entry nzin+1
!! \param u [none] copy of the complementary triangle
!! !!
! !
interface interface
subroutine psb_s_base_tril(a,b,info,diag,imin,imax,& subroutine psb_s_base_tril(a,l,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,u)
import :: psb_ipk_, psb_s_base_sparse_mat, psb_s_coo_sparse_mat, psb_spk_ import :: psb_ipk_, psb_s_base_sparse_mat, psb_s_coo_sparse_mat, psb_spk_
class(psb_s_base_sparse_mat), intent(in) :: a class(psb_s_base_sparse_mat), intent(in) :: a
class(psb_s_coo_sparse_mat), intent(out) :: b class(psb_s_coo_sparse_mat), intent(out) :: l
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_s_coo_sparse_mat), optional, intent(out) :: u
end subroutine psb_s_base_tril end subroutine psb_s_base_tril
end interface end interface
@ -456,8 +458,9 @@ module psb_s_base_mat_mod
!! Moreover, apply a clipping by copying entries A(I,J) only if !! Moreover, apply a clipping by copying entries A(I,J) only if
!! IMIN<=I<=IMAX !! IMIN<=I<=IMAX
!! JMIN<=J<=JMAX !! JMIN<=J<=JMAX
!! Optionally copies the lower triangle at the same time
!! !!
!! \param b the output (sub)matrix !! \param u the output (sub)matrix
!! \param info return code !! \param info return code
!! \param diag [0] the last diagonal (J-I) to be considered. !! \param diag [0] the last diagonal (J-I) to be considered.
!! \param imin [1] the minimum row index we are interested in !! \param imin [1] the minimum row index we are interested in
@ -470,17 +473,19 @@ module psb_s_base_mat_mod
!! ( iren cannot be specified with rscale/cscale) !! ( iren cannot be specified with rscale/cscale)
!! \param append [false] append to ia,ja !! \param append [false] append to ia,ja
!! \param nzin [none] if append, then first new entry should go in entry nzin+1 !! \param nzin [none] if append, then first new entry should go in entry nzin+1
!! \param l [none] copy of the complementary triangle
!! !!
! !
interface interface
subroutine psb_s_base_triu(a,b,info,diag,imin,imax,& subroutine psb_s_base_triu(a,u,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,l)
import :: psb_ipk_, psb_s_base_sparse_mat, psb_s_coo_sparse_mat, psb_spk_ import :: psb_ipk_, psb_s_base_sparse_mat, psb_s_coo_sparse_mat, psb_spk_
class(psb_s_base_sparse_mat), intent(in) :: a class(psb_s_base_sparse_mat), intent(in) :: a
class(psb_s_coo_sparse_mat), intent(out) :: b class(psb_s_coo_sparse_mat), intent(out) :: u
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_s_coo_sparse_mat), optional, intent(out) :: l
end subroutine psb_s_base_triu end subroutine psb_s_base_triu
end interface end interface

14
base/modules/serial/psb_s_mat_mod.f90
Unescape Escape View File

@ -481,26 +481,28 @@ module psb_s_mat_mod
end interface end interface
interface interface
subroutine psb_s_tril(a,b,info,diag,imin,imax,& subroutine psb_s_tril(a,l,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,u)
import :: psb_ipk_, psb_sspmat_type, psb_spk_ import :: psb_ipk_, psb_sspmat_type, psb_spk_
class(psb_sspmat_type), intent(in) :: a class(psb_sspmat_type), intent(in) :: a
class(psb_sspmat_type), intent(inout) :: b class(psb_sspmat_type), intent(inout) :: l
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_sspmat_type), optional, intent(inout) :: u
end subroutine psb_s_tril end subroutine psb_s_tril
end interface end interface
interface interface
subroutine psb_s_triu(a,b,info,diag,imin,imax,& subroutine psb_s_triu(a,u,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,l)
import :: psb_ipk_, psb_sspmat_type, psb_spk_ import :: psb_ipk_, psb_sspmat_type, psb_spk_
class(psb_sspmat_type), intent(in) :: a class(psb_sspmat_type), intent(in) :: a
class(psb_sspmat_type), intent(inout) :: b class(psb_sspmat_type), intent(inout) :: u
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_sspmat_type), optional, intent(inout) :: l
end subroutine psb_s_triu end subroutine psb_s_triu
end interface end interface

21
base/modules/serial/psb_z_base_mat_mod.f90
Unescape Escape View File

@ -416,7 +416,7 @@ module psb_z_base_mat_mod
!! IMIN<=I<=IMAX !! IMIN<=I<=IMAX
!! JMIN<=J<=JMAX !! JMIN<=J<=JMAX
!! !!
!! \param b the output (sub)matrix !! \param l the output (sub)matrix
!! \param info return code !! \param info return code
!! \param diag [0] the last diagonal (J-I) to be considered. !! \param diag [0] the last diagonal (J-I) to be considered.
!! \param imin [1] the minimum row index we are interested in !! \param imin [1] the minimum row index we are interested in
@ -429,17 +429,19 @@ module psb_z_base_mat_mod
!! ( iren cannot be specified with rscale/cscale) !! ( iren cannot be specified with rscale/cscale)
!! \param append [false] append to ia,ja !! \param append [false] append to ia,ja
!! \param nzin [none] if append, then first new entry should go in entry nzin+1 !! \param nzin [none] if append, then first new entry should go in entry nzin+1
!! \param u [none] copy of the complementary triangle
!! !!
! !
interface interface
subroutine psb_z_base_tril(a,b,info,diag,imin,imax,& subroutine psb_z_base_tril(a,l,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,u)
import :: psb_ipk_, psb_z_base_sparse_mat, psb_z_coo_sparse_mat, psb_dpk_ import :: psb_ipk_, psb_z_base_sparse_mat, psb_z_coo_sparse_mat, psb_dpk_
class(psb_z_base_sparse_mat), intent(in) :: a class(psb_z_base_sparse_mat), intent(in) :: a
class(psb_z_coo_sparse_mat), intent(out) :: b class(psb_z_coo_sparse_mat), intent(out) :: l
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_z_coo_sparse_mat), optional, intent(out) :: u
end subroutine psb_z_base_tril end subroutine psb_z_base_tril
end interface end interface
@ -456,8 +458,9 @@ module psb_z_base_mat_mod
!! Moreover, apply a clipping by copying entries A(I,J) only if !! Moreover, apply a clipping by copying entries A(I,J) only if
!! IMIN<=I<=IMAX !! IMIN<=I<=IMAX
!! JMIN<=J<=JMAX !! JMIN<=J<=JMAX
!! Optionally copies the lower triangle at the same time
!! !!
!! \param b the output (sub)matrix !! \param u the output (sub)matrix
!! \param info return code !! \param info return code
!! \param diag [0] the last diagonal (J-I) to be considered. !! \param diag [0] the last diagonal (J-I) to be considered.
!! \param imin [1] the minimum row index we are interested in !! \param imin [1] the minimum row index we are interested in
@ -470,17 +473,19 @@ module psb_z_base_mat_mod
!! ( iren cannot be specified with rscale/cscale) !! ( iren cannot be specified with rscale/cscale)
!! \param append [false] append to ia,ja !! \param append [false] append to ia,ja
!! \param nzin [none] if append, then first new entry should go in entry nzin+1 !! \param nzin [none] if append, then first new entry should go in entry nzin+1
!! \param l [none] copy of the complementary triangle
!! !!
! !
interface interface
subroutine psb_z_base_triu(a,b,info,diag,imin,imax,& subroutine psb_z_base_triu(a,u,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,l)
import :: psb_ipk_, psb_z_base_sparse_mat, psb_z_coo_sparse_mat, psb_dpk_ import :: psb_ipk_, psb_z_base_sparse_mat, psb_z_coo_sparse_mat, psb_dpk_
class(psb_z_base_sparse_mat), intent(in) :: a class(psb_z_base_sparse_mat), intent(in) :: a
class(psb_z_coo_sparse_mat), intent(out) :: b class(psb_z_coo_sparse_mat), intent(out) :: u
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_z_coo_sparse_mat), optional, intent(out) :: l
end subroutine psb_z_base_triu end subroutine psb_z_base_triu
end interface end interface

14
base/modules/serial/psb_z_mat_mod.f90
Unescape Escape View File

@ -481,26 +481,28 @@ module psb_z_mat_mod
end interface end interface
interface interface
subroutine psb_z_tril(a,b,info,diag,imin,imax,& subroutine psb_z_tril(a,l,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,u)
import :: psb_ipk_, psb_zspmat_type, psb_dpk_ import :: psb_ipk_, psb_zspmat_type, psb_dpk_
class(psb_zspmat_type), intent(in) :: a class(psb_zspmat_type), intent(in) :: a
class(psb_zspmat_type), intent(inout) :: b class(psb_zspmat_type), intent(inout) :: l
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_zspmat_type), optional, intent(inout) :: u
end subroutine psb_z_tril end subroutine psb_z_tril
end interface end interface
interface interface
subroutine psb_z_triu(a,b,info,diag,imin,imax,& subroutine psb_z_triu(a,u,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,l)
import :: psb_ipk_, psb_zspmat_type, psb_dpk_ import :: psb_ipk_, psb_zspmat_type, psb_dpk_
class(psb_zspmat_type), intent(in) :: a class(psb_zspmat_type), intent(in) :: a
class(psb_zspmat_type), intent(inout) :: b class(psb_zspmat_type), intent(inout) :: u
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_zspmat_type), optional, intent(inout) :: l
end subroutine psb_z_triu end subroutine psb_z_triu
end interface end interface

179
base/serial/impl/psb_c_base_mat_impl.F90
Unescape Escape View File

@ -630,8 +630,8 @@ end subroutine psb_c_base_csclip
! this is just based on the getrow. ! this is just based on the getrow.
! If performance is critical it can be overridden. ! If performance is critical it can be overridden.
! !
subroutine psb_c_base_tril(a,b,info,& subroutine psb_c_base_tril(a,l,info,&
& diag,imin,imax,jmin,jmax,rscale,cscale) & diag,imin,imax,jmin,jmax,rscale,cscale,u)
! Output is always in COO format ! Output is always in COO format
use psb_error_mod use psb_error_mod
use psb_const_mod use psb_const_mod
@ -639,12 +639,16 @@ subroutine psb_c_base_tril(a,b,info,&
implicit none implicit none
class(psb_c_base_sparse_mat), intent(in) :: a class(psb_c_base_sparse_mat), intent(in) :: a
class(psb_c_coo_sparse_mat), intent(out) :: b class(psb_c_coo_sparse_mat), intent(out) :: l
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_c_coo_sparse_mat), optional, intent(out) :: u
integer(psb_ipk_) :: err_act, nzin, nzout, i, j, k integer(psb_ipk_) :: err_act, nzin, nzout, i, j, k
integer(psb_ipk_) :: imin_, imax_, jmin_, jmax_, mb,nb, diag_ integer(psb_ipk_) :: imin_, imax_, jmin_, jmax_, mb,nb, diag_, nzlin, nzuin, nz
integer(psb_ipk_), allocatable :: ia(:), ja(:)
complex(psb_spk_), allocatable :: val(:)
integer(psb_ipk_) :: ierr(5) integer(psb_ipk_) :: ierr(5)
character(len=20) :: name='tril' character(len=20) :: name='tril'
logical :: rscale_, cscale_ logical :: rscale_, cscale_
@ -700,28 +704,70 @@ subroutine psb_c_base_tril(a,b,info,&
nb = jmax_ nb = jmax_
endif endif
call b%allocate(mb,nb)
nzin = b%get_nzeros() ! At this point it should be 0 nz = a%get_nzeros()
call l%allocate(mb,nb,nz)
do i=imin_,imax_
k = min(jmax_,i+diag_) if (present(u)) then
call a%csget(i,i,nzout,b%ia,b%ja,b%val,info,& nzlin = l%get_nzeros() ! At this point it should be 0
& jmin=jmin_, jmax=k, append=.true., & call u%allocate(mb,nb,nz)
& nzin=nzin) nzuin = u%get_nzeros() ! At this point it should be 0
if (info /= psb_success_) goto 9999 call psb_realloc(max(mb,nb),ia,info)
call b%set_nzeros(nzin+nzout) call psb_realloc(max(mb,nb),ja,info)
nzin = nzin+nzout call psb_realloc(max(mb,nb),val,info)
end do do i=imin_,imax_
call b%fix(info) call a%csget(i,i,nzout,ia,ja,val,info,&
nzout = b%get_nzeros() & jmin=jmin_, jmax=jmax_)
do k=1, nzout
j = ja(k)
if (j-i<=diag_) then
nzlin = nzlin + 1
l%ia(nzlin) = ia(k)
l%ja(nzlin) = ja(k)
l%val(nzlin) = val(k)
else
nzuin = nzuin + 1
u%ia(nzuin) = ia(k)
u%ja(nzuin) = ja(k)
u%val(nzuin) = val(k)
end if
end do
end do
call l%set_nzeros(nzlin)
call u%set_nzeros(nzuin)
call u%fix(info)
nzout = u%get_nzeros()
if (rscale_) &
& u%ia(1:nzout) = u%ia(1:nzout) - imin_ + 1
if (cscale_) &
& u%ja(1:nzout) = u%ja(1:nzout) - jmin_ + 1
if ((diag_ >= -1).and.(imin_ == jmin_)) then
call u%set_triangle(.true.)
call u%set_lower(.false.)
end if
else
nzin = l%get_nzeros() ! At this point it should be 0
do i=imin_,imax_
k = min(jmax_,i+diag_)
call a%csget(i,i,nzout,l%ia,l%ja,l%val,info,&
& jmin=jmin_, jmax=k, append=.true., &
& nzin=nzin)
if (info /= psb_success_) goto 9999
call l%set_nzeros(nzin+nzout)
nzin = nzin+nzout
end do
end if
call l%fix(info)
nzout = l%get_nzeros()
if (rscale_) & if (rscale_) &
& b%ia(1:nzout) = b%ia(1:nzout) - imin_ + 1 & l%ia(1:nzout) = l%ia(1:nzout) - imin_ + 1
if (cscale_) & if (cscale_) &
& b%ja(1:nzout) = b%ja(1:nzout) - jmin_ + 1 & l%ja(1:nzout) = l%ja(1:nzout) - jmin_ + 1
if ((diag_ <= 0).and.(imin_ == jmin_)) then if ((diag_ <= 0).and.(imin_ == jmin_)) then
call b%set_triangle(.true.) call l%set_triangle(.true.)
call b%set_lower(.true.) call l%set_lower(.true.)
end if end if
if (info /= psb_success_) goto 9999 if (info /= psb_success_) goto 9999
@ -735,8 +781,8 @@ subroutine psb_c_base_tril(a,b,info,&
end subroutine psb_c_base_tril end subroutine psb_c_base_tril
subroutine psb_c_base_triu(a,b,info,& subroutine psb_c_base_triu(a,u,info,&
& diag,imin,imax,jmin,jmax,rscale,cscale) & diag,imin,imax,jmin,jmax,rscale,cscale,l)
! Output is always in COO format ! Output is always in COO format
use psb_error_mod use psb_error_mod
use psb_const_mod use psb_const_mod
@ -744,12 +790,16 @@ subroutine psb_c_base_triu(a,b,info,&
implicit none implicit none
class(psb_c_base_sparse_mat), intent(in) :: a class(psb_c_base_sparse_mat), intent(in) :: a
class(psb_c_coo_sparse_mat), intent(out) :: b class(psb_c_coo_sparse_mat), intent(out) :: u
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_c_coo_sparse_mat), optional, intent(out) :: l
integer(psb_ipk_) :: err_act, nzin, nzout, i, j, k integer(psb_ipk_) :: err_act, nzin, nzout, i, j, k
integer(psb_ipk_) :: imin_, imax_, jmin_, jmax_, mb,nb, diag_ integer(psb_ipk_) :: imin_, imax_, jmin_, jmax_, mb,nb, diag_, nzlin, nzuin, nz
integer(psb_ipk_), allocatable :: ia(:), ja(:)
complex(psb_spk_), allocatable :: val(:)
integer(psb_ipk_) :: ierr(5) integer(psb_ipk_) :: ierr(5)
character(len=20) :: name='triu' character(len=20) :: name='triu'
logical :: rscale_, cscale_ logical :: rscale_, cscale_
@ -805,28 +855,69 @@ subroutine psb_c_base_triu(a,b,info,&
nb = jmax_ nb = jmax_
endif endif
call b%allocate(mb,nb)
nzin = b%get_nzeros() ! At this point it should be 0 nz = a%get_nzeros()
call u%allocate(mb,nb,nz)
do i=imin_,imax_
k = max(jmin_,i+diag_) if (present(l)) then
call a%csget(i,i,nzout,b%ia,b%ja,b%val,info,& nzuin = u%get_nzeros() ! At this point it should be 0
& jmin=k, jmax=jmax_, append=.true., & call l%allocate(mb,nb,nz)
& nzin=nzin) nzlin = l%get_nzeros() ! At this point it should be 0
if (info /= psb_success_) goto 9999 call psb_realloc(max(mb,nb),ia,info)
call b%set_nzeros(nzin+nzout) call psb_realloc(max(mb,nb),ja,info)
nzin = nzin+nzout call psb_realloc(max(mb,nb),val,info)
end do do i=imin_,imax_
call b%fix(info) call a%csget(i,i,nzout,ia,ja,val,info,&
nzout = b%get_nzeros() & jmin=jmin_, jmax=jmax_)
do k=1, nzout
j = ja(k)
if (j-i<diag_) then
nzlin = nzlin + 1
l%ia(nzlin) = ia(k)
l%ja(nzlin) = ja(k)
l%val(nzlin) = val(k)
else
nzuin = nzuin + 1
u%ia(nzuin) = ia(k)
u%ja(nzuin) = ja(k)
u%val(nzuin) = val(k)
end if
end do
end do
call u%set_nzeros(nzuin)
call l%set_nzeros(nzlin)
call l%fix(info)
nzout = l%get_nzeros()
if (rscale_) &
& l%ia(1:nzout) = l%ia(1:nzout) - imin_ + 1
if (cscale_) &
& l%ja(1:nzout) = l%ja(1:nzout) - jmin_ + 1
if ((diag_ <=1).and.(imin_ == jmin_)) then
call l%set_triangle(.true.)
call l%set_lower(.true.)
end if
else
nzin = u%get_nzeros()
do i=imin_,imax_
k = max(jmin_,i+diag_)
call a%csget(i,i,nzout,u%ia,u%ja,u%val,info,&
& jmin=k, jmax=jmax_, append=.true., &
& nzin=nzin)
if (info /= psb_success_) goto 9999
call u%set_nzeros(nzin+nzout)
nzin = nzin+nzout
end do
end if
call u%fix(info)
nzout = u%get_nzeros()
if (rscale_) & if (rscale_) &
& b%ia(1:nzout) = b%ia(1:nzout) - imin_ + 1 & u%ia(1:nzout) = u%ia(1:nzout) - imin_ + 1
if (cscale_) & if (cscale_) &
& b%ja(1:nzout) = b%ja(1:nzout) - jmin_ + 1 & u%ja(1:nzout) = u%ja(1:nzout) - jmin_ + 1
if ((diag_ >= 0).and.(imin_ == jmin_)) then if ((diag_ >= 0).and.(imin_ == jmin_)) then
call b%set_triangle(.true.) call u%set_triangle(.true.)
call b%set_upper(.true.) call u%set_upper(.true.)
end if end if
if (info /= psb_success_) goto 9999 if (info /= psb_success_) goto 9999

72
base/serial/impl/psb_c_mat_impl.F90
Unescape Escape View File

@ -906,24 +906,24 @@ subroutine psb_c_csgetblk(imin,imax,a,b,info,&
end subroutine psb_c_csgetblk end subroutine psb_c_csgetblk
subroutine psb_c_tril(a,b,info,diag,imin,imax,& subroutine psb_c_tril(a,l,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,u)
use psb_error_mod use psb_error_mod
use psb_const_mod use psb_const_mod
use psb_c_base_mat_mod use psb_c_base_mat_mod
use psb_c_mat_mod, psb_protect_name => psb_c_tril use psb_c_mat_mod, psb_protect_name => psb_c_tril
implicit none implicit none
class(psb_cspmat_type), intent(in) :: a class(psb_cspmat_type), intent(in) :: a
class(psb_cspmat_type), intent(inout) :: b class(psb_cspmat_type), intent(inout) :: l
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_cspmat_type), optional, intent(inout) :: u
integer(psb_ipk_) :: err_act integer(psb_ipk_) :: err_act
character(len=20) :: name='tril' character(len=20) :: name='tril'
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
type(psb_c_coo_sparse_mat), allocatable :: acoo type(psb_c_coo_sparse_mat), allocatable :: lcoo, ucoo
info = psb_success_ info = psb_success_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
@ -932,23 +932,30 @@ subroutine psb_c_tril(a,b,info,diag,imin,imax,&
call psb_errpush(info,name) call psb_errpush(info,name)
goto 9999 goto 9999
endif endif
allocate(acoo,stat=info) allocate(lcoo,stat=info)
call b%free() call l%free()
if (present(u)) then
if (info == psb_success_) then if (info == psb_success_) allocate(ucoo,stat=info)
call a%a%tril(acoo,info,diag,imin,imax,& call u%free()
& jmin,jmax,rscale,cscale) if (info == psb_success_) call a%a%tril(lcoo,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale,ucoo)
if (info == psb_success_) call move_alloc(ucoo,u%a)
if (info == psb_success_) call u%cscnv(info,mold=a%a)
else else
info = psb_err_alloc_dealloc_ if (info == psb_success_) then
call a%a%tril(lcoo,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale)
else
info = psb_err_alloc_dealloc_
end if
end if end if
if (info == psb_success_) call move_alloc(acoo,b%a) if (info == psb_success_) call move_alloc(lcoo,l%a)
if (info == psb_success_) call b%cscnv(info,mold=a%a) if (info == psb_success_) call l%cscnv(info,mold=a%a)
if (info /= psb_success_) goto 9999 if (info /= psb_success_) goto 9999
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return
9999 call psb_error_handler(err_act) 9999 call psb_error_handler(err_act)
return return
@ -956,23 +963,24 @@ subroutine psb_c_tril(a,b,info,diag,imin,imax,&
end subroutine psb_c_tril end subroutine psb_c_tril
subroutine psb_c_triu(a,b,info,diag,imin,imax,& subroutine psb_c_triu(a,u,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,l)
use psb_error_mod use psb_error_mod
use psb_const_mod use psb_const_mod
use psb_c_base_mat_mod use psb_c_base_mat_mod
use psb_c_mat_mod, psb_protect_name => psb_c_triu use psb_c_mat_mod, psb_protect_name => psb_c_triu
implicit none implicit none
class(psb_cspmat_type), intent(in) :: a class(psb_cspmat_type), intent(in) :: a
class(psb_cspmat_type), intent(inout) :: b class(psb_cspmat_type), intent(inout) :: u
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_cspmat_type), optional, intent(inout) :: l
integer(psb_ipk_) :: err_act integer(psb_ipk_) :: err_act
character(len=20) :: name='triu' character(len=20) :: name='triu'
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
type(psb_c_coo_sparse_mat), allocatable :: acoo type(psb_c_coo_sparse_mat), allocatable :: lcoo, ucoo
info = psb_success_ info = psb_success_
@ -983,23 +991,31 @@ subroutine psb_c_triu(a,b,info,diag,imin,imax,&
goto 9999 goto 9999
endif endif
allocate(acoo,stat=info) allocate(ucoo,stat=info)
call b%free() call u%free()
if (info == psb_success_) then if (present(l)) then
call a%a%triu(acoo,info,diag,imin,imax,& if (info == psb_success_) allocate(lcoo,stat=info)
& jmin,jmax,rscale,cscale) call l%free()
if (info == psb_success_) call a%a%triu(ucoo,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale,lcoo)
if (info == psb_success_) call move_alloc(lcoo,l%a)
if (info == psb_success_) call l%cscnv(info,mold=a%a)
else else
info = psb_err_alloc_dealloc_ if (info == psb_success_) then
call a%a%triu(ucoo,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale)
else
info = psb_err_alloc_dealloc_
end if
end if end if
if (info == psb_success_) call move_alloc(acoo,b%a) if (info == psb_success_) call move_alloc(ucoo,u%a)
if (info == psb_success_) call b%cscnv(info,mold=a%a) if (info == psb_success_) call u%cscnv(info,mold=a%a)
if (info /= psb_success_) goto 9999 if (info /= psb_success_) goto 9999
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return
9999 call psb_error_handler(err_act) 9999 call psb_error_handler(err_act)
return return

179
base/serial/impl/psb_d_base_mat_impl.F90
Unescape Escape View File

@ -630,8 +630,8 @@ end subroutine psb_d_base_csclip
! this is just based on the getrow. ! this is just based on the getrow.
! If performance is critical it can be overridden. ! If performance is critical it can be overridden.
! !
subroutine psb_d_base_tril(a,b,info,& subroutine psb_d_base_tril(a,l,info,&
& diag,imin,imax,jmin,jmax,rscale,cscale) & diag,imin,imax,jmin,jmax,rscale,cscale,u)
! Output is always in COO format ! Output is always in COO format
use psb_error_mod use psb_error_mod
use psb_const_mod use psb_const_mod
@ -639,12 +639,16 @@ subroutine psb_d_base_tril(a,b,info,&
implicit none implicit none
class(psb_d_base_sparse_mat), intent(in) :: a class(psb_d_base_sparse_mat), intent(in) :: a
class(psb_d_coo_sparse_mat), intent(out) :: b class(psb_d_coo_sparse_mat), intent(out) :: l
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_d_coo_sparse_mat), optional, intent(out) :: u
integer(psb_ipk_) :: err_act, nzin, nzout, i, j, k integer(psb_ipk_) :: err_act, nzin, nzout, i, j, k
integer(psb_ipk_) :: imin_, imax_, jmin_, jmax_, mb,nb, diag_ integer(psb_ipk_) :: imin_, imax_, jmin_, jmax_, mb,nb, diag_, nzlin, nzuin, nz
integer(psb_ipk_), allocatable :: ia(:), ja(:)
real(psb_dpk_), allocatable :: val(:)
integer(psb_ipk_) :: ierr(5) integer(psb_ipk_) :: ierr(5)
character(len=20) :: name='tril' character(len=20) :: name='tril'
logical :: rscale_, cscale_ logical :: rscale_, cscale_
@ -700,28 +704,70 @@ subroutine psb_d_base_tril(a,b,info,&
nb = jmax_ nb = jmax_
endif endif
call b%allocate(mb,nb)
nzin = b%get_nzeros() ! At this point it should be 0 nz = a%get_nzeros()
call l%allocate(mb,nb,nz)
do i=imin_,imax_
k = min(jmax_,i+diag_) if (present(u)) then
call a%csget(i,i,nzout,b%ia,b%ja,b%val,info,& nzlin = l%get_nzeros() ! At this point it should be 0
& jmin=jmin_, jmax=k, append=.true., & call u%allocate(mb,nb,nz)
& nzin=nzin) nzuin = u%get_nzeros() ! At this point it should be 0
if (info /= psb_success_) goto 9999 call psb_realloc(max(mb,nb),ia,info)
call b%set_nzeros(nzin+nzout) call psb_realloc(max(mb,nb),ja,info)
nzin = nzin+nzout call psb_realloc(max(mb,nb),val,info)
end do do i=imin_,imax_
call b%fix(info) call a%csget(i,i,nzout,ia,ja,val,info,&
nzout = b%get_nzeros() & jmin=jmin_, jmax=jmax_)
do k=1, nzout
j = ja(k)
if (j-i<=diag_) then
nzlin = nzlin + 1
l%ia(nzlin) = ia(k)
l%ja(nzlin) = ja(k)
l%val(nzlin) = val(k)
else
nzuin = nzuin + 1
u%ia(nzuin) = ia(k)
u%ja(nzuin) = ja(k)
u%val(nzuin) = val(k)
end if
end do
end do
call l%set_nzeros(nzlin)
call u%set_nzeros(nzuin)
call u%fix(info)
nzout = u%get_nzeros()
if (rscale_) &
& u%ia(1:nzout) = u%ia(1:nzout) - imin_ + 1
if (cscale_) &
& u%ja(1:nzout) = u%ja(1:nzout) - jmin_ + 1
if ((diag_ >= -1).and.(imin_ == jmin_)) then
call u%set_triangle(.true.)
call u%set_lower(.false.)
end if
else
nzin = l%get_nzeros() ! At this point it should be 0
do i=imin_,imax_
k = min(jmax_,i+diag_)
call a%csget(i,i,nzout,l%ia,l%ja,l%val,info,&
& jmin=jmin_, jmax=k, append=.true., &
& nzin=nzin)
if (info /= psb_success_) goto 9999
call l%set_nzeros(nzin+nzout)
nzin = nzin+nzout
end do
end if
call l%fix(info)
nzout = l%get_nzeros()
if (rscale_) & if (rscale_) &
& b%ia(1:nzout) = b%ia(1:nzout) - imin_ + 1 & l%ia(1:nzout) = l%ia(1:nzout) - imin_ + 1
if (cscale_) & if (cscale_) &
& b%ja(1:nzout) = b%ja(1:nzout) - jmin_ + 1 & l%ja(1:nzout) = l%ja(1:nzout) - jmin_ + 1
if ((diag_ <= 0).and.(imin_ == jmin_)) then if ((diag_ <= 0).and.(imin_ == jmin_)) then
call b%set_triangle(.true.) call l%set_triangle(.true.)
call b%set_lower(.true.) call l%set_lower(.true.)
end if end if
if (info /= psb_success_) goto 9999 if (info /= psb_success_) goto 9999
@ -735,8 +781,8 @@ subroutine psb_d_base_tril(a,b,info,&
end subroutine psb_d_base_tril end subroutine psb_d_base_tril
subroutine psb_d_base_triu(a,b,info,& subroutine psb_d_base_triu(a,u,info,&
& diag,imin,imax,jmin,jmax,rscale,cscale) & diag,imin,imax,jmin,jmax,rscale,cscale,l)
! Output is always in COO format ! Output is always in COO format
use psb_error_mod use psb_error_mod
use psb_const_mod use psb_const_mod
@ -744,12 +790,16 @@ subroutine psb_d_base_triu(a,b,info,&
implicit none implicit none
class(psb_d_base_sparse_mat), intent(in) :: a class(psb_d_base_sparse_mat), intent(in) :: a
class(psb_d_coo_sparse_mat), intent(out) :: b class(psb_d_coo_sparse_mat), intent(out) :: u
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_d_coo_sparse_mat), optional, intent(out) :: l
integer(psb_ipk_) :: err_act, nzin, nzout, i, j, k integer(psb_ipk_) :: err_act, nzin, nzout, i, j, k
integer(psb_ipk_) :: imin_, imax_, jmin_, jmax_, mb,nb, diag_ integer(psb_ipk_) :: imin_, imax_, jmin_, jmax_, mb,nb, diag_, nzlin, nzuin, nz
integer(psb_ipk_), allocatable :: ia(:), ja(:)
real(psb_dpk_), allocatable :: val(:)
integer(psb_ipk_) :: ierr(5) integer(psb_ipk_) :: ierr(5)
character(len=20) :: name='triu' character(len=20) :: name='triu'
logical :: rscale_, cscale_ logical :: rscale_, cscale_
@ -805,28 +855,69 @@ subroutine psb_d_base_triu(a,b,info,&
nb = jmax_ nb = jmax_
endif endif
call b%allocate(mb,nb)
nzin = b%get_nzeros() ! At this point it should be 0 nz = a%get_nzeros()
call u%allocate(mb,nb,nz)
do i=imin_,imax_
k = max(jmin_,i+diag_) if (present(l)) then
call a%csget(i,i,nzout,b%ia,b%ja,b%val,info,& nzuin = u%get_nzeros() ! At this point it should be 0
& jmin=k, jmax=jmax_, append=.true., & call l%allocate(mb,nb,nz)
& nzin=nzin) nzlin = l%get_nzeros() ! At this point it should be 0
if (info /= psb_success_) goto 9999 call psb_realloc(max(mb,nb),ia,info)
call b%set_nzeros(nzin+nzout) call psb_realloc(max(mb,nb),ja,info)
nzin = nzin+nzout call psb_realloc(max(mb,nb),val,info)
end do do i=imin_,imax_
call b%fix(info) call a%csget(i,i,nzout,ia,ja,val,info,&
nzout = b%get_nzeros() & jmin=jmin_, jmax=jmax_)
do k=1, nzout
j = ja(k)
if (j-i<diag_) then
nzlin = nzlin + 1
l%ia(nzlin) = ia(k)
l%ja(nzlin) = ja(k)
l%val(nzlin) = val(k)
else
nzuin = nzuin + 1
u%ia(nzuin) = ia(k)
u%ja(nzuin) = ja(k)
u%val(nzuin) = val(k)
end if
end do
end do
call u%set_nzeros(nzuin)
call l%set_nzeros(nzlin)
call l%fix(info)
nzout = l%get_nzeros()
if (rscale_) &
& l%ia(1:nzout) = l%ia(1:nzout) - imin_ + 1
if (cscale_) &
& l%ja(1:nzout) = l%ja(1:nzout) - jmin_ + 1
if ((diag_ <=1).and.(imin_ == jmin_)) then
call l%set_triangle(.true.)
call l%set_lower(.true.)
end if
else
nzin = u%get_nzeros()
do i=imin_,imax_
k = max(jmin_,i+diag_)
call a%csget(i,i,nzout,u%ia,u%ja,u%val,info,&
& jmin=k, jmax=jmax_, append=.true., &
& nzin=nzin)
if (info /= psb_success_) goto 9999
call u%set_nzeros(nzin+nzout)
nzin = nzin+nzout
end do
end if
call u%fix(info)
nzout = u%get_nzeros()
if (rscale_) & if (rscale_) &
& b%ia(1:nzout) = b%ia(1:nzout) - imin_ + 1 & u%ia(1:nzout) = u%ia(1:nzout) - imin_ + 1
if (cscale_) & if (cscale_) &
& b%ja(1:nzout) = b%ja(1:nzout) - jmin_ + 1 & u%ja(1:nzout) = u%ja(1:nzout) - jmin_ + 1
if ((diag_ >= 0).and.(imin_ == jmin_)) then if ((diag_ >= 0).and.(imin_ == jmin_)) then
call b%set_triangle(.true.) call u%set_triangle(.true.)
call b%set_upper(.true.) call u%set_upper(.true.)
end if end if
if (info /= psb_success_) goto 9999 if (info /= psb_success_) goto 9999

72
base/serial/impl/psb_d_mat_impl.F90
Unescape Escape View File

@ -906,24 +906,24 @@ subroutine psb_d_csgetblk(imin,imax,a,b,info,&
end subroutine psb_d_csgetblk end subroutine psb_d_csgetblk
subroutine psb_d_tril(a,b,info,diag,imin,imax,& subroutine psb_d_tril(a,l,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,u)
use psb_error_mod use psb_error_mod
use psb_const_mod use psb_const_mod
use psb_d_base_mat_mod use psb_d_base_mat_mod
use psb_d_mat_mod, psb_protect_name => psb_d_tril use psb_d_mat_mod, psb_protect_name => psb_d_tril
implicit none implicit none
class(psb_dspmat_type), intent(in) :: a class(psb_dspmat_type), intent(in) :: a
class(psb_dspmat_type), intent(inout) :: b class(psb_dspmat_type), intent(inout) :: l
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_dspmat_type), optional, intent(inout) :: u
integer(psb_ipk_) :: err_act integer(psb_ipk_) :: err_act
character(len=20) :: name='tril' character(len=20) :: name='tril'
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
type(psb_d_coo_sparse_mat), allocatable :: acoo type(psb_d_coo_sparse_mat), allocatable :: lcoo, ucoo
info = psb_success_ info = psb_success_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
@ -932,23 +932,30 @@ subroutine psb_d_tril(a,b,info,diag,imin,imax,&
call psb_errpush(info,name) call psb_errpush(info,name)
goto 9999 goto 9999
endif endif
allocate(acoo,stat=info) allocate(lcoo,stat=info)
call b%free() call l%free()
if (present(u)) then
if (info == psb_success_) then if (info == psb_success_) allocate(ucoo,stat=info)
call a%a%tril(acoo,info,diag,imin,imax,& call u%free()
& jmin,jmax,rscale,cscale) if (info == psb_success_) call a%a%tril(lcoo,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale,ucoo)
if (info == psb_success_) call move_alloc(ucoo,u%a)
if (info == psb_success_) call u%cscnv(info,mold=a%a)
else else
info = psb_err_alloc_dealloc_ if (info == psb_success_) then
call a%a%tril(lcoo,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale)
else
info = psb_err_alloc_dealloc_
end if
end if end if
if (info == psb_success_) call move_alloc(acoo,b%a) if (info == psb_success_) call move_alloc(lcoo,l%a)
if (info == psb_success_) call b%cscnv(info,mold=a%a) if (info == psb_success_) call l%cscnv(info,mold=a%a)
if (info /= psb_success_) goto 9999 if (info /= psb_success_) goto 9999
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return
9999 call psb_error_handler(err_act) 9999 call psb_error_handler(err_act)
return return
@ -956,23 +963,24 @@ subroutine psb_d_tril(a,b,info,diag,imin,imax,&
end subroutine psb_d_tril end subroutine psb_d_tril
subroutine psb_d_triu(a,b,info,diag,imin,imax,& subroutine psb_d_triu(a,u,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,l)
use psb_error_mod use psb_error_mod
use psb_const_mod use psb_const_mod
use psb_d_base_mat_mod use psb_d_base_mat_mod
use psb_d_mat_mod, psb_protect_name => psb_d_triu use psb_d_mat_mod, psb_protect_name => psb_d_triu
implicit none implicit none
class(psb_dspmat_type), intent(in) :: a class(psb_dspmat_type), intent(in) :: a
class(psb_dspmat_type), intent(inout) :: b class(psb_dspmat_type), intent(inout) :: u
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_dspmat_type), optional, intent(inout) :: l
integer(psb_ipk_) :: err_act integer(psb_ipk_) :: err_act
character(len=20) :: name='triu' character(len=20) :: name='triu'
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
type(psb_d_coo_sparse_mat), allocatable :: acoo type(psb_d_coo_sparse_mat), allocatable :: lcoo, ucoo
info = psb_success_ info = psb_success_
@ -983,23 +991,31 @@ subroutine psb_d_triu(a,b,info,diag,imin,imax,&
goto 9999 goto 9999
endif endif
allocate(acoo,stat=info) allocate(ucoo,stat=info)
call b%free() call u%free()
if (info == psb_success_) then if (present(l)) then
call a%a%triu(acoo,info,diag,imin,imax,& if (info == psb_success_) allocate(lcoo,stat=info)
& jmin,jmax,rscale,cscale) call l%free()
if (info == psb_success_) call a%a%triu(ucoo,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale,lcoo)
if (info == psb_success_) call move_alloc(lcoo,l%a)
if (info == psb_success_) call l%cscnv(info,mold=a%a)
else else
info = psb_err_alloc_dealloc_ if (info == psb_success_) then
call a%a%triu(ucoo,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale)
else
info = psb_err_alloc_dealloc_
end if
end if end if
if (info == psb_success_) call move_alloc(acoo,b%a) if (info == psb_success_) call move_alloc(ucoo,u%a)
if (info == psb_success_) call b%cscnv(info,mold=a%a) if (info == psb_success_) call u%cscnv(info,mold=a%a)
if (info /= psb_success_) goto 9999 if (info /= psb_success_) goto 9999
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return
9999 call psb_error_handler(err_act) 9999 call psb_error_handler(err_act)
return return

179
base/serial/impl/psb_s_base_mat_impl.F90
Unescape Escape View File

@ -630,8 +630,8 @@ end subroutine psb_s_base_csclip
! this is just based on the getrow. ! this is just based on the getrow.
! If performance is critical it can be overridden. ! If performance is critical it can be overridden.
! !
subroutine psb_s_base_tril(a,b,info,& subroutine psb_s_base_tril(a,l,info,&
& diag,imin,imax,jmin,jmax,rscale,cscale) & diag,imin,imax,jmin,jmax,rscale,cscale,u)
! Output is always in COO format ! Output is always in COO format
use psb_error_mod use psb_error_mod
use psb_const_mod use psb_const_mod
@ -639,12 +639,16 @@ subroutine psb_s_base_tril(a,b,info,&
implicit none implicit none
class(psb_s_base_sparse_mat), intent(in) :: a class(psb_s_base_sparse_mat), intent(in) :: a
class(psb_s_coo_sparse_mat), intent(out) :: b class(psb_s_coo_sparse_mat), intent(out) :: l
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_s_coo_sparse_mat), optional, intent(out) :: u
integer(psb_ipk_) :: err_act, nzin, nzout, i, j, k integer(psb_ipk_) :: err_act, nzin, nzout, i, j, k
integer(psb_ipk_) :: imin_, imax_, jmin_, jmax_, mb,nb, diag_ integer(psb_ipk_) :: imin_, imax_, jmin_, jmax_, mb,nb, diag_, nzlin, nzuin, nz
integer(psb_ipk_), allocatable :: ia(:), ja(:)
real(psb_spk_), allocatable :: val(:)
integer(psb_ipk_) :: ierr(5) integer(psb_ipk_) :: ierr(5)
character(len=20) :: name='tril' character(len=20) :: name='tril'
logical :: rscale_, cscale_ logical :: rscale_, cscale_
@ -700,28 +704,70 @@ subroutine psb_s_base_tril(a,b,info,&
nb = jmax_ nb = jmax_
endif endif
call b%allocate(mb,nb)
nzin = b%get_nzeros() ! At this point it should be 0 nz = a%get_nzeros()
call l%allocate(mb,nb,nz)
do i=imin_,imax_
k = min(jmax_,i+diag_) if (present(u)) then
call a%csget(i,i,nzout,b%ia,b%ja,b%val,info,& nzlin = l%get_nzeros() ! At this point it should be 0
& jmin=jmin_, jmax=k, append=.true., & call u%allocate(mb,nb,nz)
& nzin=nzin) nzuin = u%get_nzeros() ! At this point it should be 0
if (info /= psb_success_) goto 9999 call psb_realloc(max(mb,nb),ia,info)
call b%set_nzeros(nzin+nzout) call psb_realloc(max(mb,nb),ja,info)
nzin = nzin+nzout call psb_realloc(max(mb,nb),val,info)
end do do i=imin_,imax_
call b%fix(info) call a%csget(i,i,nzout,ia,ja,val,info,&
nzout = b%get_nzeros() & jmin=jmin_, jmax=jmax_)
do k=1, nzout
j = ja(k)
if (j-i<=diag_) then
nzlin = nzlin + 1
l%ia(nzlin) = ia(k)
l%ja(nzlin) = ja(k)
l%val(nzlin) = val(k)
else
nzuin = nzuin + 1
u%ia(nzuin) = ia(k)
u%ja(nzuin) = ja(k)
u%val(nzuin) = val(k)
end if
end do
end do
call l%set_nzeros(nzlin)
call u%set_nzeros(nzuin)
call u%fix(info)
nzout = u%get_nzeros()
if (rscale_) &
& u%ia(1:nzout) = u%ia(1:nzout) - imin_ + 1
if (cscale_) &
& u%ja(1:nzout) = u%ja(1:nzout) - jmin_ + 1
if ((diag_ >= -1).and.(imin_ == jmin_)) then
call u%set_triangle(.true.)
call u%set_lower(.false.)
end if
else
nzin = l%get_nzeros() ! At this point it should be 0
do i=imin_,imax_
k = min(jmax_,i+diag_)
call a%csget(i,i,nzout,l%ia,l%ja,l%val,info,&
& jmin=jmin_, jmax=k, append=.true., &
& nzin=nzin)
if (info /= psb_success_) goto 9999
call l%set_nzeros(nzin+nzout)
nzin = nzin+nzout
end do
end if
call l%fix(info)
nzout = l%get_nzeros()
if (rscale_) & if (rscale_) &
& b%ia(1:nzout) = b%ia(1:nzout) - imin_ + 1 & l%ia(1:nzout) = l%ia(1:nzout) - imin_ + 1
if (cscale_) & if (cscale_) &
& b%ja(1:nzout) = b%ja(1:nzout) - jmin_ + 1 & l%ja(1:nzout) = l%ja(1:nzout) - jmin_ + 1
if ((diag_ <= 0).and.(imin_ == jmin_)) then if ((diag_ <= 0).and.(imin_ == jmin_)) then
call b%set_triangle(.true.) call l%set_triangle(.true.)
call b%set_lower(.true.) call l%set_lower(.true.)
end if end if
if (info /= psb_success_) goto 9999 if (info /= psb_success_) goto 9999
@ -735,8 +781,8 @@ subroutine psb_s_base_tril(a,b,info,&
end subroutine psb_s_base_tril end subroutine psb_s_base_tril
subroutine psb_s_base_triu(a,b,info,& subroutine psb_s_base_triu(a,u,info,&
& diag,imin,imax,jmin,jmax,rscale,cscale) & diag,imin,imax,jmin,jmax,rscale,cscale,l)
! Output is always in COO format ! Output is always in COO format
use psb_error_mod use psb_error_mod
use psb_const_mod use psb_const_mod
@ -744,12 +790,16 @@ subroutine psb_s_base_triu(a,b,info,&
implicit none implicit none
class(psb_s_base_sparse_mat), intent(in) :: a class(psb_s_base_sparse_mat), intent(in) :: a
class(psb_s_coo_sparse_mat), intent(out) :: b class(psb_s_coo_sparse_mat), intent(out) :: u
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_s_coo_sparse_mat), optional, intent(out) :: l
integer(psb_ipk_) :: err_act, nzin, nzout, i, j, k integer(psb_ipk_) :: err_act, nzin, nzout, i, j, k
integer(psb_ipk_) :: imin_, imax_, jmin_, jmax_, mb,nb, diag_ integer(psb_ipk_) :: imin_, imax_, jmin_, jmax_, mb,nb, diag_, nzlin, nzuin, nz
integer(psb_ipk_), allocatable :: ia(:), ja(:)
real(psb_spk_), allocatable :: val(:)
integer(psb_ipk_) :: ierr(5) integer(psb_ipk_) :: ierr(5)
character(len=20) :: name='triu' character(len=20) :: name='triu'
logical :: rscale_, cscale_ logical :: rscale_, cscale_
@ -805,28 +855,69 @@ subroutine psb_s_base_triu(a,b,info,&
nb = jmax_ nb = jmax_
endif endif
call b%allocate(mb,nb)
nzin = b%get_nzeros() ! At this point it should be 0 nz = a%get_nzeros()
call u%allocate(mb,nb,nz)
do i=imin_,imax_
k = max(jmin_,i+diag_) if (present(l)) then
call a%csget(i,i,nzout,b%ia,b%ja,b%val,info,& nzuin = u%get_nzeros() ! At this point it should be 0
& jmin=k, jmax=jmax_, append=.true., & call l%allocate(mb,nb,nz)
& nzin=nzin) nzlin = l%get_nzeros() ! At this point it should be 0
if (info /= psb_success_) goto 9999 call psb_realloc(max(mb,nb),ia,info)
call b%set_nzeros(nzin+nzout) call psb_realloc(max(mb,nb),ja,info)
nzin = nzin+nzout call psb_realloc(max(mb,nb),val,info)
end do do i=imin_,imax_
call b%fix(info) call a%csget(i,i,nzout,ia,ja,val,info,&
nzout = b%get_nzeros() & jmin=jmin_, jmax=jmax_)
do k=1, nzout
j = ja(k)
if (j-i<diag_) then
nzlin = nzlin + 1
l%ia(nzlin) = ia(k)
l%ja(nzlin) = ja(k)
l%val(nzlin) = val(k)
else
nzuin = nzuin + 1
u%ia(nzuin) = ia(k)
u%ja(nzuin) = ja(k)
u%val(nzuin) = val(k)
end if
end do
end do
call u%set_nzeros(nzuin)
call l%set_nzeros(nzlin)
call l%fix(info)
nzout = l%get_nzeros()
if (rscale_) &
& l%ia(1:nzout) = l%ia(1:nzout) - imin_ + 1
if (cscale_) &
& l%ja(1:nzout) = l%ja(1:nzout) - jmin_ + 1
if ((diag_ <=1).and.(imin_ == jmin_)) then
call l%set_triangle(.true.)
call l%set_lower(.true.)
end if
else
nzin = u%get_nzeros()
do i=imin_,imax_
k = max(jmin_,i+diag_)
call a%csget(i,i,nzout,u%ia,u%ja,u%val,info,&
& jmin=k, jmax=jmax_, append=.true., &
& nzin=nzin)
if (info /= psb_success_) goto 9999
call u%set_nzeros(nzin+nzout)
nzin = nzin+nzout
end do
end if
call u%fix(info)
nzout = u%get_nzeros()
if (rscale_) & if (rscale_) &
& b%ia(1:nzout) = b%ia(1:nzout) - imin_ + 1 & u%ia(1:nzout) = u%ia(1:nzout) - imin_ + 1
if (cscale_) & if (cscale_) &
& b%ja(1:nzout) = b%ja(1:nzout) - jmin_ + 1 & u%ja(1:nzout) = u%ja(1:nzout) - jmin_ + 1
if ((diag_ >= 0).and.(imin_ == jmin_)) then if ((diag_ >= 0).and.(imin_ == jmin_)) then
call b%set_triangle(.true.) call u%set_triangle(.true.)
call b%set_upper(.true.) call u%set_upper(.true.)
end if end if
if (info /= psb_success_) goto 9999 if (info /= psb_success_) goto 9999

72
base/serial/impl/psb_s_mat_impl.F90
Unescape Escape View File

@ -906,24 +906,24 @@ subroutine psb_s_csgetblk(imin,imax,a,b,info,&
end subroutine psb_s_csgetblk end subroutine psb_s_csgetblk
subroutine psb_s_tril(a,b,info,diag,imin,imax,& subroutine psb_s_tril(a,l,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,u)
use psb_error_mod use psb_error_mod
use psb_const_mod use psb_const_mod
use psb_s_base_mat_mod use psb_s_base_mat_mod
use psb_s_mat_mod, psb_protect_name => psb_s_tril use psb_s_mat_mod, psb_protect_name => psb_s_tril
implicit none implicit none
class(psb_sspmat_type), intent(in) :: a class(psb_sspmat_type), intent(in) :: a
class(psb_sspmat_type), intent(inout) :: b class(psb_sspmat_type), intent(inout) :: l
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_sspmat_type), optional, intent(inout) :: u
integer(psb_ipk_) :: err_act integer(psb_ipk_) :: err_act
character(len=20) :: name='tril' character(len=20) :: name='tril'
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
type(psb_s_coo_sparse_mat), allocatable :: acoo type(psb_s_coo_sparse_mat), allocatable :: lcoo, ucoo
info = psb_success_ info = psb_success_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
@ -932,23 +932,30 @@ subroutine psb_s_tril(a,b,info,diag,imin,imax,&
call psb_errpush(info,name) call psb_errpush(info,name)
goto 9999 goto 9999
endif endif
allocate(acoo,stat=info) allocate(lcoo,stat=info)
call b%free() call l%free()
if (present(u)) then
if (info == psb_success_) then if (info == psb_success_) allocate(ucoo,stat=info)
call a%a%tril(acoo,info,diag,imin,imax,& call u%free()
& jmin,jmax,rscale,cscale) if (info == psb_success_) call a%a%tril(lcoo,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale,ucoo)
if (info == psb_success_) call move_alloc(ucoo,u%a)
if (info == psb_success_) call u%cscnv(info,mold=a%a)
else else
info = psb_err_alloc_dealloc_ if (info == psb_success_) then
call a%a%tril(lcoo,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale)
else
info = psb_err_alloc_dealloc_
end if
end if end if
if (info == psb_success_) call move_alloc(acoo,b%a) if (info == psb_success_) call move_alloc(lcoo,l%a)
if (info == psb_success_) call b%cscnv(info,mold=a%a) if (info == psb_success_) call l%cscnv(info,mold=a%a)
if (info /= psb_success_) goto 9999 if (info /= psb_success_) goto 9999
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return
9999 call psb_error_handler(err_act) 9999 call psb_error_handler(err_act)
return return
@ -956,23 +963,24 @@ subroutine psb_s_tril(a,b,info,diag,imin,imax,&
end subroutine psb_s_tril end subroutine psb_s_tril
subroutine psb_s_triu(a,b,info,diag,imin,imax,& subroutine psb_s_triu(a,u,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,l)
use psb_error_mod use psb_error_mod
use psb_const_mod use psb_const_mod
use psb_s_base_mat_mod use psb_s_base_mat_mod
use psb_s_mat_mod, psb_protect_name => psb_s_triu use psb_s_mat_mod, psb_protect_name => psb_s_triu
implicit none implicit none
class(psb_sspmat_type), intent(in) :: a class(psb_sspmat_type), intent(in) :: a
class(psb_sspmat_type), intent(inout) :: b class(psb_sspmat_type), intent(inout) :: u
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_sspmat_type), optional, intent(inout) :: l
integer(psb_ipk_) :: err_act integer(psb_ipk_) :: err_act
character(len=20) :: name='triu' character(len=20) :: name='triu'
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
type(psb_s_coo_sparse_mat), allocatable :: acoo type(psb_s_coo_sparse_mat), allocatable :: lcoo, ucoo
info = psb_success_ info = psb_success_
@ -983,23 +991,31 @@ subroutine psb_s_triu(a,b,info,diag,imin,imax,&
goto 9999 goto 9999
endif endif
allocate(acoo,stat=info) allocate(ucoo,stat=info)
call b%free() call u%free()
if (info == psb_success_) then if (present(l)) then
call a%a%triu(acoo,info,diag,imin,imax,& if (info == psb_success_) allocate(lcoo,stat=info)
& jmin,jmax,rscale,cscale) call l%free()
if (info == psb_success_) call a%a%triu(ucoo,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale,lcoo)
if (info == psb_success_) call move_alloc(lcoo,l%a)
if (info == psb_success_) call l%cscnv(info,mold=a%a)
else else
info = psb_err_alloc_dealloc_ if (info == psb_success_) then
call a%a%triu(ucoo,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale)
else
info = psb_err_alloc_dealloc_
end if
end if end if
if (info == psb_success_) call move_alloc(acoo,b%a) if (info == psb_success_) call move_alloc(ucoo,u%a)
if (info == psb_success_) call b%cscnv(info,mold=a%a) if (info == psb_success_) call u%cscnv(info,mold=a%a)
if (info /= psb_success_) goto 9999 if (info /= psb_success_) goto 9999
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return
9999 call psb_error_handler(err_act) 9999 call psb_error_handler(err_act)
return return

179
base/serial/impl/psb_z_base_mat_impl.F90
Unescape Escape View File

@ -630,8 +630,8 @@ end subroutine psb_z_base_csclip
! this is just based on the getrow. ! this is just based on the getrow.
! If performance is critical it can be overridden. ! If performance is critical it can be overridden.
! !
subroutine psb_z_base_tril(a,b,info,& subroutine psb_z_base_tril(a,l,info,&
& diag,imin,imax,jmin,jmax,rscale,cscale) & diag,imin,imax,jmin,jmax,rscale,cscale,u)
! Output is always in COO format ! Output is always in COO format
use psb_error_mod use psb_error_mod
use psb_const_mod use psb_const_mod
@ -639,12 +639,16 @@ subroutine psb_z_base_tril(a,b,info,&
implicit none implicit none
class(psb_z_base_sparse_mat), intent(in) :: a class(psb_z_base_sparse_mat), intent(in) :: a
class(psb_z_coo_sparse_mat), intent(out) :: b class(psb_z_coo_sparse_mat), intent(out) :: l
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_z_coo_sparse_mat), optional, intent(out) :: u
integer(psb_ipk_) :: err_act, nzin, nzout, i, j, k integer(psb_ipk_) :: err_act, nzin, nzout, i, j, k
integer(psb_ipk_) :: imin_, imax_, jmin_, jmax_, mb,nb, diag_ integer(psb_ipk_) :: imin_, imax_, jmin_, jmax_, mb,nb, diag_, nzlin, nzuin, nz
integer(psb_ipk_), allocatable :: ia(:), ja(:)
complex(psb_dpk_), allocatable :: val(:)
integer(psb_ipk_) :: ierr(5) integer(psb_ipk_) :: ierr(5)
character(len=20) :: name='tril' character(len=20) :: name='tril'
logical :: rscale_, cscale_ logical :: rscale_, cscale_
@ -700,28 +704,70 @@ subroutine psb_z_base_tril(a,b,info,&
nb = jmax_ nb = jmax_
endif endif
call b%allocate(mb,nb)
nzin = b%get_nzeros() ! At this point it should be 0 nz = a%get_nzeros()
call l%allocate(mb,nb,nz)
do i=imin_,imax_
k = min(jmax_,i+diag_) if (present(u)) then
call a%csget(i,i,nzout,b%ia,b%ja,b%val,info,& nzlin = l%get_nzeros() ! At this point it should be 0
& jmin=jmin_, jmax=k, append=.true., & call u%allocate(mb,nb,nz)
& nzin=nzin) nzuin = u%get_nzeros() ! At this point it should be 0
if (info /= psb_success_) goto 9999 call psb_realloc(max(mb,nb),ia,info)
call b%set_nzeros(nzin+nzout) call psb_realloc(max(mb,nb),ja,info)
nzin = nzin+nzout call psb_realloc(max(mb,nb),val,info)
end do do i=imin_,imax_
call b%fix(info) call a%csget(i,i,nzout,ia,ja,val,info,&
nzout = b%get_nzeros() & jmin=jmin_, jmax=jmax_)
do k=1, nzout
j = ja(k)
if (j-i<=diag_) then
nzlin = nzlin + 1
l%ia(nzlin) = ia(k)
l%ja(nzlin) = ja(k)
l%val(nzlin) = val(k)
else
nzuin = nzuin + 1
u%ia(nzuin) = ia(k)
u%ja(nzuin) = ja(k)
u%val(nzuin) = val(k)
end if
end do
end do
call l%set_nzeros(nzlin)
call u%set_nzeros(nzuin)
call u%fix(info)
nzout = u%get_nzeros()
if (rscale_) &
& u%ia(1:nzout) = u%ia(1:nzout) - imin_ + 1
if (cscale_) &
& u%ja(1:nzout) = u%ja(1:nzout) - jmin_ + 1
if ((diag_ >= -1).and.(imin_ == jmin_)) then
call u%set_triangle(.true.)
call u%set_lower(.false.)
end if
else
nzin = l%get_nzeros() ! At this point it should be 0
do i=imin_,imax_
k = min(jmax_,i+diag_)
call a%csget(i,i,nzout,l%ia,l%ja,l%val,info,&
& jmin=jmin_, jmax=k, append=.true., &
& nzin=nzin)
if (info /= psb_success_) goto 9999
call l%set_nzeros(nzin+nzout)
nzin = nzin+nzout
end do
end if
call l%fix(info)
nzout = l%get_nzeros()
if (rscale_) & if (rscale_) &
& b%ia(1:nzout) = b%ia(1:nzout) - imin_ + 1 & l%ia(1:nzout) = l%ia(1:nzout) - imin_ + 1
if (cscale_) & if (cscale_) &
& b%ja(1:nzout) = b%ja(1:nzout) - jmin_ + 1 & l%ja(1:nzout) = l%ja(1:nzout) - jmin_ + 1
if ((diag_ <= 0).and.(imin_ == jmin_)) then if ((diag_ <= 0).and.(imin_ == jmin_)) then
call b%set_triangle(.true.) call l%set_triangle(.true.)
call b%set_lower(.true.) call l%set_lower(.true.)
end if end if
if (info /= psb_success_) goto 9999 if (info /= psb_success_) goto 9999
@ -735,8 +781,8 @@ subroutine psb_z_base_tril(a,b,info,&
end subroutine psb_z_base_tril end subroutine psb_z_base_tril
subroutine psb_z_base_triu(a,b,info,& subroutine psb_z_base_triu(a,u,info,&
& diag,imin,imax,jmin,jmax,rscale,cscale) & diag,imin,imax,jmin,jmax,rscale,cscale,l)
! Output is always in COO format ! Output is always in COO format
use psb_error_mod use psb_error_mod
use psb_const_mod use psb_const_mod
@ -744,12 +790,16 @@ subroutine psb_z_base_triu(a,b,info,&
implicit none implicit none
class(psb_z_base_sparse_mat), intent(in) :: a class(psb_z_base_sparse_mat), intent(in) :: a
class(psb_z_coo_sparse_mat), intent(out) :: b class(psb_z_coo_sparse_mat), intent(out) :: u
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_z_coo_sparse_mat), optional, intent(out) :: l
integer(psb_ipk_) :: err_act, nzin, nzout, i, j, k integer(psb_ipk_) :: err_act, nzin, nzout, i, j, k
integer(psb_ipk_) :: imin_, imax_, jmin_, jmax_, mb,nb, diag_ integer(psb_ipk_) :: imin_, imax_, jmin_, jmax_, mb,nb, diag_, nzlin, nzuin, nz
integer(psb_ipk_), allocatable :: ia(:), ja(:)
complex(psb_dpk_), allocatable :: val(:)
integer(psb_ipk_) :: ierr(5) integer(psb_ipk_) :: ierr(5)
character(len=20) :: name='triu' character(len=20) :: name='triu'
logical :: rscale_, cscale_ logical :: rscale_, cscale_
@ -805,28 +855,69 @@ subroutine psb_z_base_triu(a,b,info,&
nb = jmax_ nb = jmax_
endif endif
call b%allocate(mb,nb)
nzin = b%get_nzeros() ! At this point it should be 0 nz = a%get_nzeros()
call u%allocate(mb,nb,nz)
do i=imin_,imax_
k = max(jmin_,i+diag_) if (present(l)) then
call a%csget(i,i,nzout,b%ia,b%ja,b%val,info,& nzuin = u%get_nzeros() ! At this point it should be 0
& jmin=k, jmax=jmax_, append=.true., & call l%allocate(mb,nb,nz)
& nzin=nzin) nzlin = l%get_nzeros() ! At this point it should be 0
if (info /= psb_success_) goto 9999 call psb_realloc(max(mb,nb),ia,info)
call b%set_nzeros(nzin+nzout) call psb_realloc(max(mb,nb),ja,info)
nzin = nzin+nzout call psb_realloc(max(mb,nb),val,info)
end do do i=imin_,imax_
call b%fix(info) call a%csget(i,i,nzout,ia,ja,val,info,&
nzout = b%get_nzeros() & jmin=jmin_, jmax=jmax_)
do k=1, nzout
j = ja(k)
if (j-i<diag_) then
nzlin = nzlin + 1
l%ia(nzlin) = ia(k)
l%ja(nzlin) = ja(k)
l%val(nzlin) = val(k)
else
nzuin = nzuin + 1
u%ia(nzuin) = ia(k)
u%ja(nzuin) = ja(k)
u%val(nzuin) = val(k)
end if
end do
end do
call u%set_nzeros(nzuin)
call l%set_nzeros(nzlin)
call l%fix(info)
nzout = l%get_nzeros()
if (rscale_) &
& l%ia(1:nzout) = l%ia(1:nzout) - imin_ + 1
if (cscale_) &
& l%ja(1:nzout) = l%ja(1:nzout) - jmin_ + 1
if ((diag_ <=1).and.(imin_ == jmin_)) then
call l%set_triangle(.true.)
call l%set_lower(.true.)
end if
else
nzin = u%get_nzeros()
do i=imin_,imax_
k = max(jmin_,i+diag_)
call a%csget(i,i,nzout,u%ia,u%ja,u%val,info,&
& jmin=k, jmax=jmax_, append=.true., &
& nzin=nzin)
if (info /= psb_success_) goto 9999
call u%set_nzeros(nzin+nzout)
nzin = nzin+nzout
end do
end if
call u%fix(info)
nzout = u%get_nzeros()
if (rscale_) & if (rscale_) &
& b%ia(1:nzout) = b%ia(1:nzout) - imin_ + 1 & u%ia(1:nzout) = u%ia(1:nzout) - imin_ + 1
if (cscale_) & if (cscale_) &
& b%ja(1:nzout) = b%ja(1:nzout) - jmin_ + 1 & u%ja(1:nzout) = u%ja(1:nzout) - jmin_ + 1
if ((diag_ >= 0).and.(imin_ == jmin_)) then if ((diag_ >= 0).and.(imin_ == jmin_)) then
call b%set_triangle(.true.) call u%set_triangle(.true.)
call b%set_upper(.true.) call u%set_upper(.true.)
end if end if
if (info /= psb_success_) goto 9999 if (info /= psb_success_) goto 9999

72
base/serial/impl/psb_z_mat_impl.F90
Unescape Escape View File

@ -906,24 +906,24 @@ subroutine psb_z_csgetblk(imin,imax,a,b,info,&
end subroutine psb_z_csgetblk end subroutine psb_z_csgetblk
subroutine psb_z_tril(a,b,info,diag,imin,imax,& subroutine psb_z_tril(a,l,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,u)
use psb_error_mod use psb_error_mod
use psb_const_mod use psb_const_mod
use psb_z_base_mat_mod use psb_z_base_mat_mod
use psb_z_mat_mod, psb_protect_name => psb_z_tril use psb_z_mat_mod, psb_protect_name => psb_z_tril
implicit none implicit none
class(psb_zspmat_type), intent(in) :: a class(psb_zspmat_type), intent(in) :: a
class(psb_zspmat_type), intent(inout) :: b class(psb_zspmat_type), intent(inout) :: l
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_zspmat_type), optional, intent(inout) :: u
integer(psb_ipk_) :: err_act integer(psb_ipk_) :: err_act
character(len=20) :: name='tril' character(len=20) :: name='tril'
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
type(psb_z_coo_sparse_mat), allocatable :: acoo type(psb_z_coo_sparse_mat), allocatable :: lcoo, ucoo
info = psb_success_ info = psb_success_
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
@ -932,23 +932,30 @@ subroutine psb_z_tril(a,b,info,diag,imin,imax,&
call psb_errpush(info,name) call psb_errpush(info,name)
goto 9999 goto 9999
endif endif
allocate(acoo,stat=info) allocate(lcoo,stat=info)
call b%free() call l%free()
if (present(u)) then
if (info == psb_success_) then if (info == psb_success_) allocate(ucoo,stat=info)
call a%a%tril(acoo,info,diag,imin,imax,& call u%free()
& jmin,jmax,rscale,cscale) if (info == psb_success_) call a%a%tril(lcoo,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale,ucoo)
if (info == psb_success_) call move_alloc(ucoo,u%a)
if (info == psb_success_) call u%cscnv(info,mold=a%a)
else else
info = psb_err_alloc_dealloc_ if (info == psb_success_) then
call a%a%tril(lcoo,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale)
else
info = psb_err_alloc_dealloc_
end if
end if end if
if (info == psb_success_) call move_alloc(acoo,b%a) if (info == psb_success_) call move_alloc(lcoo,l%a)
if (info == psb_success_) call b%cscnv(info,mold=a%a) if (info == psb_success_) call l%cscnv(info,mold=a%a)
if (info /= psb_success_) goto 9999 if (info /= psb_success_) goto 9999
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return
9999 call psb_error_handler(err_act) 9999 call psb_error_handler(err_act)
return return
@ -956,23 +963,24 @@ subroutine psb_z_tril(a,b,info,diag,imin,imax,&
end subroutine psb_z_tril end subroutine psb_z_tril
subroutine psb_z_triu(a,b,info,diag,imin,imax,& subroutine psb_z_triu(a,u,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale) & jmin,jmax,rscale,cscale,l)
use psb_error_mod use psb_error_mod
use psb_const_mod use psb_const_mod
use psb_z_base_mat_mod use psb_z_base_mat_mod
use psb_z_mat_mod, psb_protect_name => psb_z_triu use psb_z_mat_mod, psb_protect_name => psb_z_triu
implicit none implicit none
class(psb_zspmat_type), intent(in) :: a class(psb_zspmat_type), intent(in) :: a
class(psb_zspmat_type), intent(inout) :: b class(psb_zspmat_type), intent(inout) :: u
integer(psb_ipk_),intent(out) :: info integer(psb_ipk_),intent(out) :: info
integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax integer(psb_ipk_), intent(in), optional :: diag,imin,imax,jmin,jmax
logical, intent(in), optional :: rscale,cscale logical, intent(in), optional :: rscale,cscale
class(psb_zspmat_type), optional, intent(inout) :: l
integer(psb_ipk_) :: err_act integer(psb_ipk_) :: err_act
character(len=20) :: name='triu' character(len=20) :: name='triu'
logical, parameter :: debug=.false. logical, parameter :: debug=.false.
type(psb_z_coo_sparse_mat), allocatable :: acoo type(psb_z_coo_sparse_mat), allocatable :: lcoo, ucoo
info = psb_success_ info = psb_success_
@ -983,23 +991,31 @@ subroutine psb_z_triu(a,b,info,diag,imin,imax,&
goto 9999 goto 9999
endif endif
allocate(acoo,stat=info) allocate(ucoo,stat=info)
call b%free() call u%free()
if (info == psb_success_) then if (present(l)) then
call a%a%triu(acoo,info,diag,imin,imax,& if (info == psb_success_) allocate(lcoo,stat=info)
& jmin,jmax,rscale,cscale) call l%free()
if (info == psb_success_) call a%a%triu(ucoo,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale,lcoo)
if (info == psb_success_) call move_alloc(lcoo,l%a)
if (info == psb_success_) call l%cscnv(info,mold=a%a)
else else
info = psb_err_alloc_dealloc_ if (info == psb_success_) then
call a%a%triu(ucoo,info,diag,imin,imax,&
& jmin,jmax,rscale,cscale)
else
info = psb_err_alloc_dealloc_
end if
end if end if
if (info == psb_success_) call move_alloc(acoo,b%a) if (info == psb_success_) call move_alloc(ucoo,u%a)
if (info == psb_success_) call b%cscnv(info,mold=a%a) if (info == psb_success_) call u%cscnv(info,mold=a%a)
if (info /= psb_success_) goto 9999 if (info /= psb_success_) goto 9999
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return
9999 call psb_error_handler(err_act) 9999 call psb_error_handler(err_act)
return return

22
docs/src/datastruct.tex
Unescape Escape View File

@ -826,13 +826,14 @@ A variable of type \verb|psb_Tspmat_type|.
\subsubsection*{tril --- Return the lower triangle} \subsubsection*{tril --- Return the lower triangle}
\addcontentsline{toc}{paragraph}{tril} \addcontentsline{toc}{paragraph}{tril}
\begin{verbatim} \begin{verbatim}
call a%tril(b,info[,& call a%tril(l,info[,&
& diag,imin,imax,jmin,jmax,rscale,cscale]) & diag,imin,imax,jmin,jmax,rscale,cscale,u])
\end{verbatim} \end{verbatim}
Returns the lower triangular part of submatrix Returns the lower triangular part of submatrix
\verb|A(imin:imax,jmin:jmax)|, optionally rescaling row/col indices to \verb|A(imin:imax,jmin:jmax)|, optionally rescaling row/col indices to
the range \verb|1:imax-imin+1,1:jmax-jmin+1|. the range \verb|1:imax-imin+1,1:jmax-jmin+1| and returing the
complementary upper triangle.
\begin{description} \begin{description}
\item[Type:] Asynchronous. \item[Type:] Asynchronous.
\item[\bf On Entry] \item[\bf On Entry]
@ -849,7 +850,9 @@ Type: optional.
\end{description} \end{description}
\begin{description} \begin{description}
\item[\bf On Return] \item[\bf On Return]
\item[b] A copy of a subtriangle of \verb|a|.\\ \item[l] A copy of the lower triangle of \verb|a|.\\
A variable of type \verb|psb_Tspmat_type|.
\item[u] (optional) A copy of the upper triangle of \verb|a|.\\
A variable of type \verb|psb_Tspmat_type|. A variable of type \verb|psb_Tspmat_type|.
\item[info] Return code. \item[info] Return code.
\end{description} \end{description}
@ -857,13 +860,14 @@ A variable of type \verb|psb_Tspmat_type|.
\subsubsection*{triu --- Return the upper triangle} \subsubsection*{triu --- Return the upper triangle}
\addcontentsline{toc}{paragraph}{triu} \addcontentsline{toc}{paragraph}{triu}
\begin{verbatim} \begin{verbatim}
call a%triu(b,info[,& call a%triu(u,info[,&
& diag,imin,imax,jmin,jmax,rscale,cscale]) & diag,imin,imax,jmin,jmax,rscale,cscale,l])
\end{verbatim} \end{verbatim}
Returns the upper triangular part of submatrix Returns the upper triangular part of submatrix
\verb|A(imin:imax,jmin:jmax)|, optionally rescaling row/col indices to \verb|A(imin:imax,jmin:jmax)|, optionally rescaling row/col indices to
the range \verb|1:imax-imin+1,1:jmax-jmin+1|. the range \verb|1:imax-imin+1,1:jmax-jmin+1|, and returing the
complementary lower triangle.
\begin{description} \begin{description}
\item[Type:] Asynchronous. \item[Type:] Asynchronous.
\item[\bf On Entry] \item[\bf On Entry]
@ -880,7 +884,9 @@ Type: optional.
\end{description} \end{description}
\begin{description} \begin{description}
\item[\bf On Return] \item[\bf On Return]
\item[b] A copy of a subtriangle of \verb|a|.\\ \item[u] A copy of the upper triangle of \verb|a|.\\
A variable of type \verb|psb_Tspmat_type|.
\item[l] (optional) A copy of the lower triangle of \verb|a|.\\
A variable of type \verb|psb_Tspmat_type|. A variable of type \verb|psb_Tspmat_type|.
\item[info] Return code. \item[info] Return code.
\end{description} \end{description}

2
docs/src/userguide.tex
Unescape Escape View File

@ -111,7 +111,7 @@
by Salvatore Filippone\\ by Salvatore Filippone\\
and Alfredo Buttari}\\ and Alfredo Buttari}\\
University of Rome ``Tor Vergata''.\\[3ex] University of Rome ``Tor Vergata''.\\[3ex]
May 1st, 2017 Sep 1st, 2017
\end{minipage}} \end{minipage}}
%\addtolength{\textwidth}{\centeroffset} %\addtolength{\textwidth}{\centeroffset}

2
docs/src/userhtml.tex
Unescape Escape View File

@ -96,7 +96,7 @@
%\today %\today
Software version: 3.5.0\\ Software version: 3.5.0\\
%\today %\today
May 1st, 2017 Sep 1st, 2017
\cleardoublepage \cleardoublepage
\begingroup \begingroup
\renewcommand*{\thepage}{toc} \renewcommand*{\thepage}{toc}

Write Preview
Loading…
Cancel
Save