Skip to content

FDS Source: Issue #13963. Clean up exterior patch logic #13971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcgratta merged 1 commit into from
Jan 2, 2025
Merged

FDS Source: Issue #13963. Clean up exterior patch logic #13971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 8 additions & 23 deletions Source/dump.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1510,8 +1510,7 @@ SUBROUTINE WRITE_SMOKEVIEW_FILE
USE HVAC_ROUTINES, ONLY: N_DUCT_QUANTITY,N_NODE_QUANTITY, DUCT_QUANTITY_ARRAY,NODE_QUANTITY_ARRAY
USE TRAN, ONLY: TRAN_TYPE,TRANS
USE MISC_FUNCTIONS, ONLY : ACCUMULATE_STRING
INTEGER :: N,NN,I,J,K,NM,NX,NY,NZ,NIN,NXL,NYL,NZL,COLOR_INDEX,IZERO,STATE_INDEX,SURF_INDEX,&
TYPE_INDEX,HI1,HI2,VI1,VI2,FACE_INDEX,VRGB(3),N_CVENT
INTEGER :: N,NN,I,J,K,NM,NX,NY,NZ,NIN,NXL,NYL,NZL,COLOR_INDEX,IZERO,STATE_INDEX,TYPE_INDEX,HI1,HI2,VI1,VI2,FACE_INDEX,N_CVENT
INTEGER, ALLOCATABLE, DIMENSION(:,:,:) :: VENT_INDICES
REAL(EB) :: X1,Y1,Z1,X2,Y2,Z2,XX,YY,ZZ,PERT1(4),PERT2(4),XMIN,YMIN,ZMIN,XA,YA,ZA
TYPE SEGMENT_TYPE
Expand Down Expand Up @@ -2288,11 +2287,8 @@ SUBROUTINE WRITE_SMOKEVIEW_FILE
VT%BOUNDARY_TYPE==PERIODIC_BOUNDARY .OR. &
VT%TYPE_INDICATOR==2) THEN ! Render this vent invisible in Smokeview
WHERE (VENT_INDICES(HI1:HI2,VI1:VI2,FACE_INDEX)==0) VENT_INDICES(HI1:HI2,VI1:VI2,FACE_INDEX) = -1
ELSE ! Make solid color vents invisible (they will be replaced by dummy vents)
ELSE ! Vent on a solid wall
WHERE (VENT_INDICES(HI1:HI2,VI1:VI2,FACE_INDEX)==0) VENT_INDICES(HI1:HI2,VI1:VI2,FACE_INDEX) = N
VT%COLOR_INDICATOR = 8
VT%TYPE_INDICATOR = -2
VT%TRANSPARENCY = 0._EB
ENDIF

ENDDO VENT_LOOP
Expand Down Expand Up @@ -2363,11 +2359,9 @@ SUBROUTINE WRITE_SMOKEVIEW_FILE
ENDDO

DO N=1,M%N_EXTERIOR_PATCH
SURF_INDEX = DEFAULT_SURF_INDEX
EP => M%EXTERIOR_PATCH(N)
IF (EP%VENT_INDEX>0) SURF_INDEX = M%VENTS(EP%VENT_INDEX)%SURF_INDEX
WRITE(MYSTR,'(6F14.5,I6,I4)') M%X(EP%I1),M%X(EP%I2),M%Y(EP%J1),M%Y(EP%J2), &
M%Z(EP%K1),M%Z(EP%K2),M%N_VENT+N,SURF_INDEX; CALL ADDSTR
M%Z(EP%K1),M%Z(EP%K2),M%N_VENT+N,DEFAULT_SURF_INDEX; CALL ADDSTR
ENDDO

