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

Typographical changes for old/new style comparison operators.

Browse Source
psblas3-type-indexed
Salvatore Filippone 19 years ago
parent 22af704575
commit 042be22898
4 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File

52
util/psb_hbio_mod.f90
Unescape Escape View File

@ -82,7 +82,7 @@ contains
read (infile,fmt=fmt10) mtitle,key,totcrd,ptrcrd,indcrd,valcrd,rhscrd,& read (infile,fmt=fmt10) mtitle,key,totcrd,ptrcrd,indcrd,valcrd,rhscrd,&
& type,nrow,ncol,nnzero,neltvl,ptrfmt,indfmt,valfmt,rhsfmt & type,nrow,ncol,nnzero,neltvl,ptrfmt,indfmt,valfmt,rhsfmt
if (rhscrd.gt.0) read(infile,fmt=fmt11)rhstype,nrhs,nrhsix if (rhscrd > 0) read(infile,fmt=fmt11)rhstype,nrhs,nrhsix
call psb_sp_all(a,nnzero,nrow+1,nnzero,ircode) call psb_sp_all(a,nnzero,nrow+1,nnzero,ircode)
if (ircode /= 0 ) then if (ircode /= 0 ) then
@ -102,9 +102,9 @@ contains
read (infile,fmt=ptrfmt) (a%ia2(i),i=1,nrow+1) read (infile,fmt=ptrfmt) (a%ia2(i),i=1,nrow+1)
read (infile,fmt=indfmt) (a%ia1(i),i=1,nnzero) read (infile,fmt=indfmt) (a%ia1(i),i=1,nnzero)
if (valcrd.gt.0) read (infile,fmt=valfmt) (a%aspk(i),i=1,nnzero) if (valcrd > 0) read (infile,fmt=valfmt) (a%aspk(i),i=1,nnzero)
if (present(b) .and. (rhscrd.gt.0)) then if (present(b) .and. (rhscrd > 0)) then
call psb_ensure_size(nrow,b,info) call psb_ensure_size(nrow,b,info)
if (info == 0) read (infile,fmt=rhsfmt) (b(i),i=1,nrow) if (info == 0) read (infile,fmt=rhsfmt) (b(i),i=1,nrow)
endif endif
@ -116,9 +116,9 @@ contains
read (infile,fmt=ptrfmt) (a%ia2(i),i=1,nrow+1) read (infile,fmt=ptrfmt) (a%ia2(i),i=1,nrow+1)
read (infile,fmt=indfmt) (a%ia1(i),i=1,nnzero) read (infile,fmt=indfmt) (a%ia1(i),i=1,nnzero)
if (valcrd.gt.0) read (infile,fmt=valfmt) (a%aspk(i),i=1,nnzero) if (valcrd > 0) read (infile,fmt=valfmt) (a%aspk(i),i=1,nnzero)
if (present(b) .and. (rhscrd.gt.0)) then if (present(b) .and. (rhscrd > 0)) then
call psb_ensure_size(nrow,b,info) call psb_ensure_size(nrow,b,info)
if (info == 0) read (infile,fmt=rhsfmt) (b(i),i=1,nrow) if (info == 0) read (infile,fmt=rhsfmt) (b(i),i=1,nrow)
endif endif
@ -237,17 +237,17 @@ contains
neltvl = 0 neltvl = 0
ptrcrd = (nrow+1)/jptr ptrcrd = (nrow+1)/jptr
if (mod(nrow+1,jptr).gt.0) ptrcrd = ptrcrd + 1 if (mod(nrow+1,jptr) > 0) ptrcrd = ptrcrd + 1
indcrd = nnzero/jind indcrd = nnzero/jind
if (mod(nnzero,jind).gt.0) indcrd = indcrd + 1 if (mod(nnzero,jind) > 0) indcrd = indcrd + 1
valcrd = nnzero/jval valcrd = nnzero/jval
if (mod(nnzero,jval).gt.0) valcrd = valcrd + 1 if (mod(nnzero,jval) > 0) valcrd = valcrd + 1
if (present(rhs)) then if (present(rhs)) then
if (size(rhs)<nrow) then if (size(rhs)<nrow) then
rhscrd = 0 rhscrd = 0
else else
rhscrd = nrow/jrhs rhscrd = nrow/jrhs
if (mod(nrow,jrhs).gt.0) rhscrd = rhscrd + 1 if (mod(nrow,jrhs) > 0) rhscrd = rhscrd + 1
endif endif
nrhs = 1 nrhs = 1
else else
@ -262,11 +262,11 @@ contains
write (iout,fmt=fmt10) mtitle_,key_,totcrd,ptrcrd,indcrd,valcrd,rhscrd,& write (iout,fmt=fmt10) mtitle_,key_,totcrd,ptrcrd,indcrd,valcrd,rhscrd,&
& type,nrow,ncol,nnzero,neltvl,ptrfmt,indfmt,valfmt,rhsfmt & type,nrow,ncol,nnzero,neltvl,ptrfmt,indfmt,valfmt,rhsfmt
if (rhscrd.gt.0) write (iout,fmt=fmt11) rhstype,nrhs,nrhsix if (rhscrd > 0) write (iout,fmt=fmt11) rhstype,nrhs,nrhsix
write (iout,fmt=ptrfmt) (a%ia2(i),i=1,nrow+1) write (iout,fmt=ptrfmt) (a%ia2(i),i=1,nrow+1)
write (iout,fmt=indfmt) (a%ia1(i),i=1,nnzero) write (iout,fmt=indfmt) (a%ia1(i),i=1,nnzero)
if (valcrd.gt.0) write (iout,fmt=valfmt) (a%aspk(i),i=1,nnzero) if (valcrd > 0) write (iout,fmt=valfmt) (a%aspk(i),i=1,nnzero)
if (rhscrd.gt.0) write (iout,fmt=rhsfmt) (rhs(i),i=1,nrow) if (rhscrd > 0) write (iout,fmt=rhsfmt) (rhs(i),i=1,nrow)
else else
@ -330,7 +330,7 @@ contains
read (infile,fmt=fmt10) mtitle,key,totcrd,ptrcrd,indcrd,valcrd,rhscrd,& read (infile,fmt=fmt10) mtitle,key,totcrd,ptrcrd,indcrd,valcrd,rhscrd,&
& type,nrow,ncol,nnzero,neltvl,ptrfmt,indfmt,valfmt,rhsfmt & type,nrow,ncol,nnzero,neltvl,ptrfmt,indfmt,valfmt,rhsfmt
if (rhscrd.gt.0) read(infile,fmt=fmt11)rhstype,nrhs,nrhsix if (rhscrd > 0) read(infile,fmt=fmt11)rhstype,nrhs,nrhsix
if (tolower(type(1:1)) == 'c') then if (tolower(type(1:1)) == 'c') then
@ -350,9 +350,9 @@ contains
read (infile,fmt=ptrfmt) (a%ia2(i),i=1,nrow+1) read (infile,fmt=ptrfmt) (a%ia2(i),i=1,nrow+1)
read (infile,fmt=indfmt) (a%ia1(i),i=1,nnzero) read (infile,fmt=indfmt) (a%ia1(i),i=1,nnzero)
if (valcrd.gt.0) read (infile,fmt=valfmt) (a%aspk(i),i=1,nnzero) if (valcrd > 0) read (infile,fmt=valfmt) (a%aspk(i),i=1,nnzero)
if (present(b) .and. (rhscrd.gt.0)) then if (present(b) .and. (rhscrd > 0)) then
call psb_ensure_size(nrow,b,info) call psb_ensure_size(nrow,b,info)
if (info == 0) read (infile,fmt=rhsfmt) (b(i),i=1,nrow) if (info == 0) read (infile,fmt=rhsfmt) (b(i),i=1,nrow)
endif endif
@ -374,9 +374,9 @@ contains
read (infile,fmt=ptrfmt) (a%ia2(i),i=1,nrow+1) read (infile,fmt=ptrfmt) (a%ia2(i),i=1,nrow+1)
read (infile,fmt=indfmt) (a%ia1(i),i=1,nnzero) read (infile,fmt=indfmt) (a%ia1(i),i=1,nnzero)
if (valcrd.gt.0) read (infile,fmt=valfmt) (a%aspk(i),i=1,nnzero) if (valcrd > 0) read (infile,fmt=valfmt) (a%aspk(i),i=1,nnzero)
if (present(b) .and. (rhscrd.gt.0)) then if (present(b) .and. (rhscrd > 0)) then
call psb_ensure_size(nrow,b,info) call psb_ensure_size(nrow,b,info)
if (info == 0) read (infile,fmt=rhsfmt) (b(i),i=1,nrow) if (info == 0) read (infile,fmt=rhsfmt) (b(i),i=1,nrow)
endif endif
@ -430,9 +430,9 @@ contains
read (infile,fmt=ptrfmt) (a%ia2(i),i=1,nrow+1) read (infile,fmt=ptrfmt) (a%ia2(i),i=1,nrow+1)
read (infile,fmt=indfmt) (a%ia1(i),i=1,nnzero) read (infile,fmt=indfmt) (a%ia1(i),i=1,nnzero)
if (valcrd.gt.0) read (infile,fmt=valfmt) (a%aspk(i),i=1,nnzero) if (valcrd > 0) read (infile,fmt=valfmt) (a%aspk(i),i=1,nnzero)
if (present(b) .and. (rhscrd.gt.0)) then if (present(b) .and. (rhscrd > 0)) then
call psb_ensure_size(nrow,b,info) call psb_ensure_size(nrow,b,info)
if (info == 0) read (infile,fmt=rhsfmt) (b(i),i=1,nrow) if (info == 0) read (infile,fmt=rhsfmt) (b(i),i=1,nrow)
endif endif
@ -559,17 +559,17 @@ contains
nnzero = a%ia2(nrow+1)-1 nnzero = a%ia2(nrow+1)-1
neltvl = 0 neltvl = 0
ptrcrd = (nrow+1)/jptr ptrcrd = (nrow+1)/jptr
if (mod(nrow+1,jptr).gt.0) ptrcrd = ptrcrd + 1 if (mod(nrow+1,jptr) > 0) ptrcrd = ptrcrd + 1
indcrd = nnzero/jind indcrd = nnzero/jind
if (mod(nnzero,jind).gt.0) indcrd = indcrd + 1 if (mod(nnzero,jind) > 0) indcrd = indcrd + 1
valcrd = nnzero/jval valcrd = nnzero/jval
if (mod(nnzero,jval).gt.0) valcrd = valcrd + 1 if (mod(nnzero,jval) > 0) valcrd = valcrd + 1
if (present(rhs)) then if (present(rhs)) then
if (size(rhs)<nrow) then if (size(rhs)<nrow) then
rhscrd = 0 rhscrd = 0
else else
rhscrd = nrow/jrhs rhscrd = nrow/jrhs
if (mod(nrow,jrhs).gt.0) rhscrd = rhscrd + 1 if (mod(nrow,jrhs) > 0) rhscrd = rhscrd + 1
endif endif
nrhs = 1 nrhs = 1
else else
@ -583,11 +583,11 @@ contains
write (iout,fmt=fmt10) mtitle_,key_,totcrd,ptrcrd,indcrd,valcrd,rhscrd,& write (iout,fmt=fmt10) mtitle_,key_,totcrd,ptrcrd,indcrd,valcrd,rhscrd,&
& type,nrow,ncol,nnzero,neltvl,ptrfmt,indfmt,valfmt,rhsfmt & type,nrow,ncol,nnzero,neltvl,ptrfmt,indfmt,valfmt,rhsfmt
if (rhscrd.gt.0) write (iout,fmt=fmt11) rhstype,nrhs,nrhsix if (rhscrd > 0) write (iout,fmt=fmt11) rhstype,nrhs,nrhsix
write (iout,fmt=ptrfmt) (a%ia2(i),i=1,nrow+1) write (iout,fmt=ptrfmt) (a%ia2(i),i=1,nrow+1)
write (iout,fmt=indfmt) (a%ia1(i),i=1,nnzero) write (iout,fmt=indfmt) (a%ia1(i),i=1,nnzero)
if (valcrd.gt.0) write (iout,fmt=valfmt) (a%aspk(i),i=1,nnzero) if (valcrd > 0) write (iout,fmt=valfmt) (a%aspk(i),i=1,nnzero)
if (rhscrd.gt.0) write (iout,fmt=rhsfmt) (rhs(i),i=1,nrow) if (rhscrd > 0) write (iout,fmt=rhsfmt) (rhs(i),i=1,nrow)
else else

