Skip to content

Commit 5c6299f

Browse files
authored
Merge pull request #12652 from drjfloyd/master
FDS Source: Close LU_EXTERNAL after reading its contents. Fix EXTERNA…
2 parents 2523b3b + f2d1f9a commit 5c6299f

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

Source/func.f90

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ SUBROUTINE READ_EXTERNAL_FILE(FAILED)
572572
OPEN(LU_EXTERNAL,FILE=EXTERNAL_FILENAME,ERR=100)
573573

574574
DO
575-
READ(UNIT=LU_EXTERNAL,END=200,ERR=100,FMT=*) INPUT_TYPE,INPUT_LABEL,INPUT_REAL
575+
READ(UNIT=LU_EXTERNAL,END=200,ERR=110,FMT=*) INPUT_TYPE,INPUT_LABEL,INPUT_REAL
576576
IF (INPUT_TYPE=='RAMP') THEN
577577
DO NR=1,N_RAMP
578578
IF (TRIM(RAMPS(NR)%ID) == TRIM(INPUT_LABEL)) THEN
@@ -584,9 +584,9 @@ SUBROUTINE READ_EXTERNAL_FILE(FAILED)
584584
DO NC=1,N_CTRL
585585
IF (TRIM(CONTROL(NC)%ID) == TRIM(INPUT_LABEL)) THEN
586586
IF (INPUT_REAL < 0) THEN
587-
EXTERNAL_CTRL = .FALSE.
587+
EXTERNAL_CTRL(NC) = .FALSE.
588588
ELSE
589-
EXTERNAL_CTRL = .TRUE.
589+
EXTERNAL_CTRL(NC) = .TRUE.
590590
ENDIF
591591
EXIT
592592
ENDIF
@@ -597,8 +597,12 @@ SUBROUTINE READ_EXTERNAL_FILE(FAILED)
597597

598598
RETURN
599599

600-
100 FAILED = .TRUE.
601-
200 RETURN
600+
110 CLOSE(LU_EXTERNAL)
601+
100 FAILED = .TRUE.
602+
RETURN
603+
604+
200 CLOSE(LU_EXTERNAL)
605+
RETURN
602606

603607
END SUBROUTINE READ_EXTERNAL_FILE
604608

0 commit comments

Comments
 (0)