Merge pull request #14426 from ericvmueller/master

FDS Source: bug fixes for cface surface drag and NEAR_WALL_PARTICLE_INTERPOLATION

Author: ericvmueller

Source/ccib.f90

@@ -14064,6 +14064,8 @@ SUBROUTINE CC_EDGE_TAU_OMG
                   IF(FAXIS==JAXIS) THEN; U2_T = VV(IIGM,JJGM,KKGM)**2; ELSE; U2_T = WW(IIGM,JJGM,KKGM)**2; ENDIF
                CASE(JAXIS);              U1_T = VV(IIGM,JJGM,KKGM)**2
                   IF(FAXIS==IAXIS) THEN; U2_T = UU(IIGM,JJGM,KKGM)**2; ELSE; U2_T = WW(IIGM,JJGM,KKGM)**2; ENDIF
+               CASE(KAXIS);              U1_T = WW(IIGM,JJGM,KKGM)**2
+                  IF(FAXIS==IAXIS) THEN; U2_T = UU(IIGM,JJGM,KKGM)**2; ELSE; U2_T = VV(IIGM,JJGM,KKGM)**2; ENDIF
             END SELECT
             VEL_T = SQRT(U1_T+U2_T)
             DUIDXJ(ICD_SGN)    = 0._EB

Source/part.f90

@@ -2626,7 +2626,6 @@ SUBROUTINE MOVE_IN_GAS
 VBAR = VEL_G_INT(JAXIS)
 WBAR = VEL_G_INT(KAXIS)
 
-
 ! If the particle has a path, just follow the path and return
 
 IF (LP%PATH_PARTICLE) THEN
@@ -3324,7 +3323,7 @@ SUBROUTINE GET_FACE_TLW(AXIS,I,J,K,P_X,P_Y,P_Z,TLW,V)
 
    IF (AXIS/=IAXIS .AND. IIG_OLD> I .AND. IWC(-1)>0) THEN
       IF (WALL(IWC(-1))%BOUNDARY_TYPE==SOLID_BOUNDARY) THEN
-         P=(P_X-X_F(I))/(BOUNDARY_COORD(WALL(IWC(-1))%BC_INDEX)%X-X_F(I))
+         P=(P_X-BOUNDARY_COORD(WALL(IWC(-1))%BC_INDEX)%X)/(X_F(I+1)-BOUNDARY_COORD(WALL(IWC(-1))%BC_INDEX)%X)
          SELECT CASE(AXIS)
             CASE(JAXIS); V(1,:,:)=SURFACE(WALL(IWC(-1))%SURF_INDEX)%VEL_T(1)
             CASE(KAXIS); V(1,:,:)=SURFACE(WALL(IWC(-1))%SURF_INDEX)%VEL_T(2)
@@ -3343,7 +3342,7 @@ SUBROUTINE GET_FACE_TLW(AXIS,I,J,K,P_X,P_Y,P_Z,TLW,V)
 
    IF (AXIS/=JAXIS .AND. JJG_OLD> J .AND. IWC(-2)>0) THEN
       IF (WALL(IWC(-2))%BOUNDARY_TYPE==SOLID_BOUNDARY) THEN
-         R=(P_Y-Y_F(J))/(BOUNDARY_COORD(WALL(IWC(-2))%BC_INDEX)%Y-Y_F(J))
+         R=(P_Y-BOUNDARY_COORD(WALL(IWC(-2))%BC_INDEX)%Y)/(Y_F(J+1)-BOUNDARY_COORD(WALL(IWC(-2))%BC_INDEX)%Y)
          SELECT CASE(AXIS)
             CASE(IAXIS); V(:,1,:)=SURFACE(WALL(IWC(-2))%SURF_INDEX)%VEL_T(1)
             CASE(KAXIS); V(:,1,:)=SURFACE(WALL(IWC(-2))%SURF_INDEX)%VEL_T(2)
@@ -3362,7 +3361,7 @@ SUBROUTINE GET_FACE_TLW(AXIS,I,J,K,P_X,P_Y,P_Z,TLW,V)
 
    IF (AXIS/=KAXIS .AND. KKG_OLD> K .AND. IWC(-3)>0) THEN
       IF (WALL(IWC(-3))%BOUNDARY_TYPE==SOLID_BOUNDARY) THEN
-         S=(P_Z-Z_F(K))/(BOUNDARY_COORD(WALL(IWC(-3))%BC_INDEX)%Z-Z_F(K))
+         S=(P_Z-BOUNDARY_COORD(WALL(IWC(-3))%BC_INDEX)%Z)/(Z_F(K+1)-BOUNDARY_COORD(WALL(IWC(-3))%BC_INDEX)%Z)
          SELECT CASE(AXIS)
             CASE(IAXIS); V(:,:,1)=SURFACE(WALL(IWC(-3))%SURF_INDEX)%VEL_T(1)
             CASE(JAXIS); V(:,:,1)=SURFACE(WALL(IWC(-3))%SURF_INDEX)%VEL_T(2)