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

mld2p4-2:

Browse Source 
mld_cprecset.F90
 mld_dprecset.F90
 mld_sprecset.F90
 mld_zprecset.F90

Fixed handling of set sub_solve for ILU variants.
stopcriterion
Salvatore Filippone 14 years ago
parent 338dda1762
commit 10e48562a4
4 changed files with 96 additions and 20 deletions
Show Stats Download Patch File Download Diff File

25
mlprec/mld_cprecset.F90
Unescape Escape View File

@ -454,6 +454,12 @@ contains
else else
allocate(mld_c_id_solver_type :: level%sm%sv, stat=info) allocate(mld_c_id_solver_type :: level%sm%sv, stat=info)
endif endif
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
case (mld_diag_scale_) case (mld_diag_scale_)
if (allocated(level%sm%sv)) then if (allocated(level%sm%sv)) then
select type (sv => level%sm%sv) select type (sv => level%sm%sv)
@ -468,6 +474,11 @@ contains
else else
allocate(mld_c_diag_solver_type :: level%sm%sv, stat=info) allocate(mld_c_diag_solver_type :: level%sm%sv, stat=info)
endif endif
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
case (mld_ilu_n_,mld_milu_n_,mld_ilu_t_) case (mld_ilu_n_,mld_milu_n_,mld_ilu_t_)
if (allocated(level%sm%sv)) then if (allocated(level%sm%sv)) then
@ -483,6 +494,12 @@ contains
else else
allocate(mld_c_ilu_solver_type :: level%sm%sv, stat=info) allocate(mld_c_ilu_solver_type :: level%sm%sv, stat=info)
endif endif
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
call level%sm%sv%set(mld_sub_solve_,val,info)
#ifdef HAVE_SLU_ #ifdef HAVE_SLU_
case (mld_slu_) case (mld_slu_)
if (allocated(level%sm%sv)) then if (allocated(level%sm%sv)) then
@ -498,16 +515,16 @@ contains
else else
allocate(mld_c_slu_solver_type :: level%sm%sv, stat=info) allocate(mld_c_slu_solver_type :: level%sm%sv, stat=info)
endif endif
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
#endif #endif
case default case default
! !
! Do nothing and hope for the best :) ! Do nothing and hope for the best :)
! !
end select end select
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
end subroutine onelev_set_solver end subroutine onelev_set_solver

29
mlprec/mld_dprecset.F90
Unescape Escape View File

@ -461,6 +461,12 @@ contains
else else
allocate(mld_d_id_solver_type :: level%sm%sv, stat=info) allocate(mld_d_id_solver_type :: level%sm%sv, stat=info)
endif endif
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
case (mld_diag_scale_) case (mld_diag_scale_)
if (allocated(level%sm%sv)) then if (allocated(level%sm%sv)) then
select type (sv => level%sm%sv) select type (sv => level%sm%sv)
@ -475,6 +481,11 @@ contains
else else
allocate(mld_d_diag_solver_type :: level%sm%sv, stat=info) allocate(mld_d_diag_solver_type :: level%sm%sv, stat=info)
endif endif
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
case (mld_ilu_n_,mld_milu_n_,mld_ilu_t_) case (mld_ilu_n_,mld_milu_n_,mld_ilu_t_)
if (allocated(level%sm%sv)) then if (allocated(level%sm%sv)) then
@ -490,6 +501,12 @@ contains
else else
allocate(mld_d_ilu_solver_type :: level%sm%sv, stat=info) allocate(mld_d_ilu_solver_type :: level%sm%sv, stat=info)
endif endif
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
call level%sm%sv%set(mld_sub_solve_,val,info)
#ifdef HAVE_UMF_ #ifdef HAVE_UMF_
case (mld_umf_) case (mld_umf_)
if (allocated(level%sm%sv)) then if (allocated(level%sm%sv)) then
@ -505,6 +522,10 @@ contains
else else
allocate(mld_d_umf_solver_type :: level%sm%sv, stat=info) allocate(mld_d_umf_solver_type :: level%sm%sv, stat=info)
endif endif
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
#endif #endif
#ifdef HAVE_SLU_ #ifdef HAVE_SLU_
case (mld_slu_) case (mld_slu_)
@ -521,16 +542,16 @@ contains
else else
allocate(mld_d_slu_solver_type :: level%sm%sv, stat=info) allocate(mld_d_slu_solver_type :: level%sm%sv, stat=info)
endif endif
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
#endif #endif
case default case default
! !
! Do nothing and hope for the best :) ! Do nothing and hope for the best :)
! !
end select end select
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
end subroutine onelev_set_solver end subroutine onelev_set_solver

