diff --git a/mlprec/mld_prec_type.f90 b/mlprec/mld_prec_type.f90 index bec5ce60..d8ab1f16 100644 --- a/mlprec/mld_prec_type.f90 +++ b/mlprec/mld_prec_type.f90 @@ -832,7 +832,7 @@ contains ! ! Currently, all the preconditioner parameters must have the same value at levels - ! 2,...,nlev-1, hence only the values at level 2 are printed + ! 2,...,nlev-1, hence only the values at level 2 are printed ! ilev=2 @@ -848,10 +848,6 @@ contains & aggr_kinds(p%baseprecv(ilev)%iprcparm(mld_aggr_kind_)) write(iout_,*) ' Aggregation threshold: ', & & p%baseprecv(ilev)%rprcparm(mld_aggr_thresh_) - if (p%baseprecv(ilev)%iprcparm(mld_aggr_kind_) /= mld_no_smooth_) then - write(iout_,*) ' Damping omega: ', & - & p%baseprecv(ilev)%rprcparm(mld_aggr_damp_) - end if endif ! @@ -868,6 +864,10 @@ contains write(iout_,*) ' Sizes of aggregates: ', & & p%baseprecv(ilev)%nlaggr(:) end if + if (p%baseprecv(ilev)%iprcparm(mld_aggr_kind_) /= mld_no_smooth_) then + write(iout_,*) ' Damping omega: ', & + & p%baseprecv(ilev)%rprcparm(mld_aggr_damp_) + end if end if end do @@ -888,8 +888,12 @@ contains write(iout_,*) ' Sizes of aggregates: ', & & p%baseprecv(ilev)%nlaggr(:) end if + if (p%baseprecv(ilev)%iprcparm(mld_aggr_kind_) /= mld_no_smooth_) then + write(iout_,*) ' Damping omega: ', & + & p%baseprecv(ilev)%rprcparm(mld_aggr_damp_) + end if if (p%baseprecv(ilev)%iprcparm(mld_coarse_mat_) == mld_distr_mat_ .and. & - & p%baseprecv(ilev)%iprcparm(mld_sub_solve_) /= mld_sludist_) then + & p%baseprecv(ilev)%iprcparm(mld_sub_solve_) /= mld_sludist_) then write(iout_,*) ' Coarsest matrix solver: block Jacobi with ', & & fact_names(p%baseprecv(ilev)%iprcparm(mld_sub_solve_)) write(iout_,*) ' Number of Jacobi sweeps: ', & @@ -1053,10 +1057,6 @@ contains & aggr_kinds(p%baseprecv(ilev)%iprcparm(mld_aggr_kind_)) write(iout_,*) ' Aggregation threshold: ', & & p%baseprecv(ilev)%rprcparm(mld_aggr_thresh_) - if (p%baseprecv(ilev)%iprcparm(mld_aggr_kind_) /= mld_no_smooth_) then - write(iout_,*) ' Damping omega: ', & - & p%baseprecv(ilev)%rprcparm(mld_aggr_damp_) - end if endif ! @@ -1074,6 +1074,10 @@ contains & p%baseprecv(ilev)%nlaggr(:) end if end if + if (p%baseprecv(ilev)%iprcparm(mld_aggr_kind_) /= mld_no_smooth_) then + write(iout_,*) ' Damping omega: ', & + & p%baseprecv(ilev)%rprcparm(mld_aggr_damp_) + end if end do ! @@ -1093,8 +1097,12 @@ contains write(iout_,*) ' Sizes of aggregates: ', & & p%baseprecv(ilev)%nlaggr(:) end if + if (p%baseprecv(ilev)%iprcparm(mld_aggr_kind_) /= mld_no_smooth_) then + write(iout_,*) ' Damping omega: ', & + & p%baseprecv(ilev)%rprcparm(mld_aggr_damp_) + end if if (p%baseprecv(ilev)%iprcparm(mld_coarse_mat_) == mld_distr_mat_ .and. & - & p%baseprecv(ilev)%iprcparm(mld_sub_solve_) /= mld_sludist_) then + & p%baseprecv(ilev)%iprcparm(mld_sub_solve_) /= mld_sludist_) then write(iout_,*) ' Coarsest matrix solver: block Jacobi with ', & & fact_names(p%baseprecv(ilev)%iprcparm(mld_sub_solve_)) write(iout_,*) ' Number of Jacobi sweeps: ', & @@ -1279,10 +1287,6 @@ contains & aggr_kinds(p%baseprecv(ilev)%iprcparm(mld_aggr_kind_)) write(iout_,*) ' Aggregation threshold: ', & & p%baseprecv(ilev)%rprcparm(mld_aggr_thresh_) - if (p%baseprecv(ilev)%iprcparm(mld_aggr_kind_) /= mld_no_smooth_) then - write(iout_,*) ' Damping omega: ', & - & p%baseprecv(ilev)%rprcparm(mld_aggr_damp_) - end if endif ! @@ -1300,6 +1304,10 @@ contains & p%baseprecv(ilev)%nlaggr(:) end if end if + if (p%baseprecv(ilev)%iprcparm(mld_aggr_kind_) /= mld_no_smooth_) then + write(iout_,*) ' Damping omega: ', & + & p%baseprecv(ilev)%rprcparm(mld_aggr_damp_) + end if end do ! @@ -1319,8 +1327,12 @@ contains write(iout_,*) ' Sizes of aggregates: ', & & p%baseprecv(ilev)%nlaggr(:) end if + if (p%baseprecv(ilev)%iprcparm(mld_aggr_kind_) /= mld_no_smooth_) then + write(iout_,*) ' Damping omega: ', & + & p%baseprecv(ilev)%rprcparm(mld_aggr_damp_) + end if if (p%baseprecv(ilev)%iprcparm(mld_coarse_mat_) == mld_distr_mat_ .and. & - & p%baseprecv(ilev)%iprcparm(mld_sub_solve_) /= mld_sludist_) then + & p%baseprecv(ilev)%iprcparm(mld_sub_solve_) /= mld_sludist_) then write(iout_,*) ' Coarsest matrix solver: block Jacobi with ', & & fact_names(p%baseprecv(ilev)%iprcparm(mld_sub_solve_)) write(iout_,*) ' Number of Jacobi sweeps: ', & @@ -1484,10 +1496,6 @@ contains & aggr_kinds(p%baseprecv(ilev)%iprcparm(mld_aggr_kind_)) write(iout_,*) ' Aggregation threshold: ', & & p%baseprecv(ilev)%rprcparm(mld_aggr_thresh_) - if (p%baseprecv(ilev)%iprcparm(mld_aggr_kind_) /= mld_no_smooth_) then - write(iout_,*) ' Damping omega: ', & - & p%baseprecv(ilev)%rprcparm(mld_aggr_damp_) - end if endif ! @@ -1505,6 +1513,10 @@ contains & p%baseprecv(ilev)%nlaggr(:) end if end if + if (p%baseprecv(ilev)%iprcparm(mld_aggr_kind_) /= mld_no_smooth_) then + write(iout_,*) ' Damping omega: ', & + & p%baseprecv(ilev)%rprcparm(mld_aggr_damp_) + end if end do ! @@ -1524,8 +1536,12 @@ contains write(iout_,*) ' Sizes of aggregates: ', & & p%baseprecv(ilev)%nlaggr(:) end if + if (p%baseprecv(ilev)%iprcparm(mld_aggr_kind_) /= mld_no_smooth_) then + write(iout_,*) ' Damping omega: ', & + & p%baseprecv(ilev)%rprcparm(mld_aggr_damp_) + end if if (p%baseprecv(ilev)%iprcparm(mld_coarse_mat_) == mld_distr_mat_ .and. & - & p%baseprecv(ilev)%iprcparm(mld_sub_solve_) /= mld_sludist_) then + & p%baseprecv(ilev)%iprcparm(mld_sub_solve_) /= mld_sludist_) then write(iout_,*) ' Coarsest matrix solver: block Jacobi with ', & & fact_names(p%baseprecv(ilev)%iprcparm(mld_sub_solve_)) write(iout_,*) ' Number of Jacobi sweeps: ', &