Merge pull request #14631 from cxp484/FireX

FireX FDS Source: Correction to thickened flame model

Author: cxp484

Source/fire.f90

@@ -413,8 +413,6 @@ SUBROUTINE SET_SPECIES_SOURCE_TERM_CELL(DT, I, J, K, ZZ_NEW, ZZ_OLD, REAC_SOURCE
 
 USE PHYSICAL_FUNCTIONS, ONLY: GET_SPECIFIC_GAS_CONSTANT,GET_SPECIFIC_HEAT, &
                               GET_SENSIBLE_ENTHALPY_Z,IS_REALIZABLE
-USE CHEMCONS, ONLY : FLAME_THICK_FACTOR
-
 REAL(EB), INTENT(IN) :: DT
 REAL(EB), INTENT(INOUT) :: ZZ_NEW(N_TRACKED_SPECIES), ZZ_OLD(N_TRACKED_SPECIES)
 REAL(EB), INTENT(IN) :: REAC_SOURCE_TERM_TMP(N_TRACKED_SPECIES), Q_REAC_TMP(N_REACTIONS)
@@ -440,9 +438,6 @@ SUBROUTINE SET_SPECIES_SOURCE_TERM_CELL(DT, I, J, K, ZZ_NEW, ZZ_OLD, REAC_SOURCE
 ENDIF
 
 DZZ = ZZ_NEW - ZZ_OLD
-IF (FLAME_THICK_FACTOR > 1._EB) THEN
-   DZZ = DZZ/FLAME_THICK_FACTOR
-ENDIF
 
 ! Update RSUM and ZZ
 DZZ_IF: IF ( ANY(ABS(DZZ) > DZZ_CLIP) ) THEN
@@ -465,6 +460,7 @@ SUBROUTINE SET_SPECIES_SOURCE_TERM_CUTCELL(DT, ICC, JCC, ZZ_NEW, ZZ_OLD, REAC_SO
 
 USE PHYSICAL_FUNCTIONS, ONLY: GET_SPECIFIC_GAS_CONSTANT,GET_SPECIFIC_HEAT, &
                               GET_SENSIBLE_ENTHALPY_Z,IS_REALIZABLE
+
 REAL(EB), INTENT(IN) :: DT
 REAL(EB), INTENT(INOUT) :: ZZ_NEW(N_TRACKED_SPECIES), ZZ_OLD(N_TRACKED_SPECIES)
 REAL(EB), INTENT(IN) :: REAC_SOURCE_TERM_TMP(N_TRACKED_SPECIES), Q_REAC_TMP(N_REACTIONS)
@@ -723,7 +719,7 @@ SUBROUTINE COMBUSTION_MODEL(T,DT,ZZ_GET,Q_OUT,MIX_TIME_OUT,CHI_R_OUT,CHEM_SUBIT_
 USE MATH_FUNCTIONS, ONLY: EVALUATE_RAMP
 USE PHYSICAL_FUNCTIONS, ONLY: GET_REALIZABLE_MF
 USE COMP_FUNCTIONS, ONLY: SHUTDOWN
-USE CHEMCONS, ONLY: ODE_MIN_ATOL
+USE CHEMCONS, ONLY: ODE_MIN_ATOL, FLAME_THICK_FACTOR
 INTEGER, INTENT(IN), OPTIONAL :: IIC,JJC,KKC
 REAL(EB), INTENT(IN) :: T,DT,RHO_IN,PRES_IN,MU_IN,DELTA,CELL_VOLUME
 REAL(EB), INTENT(OUT) :: Q_OUT,MIX_TIME_OUT,CHI_R_OUT,REAC_SOURCE_TERM_OUT(N_TRACKED_SPECIES),Q_REAC_OUT(N_REACTIONS)
@@ -890,6 +886,11 @@ SUBROUTINE COMBUSTION_MODEL(T,DT,ZZ_GET,Q_OUT,MIX_TIME_OUT,CHI_R_OUT,CHEM_SUBIT_
          Q_REAC_SUB = 0._EB
    END SELECT INTEGRATOR_SELECT
 
+   ! Consider thickened flame model consideration here
+   IF (COMBUSTION_ODE_SOLVER == CVODE_SOLVER .AND. FLAME_THICK_FACTOR > 1._EB) THEN
+      ZZ_MIXED = ZZ_0 + (ZZ_MIXED-ZZ_0)/FLAME_THICK_FACTOR
+   ENDIF
+
    CALL GET_REALIZABLE_MF(ZZ_MIXED)
    ZZ_GET = ZETA*ZZ_0 + (1._EB-ZETA)*ZZ_MIXED ! FDS Tech Guide (5.19)
    IF (NO_REACTIONS) DT_ITER = DT