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 
tests/pdegen/Makefile
 tests/pdegen/ppde.f90
 tests/pdegen/spde.f90

Fixed test generation. Tested with new psblas, compatibility mode works.
stopcriterion
Salvatore Filippone 13 years ago
parent 1440f1c41f
commit 79cb0731c4
3 changed files with 52 additions and 94 deletions
Show Stats Download Patch File Download Diff File

18
tests/pdegen/Makefile
Unescape Escape View File

@ -11,31 +11,19 @@ FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDLIBDIR) $(FMFLAG)$(PSBINCDIR) $(FIFLAG).
EXEDIR=./runs
all: $(EXEDIR)/spde $(EXEDIR)/ppde
# FIXME: tp.c seems a ghost source !
# $(EXEDIR)/tp
all: spde ppde
check: all
cd $(EXEDIR) ; ./ppde < ppde.inp
ppde: ppde.o data_input.o
$(F90LINK) ppde.o data_input.o -o ppde $(MLD_LIB) $(PSBLAS_LIB) $(LDLIBS)
/bin/mv ppde $(EXEDIR)
spde: spde.o data_input.o
$(F90LINK) spde.o data_input.o -o spde $(MLD_LIB) $(PSBLAS_LIB) $(LDLIBS)
/bin/mv spde $(EXEDIR)
#tp: tp.o data_input.o
# $(F90LINK) tp.o data_input.o -o tp $(MLD_LIB) $(PSBLAS_LIB) $(LDLIBS)
#$(EXEDIR)/tp: tp
# /bin/cp tp $(EXEDIR)
$(EXEDIR)/ppde: ppde
/bin/cp ppde $(EXEDIR)
$(EXEDIR)/spde: spde
/bin/cp spde $(EXEDIR)
ppde.o spde.o: data_input.o

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

