From 2b48a169bf5b383ac4d649a3c91f6072b2389c2c Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Tue, 28 Nov 2006 14:01:55 +0000 Subject: [PATCH] Fixed new getters for descriptor fields. --- src/psblas/notes | 16 ---------------- src/psblas/psb_ddot.f90 | 2 -- src/psblas/psb_dnrm2.f90 | 1 - src/psblas/psb_dspmm.f90 | 2 ++ src/psblas/psb_dspsm.f90 | 2 ++ src/psblas/psb_zamax.f90 | 1 - src/psblas/psb_zasum.f90 | 1 - src/psblas/psb_zaxpby.f90 | 1 - src/psblas/psb_zdot.f90 | 2 -- src/psblas/psb_znrm2.f90 | 2 -- src/psblas/psb_zspmm.f90 | 2 -- 11 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 src/psblas/notes diff --git a/src/psblas/notes b/src/psblas/notes deleted file mode 100644 index 0d5db57e..00000000 --- a/src/psblas/notes +++ /dev/null @@ -1,16 +0,0 @@ -1 - nella f90_psdspmm si se work non è presente si alloca work1 - con dimensione pari a: - - llwork= 2*desc_a%matrix_data(psb_n_col_) - if (a%pr(1) /= 0) llwork = llwork + in * ik - if (a%pl(1) /= 0) llwork = llwork + im * ik - - però, poi, in psdspmm_.c si controlla semplicemente che la - dimensione di work si maggiore di desc_a%matrix_data(psb_n_row_). - perchè allocare un'area così grande? - -2 - nella psdspmm_.c nella parte in cui la matrice è trasposta si - usa il puntatore xcopy e si passa desc_as%matrix_data(psb_n_row_) - anzichè lldx: perchè? diff --git a/src/psblas/psb_ddot.f90 b/src/psblas/psb_ddot.f90 index 6d322263..a2f33c3b 100644 --- a/src/psblas/psb_ddot.f90 +++ b/src/psblas/psb_ddot.f90 @@ -585,8 +585,6 @@ subroutine psb_dmdots(res, x, y, desc_a, info) end subroutine psb_dmdots - - subroutine psb_ddot2v(res, x, y,w,z,desc_a, info) use psb_descriptor_type use psb_check_mod diff --git a/src/psblas/psb_dnrm2.f90 b/src/psblas/psb_dnrm2.f90 index 9097e932..1aa21037 100644 --- a/src/psblas/psb_dnrm2.f90 +++ b/src/psblas/psb_dnrm2.f90 @@ -219,7 +219,6 @@ function psb_dnrm2v(x, desc_a, info) m = psb_cd_get_global_rows(desc_a) - call psb_chkvect(m,1,size(x),ix,jx,desc_a,info,iix,jjx) if(info.ne.0) then info=4010 diff --git a/src/psblas/psb_dspmm.f90 b/src/psblas/psb_dspmm.f90 index 0853ecbb..8b35fb15 100644 --- a/src/psblas/psb_dspmm.f90 +++ b/src/psblas/psb_dspmm.f90 @@ -176,6 +176,7 @@ subroutine psb_dspmm(alpha,a,x,beta,y,desc_a,info,& n = psb_cd_get_global_cols(desc_a) nrow = psb_cd_get_local_rows(desc_a) ncol = psb_cd_get_local_cols(desc_a) + lldx = size(x,1) lldy = size(y,1) @@ -499,6 +500,7 @@ subroutine psb_dspmv(alpha,a,x,beta,y,desc_a,info,& n = psb_cd_get_global_cols(desc_a) nrow = psb_cd_get_local_rows(desc_a) ncol = psb_cd_get_local_cols(desc_a) + lldx = size(x) lldy = size(y) diff --git a/src/psblas/psb_dspsm.f90 b/src/psblas/psb_dspsm.f90 index e83b9cae..c2a0866e 100644 --- a/src/psblas/psb_dspsm.f90 +++ b/src/psblas/psb_dspsm.f90 @@ -177,6 +177,7 @@ subroutine psb_dspsm(alpha,a,x,beta,y,desc_a,info,& m = psb_cd_get_global_rows(desc_a) nrow = psb_cd_get_local_rows(desc_a) ncol = psb_cd_get_local_cols(desc_a) + lldx = size(x,1) lldy = size(y,1) @@ -469,6 +470,7 @@ subroutine psb_dspsv(alpha,a,x,beta,y,desc_a,info,& m = psb_cd_get_global_rows(desc_a) nrow = psb_cd_get_local_rows(desc_a) ncol = psb_cd_get_local_cols(desc_a) + lldx = size(x) lldy = size(y) diff --git a/src/psblas/psb_zamax.f90 b/src/psblas/psb_zamax.f90 index 1491ce8c..bbd7c57f 100644 --- a/src/psblas/psb_zamax.f90 +++ b/src/psblas/psb_zamax.f90 @@ -343,7 +343,6 @@ subroutine psb_zamaxvs (res,x,desc_a, info) ijx=1 m = psb_cd_get_global_rows(desc_a) - call psb_chkvect(m,1,size(x,1),ix,ijx,desc_a,info,iix,jjx) if(info.ne.0) then info=4010 diff --git a/src/psblas/psb_zasum.f90 b/src/psblas/psb_zasum.f90 index ae84f1d6..3cf4c60d 100644 --- a/src/psblas/psb_zasum.f90 +++ b/src/psblas/psb_zasum.f90 @@ -380,7 +380,6 @@ subroutine psb_zasumvs (res,x,desc_a, info) jx = 1 m = psb_cd_get_global_rows(desc_a) - ! check vector correctness call psb_chkvect(m,1,size(x),ix,jx,desc_a,info,iix,jjx) if(info.ne.0) then diff --git a/src/psblas/psb_zaxpby.f90 b/src/psblas/psb_zaxpby.f90 index e2cc7708..d33d5e8d 100644 --- a/src/psblas/psb_zaxpby.f90 +++ b/src/psblas/psb_zaxpby.f90 @@ -75,7 +75,6 @@ subroutine psb_zaxpby(alpha, x, beta,y,desc_a,info, n, jx, jy) call psb_erractionsave(err_act) ictxt=psb_cd_get_context(desc_a) - call psb_info(ictxt, me, np) if (np == -ione) then info = 2010 diff --git a/src/psblas/psb_zdot.f90 b/src/psblas/psb_zdot.f90 index 3143385c..f58dd131 100644 --- a/src/psblas/psb_zdot.f90 +++ b/src/psblas/psb_zdot.f90 @@ -73,7 +73,6 @@ function psb_zdot(x, y,desc_a, info, jx, jy) call psb_erractionsave(err_act) ictxt=psb_cd_get_context(desc_a) - call psb_info(ictxt, me, np) if (np == -ione) then info = 2010 @@ -376,7 +375,6 @@ subroutine psb_zdotvs(res, x, y,desc_a, info) ix = ione iy = ione m = psb_cd_get_global_rows(desc_a) - ! check vector correctness call psb_chkvect(m,ione,size(x,1),ix,ix,desc_a,info,iix,jjx) if (info == 0) & diff --git a/src/psblas/psb_znrm2.f90 b/src/psblas/psb_znrm2.f90 index cba43e8a..504ed4dc 100644 --- a/src/psblas/psb_znrm2.f90 +++ b/src/psblas/psb_znrm2.f90 @@ -86,7 +86,6 @@ function psb_znrm2(x, desc_a, info, jx) endif m = psb_cd_get_global_rows(desc_a) - call psb_chkvect(m,1,size(x,1),ix,ijx,desc_a,info,iix,jjx) if(info.ne.0) then info=4010 @@ -217,7 +216,6 @@ function psb_znrm2v(x, desc_a, info) ix = 1 jx=1 - m = psb_cd_get_global_rows(desc_a) diff --git a/src/psblas/psb_zspmm.f90 b/src/psblas/psb_zspmm.f90 index 11fec125..85916bf2 100644 --- a/src/psblas/psb_zspmm.f90 +++ b/src/psblas/psb_zspmm.f90 @@ -118,7 +118,6 @@ subroutine psb_zspmm(alpha,a,x,beta,y,desc_a,info,& call psb_erractionsave(err_act) ictxt=psb_cd_get_context(desc_a) - call psb_info(ictxt, me, np) if (np == -1) then info = 2010 @@ -451,7 +450,6 @@ subroutine psb_zspmv(alpha,a,x,beta,y,desc_a,info,& call psb_erractionsave(err_act) ictxt=psb_cd_get_context(desc_a) - call psb_info(ictxt, me, np) if (np == -1) then info = 2010