Skip to content

Commit fd65f9a

Browse files
victorkempvictorkemp
committed
Removed F04 flag param from FILE_OPEN and FILE_CLOSE
1 parent b978b08 commit fd65f9a

56 files changed

Lines changed: 586 additions & 592 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Source/EMG/EMG3/USERIN.f90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ SUBROUTINE USERIN ( INT_ELEM_ID, OPT, EMG_CALLING_SUBR, WRITE_WARN )
190190
! Open the IN4 file containing the mass and stiff matrices for this elem
191191

192192
CALL FILE_OPEN ( IN4, IN4FIL(USERIN_IN4_INDEX), OUNT, 'OLD', IN4_MSG, 'NEITHER', 'UNFORMATTED', 'READ', 'REWIND', &
193-
'Y', 'N', 'Y' )
193+
'Y', 'N' )
194194

195195
! If OPT(1) is 'Y', get the elem mass matrix from the IN4 file and expand it from boundary DOF size to ELDOF size (6 comps/grid).
196196

@@ -321,7 +321,7 @@ SUBROUTINE USERIN ( INT_ELEM_ID, OPT, EMG_CALLING_SUBR, WRITE_WARN )
321321
CALL DEALLOCATE_IN4_FILES ( 'IN4_COL_MAP' )
322322
CALL DEALLOCATE_IN4_FILES ( 'IN4_MAT' )
323323

324-
CALL FILE_CLOSE ( IN4, IN4FIL(USERIN_IN4_INDEX), 'KEEP', 'Y' )
324+
CALL FILE_CLOSE ( IN4, IN4FIL(USERIN_IN4_INDEX), 'KEEP' )
325325

326326
IF (DEBUG(180) > 0) CALL DEB_USERIN ( 99 )
327327

‎Source/Interfaces/FILE_CLOSE_Interface.f90‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ MODULE FILE_CLOSE_Interface
2828

2929
INTERFACE
3030

31-
SUBROUTINE FILE_CLOSE ( UNIT, FILNAM, CLOSE_STAT, WRITE_F04 )
31+
SUBROUTINE FILE_CLOSE ( UNIT, FILNAM, CLOSE_STAT )
3232

3333

3434
USE PENTIUM_II_KIND, ONLY : BYTE, LONG
@@ -39,7 +39,6 @@ SUBROUTINE FILE_CLOSE ( UNIT, FILNAM, CLOSE_STAT, WRITE_F04 )
3939
CHARACTER(LEN=*) , INTENT(IN) :: FILNAM ! File name
4040

4141
CHARACTER(LEN=*) , INTENT(IN) :: CLOSE_STAT ! Status for close
42-
CHARACTER(LEN=*) , INTENT(IN) :: WRITE_F04 ! If 'Y' write to F04, otherwise do not
4342

4443
INTEGER(LONG), INTENT(IN) :: UNIT ! File unit number
4544

‎Source/Interfaces/FILE_OPEN_Interface.f90‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ MODULE FILE_OPEN_Interface
2828

2929
INTERFACE
3030

31-
SUBROUTINE FILE_OPEN (UNIT, FILNAM, OUNT, STATUS, MESSAG, RW_STIME, FORMAT, ACTION, POSITION, WRITE_L1A, WRITE_VER, WRITE_F04)
31+
SUBROUTINE FILE_OPEN (UNIT, FILNAM, OUNT, STATUS, MESSAG, RW_STIME, FORMAT, ACTION, POSITION, WRITE_L1A, WRITE_VER)
3232

3333

