From 51cc071cb9859f00926324a1b225b650d18fabfa Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Wed, 3 May 2006 12:48:07 +0000 Subject: [PATCH] Fixed redundant is,js arguments in CDINS and SPINS. --- src/modules/psb_tools_mod.f90 | 10 ++++------ src/tools/psb_cdins.f90 | 5 +---- src/tools/psb_dspins.f90 | 12 +++++------- src/tools/psb_zspins.f90 | 12 +++++------- 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/src/modules/psb_tools_mod.f90 b/src/modules/psb_tools_mod.f90 index 7b8c77aa..6a0a729d 100644 --- a/src/modules/psb_tools_mod.f90 +++ b/src/modules/psb_tools_mod.f90 @@ -413,12 +413,11 @@ Module psb_tools_mod end interface interface psb_cdins - subroutine psb_cdins(nz,ia,ja,desc_a,info,is,js) + subroutine psb_cdins(nz,ia,ja,desc_a,info) use psb_descriptor_type type(psb_desc_type), intent(inout) :: desc_a Integer, intent(in) :: nz,IA(:),JA(:) integer, intent(out) :: info - integer, intent(in), optional :: is,js end subroutine psb_cdins end interface @@ -535,7 +534,7 @@ Module psb_tools_mod interface psb_spins - subroutine psb_dspins(nz,ia,ja,val,a,desc_a,info,is,js,rebuild) + subroutine psb_dspins(nz,ia,ja,val,a,desc_a,info,rebuild) use psb_descriptor_type use psb_spmat_type type(psb_desc_type), intent(inout) :: desc_a @@ -543,10 +542,9 @@ Module psb_tools_mod integer, intent(in) :: nz,ia(:),ja(:) real(kind(1.d0)), intent(in) :: val(:) integer, intent(out) :: info - integer, intent(in), optional :: is,js logical, intent(in), optional :: rebuild end subroutine psb_dspins - subroutine psb_zspins(nz,ia,ja,val,a,desc_a,info,is,js) + subroutine psb_zspins(nz,ia,ja,val,a,desc_a,info,rebuild) use psb_descriptor_type use psb_spmat_type type(psb_desc_type), intent(inout) :: desc_a @@ -554,7 +552,7 @@ Module psb_tools_mod integer, intent(in) :: nz,ia(:),ja(:) complex(kind(1.d0)), intent(in) :: val(:) integer, intent(out) :: info - integer, intent(in), optional :: is,js + logical, intent(in), optional :: rebuild end subroutine psb_zspins end interface diff --git a/src/tools/psb_cdins.f90 b/src/tools/psb_cdins.f90 index e0354915..f43764b7 100644 --- a/src/tools/psb_cdins.f90 +++ b/src/tools/psb_cdins.f90 @@ -39,9 +39,7 @@ ! ja - integer,dimension(:). The column indices of the points. ! desc_a - type(). The communication descriptor to be freed. ! info - integer. Eventually returns an error code. -! is - integer(optional). The row offset. -! js - integer(optional). The column offset. -subroutine psb_cdins(nz,ia,ja,desc_a,info,is,js) +subroutine psb_cdins(nz,ia,ja,desc_a,info) use psb_descriptor_type use psb_serial_mod @@ -53,7 +51,6 @@ subroutine psb_cdins(nz,ia,ja,desc_a,info,is,js) Type(psb_desc_type), intent(inout) :: desc_a Integer, intent(in) :: nz,ia(:),ja(:) integer, intent(out) :: info - integer, intent(in), optional :: is,js !LOCALS..... diff --git a/src/tools/psb_dspins.f90 b/src/tools/psb_dspins.f90 index c30f80b3..682bec37 100644 --- a/src/tools/psb_dspins.f90 +++ b/src/tools/psb_dspins.f90 @@ -40,11 +40,11 @@ ! val - real,dimension(:). The values of the points to be inserted. ! a - type(). The sparse destination matrix. ! desc_a - type(). The communication descriptor. -! info - integer. Eventually returns an error code. -! is - integer(optional). The row offset. -! js - integer(optional). The column offset. +! info - integer. Error code +! rebuild - logical Allows to reopen a matrix under +! certain circumstances. ! -subroutine psb_dspins(nz,ia,ja,val,a,desc_a,info,is,js,rebuild) +subroutine psb_dspins(nz,ia,ja,val,a,desc_a,info,rebuild) use psb_descriptor_type use psb_spmat_type @@ -59,7 +59,6 @@ subroutine psb_dspins(nz,ia,ja,val,a,desc_a,info,is,js,rebuild) integer, intent(in) :: nz,ia(:),ja(:) real(kind(1.d0)), intent(in) :: val(:) integer, intent(out) :: info - integer, intent(in), optional :: is,js logical, intent(in), optional :: rebuild !locals..... @@ -73,13 +72,12 @@ subroutine psb_dspins(nz,ia,ja,val,a,desc_a,info,is,js,rebuild) logical :: rebuild_ interface psb_cdins - subroutine psb_cdins(nz,ia,ja,desc_a,info,is,js) + subroutine psb_cdins(nz,ia,ja,desc_a,info) use psb_descriptor_type implicit none type(psb_desc_type), intent(inout) :: desc_a integer, intent(in) :: nz,ia(:),ja(:) integer, intent(out) :: info - integer, intent(in), optional :: is,js end subroutine psb_cdins end interface diff --git a/src/tools/psb_zspins.f90 b/src/tools/psb_zspins.f90 index fe0b2583..9e79edd9 100644 --- a/src/tools/psb_zspins.f90 +++ b/src/tools/psb_zspins.f90 @@ -40,11 +40,11 @@ ! val - real,dimension(:). The values of the points to be inserted. ! a - type(). The sparse destination matrix. ! desc_a - type(). The communication descriptor. -! info - integer. Eventually returns an error code. -! is - integer(optional). The row offset. -! js - integer(optional). The column offset. +! info - integer. Error code +! rebuild - logical Allows to reopen a matrix under +! certain circumstances. ! -subroutine psb_zspins(nz,ia,ja,val,a,desc_a,info,is,js,rebuild) +subroutine psb_zspins(nz,ia,ja,val,a,desc_a,info,rebuild) use psb_descriptor_type use psb_spmat_type @@ -59,7 +59,6 @@ subroutine psb_zspins(nz,ia,ja,val,a,desc_a,info,is,js,rebuild) integer, intent(in) :: nz,ia(:),ja(:) complex(kind(1.d0)), intent(in) :: val(:) integer, intent(out) :: info - integer, intent(in), optional :: is,js logical, intent(in), optional :: rebuild !locals..... @@ -73,13 +72,12 @@ subroutine psb_zspins(nz,ia,ja,val,a,desc_a,info,is,js,rebuild) logical :: rebuild_ interface psb_cdins - subroutine psb_cdins(nz,ia,ja,desc_a,info,is,js) + subroutine psb_cdins(nz,ia,ja,desc_a,info) use psb_descriptor_type implicit none type(psb_desc_type), intent(inout) :: desc_a integer, intent(in) :: nz,ia(:),ja(:) integer, intent(out) :: info - integer, intent(in), optional :: is,js end subroutine psb_cdins end interface