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

Fixed precset to handle correctly ILEV=1 vs. ILEV > 1 where appropriate.

Browse Source
stopcriterion
Salvatore Filippone 17 years ago
parent e49dfdf409
commit 2ffcc7940d
2 changed files with 58 additions and 22 deletions
Show Stats Download Patch File Download Diff File

40
mlprec/mld_dprecset.f90
Unescape Escape View File

@ -173,8 +173,7 @@ subroutine mld_dprecseti(p,what,val,info,ilev)
select case(what) select case(what)
case(mld_prec_type_,mld_sub_solve_,mld_sub_restr_,mld_sub_prol_,mld_sub_ren_,mld_n_ovr_,mld_sub_fill_in_,& case(mld_prec_type_,mld_sub_solve_,mld_sub_restr_,mld_sub_prol_,mld_sub_ren_,mld_n_ovr_,mld_sub_fill_in_,&
& mld_smooth_sweeps_,mld_ml_type_,mld_aggr_alg_,mld_aggr_kind_,& & mld_smooth_sweeps_)
& mld_smooth_pos_,mld_aggr_eig_)
do ilev_=1,nlev_-1 do ilev_=1,nlev_-1
if (.not.allocated(p%baseprecv(ilev_)%iprcparm)) then if (.not.allocated(p%baseprecv(ilev_)%iprcparm)) then
write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner' write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner'
@ -183,34 +182,44 @@ subroutine mld_dprecseti(p,what,val,info,ilev)
endif endif
p%baseprecv(ilev_)%iprcparm(what) = val p%baseprecv(ilev_)%iprcparm(what) = val
end do end do
case(mld_ml_type_,mld_aggr_alg_,mld_aggr_kind_,&
& mld_smooth_pos_,mld_aggr_eig_)
do ilev_=2,nlev_-1
if (.not.allocated(p%baseprecv(ilev_)%iprcparm)) then
write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner'
info = -1
return
endif
p%baseprecv(ilev_)%iprcparm(what) = val
end do
case(mld_coarse_mat_) case(mld_coarse_mat_)
if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then
write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner' write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner'
info = -1 info = -1
return return
endif endif
p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = val if (nlev_ > 1) p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = val
case(mld_coarse_solve_) case(mld_coarse_solve_)
if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then
write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner' write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner'
info = -1 info = -1
return return
endif endif
p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val if (nlev_ > 1) p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val
case(mld_coarse_sweeps_) case(mld_coarse_sweeps_)
if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then
write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner' write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner'
info = -1 info = -1
return return
endif endif
p%baseprecv(nlev_)%iprcparm(mld_smooth_sweeps_) = val if (nlev_ > 1) p%baseprecv(nlev_)%iprcparm(mld_smooth_sweeps_) = val
case(mld_coarse_fill_in_) case(mld_coarse_fill_in_)
if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then
write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner' write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner'
info = -1 info = -1
return return
endif endif
p%baseprecv(nlev_)%iprcparm(mld_sub_fill_in_) = val if (nlev_ > 1) p%baseprecv(nlev_)%iprcparm(mld_sub_fill_in_) = val
case default case default
write(0,*) 'Error: trying to call PRECSET with an invalid WHAT' write(0,*) 'Error: trying to call PRECSET with an invalid WHAT'
info = -2 info = -2
@ -348,9 +357,7 @@ subroutine mld_dprecsetc(p,what,string,info,ilev)
! !
select case(what) select case(what)
case(mld_prec_type_,mld_sub_solve_,mld_sub_restr_,mld_sub_prol_,mld_sub_ren_,& case(mld_prec_type_,mld_sub_solve_,mld_sub_restr_,mld_sub_prol_)
& mld_smooth_sweeps_,mld_ml_type_,mld_aggr_alg_,mld_aggr_kind_,&
& mld_smooth_pos_)
call get_stringval(string,val,info) call get_stringval(string,val,info)
do ilev_=1,nlev_-1 do ilev_=1,nlev_-1
if (.not.allocated(p%baseprecv(ilev_)%iprcparm)) then if (.not.allocated(p%baseprecv(ilev_)%iprcparm)) then
@ -360,6 +367,17 @@ subroutine mld_dprecsetc(p,what,string,info,ilev)
endif endif
p%baseprecv(ilev_)%iprcparm(what) = val p%baseprecv(ilev_)%iprcparm(what) = val
end do end do
case(mld_ml_type_,mld_aggr_alg_,mld_aggr_kind_,&
& mld_smooth_pos_)
call get_stringval(string,val,info)
do ilev_=2,nlev_-1
if (.not.allocated(p%baseprecv(ilev_)%iprcparm)) then
write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner'
info = -1
return
endif
p%baseprecv(ilev_)%iprcparm(what) = val
end do
case(mld_coarse_mat_) case(mld_coarse_mat_)
if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then
write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner' write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner'
@ -367,7 +385,7 @@ subroutine mld_dprecsetc(p,what,string,info,ilev)
return return
endif endif
call get_stringval(string,val,info) call get_stringval(string,val,info)
p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = val if (nlev_ > 1) p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = val
case(mld_coarse_solve_) case(mld_coarse_solve_)
if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then
write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner' write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner'
@ -375,7 +393,7 @@ subroutine mld_dprecsetc(p,what,string,info,ilev)
return return
endif endif
call get_stringval(string,val,info) call get_stringval(string,val,info)
p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val if (nlev_ > 1) p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val
case default case default
write(0,*) 'Error: trying to call PRECSET with an invalid WHAT' write(0,*) 'Error: trying to call PRECSET with an invalid WHAT'
info = -2 info = -2

