Merge pull request #14704 from drjfloyd/master

FDS Source: Allow HVAC for GEOM

Author: drjfloyd

Source/dump.f90

@@ -2349,10 +2349,6 @@ SUBROUTINE WRITE_SMOKEVIEW_FILE
          ENDIF
       ENDIF
 
-      ! Render GEOM vents using SURF properties (that is, do not draw GEOM vents in Smokeview)
-
-      IF (VT%GEOM) VT%TYPE_INDICATOR = -2
-
    ENDDO VENT_LOOP
 
    ! Look for interpolated mesh boundaries and ensure that Smokeview leaves these blank (VENT_INDICES=-1).

Source/func.f90

@@ -3910,7 +3910,7 @@ SUBROUTINE PACK_CFACE(NM,OS,CFA,SURF_INDEX,RC,IC,LC,UNPACK_IT,COUNT_ONLY,CHECK_B
 ! Assign integer pointers and values
 
 IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),CFA%SURF_INDEX,UNPACK_IT)
-IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),CFA%VENT_INDEX,UNPACK_IT)
+IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),CFA%NODE_INDEX,UNPACK_IT)
 IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),CFA%BOUNDARY_TYPE,UNPACK_IT)
 IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),CFA%CUT_FACE_IND1,UNPACK_IT)
 IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC),CFA%CUT_FACE_IND2,UNPACK_IT)

Source/geom.f90

@@ -4121,13 +4121,11 @@ SUBROUTINE GET_EXT_INB_CUTFACES_TO_CFACE
 
 ! Local Variables:
 INTEGER :: ICF, CFACE_INDEX_LOCAL, SURF_INDEX
-INTEGER :: IVENT
 REAL(EB):: ADDMAT(IAXIS:KAXIS,LOW_IND:HIGH_IND)
 
 ! GET_CUTCELLS_VERBOSE variables:
 INTEGER, ALLOCATABLE, DIMENSION(:) :: NCFACE_BY_MESH
 
-TYPE(VENTS_TYPE), POINTER :: VT
 TYPE(CFACE_TYPE), POINTER :: CFA
 
 IF(GET_CUTCELLS_VERBOSE) CALL CPU_TIME(CPUTIME_START)
@@ -4310,53 +4308,10 @@ SUBROUTINE GET_EXT_INB_CUTFACES_TO_CFACE
    MESHES(NM)%N_INTERNAL_CFACE_CELLS   = CFACE_INDEX_LOCAL - MESHES(NM)%INTERNAL_CFACE_CELLS_LB
 ENDDO MESH_LOOP_1
 
