Skip to content

Commit f1cf47e

Browse files
committed
FDS Source: Any zero or inflow non-HVAC BC has deposition.
1 parent 3d97969 commit f1cf47e

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

Source/wall.f90

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ SUBROUTINE WALL_BC(T,DT,NM)
119119

120120
IF (DEPOSITION .AND. .NOT.INITIALIZATION_PHASE .AND. CORRECTOR .AND. .NOT.SOLID_PHASE_ONLY) THEN
121121
IF (WC%BOUNDARY_TYPE==SOLID_BOUNDARY .AND. &
122-
(ANY(SF%LEAK_PATH>0) .OR. (B1%NODE_INDEX==0 .AND. ABS(SF%VEL)<TWO_EPSILON_EB .AND. &
123-
ANY(ABS(SF%MASS_FLUX)<TWO_EPSILON_EB) .AND. ABS(SF%VOLUME_FLOW)<TWO_EPSILON_EB))) THEN
122+
(ANY(SF%LEAK_PATH>0) .OR. &
123+
(B1%NODE_INDEX==0 .AND. SF%VEL<TWO_EPSILON_EB .AND. SF%VOLUME_FLOW<TWO_EPSILON_EB))) THEN
124124
CALL CALC_DEPOSITION(DT,BC,B1,B2,WALL_INDEX=IW)
125125
ENDIF
126126
ENDIF
@@ -175,8 +175,8 @@ SUBROUTINE WALL_BC(T,DT,NM)
175175

176176
IF (DEPOSITION .AND. .NOT.INITIALIZATION_PHASE .AND. CORRECTOR .AND. .NOT.SOLID_PHASE_ONLY) THEN
177177
IF (CFA%BOUNDARY_TYPE==SOLID_BOUNDARY .AND. &
178-
(ANY(SF%LEAK_PATH>0) .OR. (B1%NODE_INDEX==0 .AND. ABS(SF%VEL)<TWO_EPSILON_EB .AND. &
179-
ANY(ABS(SF%MASS_FLUX)<TWO_EPSILON_EB) .AND. ABS(SF%VOLUME_FLOW)<TWO_EPSILON_EB))) THEN
178+
(ANY(SF%LEAK_PATH>0) .OR. &
179+
(B1%NODE_INDEX==0 .AND. SF%VEL<TWO_EPSILON_EB .AND. SF%VOLUME_FLOW<TWO_EPSILON_EB))) THEN
180180
CALL CALC_DEPOSITION(DT,BC,B1,B2,CFACE_INDEX=ICF)
181181
ENDIF
182182
ENDIF
@@ -1613,19 +1613,19 @@ SUBROUTINE CALC_DEPOSITION(DT,BC,B1,B2,WALL_INDEX,CFACE_INDEX)
16131613
TYPE(BOUNDARY_COORD_TYPE), POINTER :: BC
16141614
TYPE(BOUNDARY_PROP1_TYPE), POINTER :: B1
16151615
TYPE(BOUNDARY_PROP2_TYPE), POINTER :: B2
1616-
TYPE(SURFACE_TYPE), POINTER :: SF
1616+
TYPE(SURFACE_TYPE), POINTER :: SFD
16171617

16181618
IF (PRESENT(WALL_INDEX)) THEN
1619-
SF=>SURFACE(WALL(WALL_INDEX)%SURF_INDEX)
1619+
SFD=>SURFACE(WALL(WALL_INDEX)%SURF_INDEX)
16201620
RSUM_G = RSUM(BC%IIG,BC%JJG,BC%KKG)
16211621
ZZ_G(1:N_TRACKED_SPECIES) = ZZ(BC%IIG,BC%JJG,BC%KKG,1:N_TRACKED_SPECIES)
16221622
ELSEIF (PRESENT(CFACE_INDEX)) THEN
1623-
SF=>SURFACE(CFACE(CFACE_INDEX)%SURF_INDEX)
1623+
SFD=>SURFACE(CFACE(CFACE_INDEX)%SURF_INDEX)
16241624
RSUM_G= CFACE(CFACE_INDEX)%RSUM_G
16251625
ZZ_G(1:N_TRACKED_SPECIES) = B1%ZZ_G(1:N_TRACKED_SPECIES)
16261626
ENDIF
16271627

1628-
IF (ANY(SF%LEAK_PATH>0)) THEN
1628+
IF (ANY(SFD%LEAK_PATH>0)) THEN
16291629
U_NORMAL = 0._EB
16301630
ELSE
16311631
U_NORMAL = B1%U_NORMAL
@@ -1673,7 +1673,6 @@ SUBROUTINE CALC_DEPOSITION(DT,BC,B1,B2,WALL_INDEX,CFACE_INDEX)
16731673
U_TURB = B2%U_TAU * 0.17_EB
16741674
ENDIF
16751675
ENDIF
1676-
16771676
B2%V_DEP = MAX(0._EB,U_THERM+U_TURB+U_GRAV+U_NORMAL)
16781677
IF (B2%V_DEP <= TWO_EPSILON_EB) CYCLE SMIX_LOOP
16791678
ZZ_GET = ZZ_GET * B1%RHO_G
@@ -1682,7 +1681,6 @@ SUBROUTINE CALC_DEPOSITION(DT,BC,B1,B2,WALL_INDEX,CFACE_INDEX)
16821681
ZZ_GET(N) = Y_AEROSOL - YDEP
16831682
IF (SM%AWM_INDEX > 0) B1%AWM_AEROSOL(SM%AWM_INDEX)= B1%AWM_AEROSOL(SM%AWM_INDEX)+YDEP/B1%RDN
16841683
IF (SS%AWM_INDEX > 0) B1%AWM_AEROSOL(SS%AWM_INDEX)= B1%AWM_AEROSOL(SS%AWM_INDEX)+YDEP/B1%RDN
1685-
16861684
!$OMP CRITICAL
16871685
D_SOURCE(BC%IIG,BC%JJG,BC%KKG) = D_SOURCE(BC%IIG,BC%JJG,BC%KKG) - MW_RATIO*YDEP / B1%RHO_G / DT
16881686
M_DOT_PPP(BC%IIG,BC%JJG,BC%KKG,N) = M_DOT_PPP(BC%IIG,BC%JJG,BC%KKG,N) - YDEP / DT

0 commit comments

Comments
 (0)