Merge pull request #15581 from drjfloyd/master

FDS Source: Add back Flux MW

Author: drjfloyd

Source/cons.f90

@@ -278,6 +278,7 @@ MODULE GLOBAL_CONSTANTS
 LOGICAL :: STORE_FIRE_RESIDENCE=.FALSE.             !< Flag for tracking residence time of spreading fire front over a surface
 LOGICAL :: STORE_LS_SPREAD_RATE=.FALSE.             !< Flag for outputting local level set spread rate magnitude
 LOGICAL :: TEST_NEW_CHAR_MODEL=.FALSE.              !< Flag to envoke new char model
+LOGICAL :: FLUX_LIMITER_MW_CORRECTION=.TRUE.       !< Flag for MW correction ensure consistent equation of state at face
 
 INTEGER, ALLOCATABLE, DIMENSION(:) :: CHANGE_TIME_STEP_INDEX      !< Flag to indicate if a mesh needs to change time step
 INTEGER, ALLOCATABLE, DIMENSION(:) :: SETUP_PRESSURE_ZONES_INDEX  !< Flag to indicate if a mesh needs to keep searching for ZONEs

Source/data.f90

@@ -1360,42 +1360,6 @@ 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/divg.f90

@@ -8583,20 +8583,7 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
    CASE(553) ! V_LS
       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(MAX(0,II-1),JJ,KK)
-   CASE(564) ! BFY MINUS
-      GAS_PHASE_OUTPUT_RES = BFY(II,MAX(0,JJ-1),KK)
-   CASE(565) ! BFZ MINUS
-      GAS_PHASE_OUTPUT_RES = BFZ(II,JJ,MAX(0,KK-1))
-
- END SELECT IND_SELECT
+END SELECT IND_SELECT
 
 ! Fill GAS_PHASE_OUTPUT for CUT_CELLs.
 ! Some variables have already been filled in fire.f90

Source/dump.f90

@@ -499,7 +499,7 @@ SUBROUTINE INITIALIZE_MESH_VARIABLES_1(DT,NM)
 USE RADCONS, ONLY: UIIDIM
 USE CONTROL_VARIABLES
 USE MATH_FUNCTIONS, ONLY: EVALUATE_RAMP
-INTEGER :: N,I,J,K,IZERO,NS,IW
+INTEGER :: N,I,J,K,IZERO,N_LOWER_SCALARS,NS,IW
 REAL(EB), INTENT(IN) :: DT
 INTEGER, INTENT(IN) :: NM
 REAL(EB) :: MU_N,CS,DELTA
@@ -595,6 +595,20 @@ SUBROUTINE INITIALIZE_MESH_VARIABLES_1(DT,NM)
 
 ALLOCATE(M%RSUM(0:IBP1,0:JBP1,0:KBP1),STAT=IZERO) ; CALL ChkMemErr('INIT','RSUM',IZERO) ; M%RSUM=RSUM0
 
+! Allocate scalar face values
+
+! Required for cell face density correction for multicomponent mixtures
+
+IF (FLUX_LIMITER_MW_CORRECTION) THEN
+   N_LOWER_SCALARS=0
+ELSE
+   N_LOWER_SCALARS=1
+ENDIF
+
+ALLOCATE( M%FX(0:IBP1,0:JBP1,0:KBP1,N_LOWER_SCALARS:N_TOTAL_SCALARS),STAT=IZERO); CALL ChkMemErr('INIT','FX',IZERO) ; M%FX=0._EB
+ALLOCATE( M%FY(0:IBP1,0:JBP1,0:KBP1,N_LOWER_SCALARS:N_TOTAL_SCALARS),STAT=IZERO); CALL ChkMemErr('INIT','FY',IZERO) ; M%FY=0._EB
+ALLOCATE( M%FZ(0:IBP1,0:JBP1,0:KBP1,N_LOWER_SCALARS:N_TOTAL_SCALARS),STAT=IZERO); CALL ChkMemErr('INIT','FZ',IZERO) ; M%FZ=0._EB
+
 ! Allocate storage for scalar total fluxes
 
 IF (STORE_SPECIES_FLUX) THEN