25
mlprec/mld_sprecset.F90
Unescape Escape View File

@ -455,6 +455,12 @@ contains
else else
allocate(mld_s_id_solver_type :: level%sm%sv, stat=info) allocate(mld_s_id_solver_type :: level%sm%sv, stat=info)
endif endif
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
case (mld_diag_scale_) case (mld_diag_scale_)
if (allocated(level%sm%sv)) then if (allocated(level%sm%sv)) then
select type (sv => level%sm%sv) select type (sv => level%sm%sv)
@ -469,6 +475,11 @@ contains
else else
allocate(mld_s_diag_solver_type :: level%sm%sv, stat=info) allocate(mld_s_diag_solver_type :: level%sm%sv, stat=info)
endif endif
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
case (mld_ilu_n_,mld_milu_n_,mld_ilu_t_) case (mld_ilu_n_,mld_milu_n_,mld_ilu_t_)
if (allocated(level%sm%sv)) then if (allocated(level%sm%sv)) then
@ -484,6 +495,12 @@ contains
else else
allocate(mld_s_ilu_solver_type :: level%sm%sv, stat=info) allocate(mld_s_ilu_solver_type :: level%sm%sv, stat=info)
endif endif
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
call level%sm%sv%set(mld_sub_solve_,val,info)
#ifdef HAVE_SLU_ #ifdef HAVE_SLU_
case (mld_slu_) case (mld_slu_)
if (allocated(level%sm%sv)) then if (allocated(level%sm%sv)) then
@ -499,16 +516,16 @@ contains
else else
allocate(mld_s_slu_solver_type :: level%sm%sv, stat=info) allocate(mld_s_slu_solver_type :: level%sm%sv, stat=info)
endif endif
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
#endif #endif
case default case default
! !
! Do nothing and hope for the best :) ! Do nothing and hope for the best :)
! !
end select end select
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
end subroutine onelev_set_solver end subroutine onelev_set_solver

29
mlprec/mld_zprecset.F90
Unescape Escape View File

@ -462,6 +462,12 @@ contains
else else
allocate(mld_z_id_solver_type :: level%sm%sv, stat=info) allocate(mld_z_id_solver_type :: level%sm%sv, stat=info)
endif endif
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
case (mld_diag_scale_) case (mld_diag_scale_)
if (allocated(level%sm%sv)) then if (allocated(level%sm%sv)) then
select type (sv => level%sm%sv) select type (sv => level%sm%sv)
@ -476,6 +482,11 @@ contains
else else
allocate(mld_z_diag_solver_type :: level%sm%sv, stat=info) allocate(mld_z_diag_solver_type :: level%sm%sv, stat=info)
endif endif
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
case (mld_ilu_n_,mld_milu_n_,mld_ilu_t_) case (mld_ilu_n_,mld_milu_n_,mld_ilu_t_)
if (allocated(level%sm%sv)) then if (allocated(level%sm%sv)) then
@ -491,6 +502,12 @@ contains
else else
allocate(mld_z_ilu_solver_type :: level%sm%sv, stat=info) allocate(mld_z_ilu_solver_type :: level%sm%sv, stat=info)
endif endif
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
call level%sm%sv%set(mld_sub_solve_,val,info)
#ifdef HAVE_UMF_ #ifdef HAVE_UMF_
case (mld_umf_) case (mld_umf_)
if (allocated(level%sm%sv)) then if (allocated(level%sm%sv)) then
@ -506,6 +523,10 @@ contains
else else
allocate(mld_z_umf_solver_type :: level%sm%sv, stat=info) allocate(mld_z_umf_solver_type :: level%sm%sv, stat=info)
endif endif
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
#endif #endif
#ifdef HAVE_SLU_ #ifdef HAVE_SLU_
case (mld_slu_) case (mld_slu_)
@ -522,16 +543,16 @@ contains
else else
allocate(mld_z_slu_solver_type :: level%sm%sv, stat=info) allocate(mld_z_slu_solver_type :: level%sm%sv, stat=info)
endif endif
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
#endif #endif
case default case default
! !
! Do nothing and hope for the best :) ! Do nothing and hope for the best :)
! !
end select end select
if (allocated(level%sm)) then
if (allocated(level%sm%sv)) &
& call level%sm%sv%default()
end if
end subroutine onelev_set_solver end subroutine onelev_set_solver

Write Preview
Loading…
Cancel
Save