diff --git a/mlprec/mld_c_as_smoother.f90 b/mlprec/mld_c_as_smoother.f90 index 0c68006d..1f4313fe 100644 --- a/mlprec/mld_c_as_smoother.f90 +++ b/mlprec/mld_c_as_smoother.f90 @@ -172,7 +172,7 @@ contains call psb_erractionsave(err_act) info = psb_success_ - ictxt = psb_cd_get_context(desc_data) + ictxt = desc_data%get_context() call psb_info (ictxt,me,np) trans_ = psb_toupper(trans) @@ -191,9 +191,9 @@ contains end if - n_row = psb_cd_get_local_rows(sm%desc_data) - n_col = psb_cd_get_local_cols(sm%desc_data) - nrow_d = psb_cd_get_local_rows(desc_data) + n_row = sm%desc_data%get_local_rows() + n_col = sm%desc_data%get_local_cols() + nrow_d = desc_data%get_local_rows() isz=max(n_row,N_COL) if ((6*isz) <= size(work)) then ww => work(1:isz) @@ -609,7 +609,7 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' @@ -653,8 +653,8 @@ contains call psb_cdbldext(a,desc_a,novr,sm%desc_data,info,extype=psb_ovt_asov_) if(debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& - & ' From cdbldext _:',psb_cd_get_local_rows(sm%desc_data),& - & psb_cd_get_local_cols(sm%desc_data) + & ' From cdbldext _:',sm%desc_data%get_local_rows(),& + & sm%desc_data%get_local_cols() if (info /= psb_success_) then info=psb_err_from_subroutine_ @@ -691,8 +691,8 @@ contains & call sm%sv%build(a,sm%desc_data,upd,info,blck) nrow_a = a%get_nrows() - n_row = psb_cd_get_local_rows(sm%desc_data) - n_col = psb_cd_get_local_cols(sm%desc_data) + n_row = sm%desc_data%get_local_rows() + n_col = sm%desc_data%get_local_cols() if (info == psb_success_) call a%csclip(sm%nd,info,& & jmin=nrow_a+1,rscale=.false.,cscale=.false.) diff --git a/mlprec/mld_c_dec_map_bld.F90 b/mlprec/mld_c_dec_map_bld.F90 index f50aebaf..dff4ba80 100644 --- a/mlprec/mld_c_dec_map_bld.F90 +++ b/mlprec/mld_c_dec_map_bld.F90 @@ -31,10 +31,10 @@ subroutine mld_c_dec_map_bld(theta,a,desc_a,nlaggr,ilaggr,info) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() ! - ictxt=psb_cd_get_context(desc_a) + ictxt=desc_a%get_context() call psb_info(ictxt,me,np) - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() nr = a%get_nrows() allocate(ilaggr(nr),neigh(nr),stat=info) diff --git a/mlprec/mld_c_diag_solver.f90 b/mlprec/mld_c_diag_solver.f90 index 34541adf..12fe30ea 100644 --- a/mlprec/mld_c_diag_solver.f90 +++ b/mlprec/mld_c_diag_solver.f90 @@ -99,8 +99,8 @@ contains goto 9999 end select - n_row = psb_cd_get_local_rows(desc_data) - n_col = psb_cd_get_local_cols(desc_data) + n_row = desc_data%get_local_rows() + n_col = desc_data%get_local_cols() if (beta == czero) then @@ -212,13 +212,13 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' - n_row = psb_cd_get_local_rows(desc_a) + n_row = desc_a%get_local_rows() nrow_a = a%get_nrows() if (allocated(sv%d)) then if (size(sv%d) < n_row) then diff --git a/mlprec/mld_c_id_solver.f90 b/mlprec/mld_c_id_solver.f90 index c0d02b92..a19c3846 100644 --- a/mlprec/mld_c_id_solver.f90 +++ b/mlprec/mld_c_id_solver.f90 @@ -136,7 +136,7 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' diff --git a/mlprec/mld_c_ilu_solver.f90 b/mlprec/mld_c_ilu_solver.f90 index 78611b12..422aaf8e 100644 --- a/mlprec/mld_c_ilu_solver.f90 +++ b/mlprec/mld_c_ilu_solver.f90 @@ -172,8 +172,8 @@ contains goto 9999 end select - n_row = psb_cd_get_local_rows(desc_data) - n_col = psb_cd_get_local_cols(desc_data) + n_row = desc_data%get_local_rows() + n_col = desc_data%get_local_cols() if (n_col <= size(work)) then ww => work(1:n_col) @@ -268,13 +268,13 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' - n_row = psb_cd_get_local_rows(desc_a) + n_row = desc_a%get_local_rows() if (psb_toupper(upd) == 'F') then nrow_a = a%get_nrows() diff --git a/mlprec/mld_c_jac_smoother.f90 b/mlprec/mld_c_jac_smoother.f90 index c1e914ab..f65fd7cb 100644 --- a/mlprec/mld_c_jac_smoother.f90 +++ b/mlprec/mld_c_jac_smoother.f90 @@ -111,8 +111,8 @@ contains goto 9999 end if - n_row = psb_cd_get_local_rows(desc_data) - n_col = psb_cd_get_local_cols(desc_data) + n_row = desc_data%get_local_rows() + n_col = desc_data%get_local_cols() if (n_col <= size(work)) then ww => work(1:n_col) @@ -250,13 +250,13 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' - n_row = psb_cd_get_local_rows(desc_a) + n_row = desc_a%get_local_rows() nrow_a = a%get_nrows() nztota = a%get_nzeros() diff --git a/mlprec/mld_c_prec_type.f90 b/mlprec/mld_c_prec_type.f90 index 2b833ae1..e667051e 100644 --- a/mlprec/mld_c_prec_type.f90 +++ b/mlprec/mld_c_prec_type.f90 @@ -1604,7 +1604,7 @@ contains end if if (associated(lv%base_desc)) then - icontxt = psb_cd_get_context(lv%base_desc) + icontxt = lv%base_desc%get_context() call psb_info(icontxt,iam,np) else icontxt = -1 diff --git a/mlprec/mld_c_slu_solver.f90 b/mlprec/mld_c_slu_solver.f90 index 76797196..e8ffda21 100644 --- a/mlprec/mld_c_slu_solver.f90 +++ b/mlprec/mld_c_slu_solver.f90 @@ -135,8 +135,8 @@ contains goto 9999 end select - n_row = psb_cd_get_local_rows(desc_data) - n_col = psb_cd_get_local_cols(desc_data) + n_row = desc_data%get_local_rows() + n_col = desc_data%get_local_cols() if (n_col <= size(work)) then ww => work(1:n_col) @@ -211,14 +211,14 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' - n_row = psb_cd_get_local_rows(desc_a) - n_col = psb_cd_get_local_cols(desc_a) + n_row = desc_a%get_local_rows() + n_col = desc_a%get_local_cols() if (psb_toupper(upd) == 'F') then diff --git a/mlprec/mld_caggrmap_bld.f90 b/mlprec/mld_caggrmap_bld.f90 index 6ed756cd..11c5076a 100644 --- a/mlprec/mld_caggrmap_bld.f90 +++ b/mlprec/mld_caggrmap_bld.f90 @@ -111,10 +111,10 @@ subroutine mld_caggrmap_bld(aggr_type,theta,a,desc_a,ilaggr,nlaggr,info) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() ! - ictxt=psb_cd_get_context(desc_a) + ictxt=desc_a%get_context() call psb_info(ictxt,me,np) - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() select case (aggr_type) case (mld_dec_aggr_) diff --git a/mlprec/mld_caggrmat_asb.f90 b/mlprec/mld_caggrmat_asb.f90 index be1eae4f..68c3acd9 100644 --- a/mlprec/mld_caggrmat_asb.f90 +++ b/mlprec/mld_caggrmat_asb.f90 @@ -121,8 +121,8 @@ subroutine mld_caggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info) info=psb_success_ call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_a) - icomm = psb_cd_get_mpic(desc_a) + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() call psb_info(ictxt, me, np) diff --git a/mlprec/mld_caggrmat_nosmth_asb.F90 b/mlprec/mld_caggrmat_nosmth_asb.F90 index 81081481..c8ca76bb 100644 --- a/mlprec/mld_caggrmat_nosmth_asb.F90 +++ b/mlprec/mld_caggrmat_nosmth_asb.F90 @@ -116,12 +116,12 @@ subroutine mld_caggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info) call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_a) - icomm = psb_cd_get_mpic(desc_a) + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() call psb_info(ictxt, me, np) - nglob = psb_cd_get_global_rows(desc_a) - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nglob = desc_a%get_global_rows() + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() naggr = nlaggr(me+1) diff --git a/mlprec/mld_caggrmat_smth_asb.F90 b/mlprec/mld_caggrmat_smth_asb.F90 index 3dae6a8e..cdf10574 100644 --- a/mlprec/mld_caggrmat_smth_asb.F90 +++ b/mlprec/mld_caggrmat_smth_asb.F90 @@ -140,15 +140,15 @@ subroutine mld_caggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) - icomm = psb_cd_get_mpic(desc_a) - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) - nglob = psb_cd_get_global_rows(desc_a) - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nglob = desc_a%get_global_rows() + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() theta = p%parms%aggr_thresh @@ -527,8 +527,8 @@ subroutine mld_caggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) & 'Assembld aux descr. distr.' call p%ac%mv_from(bcoo) - call p%ac%set_nrows(psb_cd_get_local_rows(p%desc_ac)) - call p%ac%set_ncols(psb_cd_get_local_cols(p%desc_ac)) + call p%ac%set_nrows(p%desc_ac%get_local_rows()) + call p%ac%set_ncols(p%desc_ac%get_local_cols()) call p%ac%set_asb() if (info == psb_success_) deallocate(nzbr,idisp,stat=info) @@ -547,7 +547,7 @@ subroutine mld_caggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) end if call am1%mv_from(acsr1) endif - call am1%set_ncols(psb_cd_get_local_cols(p%desc_ac)) + call am1%set_ncols(p%desc_ac%get_local_cols()) if (np>1) then call am2%cscnv(info,type='coo',dupl=psb_dupl_add_) @@ -562,7 +562,7 @@ subroutine mld_caggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) goto 9999 end if end if - call am2%set_nrows(psb_cd_get_local_cols(p%desc_ac)) + call am2%set_nrows(p%desc_ac%get_local_cols()) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& diff --git a/mlprec/mld_ccoarse_bld.f90 b/mlprec/mld_ccoarse_bld.f90 index fe3a900e..30094324 100644 --- a/mlprec/mld_ccoarse_bld.f90 +++ b/mlprec/mld_ccoarse_bld.f90 @@ -87,7 +87,7 @@ subroutine mld_ccoarse_bld(a,desc_a,p,info) if (psb_get_errstatus().ne.0) return call psb_erractionsave(err_act) info = psb_success_ - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt,me,np) call mld_check_def(p%parms%ml_type,'Multilevel type',& diff --git a/mlprec/mld_cmlprec_aply.f90 b/mlprec/mld_cmlprec_aply.f90 index 58cd2771..679de72a 100644 --- a/mlprec/mld_cmlprec_aply.f90 +++ b/mlprec/mld_cmlprec_aply.f90 @@ -129,7 +129,7 @@ ! If trans='N','n' then op(M^(-1)) = M^(-1); ! if trans='T','t' then op(M^(-1)) = M^(-T) (transpose of M^(-1)). ! work - complex(psb_spk_), dimension (:), optional, target. -! Workspace. Its size must be at least 4*psb_cd_get_local_cols(desc_data). +! Workspace. Its size must be at least 4*desc_data%get_local_cols(). ! info - integer, output. ! Error code. ! @@ -340,7 +340,7 @@ subroutine mld_cmlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_data) + ictxt = desc_data%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_inner_) & diff --git a/mlprec/mld_cmlprec_bld.f90 b/mlprec/mld_cmlprec_bld.f90 index 11d3f98a..6489d653 100644 --- a/mlprec/mld_cmlprec_bld.f90 +++ b/mlprec/mld_cmlprec_bld.f90 @@ -99,7 +99,7 @@ subroutine mld_cmlprec_bld(a,desc_a,p,info) name = 'mld_cmlprec_bld' info = psb_success_ int_err(1) = 0 - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & diff --git a/mlprec/mld_cprecaply.f90 b/mlprec/mld_cprecaply.f90 index fac9cc59..0557f08e 100644 --- a/mlprec/mld_cprecaply.f90 +++ b/mlprec/mld_cprecaply.f90 @@ -69,7 +69,7 @@ ! if trans='T','t' then op(M^(-1)) = M^(-T) (transpose of M^(-1)). ! work - complex(psb_spk_), dimension (:), optional, target. ! Workspace. Its size must be at -! least 4*psb_cd_get_local_cols(desc_data). +! least 4*desc_data%get_local_cols(). ! subroutine mld_cprecaply(prec,x,y,desc_data,info,trans,work) @@ -97,7 +97,7 @@ subroutine mld_cprecaply(prec,x,y,desc_data,info,trans,work) info = psb_success_ call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_data) + ictxt = desc_data%get_context() call psb_info(ictxt, me, np) if (present(trans)) then @@ -109,7 +109,7 @@ subroutine mld_cprecaply(prec,x,y,desc_data,info,trans,work) if (present(work)) then work_ => work else - iwsz = max(1,4*psb_cd_get_local_cols(desc_data)) + iwsz = max(1,4*desc_data%get_local_cols()) allocate(work_(iwsz),stat=info) if (info /= psb_success_) then call psb_errpush(psb_err_alloc_request_,name,i_err=(/iwsz,0,0,0,0/),& @@ -228,7 +228,7 @@ subroutine mld_cprecaply1(prec,x,desc_data,info,trans) call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_data) + ictxt = desc_data%get_context() call psb_info(ictxt, me, np) allocate(ww(size(x)),w1(size(x)),stat=info) diff --git a/mlprec/mld_cprecbld.f90 b/mlprec/mld_cprecbld.f90 index 8288ea16..aeb44056 100644 --- a/mlprec/mld_cprecbld.f90 +++ b/mlprec/mld_cprecbld.f90 @@ -94,7 +94,7 @@ subroutine mld_cprecbld(a,desc_a,p,info) name = 'mld_cprecbld' info = psb_success_ int_err(1) = 0 - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) p%ictxt = ictxt diff --git a/mlprec/mld_cslu_bld.f90 b/mlprec/mld_cslu_bld.f90 index bf30cb59..6986452e 100644 --- a/mlprec/mld_cslu_bld.f90 +++ b/mlprec/mld_cslu_bld.f90 @@ -91,7 +91,7 @@ subroutine mld_cslu_bld(a,desc_a,p,info) name='mld_cslu_bld' call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) diff --git a/mlprec/mld_cslud_bld.f90 b/mlprec/mld_cslud_bld.f90 index fa46155c..8394758c 100644 --- a/mlprec/mld_cslud_bld.f90 +++ b/mlprec/mld_cslud_bld.f90 @@ -89,7 +89,7 @@ subroutine mld_csludist_bld(a,desc_a,p,info) name='mld_cslud_bld' call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) @@ -100,8 +100,8 @@ subroutine mld_csludist_bld(a,desc_a,p,info) ! WARN: we need to check for a BLOCK distribution (this is the ! distribution required by SuperLU_DIST) ! - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() call psb_loc_to_glob(1,ifrst,desc_a,info) call psb_loc_to_glob(nrow,ibcheck,desc_a,info) ibcheck = ibcheck - ifrst + 1 @@ -115,7 +115,7 @@ subroutine mld_csludist_bld(a,desc_a,p,info) goto 9999 endif - mglob = psb_cd_get_global_rows(desc_a) + mglob = desc_a%get_global_rows() nzt = aa%get_nzeros() npr = np diff --git a/mlprec/mld_csp_renum.f90 b/mlprec/mld_csp_renum.f90 index 71297da0..527f4b90 100644 --- a/mlprec/mld_csp_renum.f90 +++ b/mlprec/mld_csp_renum.f90 @@ -106,7 +106,7 @@ subroutine mld_csp_renum(a,blck,p,atmp,info) name='mld_csp_renum' call psb_erractionsave(err_act) - ictxt=psb_cd_get_context(p%desc_data) + ictxt=p%desc_data%get_context() call psb_info(ictxt, me, np) ! @@ -130,7 +130,7 @@ subroutine mld_csp_renum(a,blck,p,atmp,info) ! Remember: we have switched IA1=COLS and IA2=ROWS. ! Now identify the set of distinct local column indices. ! - nnr = psb_cd_get_local_rows(p%desc_data) + nnr = p%desc_data%get_local_rows() allocate(p%perm(nnr),p%invperm(nnr),itmp2(nnr),stat=info) if (info /= psb_success_) then call psb_errpush(psb_err_from_subroutine_,name,a_err='Allocate') diff --git a/mlprec/mld_cumf_bld.f90 b/mlprec/mld_cumf_bld.f90 index f07a5fcf..3bb37f15 100644 --- a/mlprec/mld_cumf_bld.f90 +++ b/mlprec/mld_cumf_bld.f90 @@ -95,7 +95,7 @@ subroutine mld_cumf_bld(a,desc_a,p,info) info=psb_success_ name='mld_cumf_bld' call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) ! diff --git a/mlprec/mld_d_as_smoother.f90 b/mlprec/mld_d_as_smoother.f90 index 9c883d2b..11878173 100644 --- a/mlprec/mld_d_as_smoother.f90 +++ b/mlprec/mld_d_as_smoother.f90 @@ -172,7 +172,7 @@ contains call psb_erractionsave(err_act) info = psb_success_ - ictxt = psb_cd_get_context(desc_data) + ictxt = desc_data%get_context() call psb_info (ictxt,me,np) trans_ = psb_toupper(trans) @@ -191,9 +191,9 @@ contains end if - n_row = psb_cd_get_local_rows(sm%desc_data) - n_col = psb_cd_get_local_cols(sm%desc_data) - nrow_d = psb_cd_get_local_rows(desc_data) + n_row = sm%desc_data%get_local_rows() + n_col = sm%desc_data%get_local_cols() + nrow_d = desc_data%get_local_rows() isz=max(n_row,N_COL) if ((6*isz) <= size(work)) then ww => work(1:isz) @@ -609,7 +609,7 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' @@ -653,8 +653,8 @@ contains call psb_cdbldext(a,desc_a,novr,sm%desc_data,info,extype=psb_ovt_asov_) if(debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& - & ' From cdbldext _:',psb_cd_get_local_rows(sm%desc_data),& - & psb_cd_get_local_cols(sm%desc_data) + & ' From cdbldext _:',sm%desc_data%get_local_rows(),& + & sm%desc_data%get_local_cols() if (info /= psb_success_) then info=psb_err_from_subroutine_ @@ -691,8 +691,8 @@ contains & call sm%sv%build(a,sm%desc_data,upd,info,blck,mold=mold) nrow_a = a%get_nrows() - n_row = psb_cd_get_local_rows(sm%desc_data) - n_col = psb_cd_get_local_cols(sm%desc_data) + n_row = sm%desc_data%get_local_rows() + n_col = sm%desc_data%get_local_cols() if (info == psb_success_) call a%csclip(sm%nd,info,& & jmin=nrow_a+1,rscale=.false.,cscale=.false.) diff --git a/mlprec/mld_d_dec_map_bld.F90 b/mlprec/mld_d_dec_map_bld.F90 index e82eb2a4..636c9dcb 100644 --- a/mlprec/mld_d_dec_map_bld.F90 +++ b/mlprec/mld_d_dec_map_bld.F90 @@ -31,10 +31,10 @@ subroutine mld_d_dec_map_bld(theta,a,desc_a,nlaggr,ilaggr,info) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() ! - ictxt=psb_cd_get_context(desc_a) + ictxt=desc_a%get_context() call psb_info(ictxt,me,np) - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() nr = a%get_nrows() allocate(ilaggr(nr),neigh(nr),stat=info) diff --git a/mlprec/mld_d_diag_solver.f90 b/mlprec/mld_d_diag_solver.f90 index 53201fa0..865438e9 100644 --- a/mlprec/mld_d_diag_solver.f90 +++ b/mlprec/mld_d_diag_solver.f90 @@ -99,8 +99,8 @@ contains goto 9999 end select - n_row = psb_cd_get_local_rows(desc_data) - n_col = psb_cd_get_local_cols(desc_data) + n_row = desc_data%get_local_rows() + n_col = desc_data%get_local_cols() if (beta == dzero) then @@ -213,13 +213,13 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' - n_row = psb_cd_get_local_rows(desc_a) + n_row = desc_a%get_local_rows() nrow_a = a%get_nrows() if (allocated(sv%d)) then if (size(sv%d) < n_row) then diff --git a/mlprec/mld_d_id_solver.f90 b/mlprec/mld_d_id_solver.f90 index c8e9e9e6..c0be65dc 100644 --- a/mlprec/mld_d_id_solver.f90 +++ b/mlprec/mld_d_id_solver.f90 @@ -137,7 +137,7 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' diff --git a/mlprec/mld_d_ilu_solver.f90 b/mlprec/mld_d_ilu_solver.f90 index 1ce37117..27aa187a 100644 --- a/mlprec/mld_d_ilu_solver.f90 +++ b/mlprec/mld_d_ilu_solver.f90 @@ -173,8 +173,8 @@ contains goto 9999 end select - n_row = psb_cd_get_local_rows(desc_data) - n_col = psb_cd_get_local_cols(desc_data) + n_row = desc_data%get_local_rows() + n_col = desc_data%get_local_cols() if (n_col <= size(work)) then ww => work(1:n_col) @@ -270,13 +270,13 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' - n_row = psb_cd_get_local_rows(desc_a) + n_row = desc_a%get_local_rows() if (psb_toupper(upd) == 'F') then nrow_a = a%get_nrows() diff --git a/mlprec/mld_d_jac_smoother.f90 b/mlprec/mld_d_jac_smoother.f90 index 39feeca1..bca437c6 100644 --- a/mlprec/mld_d_jac_smoother.f90 +++ b/mlprec/mld_d_jac_smoother.f90 @@ -111,8 +111,8 @@ contains goto 9999 end if - n_row = psb_cd_get_local_rows(desc_data) - n_col = psb_cd_get_local_cols(desc_data) + n_row = desc_data%get_local_rows() + n_col = desc_data%get_local_cols() if (n_col <= size(work)) then ww => work(1:n_col) @@ -251,13 +251,13 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' - n_row = psb_cd_get_local_rows(desc_a) + n_row = desc_a%get_local_rows() nrow_a = a%get_nrows() nztota = a%get_nzeros() diff --git a/mlprec/mld_d_prec_type.f90 b/mlprec/mld_d_prec_type.f90 index 88ba9741..0f2660ef 100644 --- a/mlprec/mld_d_prec_type.f90 +++ b/mlprec/mld_d_prec_type.f90 @@ -1613,7 +1613,7 @@ contains end if if (associated(lv%base_desc)) then - icontxt = psb_cd_get_context(lv%base_desc) + icontxt = lv%base_desc%get_context() call psb_info(icontxt,iam,np) else icontxt = -1 diff --git a/mlprec/mld_d_slu_solver.f90 b/mlprec/mld_d_slu_solver.f90 index d27f7613..fb48a78e 100644 --- a/mlprec/mld_d_slu_solver.f90 +++ b/mlprec/mld_d_slu_solver.f90 @@ -135,8 +135,8 @@ contains goto 9999 end select - n_row = psb_cd_get_local_rows(desc_data) - n_col = psb_cd_get_local_cols(desc_data) + n_row = desc_data%get_local_rows() + n_col = desc_data%get_local_cols() if (n_col <= size(work)) then ww => work(1:n_col) @@ -210,14 +210,14 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' - n_row = psb_cd_get_local_rows(desc_a) - n_col = psb_cd_get_local_cols(desc_a) + n_row = desc_a%get_local_rows() + n_col = desc_a%get_local_cols() if (psb_toupper(upd) == 'F') then diff --git a/mlprec/mld_d_sludist_solver.f90 b/mlprec/mld_d_sludist_solver.f90 index ba93a2a0..1a8ba670 100644 --- a/mlprec/mld_d_sludist_solver.f90 +++ b/mlprec/mld_d_sludist_solver.f90 @@ -135,8 +135,8 @@ contains goto 9999 end select - n_row = psb_cd_get_local_rows(desc_data) - n_col = psb_cd_get_local_cols(desc_data) + n_row = desc_data%get_local_rows() + n_col = desc_data%get_local_cols() if (n_col <= size(work)) then ww => work(1:n_col) @@ -210,7 +210,7 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' @@ -220,8 +220,8 @@ contains call psb_errpush(info,name) goto 9999 - n_row = psb_cd_get_local_rows(desc_a) - n_col = psb_cd_get_local_cols(desc_a) + n_row = desc_a%get_local_rows() + n_col = desc_a%get_local_cols() if (psb_toupper(upd) == 'F') then diff --git a/mlprec/mld_d_umf_solver.f90 b/mlprec/mld_d_umf_solver.f90 index 27c461be..769cb693 100644 --- a/mlprec/mld_d_umf_solver.f90 +++ b/mlprec/mld_d_umf_solver.f90 @@ -135,8 +135,8 @@ contains goto 9999 end select - n_row = psb_cd_get_local_rows(desc_data) - n_col = psb_cd_get_local_cols(desc_data) + n_row = desc_data%get_local_rows() + n_col = desc_data%get_local_cols() if (n_col <= size(work)) then ww => work(1:n_col) @@ -210,14 +210,14 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' - n_row = psb_cd_get_local_rows(desc_a) - n_col = psb_cd_get_local_cols(desc_a) + n_row = desc_a%get_local_rows() + n_col = desc_a%get_local_cols() if (psb_toupper(upd) == 'F') then diff --git a/mlprec/mld_daggrmap_bld.f90 b/mlprec/mld_daggrmap_bld.f90 index 6297ae80..dc049b6e 100644 --- a/mlprec/mld_daggrmap_bld.f90 +++ b/mlprec/mld_daggrmap_bld.f90 @@ -111,10 +111,10 @@ subroutine mld_daggrmap_bld(aggr_type,theta,a,desc_a,ilaggr,nlaggr,info) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() ! - ictxt=psb_cd_get_context(desc_a) + ictxt=desc_a%get_context() call psb_info(ictxt,me,np) - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() select case (aggr_type) case (mld_dec_aggr_) diff --git a/mlprec/mld_daggrmat_asb.f90 b/mlprec/mld_daggrmat_asb.f90 index 154bb5a6..98810bf9 100644 --- a/mlprec/mld_daggrmat_asb.f90 +++ b/mlprec/mld_daggrmat_asb.f90 @@ -121,8 +121,8 @@ subroutine mld_daggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info) info=psb_success_ call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_a) - icomm = psb_cd_get_mpic(desc_a) + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() call psb_info(ictxt, me, np) diff --git a/mlprec/mld_daggrmat_minnrg_asb.F90 b/mlprec/mld_daggrmat_minnrg_asb.F90 index 3430c55e..bfd24a9b 100644 --- a/mlprec/mld_daggrmat_minnrg_asb.F90 +++ b/mlprec/mld_daggrmat_minnrg_asb.F90 @@ -140,9 +140,9 @@ subroutine mld_daggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr,p,info) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) - icomm = psb_cd_get_mpic(desc_a) - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) !!$ @@ -165,9 +165,9 @@ subroutine mld_daggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr,p,info) !!$ call psb_nullify_sp(ptilde) !!$ call psb_nullify_sp(rtilde) !!$ -!!$ nglob = psb_cd_get_global_rows(desc_a) -!!$ nrow = psb_cd_get_local_rows(desc_a) -!!$ ncol = psb_cd_get_local_cols(desc_a) +!!$ nglob = desc_a%get_global_rows() +!!$ nrow = desc_a%get_local_rows() +!!$ ncol = desc_a%get_local_cols() !!$ !!$ theta = p%rprcparm(mld_aggr_thresh_) !!$ @@ -720,8 +720,8 @@ subroutine mld_daggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr,p,info) !!$ & 'Assembld aux descr. distr.' !!$ !!$ -!!$ p%ac%m=psb_cd_get_local_rows(p%desc_ac) -!!$ p%ac%k=psb_cd_get_local_cols(p%desc_ac) +!!$ p%ac%m=p%desc_ac%get_local_rows() +!!$ p%ac%k=p%desc_ac%get_local_cols() !!$ p%ac%fida='COO' !!$ p%ac%descra='GUN' !!$ @@ -740,7 +740,7 @@ subroutine mld_daggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr,p,info) !!$ goto 9999 !!$ end if !!$ endif -!!$ am1%k=psb_cd_get_local_cols(p%desc_ac) +!!$ am1%k=p%desc_ac%get_local_cols() !!$ !!$ if (np>1) then !!$ call psb_spcnv(am2,info,afmt='coo',dupl=psb_dupl_add_) @@ -752,7 +752,7 @@ subroutine mld_daggrmat_minnrg_asb(a,desc_a,ilaggr,nlaggr,p,info) !!$ goto 9999 !!$ end if !!$ end if -!!$ am2%m=psb_cd_get_local_cols(p%desc_ac) +!!$ am2%m=p%desc_ac%get_local_cols() !!$ !!$ if (debug_level >= psb_debug_outer_) & !!$ & write(debug_unit,*) me,' ',trim(name),& diff --git a/mlprec/mld_daggrmat_nosmth_asb.F90 b/mlprec/mld_daggrmat_nosmth_asb.F90 index b802ec84..497fa463 100644 --- a/mlprec/mld_daggrmat_nosmth_asb.F90 +++ b/mlprec/mld_daggrmat_nosmth_asb.F90 @@ -116,12 +116,12 @@ subroutine mld_daggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info) call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_a) - icomm = psb_cd_get_mpic(desc_a) + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() call psb_info(ictxt, me, np) - nglob = psb_cd_get_global_rows(desc_a) - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nglob = desc_a%get_global_rows() + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() naggr = nlaggr(me+1) diff --git a/mlprec/mld_daggrmat_smth_asb.F90 b/mlprec/mld_daggrmat_smth_asb.F90 index c4012aba..57b9d2d1 100644 --- a/mlprec/mld_daggrmat_smth_asb.F90 +++ b/mlprec/mld_daggrmat_smth_asb.F90 @@ -140,15 +140,15 @@ subroutine mld_daggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) - icomm = psb_cd_get_mpic(desc_a) - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) - nglob = psb_cd_get_global_rows(desc_a) - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nglob = desc_a%get_global_rows() + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() theta = p%parms%aggr_thresh @@ -527,8 +527,8 @@ subroutine mld_daggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) & 'Assembld aux descr. distr.' call p%ac%mv_from(bcoo) - call p%ac%set_nrows(psb_cd_get_local_rows(p%desc_ac)) - call p%ac%set_ncols(psb_cd_get_local_cols(p%desc_ac)) + call p%ac%set_nrows(p%desc_ac%get_local_rows()) + call p%ac%set_ncols(p%desc_ac%get_local_cols()) call p%ac%set_asb() if (info == psb_success_) deallocate(nzbr,idisp,stat=info) @@ -547,7 +547,7 @@ subroutine mld_daggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) end if call am1%mv_from(acsr1) endif - call am1%set_ncols(psb_cd_get_local_cols(p%desc_ac)) + call am1%set_ncols(p%desc_ac%get_local_cols()) if (np>1) then call am2%cscnv(info,type='coo',dupl=psb_dupl_add_) @@ -562,7 +562,7 @@ subroutine mld_daggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) goto 9999 end if end if - call am2%set_nrows(psb_cd_get_local_cols(p%desc_ac)) + call am2%set_nrows(p%desc_ac%get_local_cols()) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& diff --git a/mlprec/mld_dcoarse_bld.f90 b/mlprec/mld_dcoarse_bld.f90 index e9925c00..7669cee4 100644 --- a/mlprec/mld_dcoarse_bld.f90 +++ b/mlprec/mld_dcoarse_bld.f90 @@ -87,7 +87,7 @@ subroutine mld_dcoarse_bld(a,desc_a,p,info) if (psb_get_errstatus().ne.0) return call psb_erractionsave(err_act) info = psb_success_ - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt,me,np) call mld_check_def(p%parms%ml_type,'Multilevel type',& diff --git a/mlprec/mld_dmlprec_aply.f90 b/mlprec/mld_dmlprec_aply.f90 index b07c55de..632706e4 100644 --- a/mlprec/mld_dmlprec_aply.f90 +++ b/mlprec/mld_dmlprec_aply.f90 @@ -129,7 +129,7 @@ ! If trans='N','n' then op(M^(-1)) = M^(-1); ! if trans='T','t' then op(M^(-1)) = M^(-T) (transpose of M^(-1)). ! work - real(psb_dpk_), dimension (:), optional, target. -! Workspace. Its size must be at least 4*psb_cd_get_local_cols(desc_data). +! Workspace. Its size must be at least 4*desc_data%get_local_cols(). ! info - integer, output. ! Error code. ! @@ -340,7 +340,7 @@ subroutine mld_dmlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_data) + ictxt = desc_data%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_inner_) & diff --git a/mlprec/mld_dmlprec_bld.f90 b/mlprec/mld_dmlprec_bld.f90 index f9c594bf..964aab7a 100644 --- a/mlprec/mld_dmlprec_bld.f90 +++ b/mlprec/mld_dmlprec_bld.f90 @@ -99,7 +99,7 @@ subroutine mld_dmlprec_bld(a,desc_a,p,info,mold) name = 'mld_dmlprec_bld' info = psb_success_ int_err(1) = 0 - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & diff --git a/mlprec/mld_dprecaply.f90 b/mlprec/mld_dprecaply.f90 index c1ccf078..3329ee0b 100644 --- a/mlprec/mld_dprecaply.f90 +++ b/mlprec/mld_dprecaply.f90 @@ -69,7 +69,7 @@ ! if trans='T','t' then op(M^(-1)) = M^(-T) (transpose of M^(-1)). ! work - real(psb_dpk_), dimension (:), optional, target. ! Workspace. Its size must be at -! least 4*psb_cd_get_local_cols(desc_data). +! least 4*desc_data%get_local_cols(). ! subroutine mld_dprecaply(prec,x,y,desc_data,info,trans,work) @@ -97,7 +97,7 @@ subroutine mld_dprecaply(prec,x,y,desc_data,info,trans,work) info = psb_success_ call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_data) + ictxt = desc_data%get_context() call psb_info(ictxt, me, np) if (present(trans)) then @@ -109,7 +109,7 @@ subroutine mld_dprecaply(prec,x,y,desc_data,info,trans,work) if (present(work)) then work_ => work else - iwsz = max(1,4*psb_cd_get_local_cols(desc_data)) + iwsz = max(1,4*desc_data%get_local_cols()) allocate(work_(iwsz),stat=info) if (info /= psb_success_) then call psb_errpush(psb_err_alloc_request_,name,i_err=(/iwsz,0,0,0,0/),& @@ -227,7 +227,7 @@ subroutine mld_dprecaply1(prec,x,desc_data,info,trans) call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_data) + ictxt = desc_data%get_context() call psb_info(ictxt, me, np) allocate(ww(size(x)),w1(size(x)),stat=info) diff --git a/mlprec/mld_dprecbld.f90 b/mlprec/mld_dprecbld.f90 index 589a1a3c..32d468de 100644 --- a/mlprec/mld_dprecbld.f90 +++ b/mlprec/mld_dprecbld.f90 @@ -94,7 +94,7 @@ subroutine mld_dprecbld(a,desc_a,p,info,mold) name = 'mld_dprecbld' info = psb_success_ int_err(1) = 0 - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) p%ictxt = ictxt diff --git a/mlprec/mld_dslu_bld.f90 b/mlprec/mld_dslu_bld.f90 index 618b7f42..843c46b4 100644 --- a/mlprec/mld_dslu_bld.f90 +++ b/mlprec/mld_dslu_bld.f90 @@ -91,7 +91,7 @@ subroutine mld_dslu_bld(a,desc_a,p,info) name='mld_dslu_bld' call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) diff --git a/mlprec/mld_dslud_bld.f90 b/mlprec/mld_dslud_bld.f90 index e86e2c80..68cdb5a4 100644 --- a/mlprec/mld_dslud_bld.f90 +++ b/mlprec/mld_dslud_bld.f90 @@ -89,7 +89,7 @@ subroutine mld_dsludist_bld(a,desc_a,p,info) name='mld_dslud_bld' call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) @@ -100,8 +100,8 @@ subroutine mld_dsludist_bld(a,desc_a,p,info) ! WARN: we need to check for a BLOCK distribution (this is the ! distribution required by SuperLU_DIST) ! - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() call psb_loc_to_glob(1,ifrst,desc_a,info) call psb_loc_to_glob(nrow,ibcheck,desc_a,info) ibcheck = ibcheck - ifrst + 1 @@ -115,7 +115,7 @@ subroutine mld_dsludist_bld(a,desc_a,p,info) goto 9999 endif - mglob = psb_cd_get_global_rows(desc_a) + mglob = desc_a%get_global_rows() nzt = aa%get_nzeros() npr = np diff --git a/mlprec/mld_dsp_renum.f90 b/mlprec/mld_dsp_renum.f90 index 87bcc36c..ec7bf76c 100644 --- a/mlprec/mld_dsp_renum.f90 +++ b/mlprec/mld_dsp_renum.f90 @@ -108,7 +108,7 @@ subroutine mld_dsp_renum(a,blck,p,atmp,info) name='mld_dsp_renum' call psb_erractionsave(err_act) - ictxt=psb_cd_get_context(p%desc_data) + ictxt=p%desc_data%get_context() call psb_info(ictxt, me, np) ! @@ -133,7 +133,7 @@ subroutine mld_dsp_renum(a,blck,p,atmp,info) ! Remember: we have switched IA1=COLS and IA2=ROWS. ! Now identify the set of distinct local column indices. ! - nnr = psb_cd_get_local_rows(p%desc_data) + nnr = p%desc_data%get_local_rows() allocate(p%perm(nnr),p%invperm(nnr),itmp2(nnr),stat=info) if (info /= psb_success_) then call psb_errpush(psb_err_from_subroutine_,name,a_err='Allocate') diff --git a/mlprec/mld_s_as_smoother.f90 b/mlprec/mld_s_as_smoother.f90 index 11910ef9..dbc06559 100644 --- a/mlprec/mld_s_as_smoother.f90 +++ b/mlprec/mld_s_as_smoother.f90 @@ -172,7 +172,7 @@ contains call psb_erractionsave(err_act) info = psb_success_ - ictxt = psb_cd_get_context(desc_data) + ictxt = desc_data%get_context() call psb_info (ictxt,me,np) trans_ = psb_toupper(trans) @@ -191,9 +191,9 @@ contains end if - n_row = psb_cd_get_local_rows(sm%desc_data) - n_col = psb_cd_get_local_cols(sm%desc_data) - nrow_d = psb_cd_get_local_rows(desc_data) + n_row = sm%desc_data%get_local_rows() + n_col = sm%desc_data%get_local_cols() + nrow_d = desc_data%get_local_rows() isz=max(n_row,N_COL) if ((6*isz) <= size(work)) then ww => work(1:isz) @@ -608,7 +608,7 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' @@ -652,8 +652,8 @@ contains call psb_cdbldext(a,desc_a,novr,sm%desc_data,info,extype=psb_ovt_asov_) if(debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& - & ' From cdbldext _:',psb_cd_get_local_rows(sm%desc_data),& - & psb_cd_get_local_cols(sm%desc_data) + & ' From cdbldext _:',sm%desc_data%get_local_rows(),& + & sm%desc_data%get_local_cols() if (info /= psb_success_) then info=psb_err_from_subroutine_ @@ -690,8 +690,8 @@ contains & call sm%sv%build(a,sm%desc_data,upd,info,blck) nrow_a = a%get_nrows() - n_row = psb_cd_get_local_rows(sm%desc_data) - n_col = psb_cd_get_local_cols(sm%desc_data) + n_row = sm%desc_data%get_local_rows() + n_col = sm%desc_data%get_local_cols() if (info == psb_success_) call a%csclip(sm%nd,info,& & jmin=nrow_a+1,rscale=.false.,cscale=.false.) diff --git a/mlprec/mld_s_dec_map_bld.F90 b/mlprec/mld_s_dec_map_bld.F90 index 2cbfefeb..c9be5eb3 100644 --- a/mlprec/mld_s_dec_map_bld.F90 +++ b/mlprec/mld_s_dec_map_bld.F90 @@ -31,10 +31,10 @@ subroutine mld_s_dec_map_bld(theta,a,desc_a,nlaggr,ilaggr,info) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() ! - ictxt=psb_cd_get_context(desc_a) + ictxt=desc_a%get_context() call psb_info(ictxt,me,np) - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() nr = a%get_nrows() allocate(ilaggr(nr),neigh(nr),stat=info) diff --git a/mlprec/mld_s_diag_solver.f90 b/mlprec/mld_s_diag_solver.f90 index 0bd4d83c..5a5adbcf 100644 --- a/mlprec/mld_s_diag_solver.f90 +++ b/mlprec/mld_s_diag_solver.f90 @@ -99,8 +99,8 @@ contains goto 9999 end select - n_row = psb_cd_get_local_rows(desc_data) - n_col = psb_cd_get_local_cols(desc_data) + n_row = desc_data%get_local_rows() + n_col = desc_data%get_local_cols() if (beta == szero) then @@ -212,13 +212,13 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' - n_row = psb_cd_get_local_rows(desc_a) + n_row = desc_a%get_local_rows() nrow_a = a%get_nrows() if (allocated(sv%d)) then if (size(sv%d) < n_row) then diff --git a/mlprec/mld_s_id_solver.f90 b/mlprec/mld_s_id_solver.f90 index 31879ceb..3fcb40bc 100644 --- a/mlprec/mld_s_id_solver.f90 +++ b/mlprec/mld_s_id_solver.f90 @@ -136,7 +136,7 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' diff --git a/mlprec/mld_s_ilu_solver.f90 b/mlprec/mld_s_ilu_solver.f90 index 3aa48199..793b47de 100644 --- a/mlprec/mld_s_ilu_solver.f90 +++ b/mlprec/mld_s_ilu_solver.f90 @@ -172,8 +172,8 @@ contains goto 9999 end select - n_row = psb_cd_get_local_rows(desc_data) - n_col = psb_cd_get_local_cols(desc_data) + n_row = desc_data%get_local_rows() + n_col = desc_data%get_local_cols() if (n_col <= size(work)) then ww => work(1:n_col) @@ -268,13 +268,13 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' - n_row = psb_cd_get_local_rows(desc_a) + n_row = desc_a%get_local_rows() if (psb_toupper(upd) == 'F') then nrow_a = a%get_nrows() diff --git a/mlprec/mld_s_jac_smoother.f90 b/mlprec/mld_s_jac_smoother.f90 index 80dd8700..5d759896 100644 --- a/mlprec/mld_s_jac_smoother.f90 +++ b/mlprec/mld_s_jac_smoother.f90 @@ -111,8 +111,8 @@ contains goto 9999 end if - n_row = psb_cd_get_local_rows(desc_data) - n_col = psb_cd_get_local_cols(desc_data) + n_row = desc_data%get_local_rows() + n_col = desc_data%get_local_cols() if (n_col <= size(work)) then ww => work(1:n_col) @@ -250,13 +250,13 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' - n_row = psb_cd_get_local_rows(desc_a) + n_row = desc_a%get_local_rows() nrow_a = a%get_nrows() nztota = a%get_nzeros() diff --git a/mlprec/mld_s_prec_type.f90 b/mlprec/mld_s_prec_type.f90 index ad8ed915..cbb28c0b 100644 --- a/mlprec/mld_s_prec_type.f90 +++ b/mlprec/mld_s_prec_type.f90 @@ -1612,7 +1612,7 @@ contains end if if (associated(lv%base_desc)) then - icontxt = psb_cd_get_context(lv%base_desc) + icontxt = lv%base_desc%get_context() call psb_info(icontxt,iam,np) else icontxt = -1 diff --git a/mlprec/mld_s_slu_solver.f90 b/mlprec/mld_s_slu_solver.f90 index 1260f1ca..3b34d0ae 100644 --- a/mlprec/mld_s_slu_solver.f90 +++ b/mlprec/mld_s_slu_solver.f90 @@ -135,8 +135,8 @@ contains goto 9999 end select - n_row = psb_cd_get_local_rows(desc_data) - n_col = psb_cd_get_local_cols(desc_data) + n_row = desc_data%get_local_rows() + n_col = desc_data%get_local_cols() if (n_col <= size(work)) then ww => work(1:n_col) @@ -209,14 +209,14 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' - n_row = psb_cd_get_local_rows(desc_a) - n_col = psb_cd_get_local_cols(desc_a) + n_row = desc_a%get_local_rows() + n_col = desc_a%get_local_cols() if (psb_toupper(upd) == 'F') then diff --git a/mlprec/mld_saggrmap_bld.f90 b/mlprec/mld_saggrmap_bld.f90 index 4ad92ed7..6a93cf49 100644 --- a/mlprec/mld_saggrmap_bld.f90 +++ b/mlprec/mld_saggrmap_bld.f90 @@ -111,10 +111,10 @@ subroutine mld_saggrmap_bld(aggr_type,theta,a,desc_a,ilaggr,nlaggr,info) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() ! - ictxt=psb_cd_get_context(desc_a) + ictxt=desc_a%get_context() call psb_info(ictxt,me,np) - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() select case (aggr_type) case (mld_dec_aggr_) diff --git a/mlprec/mld_saggrmat_asb.f90 b/mlprec/mld_saggrmat_asb.f90 index e8ed1f34..1618f34a 100644 --- a/mlprec/mld_saggrmat_asb.f90 +++ b/mlprec/mld_saggrmat_asb.f90 @@ -121,8 +121,8 @@ subroutine mld_saggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info) info=psb_success_ call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_a) - icomm = psb_cd_get_mpic(desc_a) + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() call psb_info(ictxt, me, np) diff --git a/mlprec/mld_saggrmat_nosmth_asb.F90 b/mlprec/mld_saggrmat_nosmth_asb.F90 index 213946e2..6853d270 100644 --- a/mlprec/mld_saggrmat_nosmth_asb.F90 +++ b/mlprec/mld_saggrmat_nosmth_asb.F90 @@ -116,12 +116,12 @@ subroutine mld_saggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info) call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_a) - icomm = psb_cd_get_mpic(desc_a) + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() call psb_info(ictxt, me, np) - nglob = psb_cd_get_global_rows(desc_a) - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nglob = desc_a%get_global_rows() + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() naggr = nlaggr(me+1) diff --git a/mlprec/mld_saggrmat_smth_asb.F90 b/mlprec/mld_saggrmat_smth_asb.F90 index b8432f68..3a8941ea 100644 --- a/mlprec/mld_saggrmat_smth_asb.F90 +++ b/mlprec/mld_saggrmat_smth_asb.F90 @@ -140,15 +140,15 @@ subroutine mld_saggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) - icomm = psb_cd_get_mpic(desc_a) - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) - nglob = psb_cd_get_global_rows(desc_a) - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nglob = desc_a%get_global_rows() + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() theta = p%parms%aggr_thresh @@ -527,8 +527,8 @@ subroutine mld_saggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) & 'Assembld aux descr. distr.' call p%ac%mv_from(bcoo) - call p%ac%set_nrows(psb_cd_get_local_rows(p%desc_ac)) - call p%ac%set_ncols(psb_cd_get_local_cols(p%desc_ac)) + call p%ac%set_nrows(p%desc_ac%get_local_rows()) + call p%ac%set_ncols(p%desc_ac%get_local_cols()) call p%ac%set_asb() if (info == psb_success_) deallocate(nzbr,idisp,stat=info) @@ -547,7 +547,7 @@ subroutine mld_saggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) end if call am1%mv_from(acsr1) endif - call am1%set_ncols(psb_cd_get_local_cols(p%desc_ac)) + call am1%set_ncols(p%desc_ac%get_local_cols()) if (np>1) then call am2%cscnv(info,type='coo',dupl=psb_dupl_add_) @@ -562,7 +562,7 @@ subroutine mld_saggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) goto 9999 end if end if - call am2%set_nrows(psb_cd_get_local_cols(p%desc_ac)) + call am2%set_nrows(p%desc_ac%get_local_cols()) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& diff --git a/mlprec/mld_scoarse_bld.f90 b/mlprec/mld_scoarse_bld.f90 index 146c6d7e..e56c9ccf 100644 --- a/mlprec/mld_scoarse_bld.f90 +++ b/mlprec/mld_scoarse_bld.f90 @@ -87,7 +87,7 @@ subroutine mld_scoarse_bld(a,desc_a,p,info) if (psb_get_errstatus().ne.0) return call psb_erractionsave(err_act) info = psb_success_ - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt,me,np) call mld_check_def(p%parms%ml_type,'Multilevel type',& diff --git a/mlprec/mld_smlprec_aply.f90 b/mlprec/mld_smlprec_aply.f90 index c13111f0..d0b076bb 100644 --- a/mlprec/mld_smlprec_aply.f90 +++ b/mlprec/mld_smlprec_aply.f90 @@ -129,7 +129,7 @@ ! If trans='N','n' then op(M^(-1)) = M^(-1); ! if trans='T','t' then op(M^(-1)) = M^(-T) (transpose of M^(-1)). ! work - real(psb_spk_), dimension (:), optional, target. -! Workspace. Its size must be at least 4*psb_cd_get_local_cols(desc_data). +! Workspace. Its size must be at least 4*desc_data%get_local_cols(). ! info - integer, output. ! Error code. ! @@ -340,7 +340,7 @@ subroutine mld_smlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_data) + ictxt = desc_data%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_inner_) & diff --git a/mlprec/mld_smlprec_bld.f90 b/mlprec/mld_smlprec_bld.f90 index 74e3bc07..59b702ed 100644 --- a/mlprec/mld_smlprec_bld.f90 +++ b/mlprec/mld_smlprec_bld.f90 @@ -99,7 +99,7 @@ subroutine mld_smlprec_bld(a,desc_a,p,info) name = 'mld_smlprec_bld' info = psb_success_ int_err(1) = 0 - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & diff --git a/mlprec/mld_sprecaply.f90 b/mlprec/mld_sprecaply.f90 index 02336a08..2c96024e 100644 --- a/mlprec/mld_sprecaply.f90 +++ b/mlprec/mld_sprecaply.f90 @@ -69,7 +69,7 @@ ! if trans='T','t' then op(M^(-1)) = M^(-T) (transpose of M^(-1)). ! work - real(psb_spk_), dimension (:), optional, target. ! Workspace. Its size must be at -! least 4*psb_cd_get_local_cols(desc_data). +! least 4*desc_data%get_local_cols(). ! subroutine mld_sprecaply(prec,x,y,desc_data,info,trans,work) @@ -97,7 +97,7 @@ subroutine mld_sprecaply(prec,x,y,desc_data,info,trans,work) info = psb_success_ call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_data) + ictxt = desc_data%get_context() call psb_info(ictxt, me, np) if (present(trans)) then @@ -109,7 +109,7 @@ subroutine mld_sprecaply(prec,x,y,desc_data,info,trans,work) if (present(work)) then work_ => work else - iwsz = max(1,4*psb_cd_get_local_cols(desc_data)) + iwsz = max(1,4*desc_data%get_local_cols()) allocate(work_(iwsz),stat=info) if (info /= psb_success_) then call psb_errpush(psb_err_alloc_request_,name,i_err=(/iwsz,0,0,0,0/),& @@ -227,7 +227,7 @@ subroutine mld_sprecaply1(prec,x,desc_data,info,trans) call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_data) + ictxt = desc_data%get_context() call psb_info(ictxt, me, np) allocate(ww(size(x)),w1(size(x)),stat=info) diff --git a/mlprec/mld_sprecbld.f90 b/mlprec/mld_sprecbld.f90 index e47375be..9d8b2cdd 100644 --- a/mlprec/mld_sprecbld.f90 +++ b/mlprec/mld_sprecbld.f90 @@ -93,7 +93,7 @@ subroutine mld_sprecbld(a,desc_a,p,info) name = 'mld_sprecbld' info = psb_success_ int_err(1) = 0 - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) p%ictxt = ictxt diff --git a/mlprec/mld_sslu_bld.f90 b/mlprec/mld_sslu_bld.f90 index 25df97f8..dc10eead 100644 --- a/mlprec/mld_sslu_bld.f90 +++ b/mlprec/mld_sslu_bld.f90 @@ -91,7 +91,7 @@ subroutine mld_sslu_bld(a,desc_a,p,info) name='mld_dslu_bld' call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) diff --git a/mlprec/mld_sslud_bld.f90 b/mlprec/mld_sslud_bld.f90 index ff63f5f0..4d31e118 100644 --- a/mlprec/mld_sslud_bld.f90 +++ b/mlprec/mld_sslud_bld.f90 @@ -89,7 +89,7 @@ subroutine mld_ssludist_bld(a,desc_a,p,info) name='mld_sslud_bld' call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) @@ -100,8 +100,8 @@ subroutine mld_ssludist_bld(a,desc_a,p,info) ! WARN: we need to check for a BLOCK distribution (this is the ! distribution required by SuperLU_DIST) ! - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() call psb_loc_to_glob(1,ifrst,desc_a,info) call psb_loc_to_glob(nrow,ibcheck,desc_a,info) ibcheck = ibcheck - ifrst + 1 @@ -115,7 +115,7 @@ subroutine mld_ssludist_bld(a,desc_a,p,info) goto 9999 endif - mglob = psb_cd_get_global_rows(desc_a) + mglob = desc_a%get_global_rows() nzt = aa%get_nzeros() npr = np diff --git a/mlprec/mld_ssp_renum.f90 b/mlprec/mld_ssp_renum.f90 index c6c53dca..7b1da4ae 100644 --- a/mlprec/mld_ssp_renum.f90 +++ b/mlprec/mld_ssp_renum.f90 @@ -106,7 +106,7 @@ subroutine mld_ssp_renum(a,blck,p,atmp,info) name='mld_ssp_renum' call psb_erractionsave(err_act) - ictxt=psb_cd_get_context(p%desc_data) + ictxt=p%desc_data%get_context() call psb_info(ictxt, me, np) ! @@ -130,7 +130,7 @@ subroutine mld_ssp_renum(a,blck,p,atmp,info) ! Remember: we have switched IA1=COLS and IA2=ROWS. ! Now identify the set of distinct local column indices. ! - nnr = psb_cd_get_local_rows(p%desc_data) + nnr = p%desc_data%get_local_rows() allocate(p%perm(nnr),p%invperm(nnr),itmp2(nnr),stat=info) if (info /= psb_success_) then call psb_errpush(psb_err_from_subroutine_,name,a_err='Allocate') diff --git a/mlprec/mld_sumf_bld.f90 b/mlprec/mld_sumf_bld.f90 index 50a425c8..c09baf3a 100644 --- a/mlprec/mld_sumf_bld.f90 +++ b/mlprec/mld_sumf_bld.f90 @@ -95,7 +95,7 @@ subroutine mld_sumf_bld(a,desc_a,p,info) info=psb_success_ name='mld_sumf_bld' call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) ! diff --git a/mlprec/mld_z_as_smoother.f90 b/mlprec/mld_z_as_smoother.f90 index 1dee9315..0d6a854e 100644 --- a/mlprec/mld_z_as_smoother.f90 +++ b/mlprec/mld_z_as_smoother.f90 @@ -172,7 +172,7 @@ contains call psb_erractionsave(err_act) info = psb_success_ - ictxt = psb_cd_get_context(desc_data) + ictxt = desc_data%get_context() call psb_info (ictxt,me,np) trans_ = psb_toupper(trans) @@ -191,9 +191,9 @@ contains end if - n_row = psb_cd_get_local_rows(sm%desc_data) - n_col = psb_cd_get_local_cols(sm%desc_data) - nrow_d = psb_cd_get_local_rows(desc_data) + n_row = sm%desc_data%get_local_rows() + n_col = sm%desc_data%get_local_cols() + nrow_d = desc_data%get_local_rows() isz=max(n_row,N_COL) if ((6*isz) <= size(work)) then ww => work(1:isz) @@ -609,7 +609,7 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' @@ -653,8 +653,8 @@ contains call psb_cdbldext(a,desc_a,novr,sm%desc_data,info,extype=psb_ovt_asov_) if(debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& - & ' From cdbldext _:',psb_cd_get_local_rows(sm%desc_data),& - & psb_cd_get_local_cols(sm%desc_data) + & ' From cdbldext _:',sm%desc_data%get_local_rows(),& + & sm%desc_data%get_local_cols() if (info /= psb_success_) then info=psb_err_from_subroutine_ @@ -691,8 +691,8 @@ contains & call sm%sv%build(a,sm%desc_data,upd,info,blck) nrow_a = a%get_nrows() - n_row = psb_cd_get_local_rows(sm%desc_data) - n_col = psb_cd_get_local_cols(sm%desc_data) + n_row = sm%desc_data%get_local_rows() + n_col = sm%desc_data%get_local_cols() if (info == psb_success_) call a%csclip(sm%nd,info,& & jmin=nrow_a+1,rscale=.false.,cscale=.false.) diff --git a/mlprec/mld_z_dec_map_bld.F90 b/mlprec/mld_z_dec_map_bld.F90 index 51e29e0e..bafc1018 100644 --- a/mlprec/mld_z_dec_map_bld.F90 +++ b/mlprec/mld_z_dec_map_bld.F90 @@ -31,10 +31,10 @@ subroutine mld_z_dec_map_bld(theta,a,desc_a,nlaggr,ilaggr,info) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() ! - ictxt=psb_cd_get_context(desc_a) + ictxt=desc_a%get_context() call psb_info(ictxt,me,np) - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() nr = a%get_nrows() allocate(ilaggr(nr),neigh(nr),stat=info) diff --git a/mlprec/mld_z_diag_solver.f90 b/mlprec/mld_z_diag_solver.f90 index b219493c..6f598809 100644 --- a/mlprec/mld_z_diag_solver.f90 +++ b/mlprec/mld_z_diag_solver.f90 @@ -99,8 +99,8 @@ contains goto 9999 end select - n_row = psb_cd_get_local_rows(desc_data) - n_col = psb_cd_get_local_cols(desc_data) + n_row = desc_data%get_local_rows() + n_col = desc_data%get_local_cols() if (beta == zzero) then @@ -212,13 +212,13 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' - n_row = psb_cd_get_local_rows(desc_a) + n_row = desc_a%get_local_rows() nrow_a = a%get_nrows() if (allocated(sv%d)) then if (size(sv%d) < n_row) then diff --git a/mlprec/mld_z_id_solver.f90 b/mlprec/mld_z_id_solver.f90 index abf772f8..3b8a0d8f 100644 --- a/mlprec/mld_z_id_solver.f90 +++ b/mlprec/mld_z_id_solver.f90 @@ -136,7 +136,7 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' diff --git a/mlprec/mld_z_ilu_solver.f90 b/mlprec/mld_z_ilu_solver.f90 index e9c4ddc5..e6a430fb 100644 --- a/mlprec/mld_z_ilu_solver.f90 +++ b/mlprec/mld_z_ilu_solver.f90 @@ -172,8 +172,8 @@ contains goto 9999 end select - n_row = psb_cd_get_local_rows(desc_data) - n_col = psb_cd_get_local_cols(desc_data) + n_row = desc_data%get_local_rows() + n_col = desc_data%get_local_cols() if (n_col <= size(work)) then ww => work(1:n_col) @@ -268,13 +268,13 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' - n_row = psb_cd_get_local_rows(desc_a) + n_row = desc_a%get_local_rows() if (psb_toupper(upd) == 'F') then nrow_a = a%get_nrows() diff --git a/mlprec/mld_z_jac_smoother.f90 b/mlprec/mld_z_jac_smoother.f90 index 14f2c3e3..509dd18a 100644 --- a/mlprec/mld_z_jac_smoother.f90 +++ b/mlprec/mld_z_jac_smoother.f90 @@ -111,8 +111,8 @@ contains goto 9999 end if - n_row = psb_cd_get_local_rows(desc_data) - n_col = psb_cd_get_local_cols(desc_data) + n_row = desc_data%get_local_rows() + n_col = desc_data%get_local_cols() if (n_col <= size(work)) then ww => work(1:n_col) @@ -250,13 +250,13 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' - n_row = psb_cd_get_local_rows(desc_a) + n_row = desc_a%get_local_rows() nrow_a = a%get_nrows() nztota = a%get_nzeros() diff --git a/mlprec/mld_z_prec_type.f90 b/mlprec/mld_z_prec_type.f90 index e4cbb7f8..43d8c0b7 100644 --- a/mlprec/mld_z_prec_type.f90 +++ b/mlprec/mld_z_prec_type.f90 @@ -1600,7 +1600,7 @@ contains end if if (associated(lv%base_desc)) then - icontxt = psb_cd_get_context(lv%base_desc) + icontxt = lv%base_desc%get_context() call psb_info(icontxt,iam,np) else icontxt = -1 diff --git a/mlprec/mld_z_slu_solver.f90 b/mlprec/mld_z_slu_solver.f90 index 28ea543e..d06fe93e 100644 --- a/mlprec/mld_z_slu_solver.f90 +++ b/mlprec/mld_z_slu_solver.f90 @@ -135,8 +135,8 @@ contains goto 9999 end select - n_row = psb_cd_get_local_rows(desc_data) - n_col = psb_cd_get_local_cols(desc_data) + n_row = desc_data%get_local_rows() + n_col = desc_data%get_local_cols() if (n_col <= size(work)) then ww => work(1:n_col) @@ -211,14 +211,14 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' - n_row = psb_cd_get_local_rows(desc_a) - n_col = psb_cd_get_local_cols(desc_a) + n_row = desc_a%get_local_rows() + n_col = desc_a%get_local_cols() if (psb_toupper(upd) == 'F') then diff --git a/mlprec/mld_z_umf_solver.f90 b/mlprec/mld_z_umf_solver.f90 index 01986790..db86c412 100644 --- a/mlprec/mld_z_umf_solver.f90 +++ b/mlprec/mld_z_umf_solver.f90 @@ -135,8 +135,8 @@ contains goto 9999 end select - n_row = psb_cd_get_local_rows(desc_data) - n_col = psb_cd_get_local_cols(desc_data) + n_row = desc_data%get_local_rows() + n_col = desc_data%get_local_cols() if (n_col <= size(work)) then ww => work(1:n_col) @@ -211,14 +211,14 @@ contains call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' - n_row = psb_cd_get_local_rows(desc_a) - n_col = psb_cd_get_local_cols(desc_a) + n_row = desc_a%get_local_rows() + n_col = desc_a%get_local_cols() if (psb_toupper(upd) == 'F') then diff --git a/mlprec/mld_zaggrmap_bld.f90 b/mlprec/mld_zaggrmap_bld.f90 index 3ca1374d..d1f730ce 100644 --- a/mlprec/mld_zaggrmap_bld.f90 +++ b/mlprec/mld_zaggrmap_bld.f90 @@ -111,10 +111,10 @@ subroutine mld_zaggrmap_bld(aggr_type,theta,a,desc_a,ilaggr,nlaggr,info) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() ! - ictxt=psb_cd_get_context(desc_a) + ictxt=desc_a%get_context() call psb_info(ictxt,me,np) - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() select case (aggr_type) case (mld_dec_aggr_) diff --git a/mlprec/mld_zaggrmat_asb.f90 b/mlprec/mld_zaggrmat_asb.f90 index 9e86dc60..48ceae13 100644 --- a/mlprec/mld_zaggrmat_asb.f90 +++ b/mlprec/mld_zaggrmat_asb.f90 @@ -121,8 +121,8 @@ subroutine mld_zaggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info) info=psb_success_ call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_a) - icomm = psb_cd_get_mpic(desc_a) + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() call psb_info(ictxt, me, np) diff --git a/mlprec/mld_zaggrmat_nosmth_asb.F90 b/mlprec/mld_zaggrmat_nosmth_asb.F90 index d03f23bc..575fc293 100644 --- a/mlprec/mld_zaggrmat_nosmth_asb.F90 +++ b/mlprec/mld_zaggrmat_nosmth_asb.F90 @@ -116,12 +116,12 @@ subroutine mld_zaggrmat_nosmth_asb(a,desc_a,ilaggr,nlaggr,p,info) call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_a) - icomm = psb_cd_get_mpic(desc_a) + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() call psb_info(ictxt, me, np) - nglob = psb_cd_get_global_rows(desc_a) - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nglob = desc_a%get_global_rows() + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() naggr = nlaggr(me+1) diff --git a/mlprec/mld_zaggrmat_smth_asb.F90 b/mlprec/mld_zaggrmat_smth_asb.F90 index 4e9d1fc8..10d88dc0 100644 --- a/mlprec/mld_zaggrmat_smth_asb.F90 +++ b/mlprec/mld_zaggrmat_smth_asb.F90 @@ -140,15 +140,15 @@ subroutine mld_zaggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) - icomm = psb_cd_get_mpic(desc_a) - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) - nglob = psb_cd_get_global_rows(desc_a) - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nglob = desc_a%get_global_rows() + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() theta = p%parms%aggr_thresh @@ -530,8 +530,8 @@ subroutine mld_zaggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) & 'Assembld aux descr. distr.' call p%ac%mv_from(bcoo) - call p%ac%set_nrows(psb_cd_get_local_rows(p%desc_ac)) - call p%ac%set_ncols(psb_cd_get_local_cols(p%desc_ac)) + call p%ac%set_nrows(p%desc_ac%get_local_rows()) + call p%ac%set_ncols(p%desc_ac%get_local_cols()) call p%ac%set_asb() if (info == psb_success_) deallocate(nzbr,idisp,stat=info) @@ -550,7 +550,7 @@ subroutine mld_zaggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) end if call am1%mv_from(acsr1) endif - call am1%set_ncols(psb_cd_get_local_cols(p%desc_ac)) + call am1%set_ncols(p%desc_ac%get_local_cols()) if (np>1) then call am2%cscnv(info,type='coo',dupl=psb_dupl_add_) @@ -565,7 +565,7 @@ subroutine mld_zaggrmat_smth_asb(a,desc_a,ilaggr,nlaggr,p,info) goto 9999 end if end if - call am2%set_nrows(psb_cd_get_local_cols(p%desc_ac)) + call am2%set_nrows(p%desc_ac%get_local_cols()) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& diff --git a/mlprec/mld_zas_aply.f90 b/mlprec/mld_zas_aply.f90 index a9c9250d..f528ca73 100644 --- a/mlprec/mld_zas_aply.f90 +++ b/mlprec/mld_zas_aply.f90 @@ -70,7 +70,7 @@ ! If trans='N','n' then op(K^(-1)) = K^(-1); ! if trans='T','t' then op(K^(-1)) = K^(-T) (transpose of K^(-1)). ! work - real(psb_dpk_), dimension (:), optional, target. -! Workspace. Its size must be at least 4*psb_cd_get_local_cols(desc_data). +! Workspace. Its size must be at least 4*desc_data%get_local_cols(). ! info - integer, output. ! Error code. ! @@ -102,7 +102,7 @@ subroutine mld_zas_aply(alpha,prec,x,beta,y,desc_data,trans,work,info) info = psb_success_ call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_data) + ictxt = desc_data%get_context() call psb_info(ictxt, me, np) @@ -140,9 +140,9 @@ subroutine mld_zas_aply(alpha,prec,x,beta,y,desc_data,trans,work,info) ! Overlap > 0 ! - n_row = psb_cd_get_local_rows(prec%desc_data) - n_col = psb_cd_get_local_cols(prec%desc_data) - nrow_d = psb_cd_get_local_rows(desc_data) + n_row = prec%desc_data%get_local_rows() + n_col = prec%desc_data%get_local_cols() + nrow_d = desc_data%get_local_rows() isz=max(n_row,N_COL) if ((6*isz) <= size(work)) then ww => work(1:isz) diff --git a/mlprec/mld_zas_bld.f90 b/mlprec/mld_zas_bld.f90 index c7e9056f..a6ce3968 100644 --- a/mlprec/mld_zas_bld.f90 +++ b/mlprec/mld_zas_bld.f90 @@ -99,15 +99,15 @@ subroutine mld_zas_bld(a,desc_a,p,upd,info) If (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& & ' start ', upd - ictxt = psb_cd_get_context(desc_a) - icomm = psb_cd_get_mpic(desc_a) + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() Call psb_info(ictxt, me, np) tot_recv=0 - n_row = psb_cd_get_local_rows(desc_a) - n_col = psb_cd_get_local_cols(desc_a) + n_row = desc_a%get_local_rows() + n_col = desc_a%get_local_cols() nnzero = psb_sp_get_nnzeros(a) nhalo = n_col-n_row ptype = p%iprcparm(mld_smoother_type_) @@ -216,8 +216,8 @@ subroutine mld_zas_bld(a,desc_a,p,upd,info) call psb_cdbldext(a,desc_a,novr,p%desc_data,info,extype=psb_ovt_asov_) if(debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& - & ' From cdbldext _:',psb_cd_get_local_rows(p%desc_data),& - & psb_cd_get_local_cols(p%desc_data) + & ' From cdbldext _:',p%desc_data%get_local_rows(),& + & p%desc_data%get_local_cols() if (info /= psb_success_) then info=psb_err_from_subroutine_ diff --git a/mlprec/mld_zbaseprec_aply.f90 b/mlprec/mld_zbaseprec_aply.f90 index 0597f8fd..f9fed706 100644 --- a/mlprec/mld_zbaseprec_aply.f90 +++ b/mlprec/mld_zbaseprec_aply.f90 @@ -74,7 +74,7 @@ ! If trans='N','n' then op(K^(-1)) = K^(-1); ! if trans='T','t' then op(K^(-1)) = K^(-T) (transpose of K^(-1)). ! work - real(psb_dpk_), dimension (:), optional, target. -! Workspace. Its size must be at least 4*psb_cd_get_local_cols(desc_data). +! Workspace. Its size must be at least 4*desc_data%get_local_cols(). ! info - integer, output. ! Error code. ! @@ -106,7 +106,7 @@ subroutine mld_zbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info) info = psb_success_ call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_data) + ictxt = desc_data%get_context() call psb_info(ictxt, me, np) @@ -145,7 +145,7 @@ subroutine mld_zbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info) end if end if - n_row = psb_cd_get_local_rows(desc_data) + n_row = desc_data%get_local_rows() if (trans_ == 'C') then ww(1:n_row) = x(1:n_row)*conjg(prec%d(1:n_row)) else diff --git a/mlprec/mld_zbaseprec_bld.f90 b/mlprec/mld_zbaseprec_bld.f90 index cab11b8a..c1f87ba9 100644 --- a/mlprec/mld_zbaseprec_bld.f90 +++ b/mlprec/mld_zbaseprec_bld.f90 @@ -96,10 +96,10 @@ subroutine mld_zbaseprec_bld(a,desc_a,p,info,upd) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_a) - n_row = psb_cd_get_local_rows(desc_a) - n_col = psb_cd_get_local_cols(desc_a) - mglob = psb_cd_get_global_rows(desc_a) + ictxt = desc_a%get_context() + n_row = desc_a%get_local_rows() + n_col = desc_a%get_local_cols() + mglob = desc_a%get_global_rows() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & diff --git a/mlprec/mld_zcoarse_bld.f90 b/mlprec/mld_zcoarse_bld.f90 index 97139e53..708322b4 100644 --- a/mlprec/mld_zcoarse_bld.f90 +++ b/mlprec/mld_zcoarse_bld.f90 @@ -87,7 +87,7 @@ subroutine mld_zcoarse_bld(a,desc_a,p,info) if (psb_get_errstatus().ne.0) return call psb_erractionsave(err_act) info = psb_success_ - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt,me,np) call mld_check_def(p%parms%ml_type,'Multilevel type',& diff --git a/mlprec/mld_zdiag_bld.f90 b/mlprec/mld_zdiag_bld.f90 index 5f501aac..03464d0e 100644 --- a/mlprec/mld_zdiag_bld.f90 +++ b/mlprec/mld_zdiag_bld.f90 @@ -82,9 +82,9 @@ subroutine mld_zdiag_bld(a,desc_a,p,info) debug_level = psb_get_debug_level() name = 'mld_zdiag_bld' info = psb_success_ - ictxt = psb_cd_get_context(desc_a) - n_row = psb_cd_get_local_rows(desc_a) - n_col = psb_cd_get_local_cols(desc_a) + ictxt = desc_a%get_context() + n_row = desc_a%get_local_rows() + n_col = desc_a%get_local_cols() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_)& diff --git a/mlprec/mld_zfact_bld.f90 b/mlprec/mld_zfact_bld.f90 index 14846f1a..c0782b50 100644 --- a/mlprec/mld_zfact_bld.f90 +++ b/mlprec/mld_zfact_bld.f90 @@ -138,7 +138,7 @@ subroutine mld_zfact_bld(a,p,upd,info,blck) call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(p%desc_data) + ictxt = p%desc_data%get_context() call psb_info(ictxt, me, np) m = a%m @@ -304,8 +304,8 @@ subroutine mld_zfact_bld(a,p,upd,info,blck) ! if (p%iprcparm(mld_smoother_sweeps_) > 1) then - n_row = psb_cd_get_local_rows(p%desc_data) - n_col = psb_cd_get_local_cols(p%desc_data) + n_row = p%desc_data%get_local_rows() + n_col = p%desc_data%get_local_cols() nrow_a = a%m ! The following is known to work ! given that the output from CLIP is in COO. @@ -361,8 +361,8 @@ subroutine mld_zfact_bld(a,p,upd,info,blck) ! ! LU factorization through the SuperLU package. ! - n_row = psb_cd_get_local_rows(p%desc_data) - n_col = psb_cd_get_local_cols(p%desc_data) + n_row = p%desc_data%get_local_rows() + n_col = p%desc_data%get_local_cols() call psb_spcnv(a,atmp,info,afmt='coo') if (info == psb_success_) call psb_rwextd(n_row,atmp,info,b=blck_) @@ -412,8 +412,8 @@ subroutine mld_zfact_bld(a,p,upd,info,blck) goto 9999 end if - n_row = psb_cd_get_local_rows(p%desc_data) - n_col = psb_cd_get_local_cols(p%desc_data) + n_row = p%desc_data%get_local_rows() + n_col = p%desc_data%get_local_cols() call psb_rwextd(n_row,atmp,info,b=blck_) ! diff --git a/mlprec/mld_zilu_bld.f90 b/mlprec/mld_zilu_bld.f90 index b570e863..5dc28fa4 100644 --- a/mlprec/mld_zilu_bld.f90 +++ b/mlprec/mld_zilu_bld.f90 @@ -116,7 +116,7 @@ subroutine mld_zilu_bld(a,p,upd,info,blck) call psb_erractionsave(err_act) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(p%desc_data) + ictxt = p%desc_data%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),' start' @@ -157,7 +157,7 @@ subroutine mld_zilu_bld(a,p,upd,info,blck) & write(debug_unit,*) me,' ',trim(name),& & ': out get_nnzeros',nztota,a%m,a%k,nrow_a - n_row = psb_cd_get_local_rows(p%desc_data) + n_row = p%desc_data%get_local_rows() p%av(mld_l_pr_)%m = n_row p%av(mld_l_pr_)%k = n_row p%av(mld_u_pr_)%m = n_row diff --git a/mlprec/mld_zmlprec_aply.f90 b/mlprec/mld_zmlprec_aply.f90 index 517c8dd7..7ced7dae 100644 --- a/mlprec/mld_zmlprec_aply.f90 +++ b/mlprec/mld_zmlprec_aply.f90 @@ -129,7 +129,7 @@ ! If trans='N','n' then op(M^(-1)) = M^(-1); ! if trans='T','t' then op(M^(-1)) = M^(-T) (transpose of M^(-1)). ! work - complex(psb_dpk_), dimension (:), optional, target. -! Workspace. Its size must be at least 4*psb_cd_get_local_cols(desc_data). +! Workspace. Its size must be at least 4*desc_data%get_local_cols(). ! info - integer, output. ! Error code. ! @@ -340,7 +340,7 @@ subroutine mld_zmlprec_aply(alpha,p,x,beta,y,desc_data,trans,work,info) debug_unit = psb_get_debug_unit() debug_level = psb_get_debug_level() - ictxt = psb_cd_get_context(desc_data) + ictxt = desc_data%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_inner_) & diff --git a/mlprec/mld_zmlprec_bld.f90 b/mlprec/mld_zmlprec_bld.f90 index 741208cd..895271c7 100644 --- a/mlprec/mld_zmlprec_bld.f90 +++ b/mlprec/mld_zmlprec_bld.f90 @@ -99,7 +99,7 @@ subroutine mld_zmlprec_bld(a,desc_a,p,info) name = 'mld_zmlprec_bld' info = psb_success_ int_err(1) = 0 - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) if (debug_level >= psb_debug_outer_) & diff --git a/mlprec/mld_zprecaply.f90 b/mlprec/mld_zprecaply.f90 index 9411f306..d30fc6b7 100644 --- a/mlprec/mld_zprecaply.f90 +++ b/mlprec/mld_zprecaply.f90 @@ -69,7 +69,7 @@ ! if trans='T','t' then op(M^(-1)) = M^(-T) (transpose of M^(-1)). ! work - complex(psb_dpk_), dimension (:), optional, target. ! Workspace. Its size must be at -! least 4*psb_cd_get_local_cols(desc_data). +! least 4*desc_data%get_local_cols(). ! subroutine mld_zprecaply(prec,x,y,desc_data,info,trans,work) @@ -97,7 +97,7 @@ subroutine mld_zprecaply(prec,x,y,desc_data,info,trans,work) info = psb_success_ call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_data) + ictxt = desc_data%get_context() call psb_info(ictxt, me, np) if (present(trans)) then @@ -109,7 +109,7 @@ subroutine mld_zprecaply(prec,x,y,desc_data,info,trans,work) if (present(work)) then work_ => work else - iwsz = max(1,4*psb_cd_get_local_cols(desc_data)) + iwsz = max(1,4*desc_data%get_local_cols()) allocate(work_(iwsz),stat=info) if (info /= psb_success_) then call psb_errpush(psb_err_alloc_request_,name,i_err=(/iwsz,0,0,0,0/),& @@ -228,7 +228,7 @@ subroutine mld_zprecaply1(prec,x,desc_data,info,trans) call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_data) + ictxt = desc_data%get_context() call psb_info(ictxt, me, np) allocate(ww(size(x)),w1(size(x)),stat=info) diff --git a/mlprec/mld_zprecbld.f90 b/mlprec/mld_zprecbld.f90 index d9b244fa..09883ae8 100644 --- a/mlprec/mld_zprecbld.f90 +++ b/mlprec/mld_zprecbld.f90 @@ -94,7 +94,7 @@ subroutine mld_zprecbld(a,desc_a,p,info) name = 'mld_zprecbld' info = psb_success_ int_err(1) = 0 - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) p%ictxt = ictxt diff --git a/mlprec/mld_zslu_bld.f90 b/mlprec/mld_zslu_bld.f90 index 1c95aa08..36f5de07 100644 --- a/mlprec/mld_zslu_bld.f90 +++ b/mlprec/mld_zslu_bld.f90 @@ -91,7 +91,7 @@ subroutine mld_zslu_bld(a,desc_a,p,info) name='mld_zslu_bld' call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) diff --git a/mlprec/mld_zslud_bld.f90 b/mlprec/mld_zslud_bld.f90 index 8d318e85..6936aa1c 100644 --- a/mlprec/mld_zslud_bld.f90 +++ b/mlprec/mld_zslud_bld.f90 @@ -89,7 +89,7 @@ subroutine mld_zsludist_bld(a,desc_a,p,info) name='mld_zslud_bld' call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) @@ -100,8 +100,8 @@ subroutine mld_zsludist_bld(a,desc_a,p,info) ! WARN: we need to check for a BLOCK distribution (this is the ! distribution required by SuperLU_DIST) ! - nrow = psb_cd_get_local_rows(desc_a) - ncol = psb_cd_get_local_cols(desc_a) + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() call psb_loc_to_glob(1,ifrst,desc_a,info) call psb_loc_to_glob(nrow,ibcheck,desc_a,info) ibcheck = ibcheck - ifrst + 1 @@ -115,7 +115,7 @@ subroutine mld_zsludist_bld(a,desc_a,p,info) goto 9999 endif - mglob = psb_cd_get_global_rows(desc_a) + mglob = desc_a%get_global_rows() nzt = aa%get_nzeros() npr = np diff --git a/mlprec/mld_zsp_renum.f90 b/mlprec/mld_zsp_renum.f90 index 662f38aa..c6e7b5be 100644 --- a/mlprec/mld_zsp_renum.f90 +++ b/mlprec/mld_zsp_renum.f90 @@ -106,7 +106,7 @@ subroutine mld_zsp_renum(a,blck,p,atmp,info) name='mld_zsp_renum' call psb_erractionsave(err_act) - ictxt=psb_cd_get_context(p%desc_data) + ictxt=p%desc_data%get_context() call psb_info(ictxt, me, np) ! @@ -130,7 +130,7 @@ subroutine mld_zsp_renum(a,blck,p,atmp,info) ! Remember: we have switched IA1=COLS and IA2=ROWS. ! Now identify the set of distinct local column indices. ! - nnr = psb_cd_get_local_rows(p%desc_data) + nnr = p%desc_data%get_local_rows() allocate(p%perm(nnr),p%invperm(nnr),itmp2(nnr),stat=info) if (info /= psb_success_) then call psb_errpush(psb_err_from_subroutine_,name,a_err='Allocate') diff --git a/mlprec/mld_zumf_bld.f90 b/mlprec/mld_zumf_bld.f90 index fd3cb8e4..572fe2bb 100644 --- a/mlprec/mld_zumf_bld.f90 +++ b/mlprec/mld_zumf_bld.f90 @@ -95,7 +95,7 @@ subroutine mld_zumf_bld(a,desc_a,p,info) info=psb_success_ name='mld_zumf_bld' call psb_erractionsave(err_act) - ictxt = psb_cd_get_context(desc_a) + ictxt = desc_a%get_context() call psb_info(ictxt, me, np) ! diff --git a/tests/pdegen/ppde.f90 b/tests/pdegen/ppde.f90 index 2aa1fa33..4a70c5da 100644 --- a/tests/pdegen/ppde.f90 +++ b/tests/pdegen/ppde.f90 @@ -217,7 +217,7 @@ program ppde end if call psb_barrier(ictxt) t1 = psb_wtime() - call mld_precbld(a,desc_a,prec,info,mold=acoo) + call mld_precbld(a,desc_a,prec,info) if(info /= psb_success_) then info=psb_err_from_subroutine_ ch_err='psb_precbld' diff --git a/tests/pdegen/runs/ppde.inp b/tests/pdegen/runs/ppde.inp index 268132c4..ecfbb351 100644 --- a/tests/pdegen/runs/ppde.inp +++ b/tests/pdegen/runs/ppde.inp @@ -2,28 +2,28 @@ BICGSTAB ! Iterative method: BiCGSTAB BiCG CGS RGMRES BiCGSTA CSR ! Storage format CSR COO JAD 040 ! IDIM; domain size is idim**3 2 ! ISTOPC -0200 ! ITMAX -01 ! ITRACE +1000 ! ITMAX +-1 ! ITRACE 30 ! IRST (restart for RGMRES and BiCGSTABL) -1.d-6 ! EPS +1.d-9 ! EPS 3L-M-RAS-I-D4 ! Longer descriptive name for preconditioner (up to 20 chars) ML ! Preconditioner NONE JACOBI BJAC AS ML 1 ! Number of overlap layers for AS preconditioner at finest level HALO ! Restriction operator NONE HALO NONE ! Prolongation operator NONE SUM AVG ILU ! Subdomain solver DSCALE ILU MILU ILUT UMF SLU -1 ! Level-set N for ILU(N) -1.d-4 ! Threshold T for ILU(T,P) +01 ! Level-set N for ILU(N) +1.d-5 ! Threshold T for ILU(T,P) 1 ! Smoother/Jacobi sweeps -AS ! Smoother type JACOBI BJAC AS; ignored for non-ML +JACOBI ! Smoother type JACOBI BJAC AS; ignored for non-ML 3 ! Number of levels in a multilevel preconditioner SMOOTHED ! Kind of aggregation: SMOOTHED, NONSMOOTHED DEC ! Type of aggregation DEC SYMDEC GLB MULT ! Type of multilevel correction: ADD MULT -POST ! Side of correction PRE POST TWOSIDE (ignored for ADD) +TWOSIDE ! Side of correction PRE POST TWOSIDE (ignored for ADD) DIST ! Coarse level: matrix distribution DIST REPL -BJAC ! Coarse level: solver JACOBI BJAC UMF SLU SLUDIST -UMF ! Coarse level: subsolver DSCALE ILU UMF SLU SLUDIST +JACOBI ! Coarse level: solver JACOBI BJAC UMF SLU SLUDIST +DSCALE ! Coarse level: subsolver DSCALE ILU UMF SLU SLUDIST 1 ! Coarse level: Level-set N for ILU(N) 1.d-4 ! Coarse level: Threshold T for ILU(T,P) 4 ! Coarse level: Number of Jacobi sweeps