@@ -682,9 +696,9 @@ SUBROUTINE INITIALIZE_MESH_VARIABLES_1(DT,NM)
 ALLOCATE(M%WORK9(0:IBP1,0:JBP1,0:KBP1),STAT=IZERO) ; CALL ChkMemErr('INIT','WORK9',IZERO)
 
 ALLOCATE(M%IWORK1(0:IBP1,0:JBP1,0:KBP1),STAT=IZERO)                                 ; CALL ChkMemErr('INIT','IWORK1',IZERO)
-ALLOCATE(M%SWORK1(0:IBP1,0:JBP1,0:KBP1,1:N_TOTAL_SCALARS),STAT=IZERO) ; CALL ChkMemErr('INIT','SWORK1',IZERO)
-ALLOCATE(M%SWORK2(0:IBP1,0:JBP1,0:KBP1,1:N_TOTAL_SCALARS),STAT=IZERO) ; CALL ChkMemErr('INIT','SWORK2',IZERO)
-ALLOCATE(M%SWORK3(0:IBP1,0:JBP1,0:KBP1,1:N_TOTAL_SCALARS),STAT=IZERO) ; CALL ChkMemErr('INIT','SWORK3',IZERO)
+ALLOCATE(M%SWORK1(0:IBP1,0:JBP1,0:KBP1,N_LOWER_SCALARS:N_TOTAL_SCALARS),STAT=IZERO) ; CALL ChkMemErr('INIT','SWORK1',IZERO)
+ALLOCATE(M%SWORK2(0:IBP1,0:JBP1,0:KBP1,N_LOWER_SCALARS:N_TOTAL_SCALARS),STAT=IZERO) ; CALL ChkMemErr('INIT','SWORK2',IZERO)
+ALLOCATE(M%SWORK3(0:IBP1,0:JBP1,0:KBP1,N_LOWER_SCALARS:N_TOTAL_SCALARS),STAT=IZERO) ; CALL ChkMemErr('INIT','SWORK3',IZERO)
 ALLOCATE(M%SWORK4(0:IBP1,0:JBP1,0:KBP1,1:N_TOTAL_SCALARS),STAT=IZERO)               ; CALL ChkMemErr('INIT','SWORK4',IZERO)
 M%IWORK1=0
 M%SWORK1=0._EB
@@ -819,23 +833,6 @@ SUBROUTINE INITIALIZE_MESH_VARIABLES_1(DT,NM)
    M%ZZS(:,:,:,N) = INITIAL_UNMIXED_FRACTION
 ENDDO
 
-! Allocate scalar face values
-
-ALLOCATE( M%FX(0:IBP1,0:JBP1,0:KBP1,1:N_TOTAL_SCALARS),STAT=IZERO); CALL ChkMemErr('INIT','FX',IZERO) ; M%FX=0._EB
-ALLOCATE( M%FY(0:IBP1,0:JBP1,0:KBP1,1:N_TOTAL_SCALARS),STAT=IZERO); CALL ChkMemErr('INIT','FY',IZERO) ; M%FY=0._EB
-ALLOCATE( M%FZ(0:IBP1,0:JBP1,0:KBP1,1:N_TOTAL_SCALARS),STAT=IZERO); CALL ChkMemErr('INIT','FZ',IZERO) ; M%FZ=0._EB
-DO N=1,N_TRACKED_SPECIES
-   M%FX(:,:,:,N)=RHOA*SPECIES_MIXTURE(N)%ZZ0
-   M%FY(:,:,:,N)=RHOA*SPECIES_MIXTURE(N)%ZZ0
-   M%FZ(:,:,:,N)=RHOA*SPECIES_MIXTURE(N)%ZZ0
-ENDDO
-
-! Allocate flux limiter coefficients
-
-ALLOCATE( M%BFX(0:IBP1,0:JBP1,0:KBP1),STAT=IZERO); CALL ChkMemErr('INIT','BFX',IZERO) ; M%BFX=0._EB
-ALLOCATE( M%BFY(0:IBP1,0:JBP1,0:KBP1),STAT=IZERO); CALL ChkMemErr('INIT','BFY',IZERO) ; M%BFY=0._EB
-ALLOCATE( M%BFZ(0:IBP1,0:JBP1,0:KBP1),STAT=IZERO); CALL ChkMemErr('INIT','BFZ',IZERO) ; M%BFZ=0._EB
-
 ! Allocate and Initialize Mesh-Dependent Radiation Arrays
 
 M%QR  = 0._EB