Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions Source/dump.f90
Original file line number Diff line number Diff line change
Expand Up @@ -8206,7 +8206,7 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z

CASE(253) ! ZONE PRESSURE SOLVER TYPE
GAS_PHASE_OUTPUT_RES = REAL(PRES_FLAG,EB)
IF (PRES_FLAG==ULMAT_FLAG .AND. ALLOCATED(MESHES(NM)%ZONE_MESH)) THEN
IF (PRES_FLAG==ULMAT_FLAG) THEN
IF (ZONE_MESH(ZONE_MESH(PRESSURE_ZONE(II,JJ,KK))%CONNECTED_ZONE_PARENT)%USE_FFT) THEN
GAS_PHASE_OUTPUT_RES = REAL(FFT_FLAG,EB)
ELSE
Expand All @@ -8217,7 +8217,7 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z

CASE(254) ! PRESSURE ZONE PARENT
GAS_PHASE_OUTPUT_RES = 0._EB
IF (PRES_FLAG==ULMAT_FLAG .AND. ALLOCATED(MESHES(NM)%ZONE_MESH)) THEN
IF (PRES_FLAG==ULMAT_FLAG) THEN
GAS_PHASE_OUTPUT_RES = REAL(ZONE_MESH(PRESSURE_ZONE(II,JJ,KK))%CONNECTED_ZONE_PARENT,EB)
ENDIF

Expand Down
36 changes: 18 additions & 18 deletions Source/main.f90
Original file line number Diff line number Diff line change
Expand Up @@ -470,24 +470,6 @@ PROGRAM FDS
CALL STOP_CHECK(1)
ENDIF

! Make an initial dump of ambient values

IF (.NOT.RESTART) THEN
DO NM=LOWER_MESH_INDEX,UPPER_MESH_INDEX
CALL UPDATE_GLOBAL_OUTPUTS(T,DT,NM)
CALL DUMP_MESH_OUTPUTS(T,DT,NM)
ENDDO
IF (MY_RANK==0 .AND. VERBOSE) CALL VERBOSE_PRINTOUT('Completed DUMP_MESH_OUTPUTS')
ENDIF

! Make an initial dump of global output quantities

IF (.NOT.RESTART) THEN
CALL EXCHANGE_GLOBAL_OUTPUTS
CALL UPDATE_CONTROLS(T,0._EB,CTRL_STOP_STATUS,.TRUE.)
CALL DUMP_GLOBAL_OUTPUTS
ENDIF

! Check for changes in VENT or OBSTruction control and device status at t=T_BEGIN

IF (.NOT.RESTART) CALL CREATE_OR_REMOVE_OBSTRUCTIONS
Expand All @@ -506,6 +488,24 @@ PROGRAM FDS

IF (MY_RANK==0 .AND. VERBOSE) CALL VERBOSE_PRINTOUT('Completed Poisson initialization')

! Make an initial dump of ambient values

IF (.NOT.RESTART) THEN
DO NM=LOWER_MESH_INDEX,UPPER_MESH_INDEX
CALL UPDATE_GLOBAL_OUTPUTS(T,DT,NM)
CALL DUMP_MESH_OUTPUTS(T,DT,NM)
ENDDO
IF (MY_RANK==0 .AND. VERBOSE) CALL VERBOSE_PRINTOUT('Completed DUMP_MESH_OUTPUTS')
ENDIF

! Make an initial dump of global output quantities

IF (.NOT.RESTART) THEN
CALL EXCHANGE_GLOBAL_OUTPUTS
CALL UPDATE_CONTROLS(T,0._EB,CTRL_STOP_STATUS,.TRUE.)
CALL DUMP_GLOBAL_OUTPUTS
ENDIF

! Write out character strings to .smv file

CALL WRITE_STRINGS
Expand Down