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 
mlprec/mld_cilut_fact.f90
 mlprec/mld_dilut_fact.f90
 mlprec/mld_silut_fact.f90
 mlprec/mld_zilut_fact.f90
 tests/pdegen/ppde.f90
 tests/pdegen/runs/ppde.inp

ILUT fix in copyin. 
Use %sizeof() method instead of function.
stopcriterion
Salvatore Filippone 13 years ago
parent c377ba1503
commit 852102c4f8
6 changed files with 90 additions and 93 deletions
Show Stats Download Patch File Download Diff File

5
mlprec/mld_cilut_fact.f90
Unescape Escape View File

@ -569,7 +569,6 @@ contains
row(k) = aa%val(j)*weight
call psb_insert_heap(k,heap,info)
if (info /= psb_success_) exit
end if
if (k<jd) nlw = nlw + 1
if (k>jd) then
nup = nup + 1
@ -578,6 +577,7 @@ contains
dmaxup = abs(row(k))
end if
end if
end if
end do
if (info /= psb_success_) then
info=psb_err_from_subroutine_
@ -620,8 +620,6 @@ contains
row(k) = trw%val(ktrw)*weight
call psb_insert_heap(k,heap,info)
if (info /= psb_success_) exit
end if
if (k<jd) nlw = nlw + 1
if (k>jd) then
nup = nup + 1
@ -630,6 +628,7 @@ contains
dmaxup = abs(row(k))
end if
end if
end if
ktrw = ktrw + 1
enddo
nz = ktrw - kin

4
mlprec/mld_dilut_fact.f90
Unescape Escape View File

@ -567,7 +567,6 @@ contains
row(k) = aa%val(j)*weight
call psb_insert_heap(k,heap,info)
if (info /= psb_success_) exit
end if
if (k<jd) nlw = nlw + 1
if (k>jd) then
nup = nup + 1
@ -576,6 +575,7 @@ contains
dmaxup = abs(row(k))
end if
end if
end if
end do
if (info /= psb_success_) then
info=psb_err_from_subroutine_
@ -619,7 +619,6 @@ contains
call psb_insert_heap(k,heap,info)
if (info /= psb_success_) exit
end if
if (k<jd) nlw = nlw + 1
if (k>jd) then
nup = nup + 1
@ -628,6 +627,7 @@ contains
dmaxup = abs(row(k))
end if
end if
end if
ktrw = ktrw + 1
enddo
nz = ktrw - kin

5
mlprec/mld_silut_fact.f90
Unescape Escape View File

@ -568,7 +568,6 @@ contains
row(k) = aa%val(j)*weight
call psb_insert_heap(k,heap,info)
if (info /= psb_success_) exit
end if
if (k<jd) nlw = nlw + 1
if (k>jd) then
nup = nup + 1
@ -577,6 +576,7 @@ contains
dmaxup = abs(row(k))
end if
end if
end if
end do
if (info /= psb_success_) then
info=psb_err_from_subroutine_
@ -619,8 +619,6 @@ contains
row(k) = trw%val(ktrw)*weight
call psb_insert_heap(k,heap,info)
if (info /= psb_success_) exit
end if
if (k<jd) nlw = nlw + 1
if (k>jd) then
nup = nup + 1
@ -629,6 +627,7 @@ contains
dmaxup = abs(row(k))
end if
end if
end if
ktrw = ktrw + 1
enddo
nz = ktrw - kin

5
mlprec/mld_zilut_fact.f90
Unescape Escape View File

@ -569,7 +569,6 @@ contains
row(k) = aa%val(j)*weight
call psb_insert_heap(k,heap,info)
if (info /= psb_success_) exit
end if
if (k<jd) nlw = nlw + 1
if (k>jd) then
nup = nup + 1
@ -578,6 +577,7 @@ contains
dmaxup = abs(row(k))
end if
end if
end if
end do
if (info /= psb_success_) then
info=psb_err_from_subroutine_
@ -620,8 +620,6 @@ contains
row(k) = trw%val(ktrw)*weight
call psb_insert_heap(k,heap,info)
if (info /= psb_success_) exit
end if
if (k<jd) nlw = nlw + 1
if (k>jd) then
nup = nup + 1
@ -630,6 +628,7 @@ contains
dmaxup = abs(row(k))
end if
end if
end if
ktrw = ktrw + 1
enddo
nz = ktrw - kin

2
tests/pdegen/ppde.f90
Unescape Escape View File

@ -258,7 +258,7 @@ program ppde
t2 = psb_wtime() - t1
call psb_amx(ictxt,t2)
amatsize = psb_sizeof(a)
amatsize = a%sizeof()
descsize = desc_a%sizeof()
precsize = mld_sizeof(prec)
call psb_sum(ictxt,amatsize)

2
tests/pdegen/runs/ppde.inp
Unescape Escape View File

@ -17,7 +17,7 @@ ILU ! Subdomain solver DSCALE ILU MILU ILUT UMF SLU
1 ! Smoother/Jacobi sweeps
BJAC ! Smoother type JACOBI BJAC AS; ignored for non-ML
3 ! Number of levels in a multilevel preconditioner
MINENERGY ! Kind of aggregation: SMOOTHED, NONSMOOTHED
SMOOTHED ! Kind of aggregation: SMOOTHED, NONSMOOTHED
DEC ! Type of aggregation DEC SYMDEC GLB
MULT ! Type of multilevel correction: ADD MULT
TWOSIDE ! Side of correction PRE POST TWOSIDE (ignored for ADD)

Write Preview
Loading…
Cancel
Save