Skip to content

Commit f2059b5

Browse files
authored
Merge pull request #14732 from rmcdermo/master
FDS Source: remove old code related to first attempt at HVAC on GEOM
2 parents ca8d75d + e399232 commit f2059b5

File tree

2 files changed

+4
-20
lines changed

2 files changed

+4
-20
lines changed

Source/dump.f90

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2349,10 +2349,6 @@ SUBROUTINE WRITE_SMOKEVIEW_FILE
23492349
ENDIF
23502350
ENDIF
23512351

2352-
! Render GEOM vents using SURF properties (that is, do not draw GEOM vents in Smokeview)
2353-
2354-
IF (VT%GEOM) VT%TYPE_INDICATOR = -2
2355-
23562352
ENDDO VENT_LOOP
23572353

23582354
! Look for interpolated mesh boundaries and ensure that Smokeview leaves these blank (VENT_INDICES=-1).

Source/read.f90

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12143,10 +12143,6 @@ SUBROUTINE READ_VENT
1214312143
IF (BLOCKED) REJECT_VENT = .TRUE.
1214412144
ENDIF
1214512145

12146-
! If the VENT is on a GEOM do not reject (further setup in READ_GEOM)
12147-
12148-
IF (GEOM .AND. .NOT.(TERRAIN_CASE .AND. ALL(XB(1:6)>-1.01E6_EB))) REJECT_VENT = .FALSE.
12149-
1215012146
! If the VENT is rejected, cycle
1215112147

1215212148
IF (REJECT_VENT) THEN
@@ -12452,7 +12448,7 @@ SUBROUTINE READ_VENT
1245212448
ENDDO
1245312449
ENDIF
1245412450

12455-
IF (VT%IOR==0 .AND. .NOT. VT%GEOM) THEN
12451+
IF (VT%IOR==0) THEN
1245612452
WRITE(MESSAGE,'(3A)') 'ERROR(818): VENT ',TRIM(VT%ID),' requires an orientation index, IOR.'
1245712453
CALL SHUTDOWN(MESSAGE,PROCESS_0_ONLY=.FALSE.) ; RETURN
1245812454
ENDIF
@@ -12500,17 +12496,9 @@ SUBROUTINE READ_VENT
1250012496

1250112497
! Check UVW
1250212498

12503-
IF (.NOT.VT%GEOM) THEN
12504-
IF (ABS(VT%UVW(ABS(VT%IOR))) < TWO_EPSILON_EB) THEN
12505-
WRITE(MESSAGE,'(3A)') 'ERROR(821): VENT ',TRIM(VT%ID),' cannot have normal component of UVW equal to 0.'
12506-
CALL SHUTDOWN(MESSAGE,PROCESS_0_ONLY=.FALSE.) ; RETURN
12507-
ENDIF
12508-
ENDIF
12509-
12510-
! Special treatment for coloring GEOM surface with HVAC_BOUNDARY
12511-
12512-
IF (VT%GEOM .AND. VT%BOUNDARY_TYPE==HVAC_BOUNDARY) THEN
12513-
SURFACE(VT%SURF_INDEX)%RGB = (/0,128,0/) ! green
12499+
IF (ABS(VT%UVW(ABS(VT%IOR))) < TWO_EPSILON_EB) THEN
12500+
WRITE(MESSAGE,'(3A)') 'ERROR(821): VENT ',TRIM(VT%ID),' cannot have normal component of UVW equal to 0.'
12501+
CALL SHUTDOWN(MESSAGE,PROCESS_0_ONLY=.FALSE.) ; RETURN
1251412502
ENDIF
1251512503

1251612504
ENDDO VENT_LOOP_2

0 commit comments

Comments
 (0)