20
util/psb_mat_dist_mod.f90
Unescape Escape View File

@ -146,7 +146,7 @@ contains
call psb_info(ictxt, iam, np) call psb_info(ictxt, iam, np)
if (iam == root) then if (iam == root) then
! extract information from a_glob ! extract information from a_glob
if (a_glob%fida.ne. 'CSR') then if (a_glob%fida /= 'CSR') then
info=135 info=135
ch_err='CSR' ch_err='CSR'
call psb_errpush(info,name,a_err=ch_err) call psb_errpush(info,name,a_err=ch_err)
@ -215,11 +215,11 @@ contains
i_count = 1 i_count = 1
do while (i_count.le.nrow) do while (i_count <= nrow)
call parts(i_count,nrow,np,iwork, length_row) call parts(i_count,nrow,np,iwork, length_row)
if (length_row.eq.1) then if (length_row == 1) then
j_count = i_count j_count = i_count
iproc = iwork(1) iproc = iwork(1)
do do
@ -450,7 +450,7 @@ contains
9999 continue 9999 continue
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
if (err_act.eq.psb_act_abort_) then if (err_act == psb_act_abort_) then
call psb_error(ictxt) call psb_error(ictxt)
return return
end if end if
@ -775,7 +775,7 @@ contains
9999 continue 9999 continue
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
if (err_act.eq.psb_act_abort_) then if (err_act == psb_act_abort_) then
call psb_error(ictxt) call psb_error(ictxt)
return return
end if end if
@ -892,7 +892,7 @@ contains
call psb_info(ictxt, iam, np) call psb_info(ictxt, iam, np)
if (iam == root) then if (iam == root) then
! extract information from a_glob ! extract information from a_glob
if (a_glob%fida.ne. 'CSR') then if (a_glob%fida /= 'CSR') then
info=135 info=135
ch_err='CSR' ch_err='CSR'
call psb_errpush(info,name,a_err=ch_err) call psb_errpush(info,name,a_err=ch_err)
@ -960,11 +960,11 @@ contains
i_count = 1 i_count = 1
do while (i_count.le.nrow) do while (i_count <= nrow)
call parts(i_count,nrow,np,iwork, length_row) call parts(i_count,nrow,np,iwork, length_row)
if (length_row.eq.1) then if (length_row == 1) then
j_count = i_count j_count = i_count
iproc = iwork(1) iproc = iwork(1)
do do
@ -1195,7 +1195,7 @@ contains
9999 continue 9999 continue
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
if (err_act.eq.psb_act_abort_) then if (err_act == psb_act_abort_) then
call psb_error(ictxt) call psb_error(ictxt)
return return
end if end if
@ -1521,7 +1521,7 @@ contains
9999 continue 9999 continue
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
if (err_act.eq.psb_act_abort_) then if (err_act == psb_act_abort_) then
call psb_error(ictxt) call psb_error(ictxt)
return return
end if end if

