diff --git a/amgprec/impl/amg_cfile_prec_memory_use.f90 b/amgprec/impl/amg_cfile_prec_memory_use.f90 index 922f4087..c578358c 100644 --- a/amgprec/impl/amg_cfile_prec_memory_use.f90 +++ b/amgprec/impl/amg_cfile_prec_memory_use.f90 @@ -109,11 +109,11 @@ subroutine amg_cfile_prec_memory_use(prec,info,iout,root, verbosity,prefix,globa ctxt = prec%ctxt call psb_info(ctxt,me,np) prefix_ = "" - if (verbosity == 0) then + if (verbosity_ == 0) then if (present(prefix)) then prefix_ = prefix end if - else if (verbosity > 0) then + else if (verbosity_ > 0) then if (present(prefix)) then write(prefix_,'(a,a,i5,a)') prefix,' from process ',me,': ' else diff --git a/amgprec/impl/amg_dfile_prec_memory_use.f90 b/amgprec/impl/amg_dfile_prec_memory_use.f90 index 9423498f..d10cd5f3 100644 --- a/amgprec/impl/amg_dfile_prec_memory_use.f90 +++ b/amgprec/impl/amg_dfile_prec_memory_use.f90 @@ -109,11 +109,11 @@ subroutine amg_dfile_prec_memory_use(prec,info,iout,root, verbosity,prefix,globa ctxt = prec%ctxt call psb_info(ctxt,me,np) prefix_ = "" - if (verbosity == 0) then + if (verbosity_ == 0) then if (present(prefix)) then prefix_ = prefix end if - else if (verbosity > 0) then + else if (verbosity_ > 0) then if (present(prefix)) then write(prefix_,'(a,a,i5,a)') prefix,' from process ',me,': ' else diff --git a/amgprec/impl/amg_sfile_prec_memory_use.f90 b/amgprec/impl/amg_sfile_prec_memory_use.f90 index ea776c2b..bde5412a 100644 --- a/amgprec/impl/amg_sfile_prec_memory_use.f90 +++ b/amgprec/impl/amg_sfile_prec_memory_use.f90 @@ -109,11 +109,11 @@ subroutine amg_sfile_prec_memory_use(prec,info,iout,root, verbosity,prefix,globa ctxt = prec%ctxt call psb_info(ctxt,me,np) prefix_ = "" - if (verbosity == 0) then + if (verbosity_ == 0) then if (present(prefix)) then prefix_ = prefix end if - else if (verbosity > 0) then + else if (verbosity_ > 0) then if (present(prefix)) then write(prefix_,'(a,a,i5,a)') prefix,' from process ',me,': ' else diff --git a/amgprec/impl/amg_zfile_prec_memory_use.f90 b/amgprec/impl/amg_zfile_prec_memory_use.f90 index e54b13ad..145ce044 100644 --- a/amgprec/impl/amg_zfile_prec_memory_use.f90 +++ b/amgprec/impl/amg_zfile_prec_memory_use.f90 @@ -109,11 +109,11 @@ subroutine amg_zfile_prec_memory_use(prec,info,iout,root, verbosity,prefix,globa ctxt = prec%ctxt call psb_info(ctxt,me,np) prefix_ = "" - if (verbosity == 0) then + if (verbosity_ == 0) then if (present(prefix)) then prefix_ = prefix end if - else if (verbosity > 0) then + else if (verbosity_ > 0) then if (present(prefix)) then write(prefix_,'(a,a,i5,a)') prefix,' from process ',me,': ' else diff --git a/amgprec/impl/level/amg_c_base_onelev_memory_use.f90 b/amgprec/impl/level/amg_c_base_onelev_memory_use.f90 index 9cfc369e..f4147bb3 100644 --- a/amgprec/impl/level/amg_c_base_onelev_memory_use.f90 +++ b/amgprec/impl/level/amg_c_base_onelev_memory_use.f90 @@ -100,11 +100,6 @@ subroutine amg_c_base_onelev_memory_use(lv,il,nl,ilmin,info,iout,verbosity,prefi write(iout_,*) trim(prefix_) - if (coarse) then - write(iout_,*) trim(prefix_), ' Level ',il,' (coarse)' - else - write(iout_,*) trim(prefix_), ' Level ',il - end if if (global_) then allocate(sz(6)) @@ -117,6 +112,11 @@ subroutine amg_c_base_onelev_memory_use(lv,il,nl,ilmin,info,iout,verbosity,prefi if (allocated(lv%wrk)) sz(6) = lv%wrk%sizeof() call psb_sum(ctxt,sz) if (me == 0) then + if (coarse) then + write(iout_,*) trim(prefix_), ' Level ',il,' (coarse)' + else + write(iout_,*) trim(prefix_), ' Level ',il + end if write(iout_,*) trim(prefix_), ' Matrix:', sz(1) write(iout_,*) trim(prefix_), ' Descriptor:', sz(2) if (il >1) write(iout_,*) trim(prefix_), ' Linear map:', sz(3) @@ -127,6 +127,11 @@ subroutine amg_c_base_onelev_memory_use(lv,il,nl,ilmin,info,iout,verbosity,prefi else if ((me == 0).or.(verbosity_>0)) then + if (coarse) then + write(iout_,*) trim(prefix_), ' Level ',il,' (coarse)' + else + write(iout_,*) trim(prefix_), ' Level ',il + end if write(iout_,*) trim(prefix_), ' Matrix:', lv%base_a%sizeof() write(iout_,*) trim(prefix_), ' Descriptor:', lv%base_desc%sizeof() if (il >1) write(iout_,*) trim(prefix_), ' Linear map:', lv%linmap%sizeof() diff --git a/amgprec/impl/level/amg_d_base_onelev_memory_use.f90 b/amgprec/impl/level/amg_d_base_onelev_memory_use.f90 index 1e9bb9a9..0a5e2066 100644 --- a/amgprec/impl/level/amg_d_base_onelev_memory_use.f90 +++ b/amgprec/impl/level/amg_d_base_onelev_memory_use.f90 @@ -100,11 +100,6 @@ subroutine amg_d_base_onelev_memory_use(lv,il,nl,ilmin,info,iout,verbosity,prefi write(iout_,*) trim(prefix_) - if (coarse) then - write(iout_,*) trim(prefix_), ' Level ',il,' (coarse)' - else - write(iout_,*) trim(prefix_), ' Level ',il - end if if (global_) then allocate(sz(6)) @@ -117,6 +112,11 @@ subroutine amg_d_base_onelev_memory_use(lv,il,nl,ilmin,info,iout,verbosity,prefi if (allocated(lv%wrk)) sz(6) = lv%wrk%sizeof() call psb_sum(ctxt,sz) if (me == 0) then + if (coarse) then + write(iout_,*) trim(prefix_), ' Level ',il,' (coarse)' + else + write(iout_,*) trim(prefix_), ' Level ',il + end if write(iout_,*) trim(prefix_), ' Matrix:', sz(1) write(iout_,*) trim(prefix_), ' Descriptor:', sz(2) if (il >1) write(iout_,*) trim(prefix_), ' Linear map:', sz(3) @@ -127,6 +127,11 @@ subroutine amg_d_base_onelev_memory_use(lv,il,nl,ilmin,info,iout,verbosity,prefi else if ((me == 0).or.(verbosity_>0)) then + if (coarse) then + write(iout_,*) trim(prefix_), ' Level ',il,' (coarse)' + else + write(iout_,*) trim(prefix_), ' Level ',il + end if write(iout_,*) trim(prefix_), ' Matrix:', lv%base_a%sizeof() write(iout_,*) trim(prefix_), ' Descriptor:', lv%base_desc%sizeof() if (il >1) write(iout_,*) trim(prefix_), ' Linear map:', lv%linmap%sizeof() diff --git a/amgprec/impl/level/amg_s_base_onelev_memory_use.f90 b/amgprec/impl/level/amg_s_base_onelev_memory_use.f90 index 53be7406..f59d8dd9 100644 --- a/amgprec/impl/level/amg_s_base_onelev_memory_use.f90 +++ b/amgprec/impl/level/amg_s_base_onelev_memory_use.f90 @@ -100,11 +100,6 @@ subroutine amg_s_base_onelev_memory_use(lv,il,nl,ilmin,info,iout,verbosity,prefi write(iout_,*) trim(prefix_) - if (coarse) then - write(iout_,*) trim(prefix_), ' Level ',il,' (coarse)' - else - write(iout_,*) trim(prefix_), ' Level ',il - end if if (global_) then allocate(sz(6)) @@ -117,6 +112,11 @@ subroutine amg_s_base_onelev_memory_use(lv,il,nl,ilmin,info,iout,verbosity,prefi if (allocated(lv%wrk)) sz(6) = lv%wrk%sizeof() call psb_sum(ctxt,sz) if (me == 0) then + if (coarse) then + write(iout_,*) trim(prefix_), ' Level ',il,' (coarse)' + else + write(iout_,*) trim(prefix_), ' Level ',il + end if write(iout_,*) trim(prefix_), ' Matrix:', sz(1) write(iout_,*) trim(prefix_), ' Descriptor:', sz(2) if (il >1) write(iout_,*) trim(prefix_), ' Linear map:', sz(3) @@ -127,6 +127,11 @@ subroutine amg_s_base_onelev_memory_use(lv,il,nl,ilmin,info,iout,verbosity,prefi else if ((me == 0).or.(verbosity_>0)) then + if (coarse) then + write(iout_,*) trim(prefix_), ' Level ',il,' (coarse)' + else + write(iout_,*) trim(prefix_), ' Level ',il + end if write(iout_,*) trim(prefix_), ' Matrix:', lv%base_a%sizeof() write(iout_,*) trim(prefix_), ' Descriptor:', lv%base_desc%sizeof() if (il >1) write(iout_,*) trim(prefix_), ' Linear map:', lv%linmap%sizeof() diff --git a/amgprec/impl/level/amg_z_base_onelev_memory_use.f90 b/amgprec/impl/level/amg_z_base_onelev_memory_use.f90 index cf9ddcbe..4c1e3432 100644 --- a/amgprec/impl/level/amg_z_base_onelev_memory_use.f90 +++ b/amgprec/impl/level/amg_z_base_onelev_memory_use.f90 @@ -100,11 +100,6 @@ subroutine amg_z_base_onelev_memory_use(lv,il,nl,ilmin,info,iout,verbosity,prefi write(iout_,*) trim(prefix_) - if (coarse) then - write(iout_,*) trim(prefix_), ' Level ',il,' (coarse)' - else - write(iout_,*) trim(prefix_), ' Level ',il - end if if (global_) then allocate(sz(6)) @@ -117,6 +112,11 @@ subroutine amg_z_base_onelev_memory_use(lv,il,nl,ilmin,info,iout,verbosity,prefi if (allocated(lv%wrk)) sz(6) = lv%wrk%sizeof() call psb_sum(ctxt,sz) if (me == 0) then + if (coarse) then + write(iout_,*) trim(prefix_), ' Level ',il,' (coarse)' + else + write(iout_,*) trim(prefix_), ' Level ',il + end if write(iout_,*) trim(prefix_), ' Matrix:', sz(1) write(iout_,*) trim(prefix_), ' Descriptor:', sz(2) if (il >1) write(iout_,*) trim(prefix_), ' Linear map:', sz(3) @@ -127,6 +127,11 @@ subroutine amg_z_base_onelev_memory_use(lv,il,nl,ilmin,info,iout,verbosity,prefi else if ((me == 0).or.(verbosity_>0)) then + if (coarse) then + write(iout_,*) trim(prefix_), ' Level ',il,' (coarse)' + else + write(iout_,*) trim(prefix_), ' Level ',il + end if write(iout_,*) trim(prefix_), ' Matrix:', lv%base_a%sizeof() write(iout_,*) trim(prefix_), ' Descriptor:', lv%base_desc%sizeof() if (il >1) write(iout_,*) trim(prefix_), ' Linear map:', lv%linmap%sizeof()