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

Fixed :q!

Browse Source
psblas-3.0-maint
Salvatore Filippone 13 years ago
parent aa30b6d62a
commit 1090b136dd
4 changed files with 47 additions and 97 deletions
Show Stats Download Patch File Download Diff File

38
test/pargen/ppde2d.f90
Unescape Escape View File

@ -278,7 +278,7 @@ contains
character(len=*) :: kmethd, ptype, afmt character(len=*) :: kmethd, ptype, afmt
integer(psb_ipk_) :: idim, istopc,itmax,itrace,irst integer(psb_ipk_) :: idim, istopc,itmax,itrace,irst
integer(psb_ipk_) :: np, iam integer(psb_ipk_) :: np, iam
integer(psb_ipk_) :: intbuf(10), ip integer(psb_ipk_) :: ip
call psb_info(ictxt, iam, np) call psb_info(ictxt, iam, np)
@ -289,12 +289,6 @@ contains
read(psb_inp_unit,*) ptype read(psb_inp_unit,*) ptype
read(psb_inp_unit,*) afmt read(psb_inp_unit,*) afmt
! broadcast parameters to all processors
call psb_bcast(ictxt,kmethd)
call psb_bcast(ictxt,afmt)
call psb_bcast(ictxt,ptype)
read(psb_inp_unit,*) idim read(psb_inp_unit,*) idim
if (ip >= 4) then if (ip >= 4) then
read(psb_inp_unit,*) istopc read(psb_inp_unit,*) istopc
@ -316,14 +310,6 @@ contains
else else
irst=1 irst=1
endif endif
! broadcast parameters to all processors
intbuf(1) = idim
intbuf(2) = istopc
intbuf(3) = itmax
intbuf(4) = itrace
intbuf(5) = irst
call psb_bcast(ictxt,intbuf(1:5))
write(psb_out_unit,'("Solving matrix : ell1")') write(psb_out_unit,'("Solving matrix : ell1")')
write(psb_out_unit,'("Grid dimensions : ",i5," x ",i5)')idim,idim write(psb_out_unit,'("Grid dimensions : ",i5," x ",i5)')idim,idim
@ -338,17 +324,19 @@ contains
call psb_abort(ictxt) call psb_abort(ictxt)
stop 1 stop 1
endif endif
else
call psb_bcast(ictxt,kmethd)
call psb_bcast(ictxt,afmt)
call psb_bcast(ictxt,ptype)
call psb_bcast(ictxt,intbuf(1:5))
idim = intbuf(1)
istopc = intbuf(2)
itmax = intbuf(3)
itrace = intbuf(4)
irst = intbuf(5)
end if end if
! broadcast parameters to all processors
call psb_bcast(ictxt,kmethd)
call psb_bcast(ictxt,afmt)
call psb_bcast(ictxt,ptype)
call psb_bcast(ictxt,idim)
call psb_bcast(ictxt,istopc)
call psb_bcast(ictxt,itmax)
call psb_bcast(ictxt,itrace)
call psb_bcast(ictxt,irst)
return return
end subroutine get_parms end subroutine get_parms

33
test/pargen/ppde3d.f90
Unescape Escape View File

