Merge pull request #15014 from rmcdermo/master

FDS Source: simplify flux coefficient loops

Author: rmcdermo

Source/data.f90

@@ -1350,6 +1350,42 @@ SUBROUTINE DEFINE_OUTPUT_QUANTITIES
 OUTPUT_QUANTITY(553)%UNITS  = 'm/s'
 OUTPUT_QUANTITY(553)%SHORT_NAME  = 'V_LS'
 
+OUTPUT_QUANTITY(560)%NAME  = 'BFX'
+OUTPUT_QUANTITY(560)%UNITS  = ''
+OUTPUT_QUANTITY(560)%SHORT_NAME  = 'bfx'
+OUTPUT_QUANTITY(560)%CELL_POSITION = CELL_FACE
+OUTPUT_QUANTITY(560)%IOR = 1
+
+OUTPUT_QUANTITY(561)%NAME  = 'BFY'
+OUTPUT_QUANTITY(561)%UNITS  = ''
+OUTPUT_QUANTITY(561)%SHORT_NAME  = 'bfy'
+OUTPUT_QUANTITY(561)%CELL_POSITION = CELL_FACE
+OUTPUT_QUANTITY(561)%IOR = 2
+
+OUTPUT_QUANTITY(562)%NAME  = 'BFZ'
+OUTPUT_QUANTITY(562)%UNITS  = ''
+OUTPUT_QUANTITY(562)%SHORT_NAME  = 'bfz'
+OUTPUT_QUANTITY(562)%CELL_POSITION = CELL_FACE
+OUTPUT_QUANTITY(562)%IOR = 3
+
+OUTPUT_QUANTITY(563)%NAME  = 'BFX MINUS'
+OUTPUT_QUANTITY(563)%UNITS  = ''
+OUTPUT_QUANTITY(563)%SHORT_NAME  = 'bfx-'
+OUTPUT_QUANTITY(563)%CELL_POSITION = CELL_FACE
+OUTPUT_QUANTITY(563)%IOR = 1
+
+OUTPUT_QUANTITY(564)%NAME  = 'BFY MINUS'
+OUTPUT_QUANTITY(564)%UNITS  = ''
+OUTPUT_QUANTITY(564)%SHORT_NAME  = 'bfy-'
+OUTPUT_QUANTITY(564)%CELL_POSITION = CELL_FACE
+OUTPUT_QUANTITY(564)%IOR = 2
+
+OUTPUT_QUANTITY(565)%NAME  = 'BFZ MINUS'
+OUTPUT_QUANTITY(565)%UNITS  = ''
+OUTPUT_QUANTITY(565)%SHORT_NAME  = 'bfz-'
+OUTPUT_QUANTITY(565)%CELL_POSITION = CELL_FACE
+OUTPUT_QUANTITY(565)%IOR = 3
+
 ! Boundary Quantities (Negative indices)
 
 OUTPUT_QUANTITY(-1)%NAME = 'RADIATIVE HEAT FLUX'

Source/dump.f90

@@ -8543,15 +8543,26 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
 
    CASE(550) ! CUTCELL VELOCITY DIVERGENCE
       GAS_PHASE_OUTPUT_RES = CARTVELDIV(II,JJ,KK)
-
    CASE(551) ! CARTESIAN VELOCITY DIVERGENCE
       GAS_PHASE_OUTPUT_RES = CARTVELDIV(II,JJ,KK)
 
    CASE(552) ! U_LS
-       GAS_PHASE_OUTPUT_RES = U_LS(II,JJ)
-
+      GAS_PHASE_OUTPUT_RES = U_LS(II,JJ)
    CASE(553) ! V_LS