4
util/psb_metispart_mod.f90
Unescape Escape View File

@ -154,8 +154,8 @@ contains
& ' failure.' & ' failure.'
return return
endif endif
if (nparts.gt.1) then if (nparts > 1) then
if (toupper(fida).eq.'CSR') then if (toupper(fida) == 'CSR') then
iopt(1) = 0 iopt(1) = 0
numflag = 1 numflag = 1
wgflag = 0 wgflag = 0

4
util/psb_read_mat_mod.f90
Unescape Escape View File

@ -120,7 +120,7 @@ contains
open(infile,file=filename, status='old', err=901, action="read") open(infile,file=filename, status='old', err=901, action="read")
read(infile,fmt=*, end=902) mmheader, object, fmt, type, sym read(infile,fmt=*, end=902) mmheader, object, fmt, type, sym
write(0,*)'obj fmt',object, fmt write(0,*)'obj fmt',object, fmt
if ( (object .ne. 'matrix').or.(fmt.ne.'array')) then if ( (object /= 'matrix').or.(fmt /= 'array')) then
write(0,*) 'read_rhs: input file type not yet supported' write(0,*) 'read_rhs: input file type not yet supported'
call psb_abort(ictxt) call psb_abort(ictxt)
end if end if
@ -209,7 +209,7 @@ contains
open(infile,file=filename, status='old', err=901, action="read") open(infile,file=filename, status='old', err=901, action="read")
read(infile,fmt=*, end=902) mmheader, object, fmt, type, sym read(infile,fmt=*, end=902) mmheader, object, fmt, type, sym
!!$ write(0,*)'obj fmt',object, fmt !!$ write(0,*)'obj fmt',object, fmt
if ( (object .ne. 'matrix').or.(fmt.ne.'array')) then if ( (object /= 'matrix').or.(fmt /= 'array')) then
write(0,*) 'read_rhs: input file type not yet supported' write(0,*) 'read_rhs: input file type not yet supported'
call psb_abort(ictxt) call psb_abort(ictxt)
end if end if

Write Preview
Loading…
Cancel
Save