From 7cefe92b0b47802b82e8cd8b2b30b0aa2cfcd4d7 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 3 Feb 2020 13:41:48 +0000 Subject: [PATCH] Improve memory management in nosmth_bld --- mlprec/impl/aggregator/mld_caggrmat_nosmth_bld.f90 | 4 ++-- mlprec/impl/aggregator/mld_daggrmat_nosmth_bld.f90 | 4 ++-- mlprec/impl/aggregator/mld_saggrmat_nosmth_bld.f90 | 4 ++-- mlprec/impl/aggregator/mld_zaggrmat_nosmth_bld.f90 | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mlprec/impl/aggregator/mld_caggrmat_nosmth_bld.f90 b/mlprec/impl/aggregator/mld_caggrmat_nosmth_bld.f90 index a8f5dc6e..5127f03a 100644 --- a/mlprec/impl/aggregator/mld_caggrmat_nosmth_bld.f90 +++ b/mlprec/impl/aggregator/mld_caggrmat_nosmth_bld.f90 @@ -169,8 +169,7 @@ subroutine mld_caggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re if (info /= psb_success_) goto 9999 - call a%cp_to_l(la) - call la%mv_to(ac_coo) + call a%cp_to(ac_coo) nzt = ac_coo%get_nzeros() k = 0 do i = 1, nzt @@ -188,6 +187,7 @@ subroutine mld_caggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re call ac_coo%set_nzeros(k) call ac_coo%set_dupl(psb_dupl_add_) call ac_coo%fix(info) + call ac_coo%trim() call ac%mv_from(ac_coo) diff --git a/mlprec/impl/aggregator/mld_daggrmat_nosmth_bld.f90 b/mlprec/impl/aggregator/mld_daggrmat_nosmth_bld.f90 index 705fd1ca..ed9a38dc 100644 --- a/mlprec/impl/aggregator/mld_daggrmat_nosmth_bld.f90 +++ b/mlprec/impl/aggregator/mld_daggrmat_nosmth_bld.f90 @@ -169,8 +169,7 @@ subroutine mld_daggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re if (info /= psb_success_) goto 9999 - call a%cp_to_l(la) - call la%mv_to(ac_coo) + call a%cp_to(ac_coo) nzt = ac_coo%get_nzeros() k = 0 do i = 1, nzt @@ -188,6 +187,7 @@ subroutine mld_daggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re call ac_coo%set_nzeros(k) call ac_coo%set_dupl(psb_dupl_add_) call ac_coo%fix(info) + call ac_coo%trim() call ac%mv_from(ac_coo) diff --git a/mlprec/impl/aggregator/mld_saggrmat_nosmth_bld.f90 b/mlprec/impl/aggregator/mld_saggrmat_nosmth_bld.f90 index c4c3ab8f..3d4aa09d 100644 --- a/mlprec/impl/aggregator/mld_saggrmat_nosmth_bld.f90 +++ b/mlprec/impl/aggregator/mld_saggrmat_nosmth_bld.f90 @@ -169,8 +169,7 @@ subroutine mld_saggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re if (info /= psb_success_) goto 9999 - call a%cp_to_l(la) - call la%mv_to(ac_coo) + call a%cp_to(ac_coo) nzt = ac_coo%get_nzeros() k = 0 do i = 1, nzt @@ -188,6 +187,7 @@ subroutine mld_saggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re call ac_coo%set_nzeros(k) call ac_coo%set_dupl(psb_dupl_add_) call ac_coo%fix(info) + call ac_coo%trim() call ac%mv_from(ac_coo) diff --git a/mlprec/impl/aggregator/mld_zaggrmat_nosmth_bld.f90 b/mlprec/impl/aggregator/mld_zaggrmat_nosmth_bld.f90 index 13eb1423..f076122a 100644 --- a/mlprec/impl/aggregator/mld_zaggrmat_nosmth_bld.f90 +++ b/mlprec/impl/aggregator/mld_zaggrmat_nosmth_bld.f90 @@ -169,8 +169,7 @@ subroutine mld_zaggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re if (info /= psb_success_) goto 9999 - call a%cp_to_l(la) - call la%mv_to(ac_coo) + call a%cp_to(ac_coo) nzt = ac_coo%get_nzeros() k = 0 do i = 1, nzt @@ -188,6 +187,7 @@ subroutine mld_zaggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re call ac_coo%set_nzeros(k) call ac_coo%set_dupl(psb_dupl_add_) call ac_coo%fix(info) + call ac_coo%trim() call ac%mv_from(ac_coo)