Fixed prec%init in examples/tests.

stopcriterion
Salvatore Filippone 6 years ago
parent 1527c5e1c2
commit 5474accddd

@ -193,7 +193,7 @@ program mld_cexample_1lev
! set RAS ! set RAS
call P%init('AS',info) call P%init(ictxt,'AS',info)
! set number of overlaps ! set number of overlaps

@ -212,7 +212,7 @@ program mld_cexample_ml
! GS sweep as pre/post-smoother and UMFPACK as coarsest-level ! GS sweep as pre/post-smoother and UMFPACK as coarsest-level
! solver ! solver
call P%init('ML',info) call P%init(ictxt,'ML',info)
kmethod = 'CG' kmethod = 'CG'
case(2) case(2)

@ -193,7 +193,7 @@ program mld_dexample_1lev
! set RAS ! set RAS
call P%init('AS',info) call P%init(ictxt,'AS',info)
! set number of overlaps ! set number of overlaps

@ -212,7 +212,7 @@ program mld_dexample_ml
! GS sweep as pre/post-smoother and UMFPACK as coarsest-level ! GS sweep as pre/post-smoother and UMFPACK as coarsest-level
! solver ! solver
call P%init('ML',info) call P%init(ictxt,'ML',info)
kmethod = 'CG' kmethod = 'CG'
case(2) case(2)

@ -193,7 +193,7 @@ program mld_sexample_1lev
! set RAS ! set RAS
call P%init('AS',info) call P%init(ictxt,'AS',info)
! set number of overlaps ! set number of overlaps

@ -212,7 +212,7 @@ program mld_sexample_ml
! GS sweep as pre/post-smoother and UMFPACK as coarsest-level ! GS sweep as pre/post-smoother and UMFPACK as coarsest-level
! solver ! solver
call P%init('ML',info) call P%init(ictxt,'ML',info)
kmethod = 'CG' kmethod = 'CG'
case(2) case(2)

@ -193,7 +193,7 @@ program mld_zexample_1lev
! set RAS ! set RAS
call P%init('AS',info) call P%init(ictxt,'AS',info)
! set number of overlaps ! set number of overlaps

@ -212,7 +212,7 @@ program mld_zexample_ml
! GS sweep as pre/post-smoother and UMFPACK as coarsest-level ! GS sweep as pre/post-smoother and UMFPACK as coarsest-level
! solver ! solver
call P%init('ML',info) call P%init(ictxt,'ML',info)
kmethod = 'CG' kmethod = 'CG'
case(2) case(2)

@ -140,7 +140,7 @@ program mld_dexample_1lev
! set RAS ! set RAS
call P%init('AS',info) call P%init(ictxt,'AS',info)
! set number of overlaps ! set number of overlaps

@ -168,7 +168,7 @@ program mld_dexample_ml
! GS sweep as pre/post-smoother and UMFPACK as coarsest-level ! GS sweep as pre/post-smoother and UMFPACK as coarsest-level
! solver ! solver
call P%init('ML',info) call P%init(ictxt,'ML',info)
kmethod = 'CG' kmethod = 'CG'
case(2) case(2)
@ -177,7 +177,7 @@ program mld_dexample_ml
! ILU(0) on the blocks) as pre- and post-smoother, and 8 block-Jacobi ! ILU(0) on the blocks) as pre- and post-smoother, and 8 block-Jacobi
! sweeps (with ILU(0) on the blocks) as coarsest-level solver ! sweeps (with ILU(0) on the blocks) as coarsest-level solver
call P%init('ML',info) call P%init(ictxt,'ML',info)
call P%set('SMOOTHER_TYPE','BJAC',info) call P%set('SMOOTHER_TYPE','BJAC',info)
call P%set('COARSE_SOLVE','BJAC',info) call P%set('COARSE_SOLVE','BJAC',info)
call P%set('COARSE_SWEEPS',8,info) call P%set('COARSE_SWEEPS',8,info)
@ -189,7 +189,7 @@ program mld_dexample_ml
! GS sweeps as pre/post-smoother, a distributed coarsest ! GS sweeps as pre/post-smoother, a distributed coarsest
! matrix, and MUMPS as coarsest-level solver ! matrix, and MUMPS as coarsest-level solver
call P%init('ML',info) call P%init(ictxt,'ML',info)
call P%set('ML_CYCLE','WCYCLE',info) call P%set('ML_CYCLE','WCYCLE',info)
call P%set('SMOOTHER_SWEEPS',2,info) call P%set('SMOOTHER_SWEEPS',2,info)
call P%set('COARSE_SOLVE','MUMPS',info) call P%set('COARSE_SOLVE','MUMPS',info)

