From 85d97093cd1f7b689d005439c96ac7e3b81b81d3 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Sun, 23 Sep 2018 09:55:18 +0100 Subject: [PATCH 1/2] Reinstate printout of smoothed/unsmoothed. --- mlprec/mld_base_prec_type.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mlprec/mld_base_prec_type.F90 b/mlprec/mld_base_prec_type.F90 index b7661e99..95015d1d 100644 --- a/mlprec/mld_base_prec_type.F90 +++ b/mlprec/mld_base_prec_type.F90 @@ -573,7 +573,7 @@ contains & par_aggr_alg_names(pm%par_aggr_alg) write(iout,*) ' Aggregation type: ',& & aggr_type_names(pm%aggr_type) - if (pm%par_aggr_alg /= mld_ext_aggr_) then + !if (pm%par_aggr_alg /= mld_ext_aggr_) then if ( pm%aggr_ord /= mld_aggr_ord_nat_) & & write(iout,*) ' with initial ordering: ',& & ord_names(pm%aggr_ord) @@ -591,7 +591,7 @@ contains write(iout,*) ' Damping omega computation: unknown value in iprcparm!!' end if end if - end if + !end if else write(iout,*) ' Multilevel type: Unkonwn value. Something is amiss....',& & pm%ml_cycle From 331e57ed350fe1e33ebae78116699d84a0cb9f1b Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 27 Sep 2018 13:32:49 +0100 Subject: [PATCH 2/2] Avoid integer overflow when computing nnz. --- tests/pdegen/mld_d_pde2d.f90 | 4 ++-- tests/pdegen/mld_d_pde3d.f90 | 2 +- tests/pdegen/mld_s_pde2d.f90 | 4 ++-- tests/pdegen/mld_s_pde3d.f90 | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/pdegen/mld_d_pde2d.f90 b/tests/pdegen/mld_d_pde2d.f90 index e1b1bde9..651b1ea7 100644 --- a/tests/pdegen/mld_d_pde2d.f90 +++ b/tests/pdegen/mld_d_pde2d.f90 @@ -247,8 +247,8 @@ contains m = idim*idim n = m - nnz = ((n*7)/(np)) - if(iam == psb_root_) write(psb_out_unit,'("Generating Matrix (size=",i0,")...")')n + nnz = 7*((n+np-1)/np) + if (iam == psb_root_) write(psb_out_unit,'("Generating Matrix (size=",i0,")...")')n t0 = psb_wtime() select case(partition_) case(1) diff --git a/tests/pdegen/mld_d_pde3d.f90 b/tests/pdegen/mld_d_pde3d.f90 index e8a85631..633d4fe0 100644 --- a/tests/pdegen/mld_d_pde3d.f90 +++ b/tests/pdegen/mld_d_pde3d.f90 @@ -263,7 +263,7 @@ contains m = idim*idim*idim n = m - nnz = ((n*7)/(np)) + nnz = 7*((n+np-1)/np) if(iam == psb_root_) write(psb_out_unit,'("Generating Matrix (size=",i0,")...")')n t0 = psb_wtime() select case(partition_) diff --git a/tests/pdegen/mld_s_pde2d.f90 b/tests/pdegen/mld_s_pde2d.f90 index 6d8abb14..49d3c1e2 100644 --- a/tests/pdegen/mld_s_pde2d.f90 +++ b/tests/pdegen/mld_s_pde2d.f90 @@ -247,8 +247,8 @@ contains m = idim*idim n = m - nnz = ((n*7)/(np)) - if(iam == psb_root_) write(psb_out_unit,'("Generating Matrix (size=",i0,")...")')n + nnz = 7*((n+np-1)/np) + if (iam == psb_root_) write(psb_out_unit,'("Generating Matrix (size=",i0,")...")')n t0 = psb_wtime() select case(partition_) case(1) diff --git a/tests/pdegen/mld_s_pde3d.f90 b/tests/pdegen/mld_s_pde3d.f90 index 26d318a7..1978fb81 100644 --- a/tests/pdegen/mld_s_pde3d.f90 +++ b/tests/pdegen/mld_s_pde3d.f90 @@ -263,7 +263,7 @@ contains m = idim*idim*idim n = m - nnz = ((n*7)/(np)) + nnz = 7*((n+np-1)/np) if(iam == psb_root_) write(psb_out_unit,'("Generating Matrix (size=",i0,")...")')n t0 = psb_wtime() select case(partition_)