scnc
/
quantum-espresso
mirror of https://gitlab.com/QEF/q-e.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

format is now compatible with both f90 free format and f77 fixed format 

git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@3390 c92efa57-630b-4861-b058-cf58834340f0
This commit is contained in:
giannozz 2006-09-14 16:28:00 +00:00
parent 3fba1e2cc6
commit 006fb34e78
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flib/indxl2g.f
View File

@ -45,7 +45,7 @@
! ..
! .. Executable Statements ..
!
INDXL2G = NPROCS*NB*((INDXLOC-1)/NB) + MOD(INDXLOC-1,NB) +
INDXL2G = NPROCS*NB*((INDXLOC-1)/NB) + MOD(INDXLOC-1,NB) + &
& MOD(NPROCS+IPROC-ISRCPROC, NPROCS)*NB + 1
!
RETURN

4
flib/infog1l.f
View File

@ -1,4 +1,4 @@
SUBROUTINE INFOG1L( GINDX, NB, NPROCS, MYROC, ISRCPROC, LINDX,
SUBROUTINE INFOG1L( GINDX, NB, NPROCS, MYROC, ISRCPROC, LINDX, &
& ROCSRC )
!
! -- ScaLAPACK tools routine (version 1.5) --
@ -7,7 +7,7 @@
! May 1, 1997
!
! .. Scalar Arguments ..
INTEGER GINDX, ISRCPROC, LINDX, MYROC, NB, NPROCS,
INTEGER GINDX, ISRCPROC, LINDX, MYROC, NB, NPROCS, &
& ROCSRC
! ..
!

18
flib/infog2l.f
View File

@ -1,4 +1,4 @@
SUBROUTINE INFOG2L( GRINDX, GCINDX, DESC, NPROW, NPCOL, MYROW,
SUBROUTINE INFOG2L( GRINDX, GCINDX, DESC, NPROW, NPCOL, MYROW, &
& MYCOL, LRINDX, LCINDX, RSRC, CSRC )
!
! -- ScaLAPACK tools routine (version 1.5) --
@ -7,7 +7,7 @@
! May 1, 1997
!
! .. Scalar Arguments ..
INTEGER CSRC, GCINDX, GRINDX, LRINDX, LCINDX, MYCOL,
INTEGER CSRC, GCINDX, GRINDX, LRINDX, LCINDX, MYCOL, &
& MYROW, NPCOL, NPROW, RSRC
! ..
! .. Array Arguments ..
@ -120,10 +120,10 @@
! =====================================================================
!
! .. Parameters ..
INTEGER BLOCK_CYCLIC_2D, CSRC_, CTXT_, DLEN_, DTYPE_,
INTEGER BLOCK_CYCLIC_2D, CSRC_, CTXT_, DLEN_, DTYPE_, &
& LLD_, MB_, M_, NB_, N_, RSRC_
PARAMETER ( BLOCK_CYCLIC_2D = 1, DLEN_ = 9, DTYPE_ = 1,
& CTXT_ = 2, M_ = 3, N_ = 4, MB_ = 5, NB_ = 6,
PARAMETER ( BLOCK_CYCLIC_2D = 1, DLEN_ = 9, DTYPE_ = 1, &
& CTXT_ = 2, M_ = 3, N_ = 4, MB_ = 5, NB_ = 6, &
& RSRC_ = 7, CSRC_ = 8, LLD_ = 9 )
! ..
! .. Local Scalars ..
@ -145,16 +145,16 @@
LRINDX = ( RBLK / NPROW + 1 ) * DESC(MB_) + 1
LCINDX = ( CBLK / NPCOL + 1 ) * DESC(NB_) + 1
!
IF( MOD( MYROW+NPROW-DESC(RSRC_), NPROW ) .GE.
IF( MOD( MYROW+NPROW-DESC(RSRC_), NPROW ) .GE. &
& MOD( RBLK, NPROW ) ) THEN
IF( MYROW.EQ.RSRC )
IF( MYROW.EQ.RSRC ) &
& LRINDX = LRINDX + MOD( GRCPY, DESC(MB_) )
LRINDX = LRINDX - DESC(MB_)
END IF
!
IF( MOD( MYCOL+NPCOL-DESC(CSRC_), NPCOL ) .GE.
IF( MOD( MYCOL+NPCOL-DESC(CSRC_), NPCOL ) .GE. &
& MOD( CBLK, NPCOL ) ) THEN
IF( MYCOL.EQ.CSRC )
IF( MYCOL.EQ.CSRC ) &
& LCINDX = LCINDX + MOD( GCCPY, DESC(NB_) )
LCINDX = LCINDX - DESC(NB_)
END IF