Skip to content

Commit 38bd207

Browse files
authored
Merge pull request #13649 from mcgratta/master
FDS Source: Issue #13645. Do not extract particles still in domain
2 parents 7a8b825 + a6311c5 commit 38bd207

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Source/part.f90

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3032,11 +3032,12 @@ END SUBROUTINE MOVE_IN_GAS
30323032

30333033
SUBROUTINE VENT_PARTICLE_EXTRACTION(HIT_SOLID,EXTRACT,WALL_INDEX,CFACE_INDEX)
30343034

3035+
USE GEOMETRY_FUNCTIONS, ONLY: SEARCH_OTHER_MESHES
30353036
LOGICAL, INTENT(OUT) :: EXTRACT
30363037
LOGICAL, INTENT(INOUT) :: HIT_SOLID
30373038
LOGICAL :: SET_EXTRACT
30383039
INTEGER, INTENT(IN), OPTIONAL :: WALL_INDEX,CFACE_INDEX
3039-
INTEGER :: SURF_INDEX
3040+
INTEGER :: SURF_INDEX,NOM,IIO,JJO,KKO
30403041
TYPE (BOUNDARY_PROP1_TYPE), POINTER :: B1
30413042
TYPE (BOUNDARY_PROP2_TYPE), POINTER :: B2
30423043
TYPE (BOUNDARY_COORD_TYPE), POINTER :: BCX
@@ -3065,8 +3066,10 @@ SUBROUTINE VENT_PARTICLE_EXTRACTION(HIT_SOLID,EXTRACT,WALL_INDEX,CFACE_INDEX)
30653066
LP%SPLAT = .TRUE.
30663067
ENDIF
30673068

3068-
IF ( B1%U_NORMAL>SURFACE(SURF_INDEX)%PARTICLE_EXTRACTION_VELOCITY .OR. &
3069+
IF_EXTRACT: IF ( B1%U_NORMAL>SURFACE(SURF_INDEX)%PARTICLE_EXTRACTION_VELOCITY .OR. &
30693070
(POROUS_FLOOR .AND. BC%Z<ZS .AND. LPC%LIQUID_DROPLET) ) THEN
3071+
CALL SEARCH_OTHER_MESHES(BC%X,BC%Y,BC%Z,NOM,IIO,JJO,KKO)
3072+
IF (POROUS_FLOOR .AND. BC%Z<ZS .AND. LPC%LIQUID_DROPLET .AND. NOM>0) EXIT IF_EXTRACT ! Do not remove particle still in domain
30703073
IF (B1%NODE_INDEX > 0) THEN
30713074
IF (DUCTNODE(B1%NODE_INDEX)%TRANSPORT_PARTICLES) THEN
30723075
SELECT CASE (BCX%IOR)
@@ -3147,7 +3150,7 @@ SUBROUTINE VENT_PARTICLE_EXTRACTION(HIT_SOLID,EXTRACT,WALL_INDEX,CFACE_INDEX)
31473150
BC%X=-1.E6_EB
31483151
EXTRACT = .TRUE.
31493152
ENDIF
3150-
ENDIF
3153+
ENDIF IF_EXTRACT
31513154

31523155
END SUBROUTINE VENT_PARTICLE_EXTRACTION
31533156

0 commit comments

Comments
 (0)