@ -140,7 +140,7 @@ program mld_sexample_1lev
! set RAS ! set RAS
call P%init('AS',info) call P%init(ictxt,'AS',info)
! set number of overlaps ! set number of overlaps

@ -168,7 +168,7 @@ program mld_sexample_ml
! GS sweep as pre/post-smoother and UMFPACK as coarsest-level ! GS sweep as pre/post-smoother and UMFPACK as coarsest-level
! solver ! solver
call P%init('ML',info) call P%init(ictxt,'ML',info)
kmethod = 'CG' kmethod = 'CG'
case(2) case(2)
@ -177,7 +177,7 @@ program mld_sexample_ml
! ILU(0) on the blocks) as pre- and post-smoother, and 8 block-Jacobi ! ILU(0) on the blocks) as pre- and post-smoother, and 8 block-Jacobi
! sweeps (with ILU(0) on the blocks) as coarsest-level solver ! sweeps (with ILU(0) on the blocks) as coarsest-level solver
call P%init('ML',info) call P%init(ictxt,'ML',info)
call P%set('SMOOTHER_TYPE','BJAC',info) call P%set('SMOOTHER_TYPE','BJAC',info)
call P%set('COARSE_SOLVE','BJAC',info) call P%set('COARSE_SOLVE','BJAC',info)
call P%set('COARSE_SWEEPS',8,info) call P%set('COARSE_SWEEPS',8,info)
@ -189,7 +189,7 @@ program mld_sexample_ml
! GS sweeps as pre/post-smoother, a distributed coarsest ! GS sweeps as pre/post-smoother, a distributed coarsest
! matrix, and MUMPS as coarsest-level solver ! matrix, and MUMPS as coarsest-level solver
call P%init('ML',info) call P%init(ictxt,'ML',info)
call P%set('ML_CYCLE','WCYCLE',info) call P%set('ML_CYCLE','WCYCLE',info)
call P%set('SMOOTHER_SWEEPS',2,info) call P%set('SMOOTHER_SWEEPS',2,info)
call P%set('COARSE_SOLVE','MUMPS',info) call P%set('COARSE_SOLVE','MUMPS',info)

@ -361,7 +361,7 @@ program mld_cf_sample
! !
! initialize the preconditioner ! initialize the preconditioner
! !
call prec%init(p_choice%ptype,info) call prec%init(ictxt,p_choice%ptype,info)
select case(trim(psb_toupper(p_choice%ptype))) select case(trim(psb_toupper(p_choice%ptype)))
case ('NONE','NOPREC') case ('NONE','NOPREC')
! Do nothing, keep defaults ! Do nothing, keep defaults

@ -361,7 +361,7 @@ program mld_df_sample
! !
! initialize the preconditioner ! initialize the preconditioner
! !
call prec%init(p_choice%ptype,info) call prec%init(ictxt,p_choice%ptype,info)
select case(trim(psb_toupper(p_choice%ptype))) select case(trim(psb_toupper(p_choice%ptype)))
case ('NONE','NOPREC') case ('NONE','NOPREC')
! Do nothing, keep defaults ! Do nothing, keep defaults

