Skip to content

Commit 9f2e9e1

Browse files
committed
FDS Source : consider ignition vents for geom terrain.
1 parent bdc5fda commit 9f2e9e1

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

Source/geom.f90

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4333,6 +4333,8 @@ SUBROUTINE GET_EXT_INB_CUTFACES_TO_CFACE
43334333
CASE(KAXIS)
43344334
ADDMAT(KAXIS,LOW_IND) = -(ZF_MAX-ZS_MIN) ! -DZ(VT%K1)
43354335
ADDMAT(KAXIS,HIGH_IND) = (ZF_MAX-ZS_MIN) ! DZ(VT%K2)
4336+
CASE DEFAULT
4337+
CYCLE VENT_LOOP
43364338
END SELECT
43374339
! CFACE Loop to modify SURF_INDEX in INTERNAL_CFACE_CELLS:
43384340
CFACE_LOOP_2 : DO CFACE_INDEX_LOCAL=INTERNAL_CFACE_CELLS_LB+1,INTERNAL_CFACE_CELLS_LB+N_INTERNAL_CFACE_CELLS
@@ -4344,6 +4346,7 @@ SUBROUTINE GET_EXT_INB_CUTFACES_TO_CFACE
43444346
IF (BC%Y > Y(VT%J2)+ADDMAT(JAXIS,HIGH_IND)) CYCLE CFACE_LOOP_2
43454347
IF (BC%Z < Z(VT%K1)+ADDMAT(KAXIS,LOW_IND )) CYCLE CFACE_LOOP_2
43464348
IF (BC%Z > Z(VT%K2)+ADDMAT(KAXIS,HIGH_IND)) CYCLE CFACE_LOOP_2
4349+
CFA%VENT_INDEX = IVENT
43474350
CFA%SURF_INDEX = VT%SURF_INDEX
43484351
ENDDO CFACE_LOOP_2
43494352
ENDDO VENT_LOOP

Source/read.f90

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4897,7 +4897,7 @@ SUBROUTINE READ_REAC
48974897
ALLOCATE(RN%SPEC_ID_NU_READ(RN%N_SMIX))
48984898
RN%SPEC_ID_NU_READ = 'null'
48994899
RN%SPEC_ID_NU_READ(1:RN%N_SMIX)=SPEC_ID_NU(1:RN%N_SMIX)
4900-
4900+
49014901
ELSE SIMPLE_IF
49024902
RN%N_SMIX = 3
49034903
RN%N_SPEC_READ = 0
@@ -6384,7 +6384,7 @@ SUBROUTINE PROC_PART
63846384
! Allocate necessary boundary information if BLOWING heat transfer correction is applied
63856385

63866386
IF (SF%BLOWING) LPC%INCLUDE_BOUNDARY_PROP2_TYPE = .TRUE.
6387-
6387+
63886388
! If COLOR is not assigned to the PART class, use the SURF color if it has been specified
63896389

63906390
IF (ALL(LPC%RGB==0) .AND. .NOT.ALL(SF%RGB==SURFACE(INERT_SURF_INDEX)%RGB)) LPC%RGB=SF%RGB
@@ -12114,7 +12114,7 @@ SUBROUTINE READ_VENT
1211412114

1211512115
! If the VENT is on a GEOM do not reject (further setup in READ_GEOM)
1211612116

12117-
IF (GEOM) REJECT_VENT = .FALSE.
12117+
IF (GEOM .AND. .NOT.(TERRAIN_CASE .AND. ALL(XB(1:6)>-1.01E6_EB))) REJECT_VENT = .FALSE.
1211812118

1211912119
! If the VENT is rejected, cycle
1212012120

@@ -12163,7 +12163,7 @@ SUBROUTINE READ_VENT
1216312163
VT%UNDIVIDED_INPUT_AREA = (XB_USER(2)-XB_USER(1))*(XB_USER(4)-XB_USER(3))
1216412164

1216512165
! For circular vent account for VENT XB may only partially overlap circle
12166-
IF (RADIUS>0._EB) THEN
12166+
IF (RADIUS>0._EB) THEN
1216712167
IF (ABS(XB_USER(1)-XB_USER(2))<=SPACING(XB_USER(2))) VT%UNDIVIDED_INPUT_AREA = &
1216812168
CIRCLE_CELL_INTERSECTION_AREA(XYZ(2),XYZ(3),RADIUS,XB_USER(3),XB_USER(4),XB_USER(5),XB_USER(6))
1216912169
IF (ABS(XB_USER(3)-XB_USER(4))<=SPACING(XB_USER(4))) VT%UNDIVIDED_INPUT_AREA = &
@@ -12572,6 +12572,7 @@ SUBROUTINE SET_VENT_DEFAULTS
1257212572
UVW = -1.E12_EB
1257312573
VEL_RMS = 0._EB
1257412574
XYZ = -1.E6_EB
12575+
XB = -1.E6_EB
1257512576

1257612577
END SUBROUTINE SET_VENT_DEFAULTS
1257712578

@@ -12891,7 +12892,7 @@ SUBROUTINE READ_INIT
1289112892
DO NS=1,MAX_SPECIES
1289212893
IF (SPEC_ID(NS)=='null') EXIT
1289312894
DO NS2=1,N_TRACKED_SPECIES
12894-
12895+
1289512896
IF (TRIM(SPEC_ID(NS))==TRIM(SPECIES_MIXTURE(NS2)%ID) .OR. &
1289612897
TRIM(SPEC_ID(NS))==TRIM(SPECIES_MIXTURE(NS2)%ALT_ID)) THEN
1289712898
IF (NS2==1) THEN

0 commit comments

Comments
 (0)