hdiff output

r29317/nodes.f90 2015-11-17 23:34:34.193767957 +0000 r29316/nodes.f90 2015-11-17 23:34:34.405770799 +0000
  1: MODULE NODES  1: MODULE NODES
  2:      USE COMMONS,ONLY : SLURMT, PBST, CHECKSPT, DEBUG  2:      USE COMMONS,ONLY : SLURMT, PBST, CHECKSPT, DEBUG, AMBERT
  3:      USE PORFUNCS  3:      USE PORFUNCS
  4:      IMPLICIT NONE  4:      IMPLICIT NONE
  5:      SAVE  5:      SAVE
  6:   6: 
  7:      INTEGER :: JPN,NNODES,NNLEN,MYSTAT,ACTUALLENPATH  7:      INTEGER :: JPN,NNODES,NNLEN,MYSTAT,ACTUALLENPATH
  8:      INTEGER, PARAMETER :: LENPATH=7000  8:      INTEGER, PARAMETER :: LENPATH=7000
  9:      CHARACTER(LEN=80),ALLOCATABLE,DIMENSION(:) :: NODENAME  9:      CHARACTER(LEN=80),ALLOCATABLE,DIMENSION(:) :: NODENAME
 10:      CHARACTER(LEN=80) :: USERNAME, RANSTRING 10:      CHARACTER(LEN=80) :: USERNAME, RANSTRING
 11:      CHARACTER(LEN=100) :: WORKINGDIRECTORY 11:      CHARACTER(LEN=100) :: WORKINGDIRECTORY
 12:      CHARACTER(LEN=7000) :: TOTALJOBSTRING 12:      CHARACTER(LEN=7000) :: TOTALJOBSTRING
150:              OPEN(UNIT=125,FILE='currentnode',STATUS='OLD')150:              OPEN(UNIT=125,FILE='currentnode',STATUS='OLD')
151:              READ(125,'(A)') HOSTNAME151:              READ(125,'(A)') HOSTNAME
152:              CLOSE(125)152:              CLOSE(125)
153:              CALL MYSYSTEM(MYSTAT,DEBUG,'rm currentnode')153:              CALL MYSYSTEM(MYSTAT,DEBUG,'rm currentnode')
154:           ELSE154:           ELSE
155:              WRITE(*,'(A)') 'getnodes> Current node unknown - stopping'155:              WRITE(*,'(A)') 'getnodes> Current node unknown - stopping'
156:              STOP156:              STOP
157:           END IF157:           END IF
158: 158: 
159:           ! Read in current PATH so that this can be passed when submitting jobs using ssh159:           ! Read in current PATH so that this can be passed when submitting jobs using ssh
 160:           IF (AMBERT) THEN
160:           CALL MYSYSTEM(MYSTAT,DEBUG,'echo $PATH > sshpath')161:           CALL MYSYSTEM(MYSTAT,DEBUG,'echo $PATH > sshpath')
161:           INQUIRE(FILE='sshpath',EXIST=YESNO)162:           INQUIRE(FILE='sshpath',EXIST=YESNO)
162:           IF (YESNO) THEN163:           IF (YESNO) THEN
163:              CALL MYSYSTEM(MYSTAT,DEBUG,'wc -c < sshpath >lenpath')164:              CALL MYSYSTEM(MYSTAT,DEBUG,'wc -c < sshpath >lenpath')
164:              OPEN(UNIT=126,FILE='lenpath',STATUS='OLD')165:              OPEN(UNIT=126,FILE='lenpath',STATUS='OLD')
165:              READ(126,*) ACTUALLENPATH166:              READ(126,*) ACTUALLENPATH
166:              CLOSE(126)167:              CLOSE(126)
167:              IF (ACTUALLENPATH > LENPATH) THEN168:              IF (ACTUALLENPATH > LENPATH) THEN
168:                 WRITE(*,'(A)') 'getnodes> Length of $PATH exceeds static allocation size'169:                 WRITE(*,'(A)') 'getnodes> Length of $PATH exceeds static allocation size'
169:                 WRITE(*,'(A)') ' - increase size of LENPATH and possibly TOTALJOBSTRING'170:                 WRITE(*,'(A)') ' - increase size of LENPATH and possibly TOTALJOBSTRING'
170:                 STOP171:                 STOP
171:              END IF172:              END IF
172:              OPEN(UNIT=127,FILE='sshpath',STATUS='OLD')173:              OPEN(UNIT=127,FILE='sshpath',STATUS='OLD')
173:              READ(127,'(A)') SSHPATH174:              READ(127,'(A)') SSHPATH
174:              CLOSE(127)175:              CLOSE(127)
175:              CALL MYSYSTEM(MYSTAT,DEBUG,'rm sshpath lenpath')176:              CALL MYSYSTEM(MYSTAT,DEBUG,'rm sshpath lenpath')
176:           ELSE177:           ELSE
177:              WRITE(*,'(A)') 'getnodes> Unable to read in $PATH - stopping'178:              WRITE(*,'(A)') 'getnodes> Unable to read in $PATH - stopping'
178:              STOP179:              STOP
179:           END IF180:           END IF
 181:           END IF
