diff --git a/Source/init.f90 b/Source/init.f90 index c16c13b0aaf..93a56c7eb6d 100644 --- a/Source/init.f90 +++ b/Source/init.f90 @@ -2893,8 +2893,8 @@ SUBROUTINE INIT_WALL_CELL(NM,I,J,K,OBST_INDEX,IW,IOR,SURF_INDEX,IERR,TT) REAL(EB), INTENT(IN) :: TT REAL(EB) :: PX,PY,PZ,T_ACTIVATE,XIN,YIN,ZIN,DIST,XW,YW,ZW,RDN,AW,TSI,& ZZ_GET(1:N_TRACKED_SPECIES),RSUM_F,R1,RR,DELTA -INTEGER :: N,SURF_INDEX_NEW,IIG,JJG,KKG,IIO,JJO,KKO,IC,ICG,ICO,NOM_CHECK(0:1),BOUNDARY_TYPE,FI -LOGICAL :: VENT_FOUND,ALIGNED +INTEGER :: N,SURF_INDEX_NEW,IIG,JJG,KKG,IIO,JJO,KKO,IC,ICG,ICO,NOM_CHECK(0:1),BOUNDARY_TYPE,FI,VENT_INDEX_FOUND +LOGICAL :: ALIGNED TYPE (MESH_TYPE), POINTER :: M,MM TYPE (OBSTRUCTION_TYPE), POINTER :: OBX TYPE (VENTS_TYPE), POINTER :: VT @@ -2912,7 +2912,7 @@ SUBROUTINE INIT_WALL_CELL(NM,I,J,K,OBST_INDEX,IW,IOR,SURF_INDEX,IERR,TT) VENT_INDEX = 0 SURF_INDEX_NEW = SURF_INDEX -VENT_FOUND = .FALSE. +VENT_INDEX_FOUND = 0 VENT_SEARCH_LOOP: DO N=1,M%N_VENT @@ -2948,16 +2948,16 @@ SUBROUTINE INIT_WALL_CELL(NM,I,J,K,OBST_INDEX,IW,IOR,SURF_INDEX,IERR,TT) ! Check if there are over-lapping VENTs - IF (VENT_FOUND) THEN - WRITE(LU_ERR,'(A,I0,A,3(I0,1X),A,I0,A,I0,A)') 'WARNING: Two VENTs overlap in MESH ',NM,', Cell ',I,J,K,& - '. IOR ',IOR,'. VENT ',VT%ORDINAL,' rejected for that cell' + IF (VENT_INDEX_FOUND>0) THEN + WRITE(LU_ERR,'(7A,2(I0,1X),I0,A,I0,3A)') 'WARNING: VENT ',TRIM(M%VENTS(N)%ID),' overlaps VENT ', & + TRIM(M%VENTS(VENT_INDEX_FOUND)%ID),' in MESH ',TRIM(MESH_NAME(NM)), & + ', Cell (',I,J,K,'), IOR ',IOR,'. VENT ',TRIM(M%VENTS(N)%ID),' rejected.' EXIT VENT_SEARCH_LOOP ENDIF - VENT_FOUND = .TRUE. - ! Reassign the SURF index to be that of the VENT + VENT_INDEX_FOUND = N VENT_INDEX = N SURF_INDEX_NEW = VT%SURF_INDEX