From bd4a84b2dd1c217dc88980360958c7246b0180d0 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 16 Feb 2017 14:51:25 +0000 Subject: [PATCH] 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. --- mlprec/impl/mld_c_extprol_bld.f90 | 2 -- mlprec/impl/mld_c_lev_aggrmat_asb.f90 | 2 -- mlprec/impl/mld_d_extprol_bld.f90 | 2 -- mlprec/impl/mld_d_lev_aggrmat_asb.f90 | 2 -- mlprec/impl/mld_daggrmat_smth_asb.f90 | 1 - mlprec/impl/mld_s_extprol_bld.f90 | 2 -- mlprec/impl/mld_s_lev_aggrmat_asb.f90 | 2 -- mlprec/impl/mld_z_extprol_bld.f90 | 2 -- mlprec/impl/mld_z_lev_aggrmat_asb.f90 | 2 -- mlprec/mld_base_prec_type.F90 | 1 - 10 files changed, 18 deletions(-) diff --git a/mlprec/impl/mld_c_extprol_bld.f90 b/mlprec/impl/mld_c_extprol_bld.f90 index 23bf4208..41bc2ef9 100644 --- a/mlprec/impl/mld_c_extprol_bld.f90 +++ b/mlprec/impl/mld_c_extprol_bld.f90 @@ -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.) diff --git a/mlprec/impl/mld_c_lev_aggrmat_asb.f90 b/mlprec/impl/mld_c_lev_aggrmat_asb.f90 index 2c2b0dc2..ca491b68 100644 --- a/mlprec/impl/mld_c_lev_aggrmat_asb.f90 +++ b/mlprec/impl/mld_c_lev_aggrmat_asb.f90 @@ -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.) diff --git a/mlprec/impl/mld_d_extprol_bld.f90 b/mlprec/impl/mld_d_extprol_bld.f90 index e8daf62b..81eedb90 100644 --- a/mlprec/impl/mld_d_extprol_bld.f90 +++ b/mlprec/impl/mld_d_extprol_bld.f90 @@ -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.) diff --git a/mlprec/impl/mld_d_lev_aggrmat_asb.f90 b/mlprec/impl/mld_d_lev_aggrmat_asb.f90 index 5f2626df..f198e8f5 100644 --- a/mlprec/impl/mld_d_lev_aggrmat_asb.f90 +++ b/mlprec/impl/mld_d_lev_aggrmat_asb.f90 @@ -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.) diff --git a/mlprec/impl/mld_daggrmat_smth_asb.f90 b/mlprec/impl/mld_daggrmat_smth_asb.f90 index 34fde67f..042edfc5 100644 --- a/mlprec/impl/mld_daggrmat_smth_asb.f90 +++ b/mlprec/impl/mld_daggrmat_smth_asb.f90 @@ -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 diff --git a/mlprec/impl/mld_s_extprol_bld.f90 b/mlprec/impl/mld_s_extprol_bld.f90 index fa07885e..27791fb8 100644 --- a/mlprec/impl/mld_s_extprol_bld.f90 +++ b/mlprec/impl/mld_s_extprol_bld.f90 @@ -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.) diff --git a/mlprec/impl/mld_s_lev_aggrmat_asb.f90 b/mlprec/impl/mld_s_lev_aggrmat_asb.f90 index 1faf911f..32bf5d08 100644 --- a/mlprec/impl/mld_s_lev_aggrmat_asb.f90 +++ b/mlprec/impl/mld_s_lev_aggrmat_asb.f90 @@ -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.) diff --git a/mlprec/impl/mld_z_extprol_bld.f90 b/mlprec/impl/mld_z_extprol_bld.f90 index 0a34c56e..ba901828 100644 --- a/mlprec/impl/mld_z_extprol_bld.f90 +++ b/mlprec/impl/mld_z_extprol_bld.f90 @@ -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.) diff --git a/mlprec/impl/mld_z_lev_aggrmat_asb.f90 b/mlprec/impl/mld_z_lev_aggrmat_asb.f90 index 6d5019c8..3b659b80 100644 --- a/mlprec/impl/mld_z_lev_aggrmat_asb.f90 +++ b/mlprec/impl/mld_z_lev_aggrmat_asb.f90 @@ -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.) diff --git a/mlprec/mld_base_prec_type.F90 b/mlprec/mld_base_prec_type.F90 index 8eaba50e..1de99e7a 100644 --- a/mlprec/mld_base_prec_type.F90 +++ b/mlprec/mld_base_prec_type.F90 @@ -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