mirror of
https://github.com/sfilippone/amg4psblas.git
synced 2026-10-06 22:55:12 +00:00
mld2p4-2:
mlprec/impl/mld_c_extprol_bld.f90 mlprec/impl/mld_c_lev_aggrmat_asb.f90 mlprec/impl/mld_d_extprol_bld.f90 mlprec/impl/mld_d_lev_aggrmat_asb.f90 mlprec/impl/mld_daggrmat_smth_asb.f90 mlprec/impl/mld_s_extprol_bld.f90 mlprec/impl/mld_s_lev_aggrmat_asb.f90 mlprec/impl/mld_z_extprol_bld.f90 mlprec/impl/mld_z_lev_aggrmat_asb.f90 mlprec/mld_base_prec_type.F90 Take out parms%clean_zeros. It was a bad idea.
This commit is contained in:
@@ -424,7 +424,6 @@ contains
|
||||
case(mld_distr_mat_)
|
||||
|
||||
call ac%mv_to(bcoo)
|
||||
if (p%parms%clean_zeros) call bcoo%clean_zeros(info)
|
||||
nzl = bcoo%get_nzeros()
|
||||
|
||||
if (info == psb_success_) call psb_cdall(ictxt,p%desc_ac,info,nl=nlaggr(me+1))
|
||||
@@ -488,7 +487,6 @@ contains
|
||||
!
|
||||
call psb_cdall(ictxt,p%desc_ac,info,mg=ntaggr,repl=.true.)
|
||||
if (info == psb_success_) call psb_cdasb(p%desc_ac,info)
|
||||
if ((info == psb_success_).and.p%parms%clean_zeros) call ac%clean_zeros(info)
|
||||
if (info == psb_success_) &
|
||||
& call psb_gather(p%ac,ac,p%desc_ac,info,dupl=psb_dupl_add_,keeploc=.false.)
|
||||
|
||||
|
||||
@@ -157,7 +157,6 @@ subroutine mld_c_lev_aggrmat_asb(p,a,desc_a,ilaggr,nlaggr,op_prol,info)
|
||||
case(mld_distr_mat_)
|
||||
|
||||
call ac%mv_to(bcoo)
|
||||
if (p%parms%clean_zeros) call bcoo%clean_zeros(info)
|
||||
nzl = bcoo%get_nzeros()
|
||||
|
||||
if (info == psb_success_) call psb_cdall(ictxt,p%desc_ac,info,nl=nlaggr(me+1))
|
||||
@@ -224,7 +223,6 @@ subroutine mld_c_lev_aggrmat_asb(p,a,desc_a,ilaggr,nlaggr,op_prol,info)
|
||||
!
|
||||
call psb_cdall(ictxt,p%desc_ac,info,mg=ntaggr,repl=.true.)
|
||||
if (info == psb_success_) call psb_cdasb(p%desc_ac,info)
|
||||
if ((info == psb_success_).and.p%parms%clean_zeros) call ac%clean_zeros(info)
|
||||
if (info == psb_success_) &
|
||||
& call psb_gather(p%ac,ac,p%desc_ac,info,dupl=psb_dupl_add_,keeploc=.false.)
|
||||
|
||||
|
||||
@@ -424,7 +424,6 @@ contains
|
||||
case(mld_distr_mat_)
|
||||
|
||||
call ac%mv_to(bcoo)
|
||||
if (p%parms%clean_zeros) call bcoo%clean_zeros(info)
|
||||
nzl = bcoo%get_nzeros()
|
||||
|
||||
if (info == psb_success_) call psb_cdall(ictxt,p%desc_ac,info,nl=nlaggr(me+1))
|
||||
@@ -488,7 +487,6 @@ contains
|
||||
!
|
||||
call psb_cdall(ictxt,p%desc_ac,info,mg=ntaggr,repl=.true.)
|
||||
if (info == psb_success_) call psb_cdasb(p%desc_ac,info)
|
||||
if ((info == psb_success_).and.p%parms%clean_zeros) call ac%clean_zeros(info)
|
||||
if (info == psb_success_) &
|
||||
& call psb_gather(p%ac,ac,p%desc_ac,info,dupl=psb_dupl_add_,keeploc=.false.)
|
||||
|
||||
|
||||
@@ -157,7 +157,6 @@ subroutine mld_d_lev_aggrmat_asb(p,a,desc_a,ilaggr,nlaggr,op_prol,info)
|
||||
case(mld_distr_mat_)
|
||||
|
||||
call ac%mv_to(bcoo)
|
||||
if (p%parms%clean_zeros) call bcoo%clean_zeros(info)
|
||||
nzl = bcoo%get_nzeros()
|
||||
|
||||
if (info == psb_success_) call psb_cdall(ictxt,p%desc_ac,info,nl=nlaggr(me+1))
|
||||
@@ -224,7 +223,6 @@ subroutine mld_d_lev_aggrmat_asb(p,a,desc_a,ilaggr,nlaggr,op_prol,info)
|
||||
!
|
||||
call psb_cdall(ictxt,p%desc_ac,info,mg=ntaggr,repl=.true.)
|
||||
if (info == psb_success_) call psb_cdasb(p%desc_ac,info)
|
||||
if ((info == psb_success_).and.p%parms%clean_zeros) call ac%clean_zeros(info)
|
||||
if (info == psb_success_) &
|
||||
& call psb_gather(p%ac,ac,p%desc_ac,info,dupl=psb_dupl_add_,keeploc=.false.)
|
||||
|
||||
|
||||
@@ -408,7 +408,6 @@ subroutine mld_daggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest
|
||||
if (debug_level >= psb_debug_outer_) &
|
||||
& write(debug_unit,*) me,' ',trim(name),&
|
||||
& 'Done smooth_aggregate '
|
||||
|
||||
call psb_erractionrestore(err_act)
|
||||
return
|
||||
|
||||
|
||||
@@ -424,7 +424,6 @@ contains
|
||||
case(mld_distr_mat_)
|
||||
|
||||
call ac%mv_to(bcoo)
|
||||
if (p%parms%clean_zeros) call bcoo%clean_zeros(info)
|
||||
nzl = bcoo%get_nzeros()
|
||||
|
||||
if (info == psb_success_) call psb_cdall(ictxt,p%desc_ac,info,nl=nlaggr(me+1))
|
||||
@@ -488,7 +487,6 @@ contains
|
||||
!
|
||||
call psb_cdall(ictxt,p%desc_ac,info,mg=ntaggr,repl=.true.)
|
||||
if (info == psb_success_) call psb_cdasb(p%desc_ac,info)
|
||||
if ((info == psb_success_).and.p%parms%clean_zeros) call ac%clean_zeros(info)
|
||||
if (info == psb_success_) &
|
||||
& call psb_gather(p%ac,ac,p%desc_ac,info,dupl=psb_dupl_add_,keeploc=.false.)
|
||||
|
||||
|
||||
@@ -157,7 +157,6 @@ subroutine mld_s_lev_aggrmat_asb(p,a,desc_a,ilaggr,nlaggr,op_prol,info)
|
||||
case(mld_distr_mat_)
|
||||
|
||||
call ac%mv_to(bcoo)
|
||||
if (p%parms%clean_zeros) call bcoo%clean_zeros(info)
|
||||
nzl = bcoo%get_nzeros()
|
||||
|
||||
if (info == psb_success_) call psb_cdall(ictxt,p%desc_ac,info,nl=nlaggr(me+1))
|
||||
@@ -224,7 +223,6 @@ subroutine mld_s_lev_aggrmat_asb(p,a,desc_a,ilaggr,nlaggr,op_prol,info)
|
||||
!
|
||||
call psb_cdall(ictxt,p%desc_ac,info,mg=ntaggr,repl=.true.)
|
||||
if (info == psb_success_) call psb_cdasb(p%desc_ac,info)
|
||||
if ((info == psb_success_).and.p%parms%clean_zeros) call ac%clean_zeros(info)
|
||||
if (info == psb_success_) &
|
||||
& call psb_gather(p%ac,ac,p%desc_ac,info,dupl=psb_dupl_add_,keeploc=.false.)
|
||||
|
||||
|
||||
@@ -424,7 +424,6 @@ contains
|
||||
case(mld_distr_mat_)
|
||||
|
||||
call ac%mv_to(bcoo)
|
||||
if (p%parms%clean_zeros) call bcoo%clean_zeros(info)
|
||||
nzl = bcoo%get_nzeros()
|
||||
|
||||
if (info == psb_success_) call psb_cdall(ictxt,p%desc_ac,info,nl=nlaggr(me+1))
|
||||
@@ -488,7 +487,6 @@ contains
|
||||
!
|
||||
call psb_cdall(ictxt,p%desc_ac,info,mg=ntaggr,repl=.true.)
|
||||
if (info == psb_success_) call psb_cdasb(p%desc_ac,info)
|
||||
if ((info == psb_success_).and.p%parms%clean_zeros) call ac%clean_zeros(info)
|
||||
if (info == psb_success_) &
|
||||
& call psb_gather(p%ac,ac,p%desc_ac,info,dupl=psb_dupl_add_,keeploc=.false.)
|
||||
|
||||
|
||||
@@ -157,7 +157,6 @@ subroutine mld_z_lev_aggrmat_asb(p,a,desc_a,ilaggr,nlaggr,op_prol,info)
|
||||
case(mld_distr_mat_)
|
||||
|
||||
call ac%mv_to(bcoo)
|
||||
if (p%parms%clean_zeros) call bcoo%clean_zeros(info)
|
||||
nzl = bcoo%get_nzeros()
|
||||
|
||||
if (info == psb_success_) call psb_cdall(ictxt,p%desc_ac,info,nl=nlaggr(me+1))
|
||||
@@ -224,7 +223,6 @@ subroutine mld_z_lev_aggrmat_asb(p,a,desc_a,ilaggr,nlaggr,op_prol,info)
|
||||
!
|
||||
call psb_cdall(ictxt,p%desc_ac,info,mg=ntaggr,repl=.true.)
|
||||
if (info == psb_success_) call psb_cdasb(p%desc_ac,info)
|
||||
if ((info == psb_success_).and.p%parms%clean_zeros) call ac%clean_zeros(info)
|
||||
if (info == psb_success_) &
|
||||
& call psb_gather(p%ac,ac,p%desc_ac,info,dupl=psb_dupl_add_,keeploc=.false.)
|
||||
|
||||
|
||||
@@ -92,7 +92,6 @@ module mld_base_prec_type
|
||||
integer(psb_ipk_) :: aggr_alg, aggr_ord, aggr_kind
|
||||
integer(psb_ipk_) :: aggr_omega_alg, aggr_eig, aggr_filter
|
||||
integer(psb_ipk_) :: coarse_mat, coarse_solve
|
||||
logical :: clean_zeros=.true.
|
||||
contains
|
||||
procedure, pass(pm) :: get_coarse => ml_parms_get_coarse
|
||||
procedure, pass(pm) :: clone => ml_parms_clone
|
||||
|
||||
Reference in New Issue
Block a user