@ -290,7 +290,7 @@ contains
character(len=*) :: kmethd, ptype, afmt character(len=*) :: kmethd, ptype, afmt
integer(psb_ipk_) :: idim, istopc,itmax,itrace,irst integer(psb_ipk_) :: idim, istopc,itmax,itrace,irst
integer(psb_ipk_) :: np, iam integer(psb_ipk_) :: np, iam
integer(psb_ipk_) :: intbuf(10), ip integer(psb_ipk_) :: ip
call psb_info(ictxt, iam, np) call psb_info(ictxt, iam, np)
@ -301,11 +301,6 @@ contains
read(psb_inp_unit,*) ptype read(psb_inp_unit,*) ptype
read(psb_inp_unit,*) afmt read(psb_inp_unit,*) afmt
! broadcast parameters to all processors
call psb_bcast(ictxt,kmethd)
call psb_bcast(ictxt,afmt)
call psb_bcast(ictxt,ptype)
read(psb_inp_unit,*) idim read(psb_inp_unit,*) idim
if (ip >= 4) then if (ip >= 4) then
@ -330,12 +325,6 @@ contains
endif endif
! broadcast parameters to all processors ! broadcast parameters to all processors
intbuf(1) = idim
intbuf(2) = istopc
intbuf(3) = itmax
intbuf(4) = itrace
intbuf(5) = irst
call psb_bcast(ictxt,intbuf(1:5))
write(psb_out_unit,'("Solving matrix : ell1")') write(psb_out_unit,'("Solving matrix : ell1")')
write(psb_out_unit,& write(psb_out_unit,&
@ -352,17 +341,17 @@ contains
call psb_abort(ictxt) call psb_abort(ictxt)
stop 1 stop 1
endif endif
else
call psb_bcast(ictxt,kmethd)
call psb_bcast(ictxt,afmt)
call psb_bcast(ictxt,ptype)
call psb_bcast(ictxt,intbuf(1:5))
idim = intbuf(1)
istopc = intbuf(2)
itmax = intbuf(3)
itrace = intbuf(4)
irst = intbuf(5)
end if end if
! broadcast parameters to all processors
call psb_bcast(ictxt,kmethd)
call psb_bcast(ictxt,afmt)
call psb_bcast(ictxt,ptype)
call psb_bcast(ictxt,idim)
call psb_bcast(ictxt,istopc)
call psb_bcast(ictxt,itmax)
call psb_bcast(ictxt,itrace)
call psb_bcast(ictxt,irst)
return return
end subroutine get_parms end subroutine get_parms

37
test/pargen/spde2d.f90
Unescape Escape View File

@ -277,7 +277,7 @@ contains
character(len=*) :: kmethd, ptype, afmt character(len=*) :: kmethd, ptype, afmt
integer(psb_ipk_) :: idim, istopc,itmax,itrace,irst integer(psb_ipk_) :: idim, istopc,itmax,itrace,irst
integer(psb_ipk_) :: np, iam integer(psb_ipk_) :: np, iam
integer(psb_ipk_) :: intbuf(10), ip integer(psb_ipk_) :: ip
call psb_info(ictxt, iam, np) call psb_info(ictxt, iam, np)
@ -288,12 +288,6 @@ contains
read(psb_inp_unit,*) ptype read(psb_inp_unit,*) ptype
read(psb_inp_unit,*) afmt read(psb_inp_unit,*) afmt
! broadcast parameters to all processors
call psb_bcast(ictxt,kmethd)
call psb_bcast(ictxt,afmt)
call psb_bcast(ictxt,ptype)
read(psb_inp_unit,*) idim read(psb_inp_unit,*) idim
if (ip >= 4) then if (ip >= 4) then
read(psb_inp_unit,*) istopc read(psb_inp_unit,*) istopc
@ -315,14 +309,6 @@ contains
else else
irst=1 irst=1
endif endif
! broadcast parameters to all processors
intbuf(1) = idim
intbuf(2) = istopc
intbuf(3) = itmax
intbuf(4) = itrace
intbuf(5) = irst
call psb_bcast(ictxt,intbuf(1:5))
write(psb_out_unit,'("Solving matrix : ell1")') write(psb_out_unit,'("Solving matrix : ell1")')
write(psb_out_unit,'("Grid dimensions : ",i5," x ",i5)')idim,idim write(psb_out_unit,'("Grid dimensions : ",i5," x ",i5)')idim,idim
@ -337,17 +323,18 @@ contains
call psb_abort(ictxt) call psb_abort(ictxt)
stop 1 stop 1
endif endif
else
call psb_bcast(ictxt,kmethd)
call psb_bcast(ictxt,afmt)
call psb_bcast(ictxt,ptype)
call psb_bcast(ictxt,intbuf(1:5))
idim = intbuf(1)
istopc = intbuf(2)
itmax = intbuf(3)
itrace = intbuf(4)
irst = intbuf(5)
end if end if
! broadcast parameters to all processors
call psb_bcast(ictxt,kmethd)
call psb_bcast(ictxt,afmt)
call psb_bcast(ictxt,ptype)
call psb_bcast(ictxt,idim)
call psb_bcast(ictxt,istopc)
call psb_bcast(ictxt,itmax)
call psb_bcast(ictxt,itrace)
call psb_bcast(ictxt,irst)
return return
end subroutine get_parms end subroutine get_parms

36
test/pargen/spde3d.f90
Unescape Escape View File

@ -291,7 +291,7 @@ contains
character(len=*) :: kmethd, ptype, afmt character(len=*) :: kmethd, ptype, afmt
integer(psb_ipk_) :: idim, istopc,itmax,itrace,irst integer(psb_ipk_) :: idim, istopc,itmax,itrace,irst
integer(psb_ipk_) :: np, iam integer(psb_ipk_) :: np, iam
integer(psb_ipk_) :: intbuf(10), ip integer(psb_ipk_) :: ip
call psb_info(ictxt, iam, np) call psb_info(ictxt, iam, np)
@ -302,12 +302,6 @@ contains
read(psb_inp_unit,*) ptype read(psb_inp_unit,*) ptype
read(psb_inp_unit,*) afmt read(psb_inp_unit,*) afmt
! broadcast parameters to all processors
call psb_bcast(ictxt,kmethd)
call psb_bcast(ictxt,afmt)
call psb_bcast(ictxt,ptype)
read(psb_inp_unit,*) idim read(psb_inp_unit,*) idim
if (ip >= 4) then if (ip >= 4) then
read(psb_inp_unit,*) istopc read(psb_inp_unit,*) istopc
@ -329,14 +323,6 @@ contains
else else
irst=1 irst=1
endif endif
! broadcast parameters to all processors
intbuf(1) = idim
intbuf(2) = istopc
intbuf(3) = itmax
intbuf(4) = itrace
intbuf(5) = irst
call psb_bcast(ictxt,intbuf(1:5))
write(psb_out_unit,'("Solving matrix : ell1")') write(psb_out_unit,'("Solving matrix : ell1")')
write(psb_out_unit,& write(psb_out_unit,&
@ -353,17 +339,17 @@ contains
call psb_abort(ictxt) call psb_abort(ictxt)
stop 1 stop 1
endif endif
else
call psb_bcast(ictxt,kmethd)
call psb_bcast(ictxt,afmt)
call psb_bcast(ictxt,ptype)
call psb_bcast(ictxt,intbuf(1:5))
idim = intbuf(1)
istopc = intbuf(2)
itmax = intbuf(3)
itrace = intbuf(4)
irst = intbuf(5)
end if end if
! broadcast parameters to all processors
call psb_bcast(ictxt,kmethd)
call psb_bcast(ictxt,afmt)
call psb_bcast(ictxt,ptype)
call psb_bcast(ictxt,idim)
call psb_bcast(ictxt,istopc)
call psb_bcast(ictxt,itmax)
call psb_bcast(ictxt,itrace)
call psb_bcast(ictxt,irst)
return return
end subroutine get_parms end subroutine get_parms

Write Preview
Loading…
Cancel
Save