DO N=1,M%N_VENT
Expand All @@ -2393,15 +2387,8 @@ SUBROUTINE WRITE_SMOKEVIEW_FILE
DO N=1,M%N_EXTERIOR_PATCH
COLOR_INDEX = 99
TYPE_INDEX = 0
VRGB = -1
EP => M%EXTERIOR_PATCH(N)
IF (EP%VENT_INDEX>0) VRGB = M%VENTS(EP%VENT_INDEX)%RGB
IF (VRGB(1)<0) THEN
WRITE(MYSTR,'(8I5)') EP%I1,EP%I2,EP%J1,EP%J2,EP%K1,EP%K2,COLOR_INDEX,TYPE_INDEX; CALL ADDSTR
ELSE
WRITE(MYSTR,'(8I5,4F13.5)') EP%I1,EP%I2,EP%J1,EP%J2,EP%K1,EP%K2,COLOR_INDEX,TYPE_INDEX, &
REAL(VRGB,FB)/255._FB,1._EB; CALL ADDSTR
ENDIF
WRITE(MYSTR,'(8I5)') EP%I1,EP%I2,EP%J1,EP%J2,EP%K1,EP%K2,COLOR_INDEX,TYPE_INDEX; CALL ADDSTR
ENDDO

! Write out information about circular vents to Smokeview file
Expand Down Expand Up @@ -2474,26 +2461,25 @@ END SUBROUTINE EOL
SUBROUTINE DUMMY_VENTS(FI,N1,N2)

INTEGER, INTENT(IN) :: N1,N2,FI
INTEGER :: I,J,II,JJ,ISTP,JSTP,VENT_INDEX
INTEGER :: I,J,II,JJ,ISTP,JSTP

JLOOP: DO J=1,N2
ILOOP: DO I=1,N1

IF (VENT_INDICES(I,J,FI)==-1) CYCLE ILOOP
VENT_INDEX = VENT_INDICES(I,J,FI)
IF (VENT_INDICES(I,J,FI)/=0) CYCLE ILOOP

ISTP = N1
JSTP = N2
JJLOOP: DO JJ=J+1,N2
IF (VENT_INDICES(I,JJ,FI)/=VENT_INDEX) THEN
IF (VENT_INDICES(I,JJ,FI)/=0) THEN
JSTP = JJ-1
EXIT JJLOOP
ENDIF
ENDDO JJLOOP

IILOOP: DO II=I+1,N1
JJLOOP2: DO JJ=J,JSTP
IF (VENT_INDICES(II,JJ,FI)/=VENT_INDEX) THEN
IF (VENT_INDICES(II,JJ,FI)/=0) THEN
ISTP = II-1
EXIT IILOOP
ENDIF
Expand All @@ -2518,7 +2504,6 @@ SUBROUTINE DUMMY_VENTS(FI,N1,N2)
CASE (6) ; EP%K1=M%KBAR ; EP%K2=M%KBAR ; EP%I1=I-1 ; EP%I2=ISTP ; EP%J1=J-1 ; EP%J2=JSTP ; EP%IOR=-3
EP%KG1=EP%K1 ; EP%KG2=EP%K2 ; EP%IG1=I ; EP%IG2=ISTP; EP%JG1=J ; EP%JG2=JSTP
END SELECT
EP%VENT_INDEX = VENT_INDEX

ENDDO ILOOP
ENDDO JLOOP
Expand Down
2 changes: 1 addition & 1 deletion Source/type.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1555,7 +1555,7 @@ MODULE TYPES
END TYPE RAD_FILE_TYPE

TYPE PATCH_TYPE
INTEGER :: I1,I2,J1,J2,K1,K2,IG1,IG2,JG1,JG2,KG1,KG2,IOR=0,OBST_INDEX=0,VENT_INDEX=0,MESH_INDEX=0
INTEGER :: I1,I2,J1,J2,K1,K2,IG1,IG2,JG1,JG2,KG1,KG2,IOR=0,OBST_INDEX=0,MESH_INDEX=0
END TYPE PATCH_TYPE

TYPE BOUNDARY_FILE_TYPE
Expand Down
Loading