FDS Source: Move EXTERNAL_RAMP and _CTRL allocation. Issue firemodels…

…#14011
gforney · Jan 9, 2025 · d505428 · d505428
1 parent 59d0136
commit d505428
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Source/main.f90 b/Source/main.f90
@@ -171,10 +171,6 @@ PROGRAM FDS
 
 IF (READ_EXTERNAL) THEN
    T_EXTERNAL = T_BEGIN + DT_EXTERNAL
-   ALLOCATE(EXTERNAL_RAMP(N_RAMP))
-   EXTERNAL_RAMP = RAMPS%LAST
-   ALLOCATE(EXTERNAL_CTRL(N_CTRL))
-   EXTERNAL_CTRL = CONTROL%INITIAL_STATE
    LU_EXTERNAL  = GET_FILE_NUMBER()
    IF (DT_EXTERNAL_HEARTBEAT > 0._EB) LU_EXTERNAL_HEARTBEAT = GET_FILE_NUMBER()
 ENDIF

diff --git a/Source/read.f90 b/Source/read.f90
@@ -10031,6 +10031,7 @@ END SUBROUTINE READ_CLIP
 
 SUBROUTINE READ_RAMP
 
+USE CONTROL_VARIABLES, ONLY: N_CTRL,CONTROL
 REAL(EB) :: X,Z,T,F,TM,INITIAL_VALUE
 INTEGER  :: I,II,NN,N,NUMBER_INTERPOLATION_POINTS,N_RES_RAMP
 CHARACTER(LABEL_LENGTH) :: DEVC_ID,CTRL_ID,CTRL_ID_DEP,DEVC_ID_DEP
@@ -10234,6 +10235,15 @@ SUBROUTINE READ_RAMP
    CALL SHUTDOWN(MESSAGE) ; RETURN
 ENDIF
 
+! Allocate and initialized external RAMP and CTRL
+
+IF (READ_EXTERNAL) THEN
+   ALLOCATE(EXTERNAL_RAMP(N_RAMP))
+   EXTERNAL_RAMP = RAMPS%LAST
+   ALLOCATE(EXTERNAL_CTRL(N_CTRL))
+   EXTERNAL_CTRL = CONTROL%INITIAL_STATE
+ENDIF
+
 END SUBROUTINE READ_RAMP