@ -152,7 +152,6 @@ program ppde
write(*,*) 'This is the ',trim(name),' sample program'
end if
!
! get parameters
!
@ -453,7 +452,7 @@ contains
real(psb_dpk_), allocatable :: val(:)
! deltah dimension of each grid cell
! deltat discretization time
real(psb_dpk_) :: deltah
real(psb_dpk_) :: deltah, deltah2
real(psb_dpk_),parameter :: rhs=0.d0,one=1.d0,zero=0.d0
real(psb_dpk_) :: t0, t1, t2, t3, tasb, talc, ttot, tgen
real(psb_dpk_) :: a1, a2, a3, a4, b1, b2, b3
@ -469,6 +468,7 @@ contains
call psb_info(ictxt, iam, np)
deltah = 1.d0/(idim-1)
deltah2 = deltah*deltah
! initialize array descriptor and sparse matrix storage. provide an
! estimate of the number of non zeroes
@ -476,7 +476,7 @@ contains
m = idim*idim*idim
n = m
nnz = ((n*9)/(np))
if(iam == psb_root_) write(*,'("Generating Matrix (size=",i0,")...")')n
if(iam == psb_root_) write(psb_out_unit,'("Generating Matrix (size=",i0,")...")')n
!
! Using a simple BLOCK distribution.
@ -486,7 +486,7 @@ contains
nt = nr
call psb_sum(ictxt,nt)
if (nt /= m) write(0,*) iam, 'Initialization error ',nr,nt,m
if (nt /= m) write(psb_err_unit,*) iam, 'Initialization error ',nr,nt,m
call psb_barrier(ictxt)
t0 = psb_wtime()
call psb_cdall(ictxt,desc_a,info,nl=nr)
@ -560,79 +560,63 @@ contains
! term depending on (x-1,y,z)
!
if (ix == 1) then
val(element)=-b1(x,y,z)-a1(x,y,z)
val(element) = val(element)/(deltah*&
& deltah)
zt(k) = exp(-y**2-z**2)*(-val(element))
val(element) = -b1(x,y,z)/deltah2-a1(x,y,z)/deltah
zt(k) = exp(-x**2-y**2-z**2)*(-val(element))
else
val(element)=-b1(x,y,z)-a1(x,y,z)
val(element) = val(element)/(deltah*&
& deltah)
val(element) = -b1(x,y,z)/deltah2-a1(x,y,z)/deltah
icol(element) = (ix-2)*idim*idim+(iy-1)*idim+(iz)
irow(element) = glob_row
element = element+1
endif
! term depending on (x,y-1,z)
if (iy == 1) then
val(element)=-b2(x,y,z)-a2(x,y,z)
val(element) = val(element)/(deltah*&
& deltah)
zt(k) = exp(-y**2-z**2)*exp(-x)*(-val(element))
val(element) = -b2(x,y,z)/deltah2-a2(x,y,z)/deltah
zt(k) = exp(-x**2-y**2-z**2)*exp(-x)*(-val(element))
else
val(element)=-b2(x,y,z)-a2(x,y,z)
val(element) = val(element)/(deltah*deltah)
val(element) = -b2(x,y,z)/deltah2-a2(x,y,z)/deltah
icol(element) = (ix-1)*idim*idim+(iy-2)*idim+(iz)
irow(element) = glob_row
element = element+1
endif
! term depending on (x,y,z-1)
if (iz == 1) then
val(element)=-b3(x,y,z)-a3(x,y,z)
val(element) = val(element)/(deltah*deltah)
zt(k) = exp(-y**2-z**2)*exp(-x)*(-val(element))
val(element)=-b3(x,y,z)/deltah2-a3(x,y,z)/deltah
zt(k) = exp(-x**2-y**2-z**2)*exp(-x)*(-val(element))
else
val(element)=-b3(x,y,z)-a3(x,y,z)
val(element) = val(element)/(deltah*deltah)
val(element)=-b3(x,y,z)/deltah2-a3(x,y,z)/deltah
icol(element) = (ix-1)*idim*idim+(iy-1)*idim+(iz-1)
irow(element) = glob_row
element = element+1
endif
! term depending on (x,y,z)
val(element)=2*b1(x,y,z) + 2*b2(x,y,z)&
& + 2*b3(x,y,z) + a1(x,y,z)&
& + a2(x,y,z) + a3(x,y,z)
val(element) = val(element)/(deltah*deltah)
val(element)=(2*b1(x,y,z) + 2*b2(x,y,z) + 2*b3(x,y,z))/deltah2&
& + (a1(x,y,z) + a2(x,y,z) + a3(x,y,z)+ a4(x,y,z))/deltah
icol(element) = (ix-1)*idim*idim+(iy-1)*idim+(iz)
irow(element) = glob_row
element = element+1
! term depending on (x,y,z+1)
if (iz == idim) then
val(element)=-b1(x,y,z)
val(element) = val(element)/(deltah*deltah)
zt(k) = exp(-y**2-z**2)*exp(-x)*(-val(element))
val(element)=-b1(x,y,z)/deltah2
zt(k) = exp(-x**2-y**2-z**2)*exp(-x)*(-val(element))
else
val(element)=-b1(x,y,z)
val(element) = val(element)/(deltah*deltah)
val(element)=-b1(x,y,z)/deltah2
icol(element) = (ix-1)*idim*idim+(iy-1)*idim+(iz+1)
irow(element) = glob_row
element = element+1
endif
! term depending on (x,y+1,z)
if (iy == idim) then
val(element)=-b2(x,y,z)
val(element) = val(element)/(deltah*deltah)
zt(k) = exp(-y**2-z**2)*exp(-x)*(-val(element))
val(element)=-b2(x,y,z)/deltah2
zt(k) = exp(-x**2-y**2-z**2)*exp(-x)*(-val(element))
else
val(element)=-b2(x,y,z)
val(element) = val(element)/(deltah*deltah)
val(element)=-b2(x,y,z)/deltah2
icol(element) = (ix-1)*idim*idim+(iy)*idim+(iz)
irow(element) = glob_row
element = element+1
endif
! term depending on (x+1,y,z)
if (ix<idim) then
val(element)=-b3(x,y,z)
val(element) = val(element)/(deltah*deltah)
val(element)=-b3(x,y,z)/deltah2
icol(element) = (ix)*idim*idim+(iy-1)*idim+(iz)
irow(element) = glob_row
element = element+1

62
tests/pdegen/spde.f90
Unescape Escape View File