@ -361,7 +361,7 @@ program mld_sf_sample
! !
! initialize the preconditioner ! initialize the preconditioner
! !
call prec%init(p_choice%ptype,info) call prec%init(ictxt,p_choice%ptype,info)
select case(trim(psb_toupper(p_choice%ptype))) select case(trim(psb_toupper(p_choice%ptype)))
case ('NONE','NOPREC') case ('NONE','NOPREC')
! Do nothing, keep defaults ! Do nothing, keep defaults

@ -361,7 +361,7 @@ program mld_zf_sample
! !
! initialize the preconditioner ! initialize the preconditioner
! !
call prec%init(p_choice%ptype,info) call prec%init(ictxt,p_choice%ptype,info)
select case(trim(psb_toupper(p_choice%ptype))) select case(trim(psb_toupper(p_choice%ptype)))
case ('NONE','NOPREC') case ('NONE','NOPREC')
! Do nothing, keep defaults ! Do nothing, keep defaults

@ -248,7 +248,7 @@ contains
m = idim*idim m = idim*idim
n = m n = m
nnz = 7*((n+np-1)/np) nnz = 7*((n+np-1)/np)
if(iam == psb_root_) write(psb_out_unit,'("Generating Matrix (size=",i0,")...")')n if (iam == psb_root_) write(psb_out_unit,'("Generating Matrix (size=",i0,")...")')n
t0 = psb_wtime() t0 = psb_wtime()
select case(partition_) select case(partition_)
case(1) case(1)
@ -687,7 +687,7 @@ program mld_d_pde2d
! !
! initialize the preconditioner ! initialize the preconditioner
! !
call prec%init(p_choice%ptype,info) call prec%init(ictxt,p_choice%ptype,info)
select case(trim(psb_toupper(p_choice%ptype))) select case(trim(psb_toupper(p_choice%ptype)))
case ('NONE','NOPREC') case ('NONE','NOPREC')
! Do nothing, keep defaults ! Do nothing, keep defaults

@ -727,7 +727,7 @@ program mld_d_pde3d
! !
! initialize the preconditioner ! initialize the preconditioner
! !
call prec%init(p_choice%ptype,info) call prec%init(ictxt,p_choice%ptype,info)
select case(trim(psb_toupper(p_choice%ptype))) select case(trim(psb_toupper(p_choice%ptype)))
case ('NONE','NOPREC') case ('NONE','NOPREC')
! Do nothing, keep defaults ! Do nothing, keep defaults

@ -248,7 +248,7 @@ contains
m = idim*idim m = idim*idim
n = m n = m
nnz = 7*((n+np-1)/np) nnz = 7*((n+np-1)/np)
if(iam == psb_root_) write(psb_out_unit,'("Generating Matrix (size=",i0,")...")')n if (iam == psb_root_) write(psb_out_unit,'("Generating Matrix (size=",i0,")...")')n
t0 = psb_wtime() t0 = psb_wtime()
select case(partition_) select case(partition_)
case(1) case(1)
@ -687,7 +687,7 @@ program mld_s_pde2d
! !
! initialize the preconditioner ! initialize the preconditioner
! !
call prec%init(p_choice%ptype,info) call prec%init(ictxt,p_choice%ptype,info)
select case(trim(psb_toupper(p_choice%ptype))) select case(trim(psb_toupper(p_choice%ptype)))
case ('NONE','NOPREC') case ('NONE','NOPREC')
! Do nothing, keep defaults ! Do nothing, keep defaults

@ -727,7 +727,7 @@ program mld_s_pde3d
! !
! initialize the preconditioner ! initialize the preconditioner
! !
call prec%init(p_choice%ptype,info) call prec%init(ictxt,p_choice%ptype,info)
select case(trim(psb_toupper(p_choice%ptype))) select case(trim(psb_toupper(p_choice%ptype)))
case ('NONE','NOPREC') case ('NONE','NOPREC')
! Do nothing, keep defaults ! Do nothing, keep defaults

Loading…
Cancel
Save