-! Second loop, apply VENTS to change SURF_ID associated with CFACEs:
-MESH_LOOP_2 : DO NM=LOWER_MESH_INDEX,UPPER_MESH_INDEX
-   CALL POINT_TO_MESH(NM)
-
-   ! ! Currently : Modify CFACE SURF_INDEX with VENT information: This needs more development.
-   IF(TERRAIN_CASE) THEN
-      VENT_LOOP : DO IVENT=1,MESHES(NM)%N_VENT
-         VT => VENTS(IVENT)
-         IF(.NOT.VT%GEOM) CYCLE VENT_LOOP ! Do not apply vent to Geometries.
-
-         ! This test is a simplified test for VENTS changing the CFACE SURF_ID to VENT SURF_ID for all CFACEs whose
-         ! centroid locations lay within the frame of the IOR grid aligned VENT:
-         ADDMAT = 0._EB;
-         SELECT CASE(ABS(VT%IOR))
-         CASE(IAXIS)
-            ADDMAT(IAXIS,LOW_IND)  = -(XF_MAX-XS_MIN) ! -DX(VT%I1) Set normal size to 2 times domain size.
-            ADDMAT(IAXIS,HIGH_IND) =  (XF_MAX-XS_MIN) !  DX(VT%I2) XF_MAX, etc. defined in cons.f90.
-         CASE(JAXIS)
-            ADDMAT(JAXIS,LOW_IND)  = -(YF_MAX-YS_MIN) ! -DY(VT%J1)
-            ADDMAT(JAXIS,HIGH_IND) =  (YF_MAX-YS_MIN) !  DY(VT%J2)
-         CASE(KAXIS)
-            ADDMAT(KAXIS,LOW_IND)  = -(ZF_MAX-ZS_MIN) ! -DZ(VT%K1)
-            ADDMAT(KAXIS,HIGH_IND) =  (ZF_MAX-ZS_MIN) !  DZ(VT%K2)
-         CASE DEFAULT
-            CYCLE VENT_LOOP
-         END SELECT
-         ! CFACE Loop to modify SURF_INDEX in INTERNAL_CFACE_CELLS:
-         CFACE_LOOP_2 : DO CFACE_INDEX_LOCAL=INTERNAL_CFACE_CELLS_LB+1,INTERNAL_CFACE_CELLS_LB+N_INTERNAL_CFACE_CELLS
-            CFA => CFACE(CFACE_INDEX_LOCAL)
-            BC => BOUNDARY_COORD(CFA%BC_INDEX)
-            IF (BC%X < X(VT%I1)+ADDMAT(IAXIS,LOW_IND )) CYCLE CFACE_LOOP_2
-            IF (BC%X > X(VT%I2)+ADDMAT(IAXIS,HIGH_IND)) CYCLE CFACE_LOOP_2
-            IF (BC%Y < Y(VT%J1)+ADDMAT(JAXIS,LOW_IND )) CYCLE CFACE_LOOP_2
-            IF (BC%Y > Y(VT%J2)+ADDMAT(JAXIS,HIGH_IND)) CYCLE CFACE_LOOP_2
-            IF (BC%Z < Z(VT%K1)+ADDMAT(KAXIS,LOW_IND )) CYCLE CFACE_LOOP_2
-            IF (BC%Z > Z(VT%K2)+ADDMAT(KAXIS,HIGH_IND)) CYCLE CFACE_LOOP_2
-            CFA%VENT_INDEX = IVENT
-            CFA%SURF_INDEX = VT%SURF_INDEX
-         ENDDO CFACE_LOOP_2
-      ENDDO VENT_LOOP
-   ENDIF
-ENDDO MESH_LOOP_2
 ! - At this pont all final values of SURF_INDEX have been given to CFACEs.
 
 ! Third loop, 1. Compute final FDS area integrals by SURF_ID and GEOM.
-!             2. Compute input areas by SURF_ID and GEOM. First sum over GEOM FACES SURF_IDs,
-!                then VENTS input surfaces are assigned to corresponding GEOMs and SURF_IDs if present (VENTs take precedence).
+!             2. Compute input areas by SURF_ID and GEOM. First sum over GEOM FACES SURF_IDs.
 IF(N_GEOMETRY>0) THEN
    ALLOCATE(FDS_AREA_GEOM(0:N_SURF,N_GEOMETRY)); FDS_AREA_GEOM = 0._EB
 ENDIF
