fdurastante
/
amg4psblas
mirror of https://github.com/sfilippone/amg4psblas.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed mld_ name glitch.

Browse Source
stopcriterion
Salvatore Filippone 17 years ago
parent dd20b6a5fd
commit 4f610021e4
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

4
mlprec/mld_daggrmap_bld.f90
Unescape Escape View File

@ -72,7 +72,7 @@ subroutine mld_daggrmap_bld(aggr_type,a,desc_a,nlaggr,ilaggr,info)
ncol = psb_cd_get_local_cols(desc_a) ncol = psb_cd_get_local_cols(desc_a)
select case (aggr_type) select case (aggr_type)
case (mld_dec_aggr_,sym_mld_dec_aggr_) case (mld_dec_aggr_,mld_sym_dec_aggr_)
nr = a%m nr = a%m
@ -305,7 +305,7 @@ subroutine mld_daggrmap_bld(aggr_type,a,desc_a,nlaggr,ilaggr,info)
nlaggr(me+1) = naggr nlaggr(me+1) = naggr
call psb_sum(ictxt,nlaggr(1:np)) call psb_sum(ictxt,nlaggr(1:np))
if (aggr_type == sym_mld_dec_aggr_) then if (aggr_type == mld_sym_dec_aggr_) then
call psb_sp_free(atmp,info) call psb_sp_free(atmp,info)
end if end if

6
mlprec/mld_prec_type.f90
Unescape Escape View File

@ -170,9 +170,9 @@ module mld_prec_type
integer, parameter :: mld_f_none_=0,mld_ilu_n_=1,mld_milu_n_=2, mld_ilu_t_=3 integer, parameter :: mld_f_none_=0,mld_ilu_n_=1,mld_milu_n_=2, mld_ilu_t_=3
integer, parameter :: mld_slu_=4, mld_umf_=5, mld_sludist_=6 integer, parameter :: mld_slu_=4, mld_umf_=5, mld_sludist_=6
! Legal values for entry: mld_aggr_alg_ ! Legal values for entry: mld_aggr_alg_
integer, parameter :: mld_dec_aggr_=0, sym_mld_dec_aggr_=1 integer, parameter :: mld_dec_aggr_=0, mld_sym_dec_aggr_=1
integer, parameter :: mld_glb_aggr_=2, new_mld_dec_aggr_=3 integer, parameter :: mld_glb_aggr_=2, mld_new_dec_aggr_=3
integer, parameter :: new_mld_glb_aggr_=4, mld_max_aggr_=new_mld_glb_aggr_ integer, parameter :: mld_new_glb_aggr_=4, mld_max_aggr_=mld_new_glb_aggr_
! Legal values for entry: mld_aggr_kind_ ! Legal values for entry: mld_aggr_kind_
integer, parameter :: mld_no_smooth_=0, mld_smooth_prol_=1, mld_biz_prol_=2 integer, parameter :: mld_no_smooth_=0, mld_smooth_prol_=1, mld_biz_prol_=2
! Legal values for entry: mld_aggr_eig_ ! Legal values for entry: mld_aggr_eig_

4
mlprec/mld_zaggrmap_bld.f90
Unescape Escape View File

@ -72,7 +72,7 @@ subroutine mld_zaggrmap_bld(aggr_type,a,desc_a,nlaggr,ilaggr,info)
ncol = psb_cd_get_local_cols(desc_a) ncol = psb_cd_get_local_cols(desc_a)
select case (aggr_type) select case (aggr_type)
case (mld_dec_aggr_,sym_mld_dec_aggr_) case (mld_dec_aggr_,mld_sym_dec_aggr_)
nr = a%m nr = a%m
@ -305,7 +305,7 @@ subroutine mld_zaggrmap_bld(aggr_type,a,desc_a,nlaggr,ilaggr,info)
nlaggr(me+1) = naggr nlaggr(me+1) = naggr
call psb_sum(ictxt,nlaggr(1:np)) call psb_sum(ictxt,nlaggr(1:np))
if (aggr_type == sym_mld_dec_aggr_) then if (aggr_type == mld_sym_dec_aggr_) then
call psb_sp_free(atmp,info) call psb_sp_free(atmp,info)
end if end if

4
test/fileread/runs/drt.sh
Unescape Escape View File

@ -61,12 +61,12 @@ as ml 0 1 0 1 0 2 0 1 1 2 5 0 1 3 -1.0 1e-4 1e
as ml 1 1 0 1 0 2 0 1 1 2 5 0 1 3 -1.0 1e-4 1e-4 3L-M-RAS-U-R as ml 1 1 0 1 0 2 0 1 1 2 5 0 1 3 -1.0 1e-4 1e-4 3L-M-RAS-U-R
as ml 2 1 0 1 0 2 0 1 1 2 5 0 1 3 -1.0 1e-4 1e-4 3L-M-RAS-U-R as ml 2 1 0 1 0 2 0 1 1 2 5 0 1 3 -1.0 1e-4 1e-4 3L-M-RAS-U-R
2 Number of matrices 2 Number of matrices
kivap004.mtx none
kivap001.mtx none
thm50x30.mtx none thm50x30.mtx none
thm200x120.mtx none thm200x120.mtx none
thm1000x600.mtx none thm1000x600.mtx none
a400x400.mtx b400.mtx a400x400.mtx b400.mtx
kivap004.mtx none
kivap001.mtx none
kivap007.mtx none kivap007.mtx none
!!! preconditioner templates !!! preconditioner templates
bja none 0 0 0 0 0 0 0 0 0 0 0 0.0 Block Jacobi bja none 0 0 0 0 0 0 0 0 0 0 0 0.0 Block Jacobi

Write Preview
Loading…
Cancel
Save