Skip to content

Commit ac8ddda

Browse files
committed
FDS Source: main.f90, Dump initial mesh/global outputs after call to create-remove obstacles.
1 parent 2c07b6e commit ac8ddda

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

Source/dump.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8206,7 +8206,7 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
82068206

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

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

Source/main.f90

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -470,24 +470,6 @@ PROGRAM FDS
470470
CALL STOP_CHECK(1)
471471
ENDIF
472472

473-
! Make an initial dump of ambient values
474-
475-
IF (.NOT.RESTART) THEN
476-
DO NM=LOWER_MESH_INDEX,UPPER_MESH_INDEX
477-
CALL UPDATE_GLOBAL_OUTPUTS(T,DT,NM)
478-
CALL DUMP_MESH_OUTPUTS(T,DT,NM)
479-
ENDDO
480-
IF (MY_RANK==0 .AND. VERBOSE) CALL VERBOSE_PRINTOUT('Completed DUMP_MESH_OUTPUTS')
481-
ENDIF
482-
483-
! Make an initial dump of global output quantities
484-
485-
IF (.NOT.RESTART) THEN
486-
CALL EXCHANGE_GLOBAL_OUTPUTS
487-
CALL UPDATE_CONTROLS(T,0._EB,CTRL_STOP_STATUS,.TRUE.)
488-
CALL DUMP_GLOBAL_OUTPUTS
489-
ENDIF
490-
491473
! Check for changes in VENT or OBSTruction control and device status at t=T_BEGIN
492474

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

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

491+
! Make an initial dump of ambient values
492+
493+
IF (.NOT.RESTART) THEN
494+
DO NM=LOWER_MESH_INDEX,UPPER_MESH_INDEX
495+
CALL UPDATE_GLOBAL_OUTPUTS(T,DT,NM)
496+
CALL DUMP_MESH_OUTPUTS(T,DT,NM)
497+
ENDDO
498+
IF (MY_RANK==0 .AND. VERBOSE) CALL VERBOSE_PRINTOUT('Completed DUMP_MESH_OUTPUTS')
499+
ENDIF
500+
501+
! Make an initial dump of global output quantities
502+
503+
IF (.NOT.RESTART) THEN
504+
CALL EXCHANGE_GLOBAL_OUTPUTS
505+
CALL UPDATE_CONTROLS(T,0._EB,CTRL_STOP_STATUS,.TRUE.)
506+
CALL DUMP_GLOBAL_OUTPUTS
507+
ENDIF
508+
509509
! Write out character strings to .smv file
510510

511511
CALL WRITE_STRINGS

0 commit comments

Comments
 (0)