180:      END SUBROUTINE GETNODES182:      END SUBROUTINE GETNODES
181: 183: 
182:      SUBROUTINE SSHSUBMIT(ICPU,STAT,JOBSTRING,CONNSTR1,LDEBUG)184:      SUBROUTINE SSHSUBMIT(ICPU,STAT,JOBSTRING,CONNSTR1,LDEBUG)
183:           USE PORFUNCS, ONLY: SYSTEM_SUBR185:           USE PORFUNCS, ONLY: SYSTEM_SUBR
184:           USE COMMONS, ONLY: CHARMMT, ZSYM, COPYFILES, COPYOPTIMT, BHINTERPT, BISECTT, SSHT186:           USE COMMONS, ONLY: CHARMMT, ZSYM, COPYFILES, COPYOPTIMT, BHINTERPT, BISECTT, SSHT
185:           IMPLICIT NONE187:           IMPLICIT NONE
186:           REAL HARVEST188:           REAL HARVEST
187: 189: 
188:           INTEGER,INTENT(IN) :: ICPU190:           INTEGER,INTENT(IN) :: ICPU
189:           LOGICAL,INTENT(IN) :: LDEBUG191:           LOGICAL,INTENT(IN) :: LDEBUG
244: !     Note that if any file is missing an error condition will result, and subsequent commands will fail.246: !     Note that if any file is missing an error condition will result, and subsequent commands will fail.
245:           TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) &247:           TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) &
246:   &          // ' ; scp -r ' // TRIM(ADJUSTL(HOSTNAME)) // ':' // TRIM(ADJUSTL(WORKINGDIRECTORY)) // '/' & 248:   &          // ' ; scp -r ' // TRIM(ADJUSTL(HOSTNAME)) // ':' // TRIM(ADJUSTL(WORKINGDIRECTORY)) // '/' & 
247:   &          // TRIM(ADJUSTL(TEMPCOPYFILESDIR)) // '/* ' // TRIM(ADJUSTL(PATHSTRING)) // ' ; rm -rf ' & 249:   &          // TRIM(ADJUSTL(TEMPCOPYFILESDIR)) // '/* ' // TRIM(ADJUSTL(PATHSTRING)) // ' ; rm -rf ' & 
248:   &          // TRIM(ADJUSTL(WORKINGDIRECTORY)) // '/' // TRIM(ADJUSTL(TEMPCOPYFILESDIR))250:   &          // TRIM(ADJUSTL(WORKINGDIRECTORY)) // '/' // TRIM(ADJUSTL(TEMPCOPYFILESDIR))
249: ! (3) move to the scratch directory on the node251: ! (3) move to the scratch directory on the node
250:           TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) // ' ; cd ' // TRIM(ADJUSTL(PATHSTRING))252:           TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) // ' ; cd ' // TRIM(ADJUSTL(PATHSTRING))
251: ! (3b) delete any existing path.info.* file (a very rare but not impossible condition!)253: ! (3b) delete any existing path.info.* file (a very rare but not impossible condition!)
252:           TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) // ' && rm -f path.info.* '254:           TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) // ' && rm -f path.info.* '
253: ! (4) run the OPTIM job255: ! (4) run the OPTIM job
 256:           IF (AMBERT) THEN
254:              TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) // ' ; PATH=' // TRIM(ADJUSTL(SSHPATH)) // ' ' // JOBSTRING257:              TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) // ' ; PATH=' // TRIM(ADJUSTL(SSHPATH)) // ' ' // JOBSTRING
 258:           ELSE
 259:              TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) // ' ; ' // JOBSTRING
 260:           END IF
255: ! (5) copy results back261: ! (5) copy results back
256:           IF (LDEBUG) THEN ! copy everything back 262:           IF (LDEBUG) THEN ! copy everything back 
257:              TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) // ' ; scp *.' // connstr1 &263:              TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) // ' ; scp *.' // connstr1 &
258:    &                      // ' ' // TRIM(ADJUSTL(HOSTNAME)) // ':' // TRIM(ADJUSTL(WORKINGDIRECTORY))264:    &                      // ' ' // TRIM(ADJUSTL(HOSTNAME)) // ':' // TRIM(ADJUSTL(WORKINGDIRECTORY))
259:           ELSEIF (COPYOPTIMT.AND.(BHINTERPT.OR.BISECTT)) THEN ! copy path.info, OPTIM265:           ELSEIF (COPYOPTIMT.AND.(BHINTERPT.OR.BISECTT)) THEN ! copy path.info, OPTIM
260:              TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) &266:              TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) &
261:    &            // ' ; scp OPTIM* min.data.info* ' // TRIM(ADJUSTL(HOSTNAME)) // ':'// TRIM(ADJUSTL(WORKINGDIRECTORY))267:    &            // ' ; scp OPTIM* min.data.info* ' // TRIM(ADJUSTL(HOSTNAME)) // ':'// TRIM(ADJUSTL(WORKINGDIRECTORY))
262:           ELSEIF (COPYOPTIMT) THEN ! copy path.info, OPTIM, odata and finish268:           ELSEIF (COPYOPTIMT) THEN ! copy path.info, OPTIM, odata and finish
263: !            IF (CHECKSPT) THEN269: !            IF (CHECKSPT) THEN
264: !               TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) &270: !               TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) &


legend
Lines Added 
Lines changed
 Lines Removed

hdiff - version: 2.1.0