Skip to content

Commit f45add4

Browse files
committed
FDS Source: adjust calculation for BI-DIR
1 parent 12003d0 commit f45add4

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Source/dump.f90

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2181,9 +2181,9 @@ SUBROUTINE WRITE_SMOKEVIEW_FILE
21812181
IF (.NOT.SETUP_ONLY) THEN
21822182

21832183
! Mesh grid dimensions and neighbor information.
2184-
! Determine if the six mesh faces abut a single mesh (MESH_NEIGHBOR>0), nothing (MESH_NEIGHBOR=0),
2184+
! Determine if the six mesh faces abut a single mesh (MESH_NEIGHBOR>0), nothing (MESH_NEIGHBOR=0),
21852185
! or a combination of nothing and/or multiple meshes (MESH_NEIGHBOR=-1). Write six values to GRID line.
2186-
2186+
21872187
DO I=1,6
21882188
SELECT CASE(I)
21892189
CASE(1) ; IW1=1 ; IW2=IW1+M%JBAR*M%KBAR-1
@@ -2203,7 +2203,7 @@ SUBROUTINE WRITE_SMOKEVIEW_FILE
22032203
ENDDO
22042204

22052205
ENDIF
2206-
2206+
22072207
CALL EOL
22082208
WRITE(MYSTR,'(A,3X,A)') 'GRID',TRIM(MESH_NAME(NM)); CALL ADDSTR
22092209
WRITE(MYSTR,'(9I6)') M%IBAR,M%JBAR,M%KBAR,MESH_NEIGHBOR(1:6) ; CALL ADDSTR
@@ -7882,9 +7882,9 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
78827882
ELSE
78837883
PROBE_TMP = TMP(II,JJ,KK)
78847884
ENDIF
7885-
UU = U(II,JJ,KK)
7886-
VV = V(II,JJ,KK)
7887-
WW = W(II,JJ,KK)
7885+
UU = 0.5_EB*(U(MAX(0,II-1),JJ,KK)+U(MIN(IBAR,II),JJ,KK))
7886+
VV = 0.5_EB*(V(II,MAX(0,JJ-1),KK)+V(II,MIN(JBAR,JJ),KK))
7887+
WW = 0.5_EB*(W(II,JJ,MAX(0,KK-1))+W(II,JJ,MIN(KBAR,KK)))
78887888
VEL2 = UU**2+VV**2+WW**2
78897889
VEL = SQRT(VEL2)
78907890
DP = 0.5_EB*VEL2*RHO(II,JJ,KK)
@@ -8293,7 +8293,7 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
82938293
IF(FCVAR(II,JJ,KK,CC_IDRC,JAXIS)>0) GAS_PHASE_OUTPUT_RES = REAL(RC_FACE(FCVAR(II,JJ,KK,CC_IDRC,JAXIS))%UNKF,EB)
82948294
ENDIF
82958295

8296-
CASE(194) ! F_Z UNKNOWN NUMBER
8296+
CASE(194) ! F_Z UNKNOWN NUMBER
82978297
GAS_PHASE_OUTPUT_RES = 0._EB
82988298
IF (CC_IBM) THEN
82998299
GAS_PHASE_OUTPUT_RES = REAL(FCVAR(II,JJ,KK,CC_UNKF,KAXIS),EB)
@@ -10608,7 +10608,7 @@ SUBROUTINE DUMP_BNDF(T,DT,NM)
1060810608
! Interpolate the boundary quantity PP at cell corners, PPN
1060910609

1061010610
IF (.NOT.BF%CELL_CENTERED) THEN
10611-
10611+
1061210612
! Dont include undetermined values in interpolation for FIRE ARRIVAL TIME
1061310613
IF (OUTPUT_QUANTITY(BF%INDEX)%NAME=='FIRE ARRIVAL TIME') THEN
1061410614
WHERE(PP>9.E5_FB) IBK=0
@@ -11569,7 +11569,7 @@ SUBROUTINE DUMP_CVODE_SUBSTEPS()
1156911569
DO ROWI = 1, TOTAL_SUBSTEPS_TAKEN
1157011570
WRITE(LU_CVODE_SUBSTEPS,TCFORM) (CVODE_SUBSTEP_DATA(ROWI,COLI),COLI=1,NCOLS)
1157111571
ENDDO
11572-
ENDIF
11572+
ENDIF
1157311573

1157411574
END SUBROUTINE DUMP_CVODE_SUBSTEPS
1157511575

0 commit comments

Comments
 (0)