From 59cd9530557084cda8f475cddb6f79f7718296ae Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 12 Oct 2007 14:06:07 +0000 Subject: [PATCH] Fixed remaining constant names with MLD_ prefix. --- mlprec/mld_daggrmat_smth_asb.F90 | 2 +- mlprec/mld_dmlprec_aply.f90 | 10 +++++----- mlprec/mld_prec_type.f90 | 6 +++--- mlprec/mld_zaggrmat_smth_asb.F90 | 2 +- mlprec/mld_zmlprec_aply.f90 | 10 +++++----- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mlprec/mld_daggrmat_smth_asb.F90 b/mlprec/mld_daggrmat_smth_asb.F90 index a5aef20f..cc491939 100644 --- a/mlprec/mld_daggrmat_smth_asb.F90 +++ b/mlprec/mld_daggrmat_smth_asb.F90 @@ -85,7 +85,7 @@ subroutine mld_daggrmat_smth_asb(a,desc_a,ac,desc_ac,p,info) call psb_nullify_sp(am4) am2 => p%av(mld_sm_pr_t_) - am1 => p%av(sm_pr_) + am1 => p%av(mld_sm_pr_) call psb_nullify_sp(am1) call psb_nullify_sp(am2) diff --git a/mlprec/mld_dmlprec_aply.f90 b/mlprec/mld_dmlprec_aply.f90 index 0fac9750..92b722b2 100644 --- a/mlprec/mld_dmlprec_aply.f90 +++ b/mlprec/mld_dmlprec_aply.f90 @@ -67,7 +67,7 @@ subroutine mld_dmlprec_aply(alpha,baseprecv,x,beta,y,desc_data,trans,work,info) ! 2.4.: baseprecv(ilev)%av(mld_ac_) Aggregated matrix of level ILEV ! 2.5.: baseprecv(ilev)%av(mld_sm_pr_t_) Smoother prolongator transpose; maps vectors ! (ilev-1) ---> (ilev) - ! 2.6.: baseprecv(ilev)%av(sm_pr_) Smoother prolongator; maps vectors + ! 2.6.: baseprecv(ilev)%av(mld_sm_pr_) Smoother prolongator; maps vectors ! (ilev) ---> (ilev-1) ! Shouldn't we keep just one of them and handle transpose in the sparse BLAS? maybe ! @@ -239,7 +239,7 @@ subroutine mld_dmlprec_aply(alpha,baseprecv,x,beta,y,desc_data,trans,work,info) if (ismth /= mld_no_smooth_) then - call psb_csmm(done,baseprecv(ilev)%av(sm_pr_),mlprec_wrk(ilev)%y2l,& + call psb_csmm(done,baseprecv(ilev)%av(mld_sm_pr_),mlprec_wrk(ilev)%y2l,& & done,mlprec_wrk(ilev-1)%y2l,info) if(info /=0) goto 9999 @@ -396,7 +396,7 @@ subroutine mld_dmlprec_aply(alpha,baseprecv,x,beta,y,desc_data,trans,work,info) if (ismth == mld_smooth_prol_) & & call psb_halo(mlprec_wrk(ilev+1)%y2l,baseprecv(ilev+1)%desc_data,& & info,work=work) - call psb_csmm(done,baseprecv(ilev+1)%av(sm_pr_),mlprec_wrk(ilev+1)%y2l,& + call psb_csmm(done,baseprecv(ilev+1)%av(mld_sm_pr_),mlprec_wrk(ilev+1)%y2l,& & dzero,mlprec_wrk(ilev)%y2l,info) if(info /=0) goto 9999 @@ -551,7 +551,7 @@ subroutine mld_dmlprec_aply(alpha,baseprecv,x,beta,y,desc_data,trans,work,info) if (ismth == mld_smooth_prol_) & & call psb_halo(mlprec_wrk(ilev+1)%y2l,& & baseprecv(ilev+1)%desc_data,info,work=work) - call psb_csmm(done,baseprecv(ilev+1)%av(sm_pr_),mlprec_wrk(ilev+1)%y2l,& + call psb_csmm(done,baseprecv(ilev+1)%av(mld_sm_pr_),mlprec_wrk(ilev+1)%y2l,& & done,mlprec_wrk(ilev)%y2l,info) if(info /=0) goto 9999 @@ -711,7 +711,7 @@ subroutine mld_dmlprec_aply(alpha,baseprecv,x,beta,y,desc_data,trans,work,info) if (ismth == mld_smooth_prol_) & & call psb_halo(mlprec_wrk(ilev+1)%y2l,baseprecv(ilev+1)%desc_data,& & info,work=work) - call psb_csmm(done,baseprecv(ilev+1)%av(sm_pr_),mlprec_wrk(ilev+1)%y2l,& + call psb_csmm(done,baseprecv(ilev+1)%av(mld_sm_pr_),mlprec_wrk(ilev+1)%y2l,& & done,mlprec_wrk(ilev)%y2l,info) if(info /=0) goto 9999 diff --git a/mlprec/mld_prec_type.f90 b/mlprec/mld_prec_type.f90 index 363ee786..8c91f682 100644 --- a/mlprec/mld_prec_type.f90 +++ b/mlprec/mld_prec_type.f90 @@ -71,7 +71,7 @@ module mld_prec_type ! 2.4.: baseprecv(ilev)%av(mld_ac_) Aggregated matrix of level ILEV ! 2.5.: baseprecv(ilev)%av(mld_sm_pr_t_) Smoother prolongator transpose; maps vectors ! (ilev-1) ---> (ilev) - ! 2.6.: baseprecv(ilev)%av(sm_pr_) Smoother prolongator; maps vectors + ! 2.6.: baseprecv(ilev)%av(mld_sm_pr_) Smoother prolongator; maps vectors ! (ilev) ---> (ilev-1) ! Shouldn't we keep just one of them and handle transpose in the sparse BLAS? maybe ! @@ -83,7 +83,7 @@ module mld_prec_type ! avoid passing explicitly matrix A to the ! outer prec. routine ! 5. baseprecv(ilev)%mlia The aggregation map from (ilev-1)-->(ilev) - ! if no smoother, it is used instead of sm_pr_ + ! if no smoother, it is used instead of mld_sm_pr_ ! 6. baseprecv(ilev)%nlaggr Number of aggregates on the various procs. ! @@ -191,7 +191,7 @@ module mld_prec_type integer, parameter :: mld_dfpsz_=4 ! Fields for sparse matrices ensembles stored in av() integer, parameter :: mld_l_pr_=1, mld_u_pr_=2, mld_bp_ilu_avsz_=2 - integer, parameter :: mld_ap_nd_=3, mld_ac_=4, mld_sm_pr_t_=5, sm_pr_=6 + integer, parameter :: mld_ap_nd_=3, mld_ac_=4, mld_sm_pr_t_=5, mld_sm_pr_=6 integer, parameter :: mld_smth_avsz_=6, mld_max_avsz_=mld_smth_avsz_ diff --git a/mlprec/mld_zaggrmat_smth_asb.F90 b/mlprec/mld_zaggrmat_smth_asb.F90 index 58d31e1a..e95bd63b 100644 --- a/mlprec/mld_zaggrmat_smth_asb.F90 +++ b/mlprec/mld_zaggrmat_smth_asb.F90 @@ -85,7 +85,7 @@ subroutine mld_zaggrmat_smth_asb(a,desc_a,ac,desc_ac,p,info) call psb_nullify_sp(am4) am2 => p%av(mld_sm_pr_t_) - am1 => p%av(sm_pr_) + am1 => p%av(mld_sm_pr_) call psb_nullify_sp(am1) call psb_nullify_sp(am2) diff --git a/mlprec/mld_zmlprec_aply.f90 b/mlprec/mld_zmlprec_aply.f90 index de3d45e8..38e3ba70 100644 --- a/mlprec/mld_zmlprec_aply.f90 +++ b/mlprec/mld_zmlprec_aply.f90 @@ -67,7 +67,7 @@ subroutine mld_zmlprec_aply(alpha,baseprecv,x,beta,y,desc_data,trans,work,info) ! 2.4.: baseprecv(ilev)%av(mld_ac_) Aggregated matrix of level ILEV ! 2.5.: baseprecv(ilev)%av(mld_sm_pr_t_) Smoother prolongator transpose; maps vectors ! (ilev-1) ---> (ilev) - ! 2.6.: baseprecv(ilev)%av(sm_pr_) Smoother prolongator; maps vectors + ! 2.6.: baseprecv(ilev)%av(mld_sm_pr_) Smoother prolongator; maps vectors ! (ilev) ---> (ilev-1) ! Shouldn't we keep just one of them and handle transpose in the sparse BLAS? maybe ! @@ -240,7 +240,7 @@ subroutine mld_zmlprec_aply(alpha,baseprecv,x,beta,y,desc_data,trans,work,info) if (ismth /= mld_no_smooth_) then - call psb_csmm(zone,baseprecv(ilev)%av(sm_pr_),mlprec_wrk(ilev)%y2l,& + call psb_csmm(zone,baseprecv(ilev)%av(mld_sm_pr_),mlprec_wrk(ilev)%y2l,& & zone,mlprec_wrk(ilev-1)%y2l,info) if(info /=0) goto 9999 @@ -390,7 +390,7 @@ subroutine mld_zmlprec_aply(alpha,baseprecv,x,beta,y,desc_data,trans,work,info) if (ismth == mld_smooth_prol_) & & call psb_halo(mlprec_wrk(ilev+1)%y2l,baseprecv(ilev+1)%desc_data,& & info,work=work) - call psb_csmm(zone,baseprecv(ilev+1)%av(sm_pr_),mlprec_wrk(ilev+1)%y2l,& + call psb_csmm(zone,baseprecv(ilev+1)%av(mld_sm_pr_),mlprec_wrk(ilev+1)%y2l,& & zzero,mlprec_wrk(ilev)%y2l,info) if(info /=0) goto 9999 @@ -545,7 +545,7 @@ subroutine mld_zmlprec_aply(alpha,baseprecv,x,beta,y,desc_data,trans,work,info) if (ismth == mld_smooth_prol_) & & call psb_halo(mlprec_wrk(ilev+1)%y2l,& & baseprecv(ilev+1)%desc_data,info,work=work) - call psb_csmm(zone,baseprecv(ilev+1)%av(sm_pr_),mlprec_wrk(ilev+1)%y2l,& + call psb_csmm(zone,baseprecv(ilev+1)%av(mld_sm_pr_),mlprec_wrk(ilev+1)%y2l,& & zone,mlprec_wrk(ilev)%y2l,info) if(info /=0) goto 9999 @@ -705,7 +705,7 @@ subroutine mld_zmlprec_aply(alpha,baseprecv,x,beta,y,desc_data,trans,work,info) if (ismth == mld_smooth_prol_) & & call psb_halo(mlprec_wrk(ilev+1)%y2l,baseprecv(ilev+1)%desc_data,& & info,work=work) - call psb_csmm(zone,baseprecv(ilev+1)%av(sm_pr_),mlprec_wrk(ilev+1)%y2l,& + call psb_csmm(zone,baseprecv(ilev+1)%av(mld_sm_pr_),mlprec_wrk(ilev+1)%y2l,& & zone,mlprec_wrk(ilev)%y2l,info) if(info /=0) goto 9999