40
mlprec/mld_zprecset.f90
Unescape Escape View File

@ -173,8 +173,7 @@ subroutine mld_zprecseti(p,what,val,info,ilev)
select case(what) select case(what)
case(mld_prec_type_,mld_sub_solve_,mld_sub_restr_,mld_sub_prol_,mld_sub_ren_,mld_n_ovr_,mld_sub_fill_in_,& case(mld_prec_type_,mld_sub_solve_,mld_sub_restr_,mld_sub_prol_,mld_sub_ren_,mld_n_ovr_,mld_sub_fill_in_,&
& mld_smooth_sweeps_,mld_ml_type_,mld_aggr_alg_,mld_aggr_kind_,& & mld_smooth_sweeps_)
& mld_smooth_pos_,mld_aggr_eig_)
do ilev_=1,nlev_-1 do ilev_=1,nlev_-1
if (.not.allocated(p%baseprecv(ilev_)%iprcparm)) then if (.not.allocated(p%baseprecv(ilev_)%iprcparm)) then
write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner' write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner'
@ -183,34 +182,44 @@ subroutine mld_zprecseti(p,what,val,info,ilev)
endif endif
p%baseprecv(ilev_)%iprcparm(what) = val p%baseprecv(ilev_)%iprcparm(what) = val
end do end do
case(mld_ml_type_,mld_aggr_alg_,mld_aggr_kind_,&
& mld_smooth_pos_,mld_aggr_eig_)
do ilev_=2,nlev_-1
if (.not.allocated(p%baseprecv(ilev_)%iprcparm)) then
write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner'
info = -1
return
endif
p%baseprecv(ilev_)%iprcparm(what) = val
end do
case(mld_coarse_mat_) case(mld_coarse_mat_)
if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then
write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner' write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner'
info = -1 info = -1
return return
endif endif
p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = val if (nlev_ > 1) p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = val
case(mld_coarse_solve_) case(mld_coarse_solve_)
if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then
write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner' write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner'
info = -1 info = -1
return return
endif endif
p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val if (nlev_ > 1) p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val
case(mld_coarse_sweeps_) case(mld_coarse_sweeps_)
if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then
write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner' write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner'
info = -1 info = -1
return return
endif endif
p%baseprecv(nlev_)%iprcparm(mld_smooth_sweeps_) = val if (nlev_ > 1) p%baseprecv(nlev_)%iprcparm(mld_smooth_sweeps_) = val
case(mld_coarse_fill_in_) case(mld_coarse_fill_in_)
if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then
write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner' write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner'
info = -1 info = -1
return return
endif endif
p%baseprecv(nlev_)%iprcparm(mld_sub_fill_in_) = val if (nlev_ > 1) p%baseprecv(nlev_)%iprcparm(mld_sub_fill_in_) = val
case default case default
write(0,*) 'Error: trying to call PRECSET with an invalid WHAT' write(0,*) 'Error: trying to call PRECSET with an invalid WHAT'
info = -2 info = -2
@ -346,9 +355,7 @@ subroutine mld_zprecsetc(p,what,string,info,ilev)
! !
select case(what) select case(what)
case(mld_prec_type_,mld_sub_solve_,mld_sub_restr_,mld_sub_prol_,mld_sub_ren_,& case(mld_prec_type_,mld_sub_solve_,mld_sub_restr_,mld_sub_prol_)
& mld_smooth_sweeps_,mld_ml_type_,mld_aggr_alg_,mld_aggr_kind_,&
& mld_smooth_pos_)
call get_stringval(string,val,info) call get_stringval(string,val,info)
do ilev_=1,nlev_-1 do ilev_=1,nlev_-1
if (.not.allocated(p%baseprecv(ilev_)%iprcparm)) then if (.not.allocated(p%baseprecv(ilev_)%iprcparm)) then
@ -358,6 +365,17 @@ subroutine mld_zprecsetc(p,what,string,info,ilev)
endif endif
p%baseprecv(ilev_)%iprcparm(what) = val p%baseprecv(ilev_)%iprcparm(what) = val
end do end do
case(mld_ml_type_,mld_aggr_alg_,mld_aggr_kind_,&
& mld_smooth_pos_)
call get_stringval(string,val,info)
do ilev_=2,nlev_-1
if (.not.allocated(p%baseprecv(ilev_)%iprcparm)) then
write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner'
info = -1
return
endif
p%baseprecv(ilev_)%iprcparm(what) = val
end do
case(mld_coarse_mat_) case(mld_coarse_mat_)
if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then
write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner' write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner'
@ -365,7 +383,7 @@ subroutine mld_zprecsetc(p,what,string,info,ilev)
return return
endif endif
call get_stringval(string,val,info) call get_stringval(string,val,info)
p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = val if (nlev_ > 1) p%baseprecv(nlev_)%iprcparm(mld_coarse_mat_) = val
case(mld_coarse_solve_) case(mld_coarse_solve_)
if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then if (.not.allocated(p%baseprecv(nlev_)%iprcparm)) then
write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner' write(0,*) 'Error: trying to call PRECSET on an uninitialized preconditioner'
@ -373,7 +391,7 @@ subroutine mld_zprecsetc(p,what,string,info,ilev)
return return
endif endif
call get_stringval(string,val,info) call get_stringval(string,val,info)
p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val if (nlev_ > 1) p%baseprecv(nlev_)%iprcparm(mld_sub_solve_) = val
case default case default
write(0,*) 'Error: trying to call PRECSET with an invalid WHAT' write(0,*) 'Error: trying to call PRECSET with an invalid WHAT'
info = -2 info = -2

Write Preview
Loading…
Cancel
Save