Merge pull request #14024 from mcgratta/master

FDS Source: Issue #14018. Fix bug in vent drawing logic
firemodels · Jan 9, 2025 · 8695afd · 8695afd
2 parents e026318 + e7a602d
commit 8695afd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Source/dump.f90 b/Source/dump.f90
@@ -2296,7 +2296,7 @@ SUBROUTINE WRITE_SMOKEVIEW_FILE
          WHERE (VENT_INDICES(HI1:HI2,VI1:VI2,FACE_INDEX)==0) VENT_INDICES(HI1:HI2,VI1:VI2,FACE_INDEX) = -1
       ELSE  ! Tag user-specified vents
          WHERE (VENT_INDICES(HI1:HI2,VI1:VI2,FACE_INDEX)==0) VENT_INDICES(HI1:HI2,VI1:VI2,FACE_INDEX) = N
-         IF (VT%OBST_INDEX==0) THEN  ! a dummy vent will be created and drawn rather than the actual vent.
+         IF (.NOT.VT%DRAW) THEN  ! a dummy vent will be created and drawn rather than the actual vent.
             VT%COLOR_INDICATOR =  8
             VT%TYPE_INDICATOR  = -2
             VT%TRANSPARENCY    =  0._EB

diff --git a/Source/init.f90 b/Source/init.f90
@@ -2956,7 +2956,7 @@ SUBROUTINE INIT_WALL_CELL(NM,I,J,K,OBST_INDEX,IW,IOR,SURF_INDEX,IERR,TT)
    VENT_INDEX_FOUND = N
    VENT_INDEX = N
    SURF_INDEX_NEW = VT%SURF_INDEX
-   VT%OBST_INDEX = OBST_INDEX
+   IF (OBST_INDEX>0 .AND. IW<=M%N_EXTERNAL_WALL_CELLS) VT%DRAW = .FALSE.
 
 ENDDO VENT_SEARCH_LOOP
 

diff --git a/Source/type.f90 b/Source/type.f90
@@ -1489,7 +1489,7 @@ MODULE TYPES
                X1_ORIG=0._EB,X2_ORIG=0._EB,Y1_ORIG=0._EB,Y2_ORIG=0._EB,Z1_ORIG=0._EB,Z2_ORIG=0._EB, &
                X0=-9.E6_EB,Y0=-9.E6_EB,Z0=-9.E6_EB,FIRE_SPREAD_RATE,UNDIVIDED_INPUT_AREA=0._EB,INPUT_AREA=0._EB,&
                TMP_EXTERIOR=-1000._EB,DYNAMIC_PRESSURE=0._EB,UVW(3)=-1.E12_EB,RADIUS=-1._EB
-   LOGICAL :: ACTIVATED=.TRUE.,GEOM=.FALSE.,AREA_ADJUST=.TRUE.
+   LOGICAL :: ACTIVATED=.TRUE.,GEOM=.FALSE.,AREA_ADJUST=.TRUE.,DRAW=.TRUE.
    CHARACTER(LABEL_LENGTH) :: DEVC_ID='null',CTRL_ID='null',ID='null'
    ! turbulent inflow (experimental)
    INTEGER :: N_EDDY=0