FDS Source: remove unnecessry abs() in wall model

firemodels · Aug 8, 2018 · 9d17690 · 9d17690
1 parent 43abf47
commit 9d17690
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Source/turb.f90 b/Source/turb.f90
@@ -1195,17 +1195,17 @@ SUBROUTINE WALL_MODEL(SLIP_FACTOR,U_TAU,Y_PLUS,U,NU,DY,S)
          IF (Y_PLUS < Y_WERNER_WENGLE) THEN
             ! viscous sublayer
             TAU_W = ( U/Y_PLUS )**2
-            U_TAU = SQRT(ABS(TAU_W))
+            U_TAU = SQRT(TAU_W)
             DUDY = ABS(U)/Y_CELL_CENTER
-         !ELSE IF (Y_PLUS < Y2) THEN
+         ! ELSEIF (Y_PLUS < Y2) THEN
          !   ! buffer layer
          !   TAU_W = ( U/U_PLUS_BUFFER_SEMILOG(Y_PLUS) )**2
          !   U_TAU = SQRT(TAU_W)
          !   DUDY = 0.5_EB*(ABS(U)/Y_CELL_CENTER + U_TAU*RKAPPA/Y_CELL_CENTER)
          ELSE
             ! log layer
             TAU_W = ( U/(RKAPPA*LOG(Y_PLUS)+B) )**2
-            U_TAU = SQRT(ABS(TAU_W))
+            U_TAU = SQRT(TAU_W)
             DUDY = U_TAU*RKAPPA/Y_CELL_CENTER
          ENDIF
       ELSE
@@ -1219,7 +1219,7 @@ SUBROUTINE WALL_MODEL(SLIP_FACTOR,U_TAU,Y_PLUS,U,NU,DY,S)
          ENDIF
          Y_PLUS = Y_CELL_CENTER/S
          TAU_W = ( U/(RKAPPA*LOG(Y_PLUS)+BTILDE) )**2  ! Pope (2000) p. 297, Eq. (7.121)
-         U_TAU = SQRT(ABS(TAU_W))
+         U_TAU = SQRT(TAU_W)
          DUDY = U_TAU*RKAPPA/Y_CELL_CENTER
       ENDIF
 

diff --git a/Source/velo.f90 b/Source/velo.f90
@@ -3011,6 +3011,8 @@ SUBROUTINE CHECK_STABILITY(DT,DT_NEW,NM)
 
 ! Determine max CFL number from all grid cells
 
+print *,CFL_VELOCITY_NORM
+
 DO K=1,KBAR
    DO J=1,JBAR
       DO I=1,IBAR