hdiff output

r29311/nodes.f90 2015-11-17 23:34:57.166076023 +0000 r29310/nodes.f90 2015-11-17 23:34:57.358078595 +0000
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 (AMBER12T) THEN 
161:           CALL MYSYSTEM(MYSTAT,DEBUG,'echo $PATH > sshpath')160:           CALL MYSYSTEM(MYSTAT,DEBUG,'echo $PATH > sshpath')
162:           INQUIRE(FILE='sshpath',EXIST=YESNO)161:           INQUIRE(FILE='sshpath',EXIST=YESNO)
163:           IF (YESNO) THEN162:           IF (YESNO) THEN
164:              CALL MYSYSTEM(MYSTAT,DEBUG,'wc -c < sshpath >lenpath')163:              CALL MYSYSTEM(MYSTAT,DEBUG,'wc -c < sshpath >lenpath')
165:              OPEN(UNIT=126,FILE='lenpath',STATUS='OLD')164:              OPEN(UNIT=126,FILE='lenpath',STATUS='OLD')
166:              READ(126,*) ACTUALLENPATH165:              READ(126,*) ACTUALLENPATH
167:              CLOSE(126)166:              CLOSE(126)
168:              IF (ACTUALLENPATH > LENPATH) THEN167:              IF (ACTUALLENPATH > LENPATH) THEN
169:                 WRITE(*,'(A)') 'getnodes> Length of $PATH exceeds static allocation size'168:                 WRITE(*,'(A)') 'getnodes> Length of $PATH exceeds static allocation size'
170:                 WRITE(*,'(A)') ' - increase size of LENPATH and possibly TOTALJOBSTRING'169:                 WRITE(*,'(A)') ' - increase size of LENPATH and possibly TOTALJOBSTRING'
171:                 STOP170:                 STOP
172:              END IF171:              END IF
173:              OPEN(UNIT=127,FILE='sshpath',STATUS='OLD')172:              OPEN(UNIT=127,FILE='sshpath',STATUS='OLD')
174:              READ(127,'(A)') SSHPATH173:              READ(127,'(A)') SSHPATH
175:              CLOSE(127)174:              CLOSE(127)
176:              CALL MYSYSTEM(MYSTAT,DEBUG,'rm sshpath lenpath')175:              CALL MYSYSTEM(MYSTAT,DEBUG,'rm sshpath lenpath')
177:           ELSE176:           ELSE
178:              WRITE(*,'(A)') 'getnodes> Unable to read in $PATH - stopping'177:              WRITE(*,'(A)') 'getnodes> Unable to read in $PATH - stopping'
179:              STOP178:              STOP
180:           END IF179:           END IF
181:           END IF 
182:      END SUBROUTINE GETNODES180:      END SUBROUTINE GETNODES
183: 181: 
184:      SUBROUTINE SSHSUBMIT(ICPU,STAT,JOBSTRING,CONNSTR1,LDEBUG)182:      SUBROUTINE SSHSUBMIT(ICPU,STAT,JOBSTRING,CONNSTR1,LDEBUG)
185:           USE PORFUNCS, ONLY: SYSTEM_SUBR183:           USE PORFUNCS, ONLY: SYSTEM_SUBR
186:           USE COMMONS, ONLY: CHARMMT, ZSYM, COPYFILES, COPYOPTIMT, BHINTERPT, BISECTT, SSHT184:           USE COMMONS, ONLY: CHARMMT, ZSYM, COPYFILES, COPYOPTIMT, BHINTERPT, BISECTT, SSHT
187:           IMPLICIT NONE185:           IMPLICIT NONE
188:           REAL HARVEST186:           REAL HARVEST
189: 187: 
190:           INTEGER,INTENT(IN) :: ICPU188:           INTEGER,INTENT(IN) :: ICPU
191:           LOGICAL,INTENT(IN) :: LDEBUG189:           LOGICAL,INTENT(IN) :: LDEBUG
246: !     Note that if any file is missing an error condition will result, and subsequent commands will fail.244: !     Note that if any file is missing an error condition will result, and subsequent commands will fail.
247:           TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) &245:           TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) &
248:   &          // ' ; scp -r ' // TRIM(ADJUSTL(HOSTNAME)) // ':' // TRIM(ADJUSTL(WORKINGDIRECTORY)) // '/' & 246:   &          // ' ; scp -r ' // TRIM(ADJUSTL(HOSTNAME)) // ':' // TRIM(ADJUSTL(WORKINGDIRECTORY)) // '/' & 
249:   &          // TRIM(ADJUSTL(TEMPCOPYFILESDIR)) // '/* ' // TRIM(ADJUSTL(PATHSTRING)) // ' ; rm -rf ' & 247:   &          // TRIM(ADJUSTL(TEMPCOPYFILESDIR)) // '/* ' // TRIM(ADJUSTL(PATHSTRING)) // ' ; rm -rf ' & 
250:   &          // TRIM(ADJUSTL(WORKINGDIRECTORY)) // '/' // TRIM(ADJUSTL(TEMPCOPYFILESDIR))248:   &          // TRIM(ADJUSTL(WORKINGDIRECTORY)) // '/' // TRIM(ADJUSTL(TEMPCOPYFILESDIR))
251: ! (3) move to the scratch directory on the node249: ! (3) move to the scratch directory on the node
252:           TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) // ' ; cd ' // TRIM(ADJUSTL(PATHSTRING))250:           TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) // ' ; cd ' // TRIM(ADJUSTL(PATHSTRING))
253: ! (3b) delete any existing path.info.* file (a very rare but not impossible condition!)251: ! (3b) delete any existing path.info.* file (a very rare but not impossible condition!)
254:           TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) // ' && rm -f path.info.* '252:           TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) // ' && rm -f path.info.* '
255: ! (4) run the OPTIM job253: ! (4) run the OPTIM job
256:           IF (AMBER12T) THEN254:           TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) // ' ; PATH=' // TRIM(ADJUSTL(SSHPATH)) // ' ' // JOBSTRING
257:              TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) // ' ; PATH=' // TRIM(ADJUSTL(SSHPATH)) // ' ' // JOBSTRING 
258:           ELSE 
259:              TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) // ' ; ' // JOBSTRING 
260:           END IF 
261: ! (5) copy results back255: ! (5) copy results back
262:           IF (LDEBUG) THEN ! copy everything back 256:           IF (LDEBUG) THEN ! copy everything back 
263:              TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) // ' ; scp *.' // connstr1 &257:              TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) // ' ; scp *.' // connstr1 &
264:    &                      // ' ' // TRIM(ADJUSTL(HOSTNAME)) // ':' // TRIM(ADJUSTL(WORKINGDIRECTORY))258:    &                      // ' ' // TRIM(ADJUSTL(HOSTNAME)) // ':' // TRIM(ADJUSTL(WORKINGDIRECTORY))
265:           ELSEIF (COPYOPTIMT.AND.(BHINTERPT.OR.BISECTT)) THEN ! copy path.info, OPTIM259:           ELSEIF (COPYOPTIMT.AND.(BHINTERPT.OR.BISECTT)) THEN ! copy path.info, OPTIM
266:              TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) &260:              TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) &
267:    &            // ' ; scp OPTIM* min.data.info* ' // TRIM(ADJUSTL(HOSTNAME)) // ':'// TRIM(ADJUSTL(WORKINGDIRECTORY))261:    &            // ' ; scp OPTIM* min.data.info* ' // TRIM(ADJUSTL(HOSTNAME)) // ':'// TRIM(ADJUSTL(WORKINGDIRECTORY))
268:           ELSEIF (COPYOPTIMT) THEN ! copy path.info, OPTIM, odata and finish262:           ELSEIF (COPYOPTIMT) THEN ! copy path.info, OPTIM, odata and finish
269: !            IF (CHECKSPT) THEN263: !            IF (CHECKSPT) THEN
270: !               TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) &264: !               TOTALJOBSTRING=TRIM(ADJUSTL(TOTALJOBSTRING)) &


legend
Lines Added 
Lines changed
 Lines Removed

hdiff - version: 2.1.0