From 042be2289836599c7e3b32e4ca99489a40e83528 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 14 Jan 2008 15:32:57 +0000 Subject: [PATCH] Typographical changes for old/new style comparison operators. --- util/psb_hbio_mod.f90 | 52 +++++++++++++++++++------------------- util/psb_mat_dist_mod.f90 | 20 +++++++-------- util/psb_metispart_mod.f90 | 4 +-- util/psb_read_mat_mod.f90 | 4 +-- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/util/psb_hbio_mod.f90 b/util/psb_hbio_mod.f90 index b693a92e..d1434980 100644 --- a/util/psb_hbio_mod.f90 +++ b/util/psb_hbio_mod.f90 @@ -82,7 +82,7 @@ contains read (infile,fmt=fmt10) mtitle,key,totcrd,ptrcrd,indcrd,valcrd,rhscrd,& & 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) if (ircode /= 0 ) then @@ -102,9 +102,9 @@ contains read (infile,fmt=ptrfmt) (a%ia2(i),i=1,nrow+1) 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) if (info == 0) read (infile,fmt=rhsfmt) (b(i),i=1,nrow) endif @@ -116,9 +116,9 @@ contains read (infile,fmt=ptrfmt) (a%ia2(i),i=1,nrow+1) 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) if (info == 0) read (infile,fmt=rhsfmt) (b(i),i=1,nrow) endif @@ -237,17 +237,17 @@ contains neltvl = 0 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 - if (mod(nnzero,jind).gt.0) indcrd = indcrd + 1 + if (mod(nnzero,jind) > 0) indcrd = indcrd + 1 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 (size(rhs) 0) rhscrd = rhscrd + 1 endif nrhs = 1 else @@ -262,11 +262,11 @@ contains write (iout,fmt=fmt10) mtitle_,key_,totcrd,ptrcrd,indcrd,valcrd,rhscrd,& & 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=indfmt) (a%ia1(i),i=1,nnzero) - if (valcrd.gt.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 (valcrd > 0) write (iout,fmt=valfmt) (a%aspk(i),i=1,nnzero) + if (rhscrd > 0) write (iout,fmt=rhsfmt) (rhs(i),i=1,nrow) else @@ -330,7 +330,7 @@ contains read (infile,fmt=fmt10) mtitle,key,totcrd,ptrcrd,indcrd,valcrd,rhscrd,& & 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 @@ -350,9 +350,9 @@ contains read (infile,fmt=ptrfmt) (a%ia2(i),i=1,nrow+1) 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) if (info == 0) read (infile,fmt=rhsfmt) (b(i),i=1,nrow) endif @@ -374,9 +374,9 @@ contains read (infile,fmt=ptrfmt) (a%ia2(i),i=1,nrow+1) 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) if (info == 0) read (infile,fmt=rhsfmt) (b(i),i=1,nrow) endif @@ -430,9 +430,9 @@ contains read (infile,fmt=ptrfmt) (a%ia2(i),i=1,nrow+1) 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) if (info == 0) read (infile,fmt=rhsfmt) (b(i),i=1,nrow) endif @@ -559,17 +559,17 @@ contains nnzero = a%ia2(nrow+1)-1 neltvl = 0 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 - if (mod(nnzero,jind).gt.0) indcrd = indcrd + 1 + if (mod(nnzero,jind) > 0) indcrd = indcrd + 1 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 (size(rhs) 0) rhscrd = rhscrd + 1 endif nrhs = 1 else @@ -583,11 +583,11 @@ contains write (iout,fmt=fmt10) mtitle_,key_,totcrd,ptrcrd,indcrd,valcrd,rhscrd,& & 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=indfmt) (a%ia1(i),i=1,nnzero) - if (valcrd.gt.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 (valcrd > 0) write (iout,fmt=valfmt) (a%aspk(i),i=1,nnzero) + if (rhscrd > 0) write (iout,fmt=rhsfmt) (rhs(i),i=1,nrow) else diff --git a/util/psb_mat_dist_mod.f90 b/util/psb_mat_dist_mod.f90 index 5c6c9de5..fcd58f29 100644 --- a/util/psb_mat_dist_mod.f90 +++ b/util/psb_mat_dist_mod.f90 @@ -146,7 +146,7 @@ contains call psb_info(ictxt, iam, np) if (iam == root) then ! extract information from a_glob - if (a_glob%fida.ne. 'CSR') then + if (a_glob%fida /= 'CSR') then info=135 ch_err='CSR' call psb_errpush(info,name,a_err=ch_err) @@ -215,11 +215,11 @@ contains i_count = 1 - do while (i_count.le.nrow) + do while (i_count <= nrow) call parts(i_count,nrow,np,iwork, length_row) - if (length_row.eq.1) then + if (length_row == 1) then j_count = i_count iproc = iwork(1) do @@ -450,7 +450,7 @@ contains 9999 continue call psb_erractionrestore(err_act) - if (err_act.eq.psb_act_abort_) then + if (err_act == psb_act_abort_) then call psb_error(ictxt) return end if @@ -775,7 +775,7 @@ contains 9999 continue call psb_erractionrestore(err_act) - if (err_act.eq.psb_act_abort_) then + if (err_act == psb_act_abort_) then call psb_error(ictxt) return end if @@ -892,7 +892,7 @@ contains call psb_info(ictxt, iam, np) if (iam == root) then ! extract information from a_glob - if (a_glob%fida.ne. 'CSR') then + if (a_glob%fida /= 'CSR') then info=135 ch_err='CSR' call psb_errpush(info,name,a_err=ch_err) @@ -960,11 +960,11 @@ contains i_count = 1 - do while (i_count.le.nrow) + do while (i_count <= nrow) call parts(i_count,nrow,np,iwork, length_row) - if (length_row.eq.1) then + if (length_row == 1) then j_count = i_count iproc = iwork(1) do @@ -1195,7 +1195,7 @@ contains 9999 continue call psb_erractionrestore(err_act) - if (err_act.eq.psb_act_abort_) then + if (err_act == psb_act_abort_) then call psb_error(ictxt) return end if @@ -1521,7 +1521,7 @@ contains 9999 continue call psb_erractionrestore(err_act) - if (err_act.eq.psb_act_abort_) then + if (err_act == psb_act_abort_) then call psb_error(ictxt) return end if diff --git a/util/psb_metispart_mod.f90 b/util/psb_metispart_mod.f90 index c18cc64a..33137aae 100644 --- a/util/psb_metispart_mod.f90 +++ b/util/psb_metispart_mod.f90 @@ -154,8 +154,8 @@ contains & ' failure.' return endif - if (nparts.gt.1) then - if (toupper(fida).eq.'CSR') then + if (nparts > 1) then + if (toupper(fida) == 'CSR') then iopt(1) = 0 numflag = 1 wgflag = 0 diff --git a/util/psb_read_mat_mod.f90 b/util/psb_read_mat_mod.f90 index 3b339974..184659f6 100644 --- a/util/psb_read_mat_mod.f90 +++ b/util/psb_read_mat_mod.f90 @@ -120,7 +120,7 @@ contains open(infile,file=filename, status='old', err=901, action="read") read(infile,fmt=*, end=902) mmheader, object, fmt, type, sym 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' call psb_abort(ictxt) end if @@ -209,7 +209,7 @@ contains open(infile,file=filename, status='old', err=901, action="read") read(infile,fmt=*, end=902) mmheader, object, fmt, type, sym !!$ 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' call psb_abort(ictxt) end if