Skip to content

FDS Source: Move EXTERNAL_RAMP and _CTRL allocation. Issue #14011 #14021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
drjfloyd merged 1 commit into from
Jan 9, 2025
Merged

FDS Source: Move EXTERNAL_RAMP and _CTRL allocation. Issue #14011 #14021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Source/main.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions Source/read.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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


Expand Down
Loading