Skip to content

Commit d505428

Browse files
committed
FDS Source: Move EXTERNAL_RAMP and _CTRL allocation. Issue #14011
1 parent 59d0136 commit d505428

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

Source/main.f90

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,6 @@ PROGRAM FDS
171171

172172
IF (READ_EXTERNAL) THEN
173173
T_EXTERNAL = T_BEGIN + DT_EXTERNAL
174-
ALLOCATE(EXTERNAL_RAMP(N_RAMP))
175-
EXTERNAL_RAMP = RAMPS%LAST
176-
ALLOCATE(EXTERNAL_CTRL(N_CTRL))
177-
EXTERNAL_CTRL = CONTROL%INITIAL_STATE
178174
LU_EXTERNAL = GET_FILE_NUMBER()
179175
IF (DT_EXTERNAL_HEARTBEAT > 0._EB) LU_EXTERNAL_HEARTBEAT = GET_FILE_NUMBER()
180176
ENDIF

Source/read.f90

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10031,6 +10031,7 @@ END SUBROUTINE READ_CLIP
1003110031

1003210032
SUBROUTINE READ_RAMP
1003310033

10034+
USE CONTROL_VARIABLES, ONLY: N_CTRL,CONTROL
1003410035
REAL(EB) :: X,Z,T,F,TM,INITIAL_VALUE
1003510036
INTEGER :: I,II,NN,N,NUMBER_INTERPOLATION_POINTS,N_RES_RAMP
1003610037
CHARACTER(LABEL_LENGTH) :: DEVC_ID,CTRL_ID,CTRL_ID_DEP,DEVC_ID_DEP
@@ -10234,6 +10235,15 @@ SUBROUTINE READ_RAMP
1023410235
CALL SHUTDOWN(MESSAGE) ; RETURN
1023510236
ENDIF
1023610237

10238+
! Allocate and initialized external RAMP and CTRL
10239+
10240+
IF (READ_EXTERNAL) THEN
10241+
ALLOCATE(EXTERNAL_RAMP(N_RAMP))
10242+
EXTERNAL_RAMP = RAMPS%LAST
10243+
ALLOCATE(EXTERNAL_CTRL(N_CTRL))
10244+
EXTERNAL_CTRL = CONTROL%INITIAL_STATE
10245+
ENDIF
10246+
1023710247
END SUBROUTINE READ_RAMP
1023810248

1023910249

0 commit comments

Comments
 (0)