Merge pull request #14646 from drjfloyd/master

FDS Source: Allow TOTAL MASS FLUX X/Y/Z in gas with no SPEC_ID

Author: drjfloyd

Source/data.f90

@@ -1280,21 +1280,21 @@ SUBROUTINE DEFINE_OUTPUT_QUANTITIES
 OUTPUT_QUANTITY(534)%SHORT_NAME = 'rho*(Z*u + D*dZ/dx)'
 OUTPUT_QUANTITY(534)%CELL_POSITION = CELL_FACE
 OUTPUT_QUANTITY(534)%IOR = 1
-OUTPUT_QUANTITY(534)%SPEC_ID_REQUIRED=.TRUE.
+!OUTPUT_QUANTITY(534)%SPEC_ID_REQUIRED=.TRUE.
 
 OUTPUT_QUANTITY(535)%NAME = 'TOTAL MASS FLUX Y'
 OUTPUT_QUANTITY(535)%UNITS = 'kg/s/m2'
 OUTPUT_QUANTITY(535)%SHORT_NAME = 'rho*(Z*v + D*dZ/dy)'
 OUTPUT_QUANTITY(535)%CELL_POSITION = CELL_FACE
 OUTPUT_QUANTITY(535)%IOR = 2
-OUTPUT_QUANTITY(535)%SPEC_ID_REQUIRED=.TRUE.
+!OUTPUT_QUANTITY(535)%SPEC_ID_REQUIRED=.TRUE.
 
 OUTPUT_QUANTITY(536)%NAME = 'TOTAL MASS FLUX Z'
 OUTPUT_QUANTITY(536)%UNITS = 'kg/s/m2'
 OUTPUT_QUANTITY(536)%SHORT_NAME = 'rho*(Z*w + D*dZ/dz)'
 OUTPUT_QUANTITY(536)%CELL_POSITION = CELL_FACE
 OUTPUT_QUANTITY(536)%IOR = 3
-OUTPUT_QUANTITY(536)%SPEC_ID_REQUIRED=.TRUE.
+!OUTPUT_QUANTITY(536)%SPEC_ID_REQUIRED=.TRUE.
 
 OUTPUT_QUANTITY(550)%NAME = 'CUTCELL VELOCITY DIVERGENCE'
 OUTPUT_QUANTITY(550)%UNITS = '1/s'

Source/dump.f90

@@ -8476,29 +8476,40 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
       ENDIF
    CASE(534)  ! TOTAL MASS FLUX X
       GAS_PHASE_OUTPUT_RES = 0._EB
-      IF (Z_INDEX>0) THEN
-         GAS_PHASE_OUTPUT_RES = ADV_FX(II,JJ,KK,Z_INDEX) + DIF_FX(II,JJ,KK,Z_INDEX)
-      ELSEIF (Y_INDEX>0) THEN
-         GAS_PHASE_OUTPUT_RES = DOT_PRODUCT( Z2Y(Y_INDEX,1:N_TRACKED_SPECIES),&
-                                (ADV_FX(II,JJ,KK,1:N_TRACKED_SPECIES) + DIF_FX(II,JJ,KK,1:N_TRACKED_SPECIES)) )
+      IF (Z_INDEX<=0 .AND. Y_INDEX<=0) THEN
+         GAS_PHASE_OUTPUT_RES = SUM(ADV_FX(II,JJ,KK,:) + DIF_FX(II,JJ,KK,:))
+      ELSE
+         IF (Z_INDEX>0) THEN
+            GAS_PHASE_OUTPUT_RES = ADV_FX(II,JJ,KK,Z_INDEX) + DIF_FX(II,JJ,KK,Z_INDEX)
+         ELSEIF (Y_INDEX>0) THEN
+            GAS_PHASE_OUTPUT_RES = DOT_PRODUCT( Z2Y(Y_INDEX,1:N_TRACKED_SPECIES),&
+                                   (ADV_FX(II,JJ,KK,1:N_TRACKED_SPECIES) + DIF_FX(II,JJ,KK,1:N_TRACKED_SPECIES)) )
+         ENDIF
       ENDIF
    CASE(535)  ! TOTAL MASS FLUX Y
       GAS_PHASE_OUTPUT_RES = 0._EB
-      IF (Z_INDEX>0) THEN
-         GAS_PHASE_OUTPUT_RES = ADV_FY(II,JJ,KK,Z_INDEX) + DIF_FY(II,JJ,KK,Z_INDEX)
-      ELSEIF (Y_INDEX>0) THEN
-         GAS_PHASE_OUTPUT_RES = DOT_PRODUCT( Z2Y(Y_INDEX,1:N_TRACKED_SPECIES),&
-                                (ADV_FY(II,JJ,KK,1:N_TRACKED_SPECIES) + DIF_FY(II,JJ,KK,1:N_TRACKED_SPECIES)) )
+      IF (Z_INDEX<=0 .AND. Y_INDEX<=0) THEN
+         GAS_PHASE_OUTPUT_RES = SUM(ADV_FY(II,JJ,KK,:) + DIF_FY(II,JJ,KK,:))
+      ELSE
+         IF (Z_INDEX>0) THEN
+            GAS_PHASE_OUTPUT_RES = ADV_FY(II,JJ,KK,Z_INDEX) + DIF_FY(II,JJ,KK,Z_INDEX)
+         ELSEIF (Y_INDEX>0) THEN
+            GAS_PHASE_OUTPUT_RES = DOT_PRODUCT( Z2Y(Y_INDEX,1:N_TRACKED_SPECIES),&
+                                   (ADV_FY(II,JJ,KK,1:N_TRACKED_SPECIES) + DIF_FY(II,JJ,KK,1:N_TRACKED_SPECIES)) )
+         ENDIF
       ENDIF
    CASE(536)  ! TOTAL MASS FLUX Z
       GAS_PHASE_OUTPUT_RES = 0._EB
-      IF (Z_INDEX>0) THEN
-         GAS_PHASE_OUTPUT_RES = ADV_FZ(II,JJ,KK,Z_INDEX) + DIF_FZ(II,JJ,KK,Z_INDEX)
-      ELSEIF (Y_INDEX>0) THEN
-         GAS_PHASE_OUTPUT_RES = DOT_PRODUCT( Z2Y(Y_INDEX,1:N_TRACKED_SPECIES),&
-                                (ADV_FZ(II,JJ,KK,1:N_TRACKED_SPECIES) + DIF_FZ(II,JJ,KK,1:N_TRACKED_SPECIES)) )
+      IF (Z_INDEX<=0 .AND. Y_INDEX<=0) THEN
+         GAS_PHASE_OUTPUT_RES = SUM(ADV_FZ(II,JJ,KK,:) + DIF_FZ(II,JJ,KK,:))
+      ELSE
+         IF (Z_INDEX>0) THEN
+            GAS_PHASE_OUTPUT_RES = ADV_FZ(II,JJ,KK,Z_INDEX) + DIF_FZ(II,JJ,KK,Z_INDEX)
+         ELSEIF (Y_INDEX>0) THEN
+            GAS_PHASE_OUTPUT_RES = DOT_PRODUCT( Z2Y(Y_INDEX,1:N_TRACKED_SPECIES),&
+                                   (ADV_FZ(II,JJ,KK,1:N_TRACKED_SPECIES) + DIF_FZ(II,JJ,KK,1:N_TRACKED_SPECIES)) )
+         ENDIF
       ENDIF
-
     CASE(550) ! CUTCELL VELOCITY DIVERGENCE
        GAS_PHASE_OUTPUT_RES = CARTVELDIV(II,JJ,KK)