3434
USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE
@@ -48,7 +48,6 @@ SUBROUTINE FILE_OPEN (UNIT, FILNAM, OUNT, STATUS, MESSAG, RW_STIME, FORMAT, ACTI
4848
CHARACTER(LEN=*), INTENT(IN) :: POSITION ! File description
4949
CHARACTER(LEN=*), INTENT(IN) :: STATUS ! File status indicator (NEW, OLD, REPLACE)
5050
CHARACTER(LEN=*), INTENT(IN) :: RW_STIME ! Indicator of whether to read or write STIME
51-
CHARACTER(LEN=*), INTENT(IN) :: WRITE_F04 ! If 'Y' write subr begin/end times to F04 (if WRT_LOG >= SUBR_BEGEND)
5251
CHARACTER(LEN=*), INTENT(IN) :: WRITE_L1A ! 'Y'/'N' Arg passed to subr OUTA_HERE
5352
CHARACTER(LEN=*), INTENT(IN) :: WRITE_VER ! 'Y'/'N' Arg to tell whether to write MYSTRAN version info
5453

‎Source/LK1/L1B/OU4_PARTVEC_PROC.f90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ SUBROUTINE OU4_PARTVEC_PROC ( INDEX, OU4_MAT_NAME, NROWS_F, NCOLS_F, ROW_SET, CO
249249

250250
FOUND_PART_VEC(I) = 'N'
251251

252-
CALL FILE_OPEN ( L1V, LINK1V, OUNT, 'OLD', L1V_MSG, 'READ_STIME', 'UNFORMATTED', 'READ', 'REWIND', 'Y', 'N', 'Y' )
252+
CALL FILE_OPEN ( L1V, LINK1V, OUNT, 'OLD', L1V_MSG, 'READ_STIME', 'UNFORMATTED', 'READ', 'REWIND', 'Y', 'N' )
253253
j_do1: DO J=1,NUM_PARTVEC_RECORDS
254254

255255
READ(L1V,IOSTAT=IOCHK) VNAME, ICOMP, GRID1, GRID2
@@ -312,7 +312,7 @@ SUBROUTINE OU4_PARTVEC_PROC ( INDEX, OU4_MAT_NAME, NROWS_F, NCOLS_F, ROW_SET, CO
312312
ENDIF
313313

314314
ENDDO j_do1
315-
CALL FILE_CLOSE ( L1V, LINK1V, 'KEEP', 'Y' )
315+
CALL FILE_CLOSE ( L1V, LINK1V, 'KEEP' )
316316

317317
IF (FOUND_PART_VEC(I) == 'N') THEN
318318

‎Source/LK1/L1B/SEQ_PROC.f90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ SUBROUTINE AUTO_SEQ_PROC
554554

555555
ENDIF
556556

557-
CALL FILE_CLOSE ( SEQ, SEQFIL, SEQSTAT, 'Y' )
557+
CALL FILE_CLOSE ( SEQ, SEQFIL, SEQSTAT )
558558

559559
ELSE
560560

@@ -657,7 +657,7 @@ SUBROUTINE AUTO_SEQ_PROC_WRAPUP ( SUBR_NAME, CLOSE_STAT )
657657
CHARACTER(LEN=*), INTENT(IN) :: CLOSE_STAT ! Status for closing SEQFIL
658658

659659
! **********************************************************************************************************************************
660-
CALL FILE_CLOSE ( SEQ, SEQFIL, CLOSE_STAT, 'Y' )
660+
CALL FILE_CLOSE ( SEQ, SEQFIL, CLOSE_STAT )
661661

662662
IF (SEQQUIT == 'Y') THEN
663663
WRITE(ERR,8881) SUBR_NAME, SEQQUIT

‎Source/LK1/L1B/USET_PROC.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ SUBROUTINE USET_PROC
104104

105105
! Process USET data from file L1X (data written when USET and USET1 Bulk Data entries were read)
106106

107-
CALL FILE_OPEN ( L1X, LINK1X, OUNT, 'OLD', L1X_MSG, 'READ_STIME', 'UNFORMATTED', 'READ', 'REWIND', 'Y', 'N', 'Y' )
107+
CALL FILE_OPEN ( L1X, LINK1X, OUNT, 'OLD', L1X_MSG, 'READ_STIME', 'UNFORMATTED', 'READ', 'REWIND', 'Y', 'N' )
108108

109109
i_do6:DO I=1,NUM_USET_RECORDS
110110

‎Source/LK1/L1D/FORCE_MOM_PROC.f90‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ SUBROUTINE FORCE_MOM_PROC
159159
OPEN (SCR(1),STATUS='SCRATCH',POSITION='REWIND',FORM='UNFORMATTED',ACTION='READWRITE',IOSTAT=IOCHK)
160160
IF (IOCHK /= 0) THEN
161161
CALL OPNERR ( IOCHK, SCRFIL, OUNT )
162-
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE', 'Y' )
162+
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE' )
163163
CALL OUTA_HERE ( 'Y' ) ! Error opening scratch file, so quit
164164
ENDIF
165165
REWIND (SCR(1))
@@ -315,7 +315,7 @@ SUBROUTINE FORCE_MOM_PROC
315315
IF (IOCHK /= 0) THEN
316316
REC_NO = J
317317
CALL READERR ( IOCHK, SCRFIL, MESSAG, REC_NO, OUNT )
318-
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE', 'Y' )
318+
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE' )
319319
CALL OUTA_HERE ( 'Y' ) ! Error reading scratch file, so quit
320320
ENDIF
321321

@@ -341,7 +341,7 @@ SUBROUTINE FORCE_MOM_PROC
341341
ELSE
342342
WRITE(ERR,1516) SUBR_NAME,NAME
343343
WRITE(F06,1516) SUBR_NAME,NAME
344-
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE', 'Y' )
344+
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE' )
345345
FATAL_ERR = FATAL_ERR + 1
346346
CALL OUTA_HERE ( 'Y' ) ! Coding error (not FORCE or MOMENT), so quit
347347
ENDIF
@@ -366,7 +366,7 @@ SUBROUTINE FORCE_MOM_PROC
366366
WRITE(ERR,1514) SUBR_NAME
367367
WRITE(F06,1514) SUBR_NAME
368368
FATAL_ERR = FATAL_ERR + 1
369-
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE', 'Y' )
369+
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE' )
370370
CALL OUTA_HERE ( 'Y' ) ! Coding error (dim on array FORMON out of bounds), so quit
371371
ELSE
372372
FORCEI = SCALE*FORMON(K1)
@@ -387,7 +387,7 @@ SUBROUTINE FORCE_MOM_PROC
387387

388388
ENDDO i_do2
389389

390-
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE', 'Y' )
390+
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE' )
391391

392392

393393

‎Source/LK1/L1D/GRAV_PROC.f90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ SUBROUTINE GRAV_PROC
178178
OPEN (SCR(1),STATUS='SCRATCH',POSITION='REWIND',FORM='UNFORMATTED',ACTION='READWRITE',IOSTAT=IOCHK)
179179
IF (IOCHK /= 0) THEN
180180
CALL OPNERR ( IOCHK, SCRFIL, OUNT )
181-
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE', 'Y' )
181+
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE' )
182182
CALL OUTA_HERE ( 'Y' ) ! Error opening scratch file, so quit
183183
ENDIF
184184
REWIND (SCR(1))
@@ -312,7 +312,7 @@ SUBROUTINE GRAV_PROC
312312
IF (IOCHK /= 0) THEN
313313
REC_NO = J
314314
CALL READERR ( IOCHK, SCRFIL, MESSAG, REC_NO, OUNT )
315-
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE', 'Y' )
315+
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE' )
316316
CALL OUTA_HERE ( 'Y' ) ! Error reading scratch file, so quit
317317
ENDIF
318318

@@ -446,7 +446,7 @@ SUBROUTINE GRAV_PROC
446446

447447
WRITE(SC1,*) CR13
448448

449-
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE', 'Y' )
449+
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE' )
450450

451451

452452

‎Source/LK1/L1D/PRESSURE_DATA_PROC.f90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,11 +293,11 @@ SUBROUTINE PRESSURE_DATA_PROC
293293

294294
! First close and delete L1Q file
295295

296-
CALL FILE_CLOSE ( L1Q, LINK1Q, 'DELETE', 'Y' )
296+
CALL FILE_CLOSE ( L1Q, LINK1Q, 'DELETE' )
297297

298298
! Open L1Q for write:
299299

300-
CALL FILE_OPEN ( L1Q, LINK1Q, OUNT, 'REPLACE', L1Q_MSG, 'WRITE_STIME', 'UNFORMATTED', 'WRITE', 'REWIND', 'Y', 'N', 'Y' )
300+
CALL FILE_OPEN ( L1Q, LINK1Q, OUNT, 'REPLACE', L1Q_MSG, 'WRITE_STIME', 'UNFORMATTED', 'WRITE', 'REWIND', 'Y', 'N' )
301301

302302
DATA_SET_NAME = 'PPNT'
303303
WRITE(L1Q) DATA_SET_NAME

‎Source/LK1/L1D/RFORCE_PROC.f90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ SUBROUTINE RFORCE_PROC
190190
OPEN (SCR(1),STATUS='SCRATCH',POSITION='REWIND',FORM='UNFORMATTED',ACTION='READWRITE',IOSTAT=IOCHK)
191191
IF (IOCHK /= 0) THEN
192192
CALL OPNERR ( IOCHK, SCRFIL, OUNT )
193-
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE', 'Y' )
193+
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE' )
194194
CALL OUTA_HERE ( 'Y' ) ! Error opening scratch file, so quit
195195
ENDIF
196196
REWIND (SCR(1))
@@ -326,7 +326,7 @@ SUBROUTINE RFORCE_PROC
326326
IF (IOCHK /= 0) THEN
327327
REC_NO = J
328328
CALL READERR ( IOCHK, SCRFIL, MESSAG, REC_NO, OUNT )
329-
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE', 'Y' )
329+
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE' )
330330
CALL OUTA_HERE ( 'Y' ) ! Error reading scratch file, so quit
331331
ENDIF
332332

@@ -445,7 +445,7 @@ SUBROUTINE RFORCE_PROC
445445

446446
WRITE(SC1,*) CR13
447447

448-
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE', 'Y' )
448+
CALL FILE_CLOSE ( SCR(1), SCRFIL, 'DELETE' )
449449

450450

451451

0 commit comments

Comments
 (0)