@@ -8855,7 +8810,7 @@ SUBROUTINE INIT_CFACE_CELL(NM,ICF,IFACE,CFACE_INDEX,SURF_INDEX,STAGE_FLG,IS_INB,
 CF=> CUT_FACE(ICF)
 
 STAGE_FLG_BRANCH : SELECT CASE(STAGE_FLG)
-
+   
 CASE(INTEGER_ONE) ! Geometry information for CFACE.
 
    CALL ALLOCATE_STORAGE(NM,SURF_INDEX=SURF_INDEX,CFACE_INDEX=CFACE_INDEX)
@@ -8865,6 +8820,8 @@ SUBROUTINE INIT_CFACE_CELL(NM,ICF,IFACE,CFACE_INDEX,SURF_INDEX,STAGE_FLG,IS_INB,
    B1   => M%BOUNDARY_PROP1(CFA%B1_INDEX)
 
    CFA%SURF_INDEX = SURF_INDEX
+   CFA%NODE_INDEX = SURFACE(SURF_INDEX)%NODE_INDEX
+   B1%NODE_INDEX = CFA%NODE_INDEX
 
    BC%X = CF%XYZCEN(IAXIS,IFACE)
    BC%Y = CF%XYZCEN(JAXIS,IFACE)
@@ -8880,7 +8837,6 @@ SUBROUTINE INIT_CFACE_CELL(NM,ICF,IFACE,CFACE_INDEX,SURF_INDEX,STAGE_FLG,IS_INB,
 
       IBOD           = CF%BODTRI(1,IFACE)
       IWSEL          = CF%BODTRI(2,IFACE)
-      CFA%VENT_INDEX = GEOMETRY(IBOD)%VENTS(IWSEL)
 
       ! Normal to cut-face:
       V2(IAXIS:KAXIS) = CF%XYZVERT(IAXIS:KAXIS,CF%CFELEM(2,IFACE))-CF%XYZCEN(IAXIS:KAXIS,IFACE)
@@ -8921,7 +8877,7 @@ SUBROUTINE INIT_CFACE_CELL(NM,ICF,IFACE,CFACE_INDEX,SURF_INDEX,STAGE_FLG,IS_INB,
 
          ! External mesh boundary CFACES inherit the underlaying WALL type.
          CFA%BOUNDARY_TYPE = WC%BOUNDARY_TYPE
-         CFA%VENT_INDEX    = WC%VENT_INDEX
+         CFA%NODE_INDEX    = BOUNDARY_PROP1(WC%B1_INDEX)%NODE_INDEX
 
          BC%II = WC_BC%II
          BC%JJ = WC_BC%JJ
@@ -22174,10 +22130,10 @@ SUBROUTINE READ_GEOM
 CHARACTER(LABEL_LENGTH) :: ID,MATL_ID,TEXTURE_MAPPING, &
                            DEVC_ID,CTRL_ID,SURF_IDS(3),SURF_ID6(6),MOVE_ID
 CHARACTER(MESSAGE_LENGTH) :: BUFFER,FN_BINGEOM,BINARY_FILE
-CHARACTER(LABEL_LENGTH),  ALLOCATABLE, DIMENSION(:) :: SURF_ID,VENT_ID
+CHARACTER(LABEL_LENGTH),  ALLOCATABLE, DIMENSION(:) :: SURF_ID
 REAL(EB), ALLOCATABLE, DIMENSION(:) :: ZVALS,TFACES
 REAL(EB), ALLOCATABLE, TARGET, DIMENSION(:) :: VERTS,VERTS_AUX
-INTEGER, ALLOCATABLE, DIMENSION(:) :: SURF_ID_IND,VENT_ID_IND,POLY
+INTEGER, ALLOCATABLE, DIMENSION(:) :: SURF_ID_IND,POLY
 INTEGER, ALLOCATABLE, TARGET, DIMENSION(:) :: FACES,FACES_AUX,VOLUS,OFACES,SURFS,SURFS2
 LOGICAL, ALLOCATABLE, DIMENSION(:) :: IS_EXTERNAL
 
@@ -22192,7 +22148,7 @@ SUBROUTINE READ_GEOM
            GEOM_TYPE,NXB,IJK(3),N_LEVELS,N_LAT,N_LONG,SPHERE_TYPE,BOXVERTLIST(8),NI,NIJ,IVOL,SORT_FACES,II,II1,II2,II3,&
            X1AXIS,NNN,CYLINDER_NSEG_THETA,CYLINDER_NSEG_AXIS,CYL_FIND(LOW_IND:HIGH_IND,1:3),CELL_BLOCK_IOR
 
-LOGICAL :: HAVE_SURF,HAVE_VENT,HAVE_MATL,IN_LIST,SURF_INDEX_PER_FACE,BNDF_GEOM,LOGTEST
+LOGICAL :: HAVE_SURF,HAVE_MATL,IN_LIST,SURF_INDEX_PER_FACE,BNDF_GEOM,LOGTEST
 REAL(EB), POINTER, DIMENSION(:) :: V1,V2,V3,V4
 INTEGER, POINTER, DIMENSION(:) :: FACEI,FACEJ,FACE_FROM,FACE_TO,VOL
 TYPE(MESH_TYPE), POINTER :: M
@@ -22235,7 +22191,7 @@ SUBROUTINE READ_GEOM
                 CYLINDER_RADIUS,CYLINDER_LENGTH,CYLINDER_NSEG_THETA,CYLINDER_NSEG_AXIS,&
                 EXTRUDE,EXTEND_TERRAIN,FACES,ID,IJK,IS_TERRAIN,MOVE_ID,N_LAT,N_LEVELS,N_LONG,POLY,&
                 RGB,SPHERE_ORIGIN,SPHERE_RADIUS,SPHERE_TYPE,SURF_ID,SURF_IDS,SURF_ID6,&
-                TEXTURE_MAPPING,TEXTURE_ORIGIN,TEXTURE_SCALE,TRANSPARENCY,VENT_ID,&
+                TEXTURE_MAPPING,TEXTURE_ORIGIN,TEXTURE_SCALE,TRANSPARENCY,&
                 VERTS,XB,ZMIN,ZVALS,ZVAL_HORIZON
 
 ! first pass - count number of &GEOM lines.
@@ -23326,9 +23282,7 @@ SUBROUTINE READ_GEOM
       ENDDO
       ALLOCATE(G%SURF_ID(1:N_SURF_ID))
       G%SURF_ID(1:N_SURF_ID) = SURF_ID(1:N_SURF_ID)
-      ALLOCATE(G%VENT_ID(1:N_SURF_ID))
-      G%VENT_ID(1:N_SURF_ID) = VENT_ID(1:N_SURF_ID)
-
+      
       ! Now find correspondence with SURFACE(N)%ID:
       IF (ALLOCATED(SURF_ID_IND)) DEALLOCATE(SURF_ID_IND)
       ALLOCATE(SURF_ID_IND(N_SURF_ID))
@@ -23350,35 +23304,6 @@ SUBROUTINE READ_GEOM
    ENDIF
    G%HAVE_SURF = HAVE_SURF
 
-   ! Look for non-'null' VENTS:
-   HAVE_VENT=.FALSE.
-   DO I = 1, MAX_SURF_IDS
-      IF (TRIM(VENT_ID(I))=='null') CYCLE
-      HAVE_VENT=.TRUE.
-   ENDDO
-   G%HAVE_VENT = HAVE_VENT
-
-   IF(HAVE_VENT) THEN
-      ! Build single VENT_ID index list:
-      IF (ALLOCATED(VENT_ID_IND)) DEALLOCATE(VENT_ID_IND); ALLOCATE(VENT_ID_IND(0:MAX_SURF_IDS)); VENT_ID_IND = 0
-      DO I = 1, MAX_SURF_IDS ! Here we run over the GEOM local vent array max range.
-          IF (TRIM(VENT_ID(I))=='null') CYCLE ! Cycle if undefined vent, its VENT_ID_IND(I)=0.
-          ! Get VENT Index:
-          IN_LIST = .FALSE.
-          DO J = 1, N_VENT
-             IF (TRIM(VENT_ID(I))/=TRIM(VENTS(J)%ID)) CYCLE
-             VENT_ID_IND(I)=J
-             IN_LIST = .TRUE.
-             EXIT
-          ENDDO
-          IF(.NOT.IN_LIST) THEN
-             WRITE(MESSAGE,'(A,I4,3A)') 'ERROR(735): problem with GEOM, the vent ID(',I,') =',&
-                                         TRIM(VENT_ID(I)),' is not defined.'
-             CALL SHUTDOWN(MESSAGE)
-          ENDIF
-      ENDDO
-   ENDIF
-
    IF (MATL_ID=='null') THEN
       HAVE_MATL = .FALSE.
    ENDIF
@@ -23671,21 +23596,13 @@ SUBROUTINE READ_GEOM
       ALLOCATE(G%SURFS(N_FACES),STAT=IZERO)
       CALL ChkMemErr('READ_GEOM','G%SURFS',IZERO)
 
-      ALLOCATE(G%VENTS(N_FACES),STAT=IZERO)
-      CALL ChkMemErr('READ_GEOM','G%VENTS',IZERO)
-      G%VENTS = 0
-
       PER_FACE_IF: IF (SURF_INDEX_PER_FACE) THEN
          DO I=1,N_FACES
             IF ( SURFS(I) <= 0 ) THEN
                G%SURFS(I) = DEFAULT_SURF_INDEX ! If local SURF ID index <= 0, use default surf ID.
             ELSE
                G%SURFS(I) = SURF_ID_IND(SURFS(I))
             ENDIF
-            IF (HAVE_VENT) THEN
-               G%VENTS(I) = VENT_ID_IND(SURFS(I)) ! Uses SURF index in local numeration from FACES input.
-               IF(G%VENTS(I)>0) G%SURFS(I) = VENTS(G%VENTS(I))%SURF_INDEX ! Change SURF to apply to the vent surface.
-            ENDIF
          ENDDO
          DEALLOCATE(SURF_ID_IND)
       ELSE
@@ -23712,26 +23629,10 @@ SUBROUTINE READ_GEOM
                   IF (SURF_ID6(4)==SURFACE(NNN)%ID .AND. NVECI(2)> TWO_EPSILON_EB) G%SURFS(I) = NNN ! Y2
                   IF (SURF_ID6(5)==SURFACE(NNN)%ID .AND. NVECI(3)<-TWO_EPSILON_EB) G%SURFS(I) = NNN ! Z1
                   IF (SURF_ID6(6)==SURFACE(NNN)%ID .AND. NVECI(3)> TWO_EPSILON_EB) G%SURFS(I) = NNN ! Z2
-                  IF (HAVE_VENT) THEN
-                     IF (SURF_ID(1)==SURFACE(NNN)%ID  .AND. ANY(ABS(NVECI(:))>TWO_EPSILON_EB)) G%VENTS(I)=VENT_ID_IND(1) !all sides
-                     IF (SURF_IDS(2)==SURFACE(NNN)%ID .AND. (ABS(NVECI(1))>TWO_EPSILON_EB .OR. ABS(NVECI(2))>TWO_EPSILON_EB) ) &
-                     G%VENTS(I) = VENT_ID_IND(2) ! sides
-                     IF (SURF_IDS(1)==SURFACE(NNN)%ID .AND. NVECI(3)> TWO_EPSILON_EB) G%VENTS(I) = VENT_ID_IND(1) ! top
-                     IF (SURF_IDS(3)==SURFACE(NNN)%ID .AND. NVECI(3)<-TWO_EPSILON_EB) G%VENTS(I) = VENT_ID_IND(3) ! bottom
-                     IF (SURF_ID6(1)==SURFACE(NNN)%ID .AND. NVECI(1)<-TWO_EPSILON_EB) G%VENTS(I) = VENT_ID_IND(1) ! X1
-                     IF (SURF_ID6(2)==SURFACE(NNN)%ID .AND. NVECI(1)> TWO_EPSILON_EB) G%VENTS(I) = VENT_ID_IND(2) ! X2
-                     IF (SURF_ID6(3)==SURFACE(NNN)%ID .AND. NVECI(2)<-TWO_EPSILON_EB) G%VENTS(I) = VENT_ID_IND(3) ! Y1
-                     IF (SURF_ID6(4)==SURFACE(NNN)%ID .AND. NVECI(2)> TWO_EPSILON_EB) G%VENTS(I) = VENT_ID_IND(4) ! Y2
-                     IF (SURF_ID6(5)==SURFACE(NNN)%ID .AND. NVECI(3)<-TWO_EPSILON_EB) G%VENTS(I) = VENT_ID_IND(5) ! Z1
-                     IF (SURF_ID6(6)==SURFACE(NNN)%ID .AND. NVECI(3)> TWO_EPSILON_EB) G%VENTS(I) = VENT_ID_IND(6) ! Z2
-
-                     IF(G%VENTS(I)>0) G%SURFS(I) = VENTS(G%VENTS(I))%SURF_INDEX ! Change SURF to apply to the vent surface.
-                  ENDIF
                ENDDO SURF_LOOP
             ENDDO FACE_LOOP
          ENDIF BOX_TYPE_IF
       ENDIF PER_FACE_IF
-      IF(HAVE_VENT) DEALLOCATE(VENT_ID_IND)
 
       ! Test for Unsupported surfaces:
       DO I=1,N_FACES
@@ -23813,9 +23714,10 @@ SUBROUTINE READ_GEOM
 
 DEALLOCATE(GEOM_LINE)
 
+CC_IBM = .TRUE.
+
 IF( (T_END-T_BEGIN) < TWO_EPSILON_EB) RETURN
 
-CC_IBM = .TRUE.
 ! If unstructured projection defined set Pressure solver on unstructured grid.
 IF (PRES_FLAG/=UGLMAT_FLAG) THEN
    PRES_METHOD = 'ULMAT'
@@ -24313,10 +24215,6 @@ SUBROUTINE ALLOCATE_BUFFERS
 ALLOCATE(SURF_ID(MAX_SURF_IDS+1),STAT=IZERO)
 CALL ChkMemErr('ALLOCATE_BUFFERS','SURF_ID',IZERO)
 
-IF(ALLOCATED(VENT_ID)) DEALLOCATE(VENT_ID)
-ALLOCATE(VENT_ID(MAX_SURF_IDS+1),STAT=IZERO)
-CALL ChkMemErr('ALLOCATE_BUFFERS','VENT_ID',IZERO)
-
 IF(ALLOCATED(ZVALS)) DEALLOCATE(ZVALS)
 ALLOCATE(ZVALS(MAX_ZVALS+1),STAT=IZERO)
 CALL ChkMemErr('ALLOCATE_BUFFERS','ZVALS',IZERO)
@@ -24351,7 +24249,6 @@ SUBROUTINE SET_GEOM_DEFAULTS
    ZMIN=ZS_MIN
    WRITE(ID,'(A,I0)') 'geom_',N
    SURF_ID(:)='null'
-   VENT_ID(:)='null'
    SURF_IDS = 'null'
    SURF_ID6 = 'null'
    MATL_ID = 'null'