@ -223,6 +223,7 @@ program spde
end if
tprec = psb_wtime()-t1
!!$ call prec%dump(info,prefix='test-ml',ac=.true.,solver=.true.,smoother=.true.)
call psb_amx(ictxt,tprec)
@ -449,7 +450,7 @@ contains
real(psb_spk_), allocatable :: val(:)
! deltah dimension of each grid cell
! deltat discretization time
real(psb_spk_) :: deltah
real(psb_spk_) :: deltah, deltah2
real(psb_spk_),parameter :: rhs=0.0,one=1.0,zero=0.0
real(psb_dpk_) :: t0, t1, t2, t3, tasb, talc, ttot, tgen
real(psb_spk_) :: a1, a2, a3, a4, b1, b2, b3
@ -464,7 +465,8 @@ contains
call psb_info(ictxt, iam, np)
deltah = 1.0/(idim-1)
deltah = 1.d0/(idim-1)
deltah2 = deltah*deltah
! initialize array descriptor and sparse matrix storage. provide an
! estimate of the number of non zeroes
@ -472,7 +474,7 @@ contains
m = idim*idim*idim
n = m
nnz = ((n*9)/(np))
if(iam == psb_root_) write(0,'("Generating Matrix (size=",i0,")...")')n
if(iam == psb_root_) write(psb_out_unit,'("Generating Matrix (size=",i0,")...")')n
!
! Using a simple BLOCK distribution.
@ -482,7 +484,7 @@ contains
nt = nr
call psb_sum(ictxt,nt)
if (nt /= m) write(0,*) iam, 'Initialization error ',nr,nt,m
if (nt /= m) write(psb_err_unit,*) iam, 'Initialization error ',nr,nt,m
call psb_barrier(ictxt)
t0 = psb_wtime()
call psb_cdall(ictxt,desc_a,info,nl=nr)
@ -556,79 +558,63 @@ contains
! term depending on (x-1,y,z)
!
if (ix == 1) then
val(element)=-b1(x,y,z)-a1(x,y,z)
val(element) = val(element)/(deltah*&
& deltah)
zt(k) = exp(-y**2-z**2)*(-val(element))
val(element) = -b1(x,y,z)/deltah2-a1(x,y,z)/deltah
zt(k) = exp(-x**2-y**2-z**2)*(-val(element))
else
val(element)=-b1(x,y,z)-a1(x,y,z)
val(element) = val(element)/(deltah*&
& deltah)
val(element) = -b1(x,y,z)/deltah2-a1(x,y,z)/deltah
icol(element) = (ix-2)*idim*idim+(iy-1)*idim+(iz)
irow(element) = glob_row
element = element+1
endif
! term depending on (x,y-1,z)
if (iy == 1) then
val(element)=-b2(x,y,z)-a2(x,y,z)
val(element) = val(element)/(deltah*&
& deltah)
zt(k) = exp(-y**2-z**2)*exp(-x)*(-val(element))
val(element) = -b2(x,y,z)/deltah2-a2(x,y,z)/deltah
zt(k) = exp(-x**2-y**2-z**2)*exp(-x)*(-val(element))
else
val(element)=-b2(x,y,z)-a2(x,y,z)
val(element) = val(element)/(deltah*deltah)
val(element) = -b2(x,y,z)/deltah2-a2(x,y,z)/deltah
icol(element) = (ix-1)*idim*idim+(iy-2)*idim+(iz)
irow(element) = glob_row
element = element+1
endif
! term depending on (x,y,z-1)
if (iz == 1) then
val(element)=-b3(x,y,z)-a3(x,y,z)
val(element) = val(element)/(deltah*deltah)
zt(k) = exp(-y**2-z**2)*exp(-x)*(-val(element))
val(element)=-b3(x,y,z)/deltah2-a3(x,y,z)/deltah
zt(k) = exp(-x**2-y**2-z**2)*exp(-x)*(-val(element))
else
val(element)=-b3(x,y,z)-a3(x,y,z)
val(element) = val(element)/(deltah*deltah)
val(element)=-b3(x,y,z)/deltah2-a3(x,y,z)/deltah
icol(element) = (ix-1)*idim*idim+(iy-1)*idim+(iz-1)
irow(element) = glob_row
element = element+1
endif
! term depending on (x,y,z)
val(element)=2*b1(x,y,z) + 2*b2(x,y,z)&
& + 2*b3(x,y,z) + a1(x,y,z)&
& + a2(x,y,z) + a3(x,y,z)
val(element) = val(element)/(deltah*deltah)
val(element)=(2*b1(x,y,z) + 2*b2(x,y,z) + 2*b3(x,y,z))/deltah2&
& + (a1(x,y,z) + a2(x,y,z) + a3(x,y,z)+ a4(x,y,z))/deltah
icol(element) = (ix-1)*idim*idim+(iy-1)*idim+(iz)
irow(element) = glob_row
element = element+1
! term depending on (x,y,z+1)
if (iz == idim) then
val(element)=-b1(x,y,z)
val(element) = val(element)/(deltah*deltah)
zt(k) = exp(-y**2-z**2)*exp(-x)*(-val(element))
val(element)=-b1(x,y,z)/deltah2
zt(k) = exp(-x**2-y**2-z**2)*exp(-x)*(-val(element))
else
val(element)=-b1(x,y,z)
val(element) = val(element)/(deltah*deltah)
val(element)=-b1(x,y,z)/deltah2
icol(element) = (ix-1)*idim*idim+(iy-1)*idim+(iz+1)
irow(element) = glob_row
element = element+1
endif
! term depending on (x,y+1,z)
if (iy == idim) then
val(element)=-b2(x,y,z)
val(element) = val(element)/(deltah*deltah)
zt(k) = exp(-y**2-z**2)*exp(-x)*(-val(element))
val(element)=-b2(x,y,z)/deltah2
zt(k) = exp(-x**2-y**2-z**2)*exp(-x)*(-val(element))
else
val(element)=-b2(x,y,z)
val(element) = val(element)/(deltah*deltah)
val(element)=-b2(x,y,z)/deltah2
icol(element) = (ix-1)*idim*idim+(iy)*idim+(iz)
irow(element) = glob_row
element = element+1
endif
! term depending on (x+1,y,z)
if (ix<idim) then
val(element)=-b3(x,y,z)
val(element) = val(element)/(deltah*deltah)
val(element)=-b3(x,y,z)/deltah2
icol(element) = (ix)*idim*idim+(iy-1)*idim+(iz)
irow(element) = glob_row
element = element+1

Write Preview
Loading…
Cancel
Save