-       GAS_PHASE_OUTPUT_RES = V_LS(II,JJ)
+      GAS_PHASE_OUTPUT_RES = V_LS(II,JJ)
+
+   CASE(560) ! BFX
+      GAS_PHASE_OUTPUT_RES = BFX(II,JJ,KK)
+   CASE(561) ! BFY
+      GAS_PHASE_OUTPUT_RES = BFY(II,JJ,KK)
+   CASE(562) ! BFZ
+      GAS_PHASE_OUTPUT_RES = BFZ(II,JJ,KK)
+   CASE(563) ! BFX MINUS
+      GAS_PHASE_OUTPUT_RES = BFX(II-1,JJ,KK)
+   CASE(564) ! BFY MINUS
+      GAS_PHASE_OUTPUT_RES = BFY(II,JJ-1,KK)
+   CASE(565) ! BFZ MINUS
+      GAS_PHASE_OUTPUT_RES = BFZ(II,JJ,KK-1)
 
  END SELECT IND_SELECT
 

Source/func.f90

@@ -1487,13 +1487,12 @@ SUBROUTINE GET_SCALAR_FACE_COEF(A,U,BF,I1,I2,J1,J2,K1,K2,IOR,LIMITER)
                DU_LOC = U(I+IP1,J+JP1,K+KP1) - U(I,J,K)
                IF (A(I,J,K) > 0._EB) THEN
                   DU_UP = U(I,J,K) - U(I+IM1,J+JM1,K+KM1)
-                  R = DU_UP / (DU_LOC + SIGN(TWO_EPSILON_EB, DU_LOC))
-                  B = MAX(0._EB, MIN(2._EB*R,1._EB), MIN(R,2._EB))
                ELSE
                   DU_UP = U(I+IP2,J+JP2,K+KP2) - U(I+IP1,J+JP1,K+KP1)
-                  R = DU_UP / (DU_LOC + SIGN(TWO_EPSILON_EB, DU_LOC))
-                  B = MAX(0._EB, MIN(2._EB*R,1._EB), MIN(R,2._EB))
                ENDIF
+               R = 0._EB ; B = 0._EB
+               IF (ABS(DU_LOC) > TWO_EPSILON_EB) R = DU_UP/DU_LOC
+               IF (R > TWO_EPSILON_EB) B = MAX(0._EB, MIN(2._EB*R,1._EB), MIN(R,2._EB))
                BF(I,J,K) = MAX(0._EB, MIN(B, BF(I,J,K)))
             ENDDO
          ENDDO
@@ -1508,15 +1507,12 @@ SUBROUTINE GET_SCALAR_FACE_COEF(A,U,BF,I1,I2,J1,J2,K1,K2,IOR,LIMITER)
                DU_LOC = U(I+IP1,J+JP1,K+KP1) - U(I,J,K)
                IF (A(I,J,K) > 0._EB) THEN
                   DU_UP = U(I,J,K) - U(I+IM1,J+JM1,K+KM1)
-                  R = 0._EB ; B = 0._EB
-                  IF (ABS(DU_UP) > TWO_EPSILON_EB) R = DU_LOC/DU_UP
-                  IF (R > 0._EB) B = R*(3._EB*R+1._EB)/((R+1._EB)**2)
                ELSE
                   DU_UP = U(I+IP2,J+JP2,K+KP2) - U(I+IP1,J+JP1,K+KP1)
-                  R = 0._EB ; B = 0._EB
-                  IF (ABS(DU_UP) > TWO_EPSILON_EB) R = DU_LOC/DU_UP
-                  IF (R > 0._EB) B = R*(3._EB*R+1._EB)/((R+1._EB)**2)
                ENDIF
+               R = 0._EB ; B = 0._EB
+               IF (ABS(DU_UP) > TWO_EPSILON_EB) R = DU_LOC/DU_UP
+               IF (R > TWO_EPSILON_EB) B = R*(3._EB*R+1._EB)/((R+1._EB)**2)
                BF(I,J,K) = MAX(0._EB, MIN(B, BF(I,J,K)))
             ENDDO
          ENDDO

Source/turb.f90

@@ -397,7 +397,7 @@ SUBROUTINE TWOD_SOBOROT_UMD(NM)
 V=0._EB
 VS=0._EB
 
-DO K=-0,KBP1
+DO K=0,KBP1
    DO J=0,JBP1
       DO I=0,IBP1
          W(I,J,K) = -WSCAL*(XC(I)-XCLOC)