From 13be647fee79c9cec16a48a86097625ed0a0a9dd Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 7 Mar 2008 09:20:02 +0000 Subject: [PATCH] psblas2: base/modules/psb_serial_mod.f90 base/modules/psb_spsb_mod.f90 base/serial/coo/dcoonrmi.f base/serial/coo/zcoonrmi.f base/serial/csr/dcrnrmi.f base/serial/csr/zcrnrmi.f base/serial/f77/dcsnmi.f base/serial/f77/zcsnmi.f base/serial/jad/djadnr.f base/serial/jad/djdnrmi.f base/serial/psb_dcsnmi.f90 base/serial/psb_zcsnmi.f90 Merged changes rev. 2919:2920 about function style declaration from psblas-2.2-maint. --- base/modules/psb_serial_mod.f90 | 6 ++++-- base/modules/psb_spsb_mod.f90 | 8 +++++--- base/serial/coo/dcoonrmi.f | 3 ++- base/serial/coo/zcoonrmi.f | 3 ++- base/serial/csr/dcrnrmi.f | 3 ++- base/serial/csr/zcrnrmi.f | 3 ++- base/serial/f77/dcsnmi.f | 3 ++- base/serial/f77/zcsnmi.f | 3 ++- base/serial/jad/djadnr.f | 3 ++- base/serial/jad/djdnrmi.f | 3 ++- base/serial/psb_dcsnmi.f90 | 7 ++++--- base/serial/psb_zcsnmi.f90 | 7 ++++--- 12 files changed, 33 insertions(+), 19 deletions(-) diff --git a/base/modules/psb_serial_mod.f90 b/base/modules/psb_serial_mod.f90 index 86749c2f..ef1dd242 100644 --- a/base/modules/psb_serial_mod.f90 +++ b/base/modules/psb_serial_mod.f90 @@ -379,17 +379,19 @@ module psb_serial_mod end interface interface psb_csnmi - real(psb_dpk_) function psb_dcsnmi(a,info,trans) + function psb_dcsnmi(a,info,trans) use psb_spmat_type type(psb_dspmat_type), intent(in) :: a integer, intent(out) :: info character, optional :: trans + real(psb_dpk_) :: psb_dcsnmi end function psb_dcsnmi - real(psb_dpk_) function psb_zcsnmi(a,info,trans) + function psb_zcsnmi(a,info,trans) use psb_spmat_type type(psb_zspmat_type), intent(in) :: a integer, intent(out) :: info character, optional :: trans + real(psb_dpk_) :: psb_zcsnmi end function psb_zcsnmi end interface diff --git a/base/modules/psb_spsb_mod.f90 b/base/modules/psb_spsb_mod.f90 index fafe78e2..a20eb091 100644 --- a/base/modules/psb_spsb_mod.f90 +++ b/base/modules/psb_spsb_mod.f90 @@ -32,10 +32,11 @@ module psb_spsb_mod interface - real(psb_dpk_) function ddot(n,dx,incx,dy,incy) + function ddot(n,dx,incx,dy,incy) use psb_const_mod real(psb_dpk_) :: dx(*),dy(*),dtemp integer :: i,incx,incy,ix,iy,m,mp1,n + real(psb_dpk_) :: ddot end function ddot end interface @@ -62,14 +63,15 @@ module psb_spsb_mod end interface interface - real(psb_dpk_) function dcsnmi(trans,m,n,fida,descra,a,ia1,ia2,& + function dcsnmi(trans,m,n,fida,descra,a,ia1,ia2,& & infoa,ierror) use psb_const_mod integer :: m,n, ierror character :: trans integer :: ia1(*),ia2(*),infoa(*) character :: descra*11, fida*5 - real(psb_dpk_) :: a(*) + real(psb_dpk_) :: a(*) + real(psb_dpk_) :: dcsnmi end function dcsnmi end interface diff --git a/base/serial/coo/dcoonrmi.f b/base/serial/coo/dcoonrmi.f index 2efbc099..cee4bad1 100644 --- a/base/serial/coo/dcoonrmi.f +++ b/base/serial/coo/dcoonrmi.f @@ -30,10 +30,11 @@ C POSSIBILITY OF SUCH DAMAGE. C C C ... Compute Infinity norm for sparse matrix in CSR Format ... - real(psb_dpk_) FUNCTION DCOONRMI(TRANS,M,N,DESCRA,A,IA1,IA2, + FUNCTION DCOONRMI(TRANS,M,N,DESCRA,A,IA1,IA2, + INFOA,IERROR) use psb_const_mod IMPLICIT NONE + real(psb_dpk_) dcoonrmi C .. Scalar Arguments .. INTEGER M,N, IERROR CHARACTER TRANS diff --git a/base/serial/coo/zcoonrmi.f b/base/serial/coo/zcoonrmi.f index c7383109..9450a492 100644 --- a/base/serial/coo/zcoonrmi.f +++ b/base/serial/coo/zcoonrmi.f @@ -29,10 +29,11 @@ C ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE C POSSIBILITY OF SUCH DAMAGE. C C ... Compute Infinity norm for sparse matrix in CSR Format ... - real(psb_dpk_) FUNCTION ZCOONRMI(TRANS,M,N,DESCRA,A,IA1,IA2, + FUNCTION ZCOONRMI(TRANS,M,N,DESCRA,A,IA1,IA2, + INFOA,IERROR) use psb_const_mod IMPLICIT NONE + real(psb_dpk_) zcoonrmi C .. Scalar Arguments .. INTEGER M,N, IERROR CHARACTER TRANS diff --git a/base/serial/csr/dcrnrmi.f b/base/serial/csr/dcrnrmi.f index 664cf9ee..d7e87198 100644 --- a/base/serial/csr/dcrnrmi.f +++ b/base/serial/csr/dcrnrmi.f @@ -30,10 +30,11 @@ C POSSIBILITY OF SUCH DAMAGE. C C C ... Compute Infinity norm for sparse matrix in CSR Format ... - real(psb_dpk_) FUNCTION DCRNRMI(TRANS,M,N,DESCRA,A,IA1,IA2, + FUNCTION DCRNRMI(TRANS,M,N,DESCRA,A,IA1,IA2, + INFOA,IERROR) use psb_const_mod IMPLICIT NONE + real(psb_dpk_) dcrnrmi C .. Scalar Arguments .. INTEGER M,N, IERROR CHARACTER TRANS diff --git a/base/serial/csr/zcrnrmi.f b/base/serial/csr/zcrnrmi.f index 1e6a9980..62900347 100644 --- a/base/serial/csr/zcrnrmi.f +++ b/base/serial/csr/zcrnrmi.f @@ -28,10 +28,11 @@ C CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) C ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE C POSSIBILITY OF SUCH DAMAGE. C - real(psb_dpk_) FUNCTION ZCRNRMI(TRANS,M,N,DESCRA,A,IA1,IA2, + FUNCTION ZCRNRMI(TRANS,M,N,DESCRA,A,IA1,IA2, & INFOA,IERROR) use psb_const_mod IMPLICIT NONE + real(psb_dpk_) zcrnrmi C .. Scalar Arguments .. INTEGER M,N, IERROR CHARACTER TRANS diff --git a/base/serial/f77/dcsnmi.f b/base/serial/f77/dcsnmi.f index 7ab6c035..89f16449 100644 --- a/base/serial/f77/dcsnmi.f +++ b/base/serial/f77/dcsnmi.f @@ -94,10 +94,11 @@ C C Notes C ===== C - real(psb_dpk_) FUNCTION DCSNMI(TRANS,M,N,FIDA,DESCRA,A,IA1,IA2, + FUNCTION DCSNMI(TRANS,M,N,FIDA,DESCRA,A,IA1,IA2, & INFOA,IERROR) use psb_const_mod IMPLICIT NONE + real(psb_dpk_) dcsnmi C .. Scalar Arguments .. INTEGER M,N, IERROR CHARACTER TRANS diff --git a/base/serial/f77/zcsnmi.f b/base/serial/f77/zcsnmi.f index fa4884af..ed268e68 100644 --- a/base/serial/f77/zcsnmi.f +++ b/base/serial/f77/zcsnmi.f @@ -93,10 +93,11 @@ C C Notes C ===== C - real(psb_dpk_) FUNCTION ZCSNMI(TRANS,M,N,FIDA,DESCRA,A,IA1,IA2, + FUNCTION ZCSNMI(TRANS,M,N,FIDA,DESCRA,A,IA1,IA2, & INFOA,IERROR) use psb_const_mod IMPLICIT NONE + real(psb_dpk_) zcsnmi C .. Scalar Arguments .. INTEGER M,N, IERROR CHARACTER TRANS diff --git a/base/serial/jad/djadnr.f b/base/serial/jad/djadnr.f index 48fd5949..287d69ea 100644 --- a/base/serial/jad/djadnr.f +++ b/base/serial/jad/djadnr.f @@ -30,11 +30,12 @@ C POSSIBILITY OF SUCH DAMAGE. C C C ... Compute infinity norma for sparse matrix in CSR Format ... - real(psb_dpk_) FUNCTION DJADNR(TRANS,M,N,NG,A,KA,JA,IA, + FUNCTION DJADNR(TRANS,M,N,NG,A,KA,JA,IA, + INFOA,IERROR) use psb_const_mod use psb_spmat_type IMPLICIT NONE + real(psb_dpk_) djadnr C .. Scalar Arguments .. INTEGER M,N, IERROR, NG CHARACTER TRANS diff --git a/base/serial/jad/djdnrmi.f b/base/serial/jad/djdnrmi.f index b9a75417..da064941 100644 --- a/base/serial/jad/djdnrmi.f +++ b/base/serial/jad/djdnrmi.f @@ -30,10 +30,11 @@ C POSSIBILITY OF SUCH DAMAGE. C C C ... Compute infinity norm for sparse matrix in CSR Format ... - real(psb_dpk_) FUNCTION DJDNRMI(TRANS,M,N,DESCRA,A,JA,IA, + FUNCTION DJDNRMI(TRANS,M,N,DESCRA,A,JA,IA, + INFOA,IERROR) use psb_const_mod IMPLICIT NONE + real(psb_dpk_) djdnrmi C .. Scalar Arguments .. INTEGER M,N, IERROR CHARACTER TRANS diff --git a/base/serial/psb_dcsnmi.f90 b/base/serial/psb_dcsnmi.f90 index 32a6f4a6..1df80bc7 100644 --- a/base/serial/psb_dcsnmi.f90 +++ b/base/serial/psb_dcsnmi.f90 @@ -33,7 +33,7 @@ ! Subroutine: ! Arguments: -real(psb_dpk_) function psb_dcsnmi(a,info,trans) +function psb_dcsnmi(a,info,trans) use psb_spmat_type use psb_error_mod @@ -42,11 +42,12 @@ real(psb_dpk_) function psb_dcsnmi(a,info,trans) type(psb_dspmat_type), intent(in) :: a integer, intent(out) :: info character, optional :: trans - + real(psb_dpk_) :: psb_dcsnmi interface - real(psb_dpk_) function dcsnmi(trans,m,n,fida,descra,a,ia1,ia2,& + function dcsnmi(trans,m,n,fida,descra,a,ia1,ia2,& & infoa,ierror) use psb_const_mod + real(psb_dpk_) :: dcsnmi integer :: m,n, ierror character :: trans integer :: ia1(*),ia2(*),infoa(*) diff --git a/base/serial/psb_zcsnmi.f90 b/base/serial/psb_zcsnmi.f90 index b7202670..0d42e442 100644 --- a/base/serial/psb_zcsnmi.f90 +++ b/base/serial/psb_zcsnmi.f90 @@ -33,7 +33,7 @@ ! Subroutine: ! Arguments: -real(psb_dpk_) function psb_zcsnmi(a,info,trans) +function psb_zcsnmi(a,info,trans) use psb_spmat_type use psb_error_mod @@ -42,11 +42,12 @@ real(psb_dpk_) function psb_zcsnmi(a,info,trans) type(psb_zspmat_type), intent(in) :: a integer, intent(out) :: info character, optional :: trans - + real(psb_dpk_) :: psb_zcsnmi interface - real(psb_dpk_) function zcsnmi(trans,m,n,fida,descra,a,ia1,ia2,& + function zcsnmi(trans,m,n,fida,descra,a,ia1,ia2,& & infoa,ierror) use psb_const_mod + real(psb_dpk_) :: psb_zcsnmi integer :: m,n, ierror character :: trans integer :: ia1(*),ia2(*),infoa(*)