FireX: Merge with firemodels/master

Manuals/FDS_Validation_Guide/Experiment_Chapter.tex

@@ -3020,10 +3020,14 @@ \section{TUS Facade Experiments}
 
 A mixture of gaseous fuels supplied by the local utility was used as a fuel. It was supplied to the compartment through four, room-wide burner pipes with holes on the top surface, approximately 20~cm above the floor. The experiments were conducted in three series, named I, 1 and 2. For each, multiple fires were generated between which changes were made to the ventilation and HRR. The test duration was 5~min with 10~min of cooling between each. 
 
+A second set of experiments was performed in this facility by Sun et~al.~\cite{Sun:FAM2024} using a configuration based on the JIS~A~1310 test standard. The fire compartment for this test is 1.35~m by 1.35~m by 1.35~m with a 0.91~m by 0.91~m opening. The 0.6~m by 0.6~m propane burner is flush with the floor at the rear of the compartment with heat release rates of 600~kW, 750~kW, and 900~kW.
+
 \subsubsection{Modeling Notes}
 
 Gleb Bytskov at the University of Aalto, Finland, performed numerical simulations of these experiments using FDS as part of his master's thesis~\cite{Bytskov:Thesis}. The grid resolution is 10~cm. The fuel is assumed to be propane with a soot yield of 0.015, CO yield of 0.015, and radiative fraction of 0.20. 
 
+The JIS~A~1310 simulations use propane with a radiative fraction of 0.30.
+
 
 \section{UL/NIST Vent Experiments}
 \label{UL_NIST_Vents_Description}

Manuals/FDS_Validation_Guide/Heat_Flux_Chapter.tex

@@ -747,7 +747,7 @@ \subsection{TUS Facade Experiments}
 
 \end{picture}
 \end{minipage}
-\caption[tUS Facade, position of heat flux gauges]{Positions of the heat flux gauges on the exterior wall of the TUS Facade experiments. The wall is 3~m wide and 5.7~m tall. The window is 2~m wide by 1.2~m tall and 0.5~m above the floor and 0.05~m to the left of an adjacent wall. The letters a, b, and c at top denote the vertical line.}
+\caption[TUS Facade, position of heat flux gauges]{Positions of the heat flux gauges on the exterior wall of the TUS Facade experiments. The wall is 3~m wide and 5.7~m tall. The window is 2~m wide by 1.2~m tall and 0.5~m above the floor and 0.05~m to the left of an adjacent wall. The letters a, b, and c at top denote the vertical line.}
 \label{TUS_Facade_HF_Positions}
 \end{figure}
 
@@ -806,6 +806,38 @@ \subsection{TUS Facade Experiments}
 \label{TUS Facade_Heat_Flux_4}
 \end{figure}
 
+\clearpage
+
+Figure~\ref{JIS_Facade_HF_Positions} indicates the location of the heat flux gauges on the outer wall of the JIS~A~1310 test configuation, described in Sec.~\ref{TUS_Facade_Description}. Figure~\ref{JIS_Facade_Heat_Flux} displays measured and predicted heat flux to the surface above a window.
+
+\begin{figure}[!ht]
+\begin{minipage}{16cm}
+\setlength{\unitlength}{1.0in}
+\begin{picture}(4.0,6.0)(-2.5,0.0)
+\put(0.0,0.0){\framebox(1.82,4.095){ }}
+\put(0.455,0.455){\framebox(0.91,0.91){Window}}
+\put(0.91,2.265){\circle{0.05}}
+\put(0.91,2.865){\circle{0.05}}
+\put(0.91,3.265){\circle{0.05}}
+\put(0.91,3.765){\circle{0.05}}
+\end{picture}
+\end{minipage}
+\caption[JIA A 1310 Facade, position of heat flux gauges]{Positions of the heat flux gauges on the exterior wall of the JIS~A~1310 experiments. The wall is 1.82~m wide and 4.095~m tall. The window is 0.91~m wide by 0.91 tall and 0.455~m above the floor.}
+\label{JIS_Facade_HF_Positions}
+\end{figure}
+
+\newpage
+
+\begin{figure}[p]
+\centering
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/TUS_Facade/JIS_A_1310_5cm_HF_600_kW} \\
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/TUS_Facade/JIS_A_1310_5cm_HF_750_kW} \\
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/TUS_Facade/JIS_A_1310_5cm_HF_900_kW}
+\caption[JIS A 1310 Facade, heat flux]{JIS A 1310 Facade, heat flux. The Height refers to the distance above the top of the window.}
+\label{JIS_Facade_Heat_Flux}
+\end{figure}
+
+
 
 \clearpage
 

Source/ccib.f90

@@ -10636,15 +10636,15 @@ SUBROUTINE GET_CC_CELL_DIFFUSIVITY(RHO_CELL,D_Z_N,MU_CELL,MU_DNS_CELL,TMP_CELL,D
 SELECT CASE(SIM_MODE)
 CASE(LES_MODE)
    CALL INTERPOLATE1D_UNIFORM(LBOUND(D_Z_N,1),D_Z_N,TMP_CELL,D_Z_TEMP_DNS)
-   D_Z_TEMP = D_Z_TEMP_DNS + MAX(0._EB,MU_CELL-MU_DNS_CELL)*RSC/RHO_CELL
+   D_Z_TEMP = D_Z_TEMP_DNS + MAX(0._EB,MU_CELL-MU_DNS_CELL)*RSC_T/RHO_CELL
 CASE(DNS_MODE)
    IF(PERIODIC_TEST==7) THEN
       D_Z_TEMP = DIFF_MMS / RHO_CELL
    ELSE
       CALL INTERPOLATE1D_UNIFORM(LBOUND(D_Z_N,1),D_Z_N,TMP_CELL,D_Z_TEMP)
    ENDIF
 CASE DEFAULT
-   D_Z_TEMP = MU_CELL*RSC/RHO_CELL ! VLES
+   D_Z_TEMP = MU_CELL*RSC_T/RHO_CELL ! VLES
 END SELECT
 
 RETURN
@@ -10667,7 +10667,7 @@ SUBROUTINE GET_CC_CELL_CONDUCTIVITY(ZZ_CELL,MU_CELL,MU_DNS_CELL,TMP_CELL,KP_CELL
    IF (SIM_MODE==LES_MODE) THEN
       IF (.NOT.CONSTANT_SPECIFIC_HEAT_RATIO) THEN
          CALL GET_SPECIFIC_HEAT(ZZ_CELL,CP_CELL,TMP_CELL)
-         KP_CELL = KP_CELL + MAX(0._EB,MU_CELL-MU_DNS_CELL)*CP_CELL*RPR
+         KP_CELL = KP_CELL + MAX(0._EB,MU_CELL-MU_DNS_CELL)*CP_CELL*RPR_T
       ELSE
          KP_CELL = KP_CELL + MAX(0._EB,MU_CELL-MU_DNS_CELL)*CPOPR
       ENDIF

Source/chem.f90

@@ -98,15 +98,15 @@ SUBROUTINE DERIVATIVE(CVEC,FVEC, TN, USER_DATA)
 TYPE(USERDATA), INTENT(IN):: USER_DATA
 
 REAL(EB) :: R_F,MIN_SPEC(N_TRACKED_SPECIES), KG,  TMP, RHO, &
-          K_0, K_INF, P_RI, FCENT, B_I, RRTMP, THIRD_BODY_ENHANCEMENT, PR
+          K_0, K_INF, P_RI, FCENT, B_I, RRTMP, THIRD_BODY_ENHANCEMENT, PRES
 INTEGER :: I,NS, ITMP
 REAL(EB) :: ZZ(N_TRACKED_SPECIES), CP, HS_I, DG, TMPI
 REAL(EB) :: ZETA, MIXING_FACTOR, VOL_CHANGE_TERM, SUM_OMEGA_DOT, SUM_CC, MW0, MW, SUM_H_ZZ0, EXPONENT, CONC
 TYPE(REACTION_TYPE), POINTER :: RN
 
 TMP = MAX(CVEC(N_TRACKED_SPECIES+1), MIN_CHEM_TMP)
 TMPI = 1._EB/TMP
-PR = CVEC(N_TRACKED_SPECIES+2) ! PA
+PRES = CVEC(N_TRACKED_SPECIES+2) ! PA
 RRTMP = 1._EB/(R0*TMP)
 ZETA = USER_DATA%ZETA0*EXP(-TN/USER_DATA%TAU_MIX)
 MIXING_FACTOR = 0._EB
@@ -118,7 +118,7 @@ SUBROUTINE DERIVATIVE(CVEC,FVEC, TN, USER_DATA)
    CALL MOLAR_CONC_TO_MASS_FRAC(CVEC(1:N_TRACKED_SPECIES), ZZ(1:N_TRACKED_SPECIES))
    CALL GET_MOLECULAR_WEIGHT(ZZ(1:N_TRACKED_SPECIES),MW)
 ELSE ! Enters at the first timestep when ZETA0=1.
-   RHO = PR*MW0/R0/TMP
+   RHO = PRES*MW0/R0/TMP
    MW = MW0
    ZZ(1:N_TRACKED_SPECIES) = USER_DATA%ZZ_0(1:N_TRACKED_SPECIES)
 ENDIF
@@ -160,7 +160,7 @@ SUBROUTINE DERIVATIVE(CVEC,FVEC, TN, USER_DATA)
       IF (RN%N_THIRD > 0) THEN
          THIRD_BODY_ENHANCEMENT = DOT_PRODUCT(CVEC(1:N_SPECIES),RN%THIRD_EFF(1:N_SPECIES))
       ELSE
-         THIRD_BODY_ENHANCEMENT = PR*RRTMP
+         THIRD_BODY_ENHANCEMENT = PRES*RRTMP
       ENDIF
 
       IF (RN%REACTYPE==THREE_BODY_ARRHENIUS_TYPE) THEN
@@ -343,7 +343,7 @@ SUBROUTINE JACOBIAN(CVEC,FVEC,JMAT,TN,USER_DATA)
 TYPE(USERDATA), INTENT(IN):: USER_DATA
 
 REAL(EB) :: R_F,DCVEC1,DCVEC2, MIN_SPEC(N_TRACKED_SPECIES), KG,  TMP, RHO, &
-            K_0, K_INF, P_RI, FCENT, B_I, RRTMP, THIRD_BODY_ENHANCEMENT, PR
+            K_0, K_INF, P_RI, FCENT, B_I, RRTMP, THIRD_BODY_ENHANCEMENT, PRES
 REAL(EB) :: ZZ(N_TRACKED_SPECIES), CP_I(N_TRACKED_SPECIES), HS_I(N_TRACKED_SPECIES)
 REAL(EB) :: DKCDTBYKC, DBIDC(N_TRACKED_SPECIES), DBIDT, CP, DCPDT, DKINFDTMPBYKINF, DTMPDT, DG, TMPI, RHOI, CPI
 REAL(EB) :: ZETA, MIXING_FACTOR, SUM_OMEGA_DOT, SUM_CC, SUM_OMEGA_DOT_BY_CC, SUM_CC_I, ENRG_TERM, DUMMY1, DUMMY2, DUMMY3
@@ -354,7 +354,7 @@ SUBROUTINE JACOBIAN(CVEC,FVEC,JMAT,TN,USER_DATA)
 
 TMP = MAX(CVEC(N_TRACKED_SPECIES+1), MIN_CHEM_TMP)
 TMPI = 1._EB/TMP
-PR = CVEC(N_TRACKED_SPECIES+2) ! PA
+PRES = CVEC(N_TRACKED_SPECIES+2) ! PA
 RRTMP = 1._EB/(R0*TMP)
 ZETA = USER_DATA%ZETA0*EXP(-TN/USER_DATA%TAU_MIX)
 MIXING_FACTOR = 0._EB
@@ -366,7 +366,7 @@ SUBROUTINE JACOBIAN(CVEC,FVEC,JMAT,TN,USER_DATA)
    CALL MOLAR_CONC_TO_MASS_FRAC(CVEC(1:N_TRACKED_SPECIES), ZZ(1:N_TRACKED_SPECIES))
    CALL GET_MOLECULAR_WEIGHT(ZZ(1:N_TRACKED_SPECIES),MW)
 ELSE ! Enters at the first timestep when ZETA0=1.
-   RHO = PR*MW0/R0/TMP
+   RHO = PRES*MW0/R0/TMP
    MW = MW0
    ZZ(1:N_TRACKED_SPECIES) = USER_DATA%ZZ_0(1:N_TRACKED_SPECIES)
 ENDIF
@@ -409,7 +409,7 @@ SUBROUTINE JACOBIAN(CVEC,FVEC,JMAT,TN,USER_DATA)
       IF (RN%N_THIRD > 0) THEN
          THIRD_BODY_ENHANCEMENT =  DOT_PRODUCT(CVEC(1:N_SPECIES),RN%THIRD_EFF(1:N_SPECIES))
       ELSE
-         THIRD_BODY_ENHANCEMENT = PR*RRTMP
+         THIRD_BODY_ENHANCEMENT = PRES*RRTMP
       ENDIF
       IF (RN%REACTYPE==THREE_BODY_ARRHENIUS_TYPE) THEN
          R_F = R_F * THIRD_BODY_ENHANCEMENT
@@ -661,13 +661,13 @@ END SUBROUTINE PRINT_JMAT
 !> \param RNI is the reaction index.
 !> \param K0 is the low pressure rate coeff.
 !> \param KINF is the high pressure rate coeff.
-!> \param PR is the pressure ratio.
+!> \param P_RATIO is the pressure ratio.
 !> \param F is the falloff function value.
 !> \param DBIDC is the derivative of modification factor w.r.t concentration (out).
 !> \param DBIDT is the derivative of modification factor w.r.t temperature (out).
 
-SUBROUTINE CALC_FALLOFF_DBIDC_AND_DBIDT(TMP, RNI, K0, KINF, PR, F, DBIDC, DBIDT)
-REAL(EB), INTENT(IN) :: TMP, PR, K0, KINF, F
+SUBROUTINE CALC_FALLOFF_DBIDC_AND_DBIDT(TMP, RNI, K0, KINF, P_RATIO, F, DBIDC, DBIDT)
+REAL(EB), INTENT(IN) :: TMP, P_RATIO, K0, KINF, F
 INTEGER, INTENT(IN) :: RNI
 REAL(EB), INTENT(INOUT) :: DBIDC(N_TRACKED_SPECIES)
 REAL(EB), INTENT(INOUT) :: DBIDT
@@ -682,37 +682,37 @@ SUBROUTINE CALC_FALLOFF_DBIDC_AND_DBIDT(TMP, RNI, K0, KINF, PR, F, DBIDC, DBIDT)
    DPRDBI = -RN%THIRD_EFF(NS     )*K0/KINF
    DFDBI = 0._EB
    IF (RN%REACTYPE==FALLOFF_TROE_TYPE) THEN
-      DFDBI = DDC_TROE(PR, F, DPRDBI, TMP, RNI)
+      DFDBI = DDC_TROE(P_RATIO, F, DPRDBI, TMP, RNI)
    ENDIF   
-   DBIDC(NS) = (DPRDBI/(PR*(1 + PR)) + DFDBI/F)
+   DBIDC(NS) = (DPRDBI/(P_RATIO*(1 + P_RATIO)) + DFDBI/F)
 ENDDO
 
 
-DPRDT = PR/TMP*( RN%N_T_LOW_PR + RN%E_LOW_PR*RRTMP - RN%N_T - RN%E*RRTMP - 1)
+DPRDT = P_RATIO/TMP*( RN%N_T_LOW_PR + RN%E_LOW_PR*RRTMP - RN%N_T - RN%E*RRTMP - 1)
 DFDT = 0._EB
 IF (RN%REACTYPE==FALLOFF_TROE_TYPE) THEN
-   DFDT = DDTMP_TROE(PR, F, DPRDT, TMP, RNI)
+   DFDT = DDTMP_TROE(P_RATIO, F, DPRDT, TMP, RNI)
 ENDIF   
-DBIDT = (DPRDT/(PR*(1 + PR)) + DFDT/F)
+DBIDT = (DPRDT/(P_RATIO*(1 + P_RATIO)) + DFDT/F)
 
 RETURN
 END SUBROUTINE CALC_FALLOFF_DBIDC_AND_DBIDT
 
 !> \brief Calculate derivative of TROE function w.r.t concentration  
-!> \param PR is the pressure ratio.
+!> \param P_RATIO is the pressure ratio.
 !> \param F is the falloff function value.
 !> \param DPRDC is the derivative of TROE function w.r.t concentration.
 !> \param TMP is the current temperature.
 !> \param RNI is the reaction index
-REAL(EB) FUNCTION DDC_TROE(PR, F, DPRDC, TMP, RNI) 
-REAL(EB), INTENT(IN) :: PR, F, DPRDC, TMP
+REAL(EB) FUNCTION DDC_TROE(P_RATIO, F, DPRDC, TMP, RNI) 
+REAL(EB), INTENT(IN) :: P_RATIO, F, DPRDC, TMP
 INTEGER, INTENT(IN) :: RNI
 REAL(EB) :: LOGPR, LOGTEN, LOGFCENT, C, N, DLOGPRDC, DPARENTDC
 TYPE(REACTION_TYPE), POINTER :: RN
 REAL(EB), PARAMETER :: D=0.14_EB
 
 RN => REACTION(RNI)
-LOGPR = LOG10(MAX(PR,  TWO_EPSILON_EB))
+LOGPR = LOG10(MAX(P_RATIO,  TWO_EPSILON_EB))
 LOGTEN = LOG(10.0)
 IF (RN%T2_TROE <-1.E20_EB) THEN
    LOGFCENT = LOG10(MAX((1 - RN%A_TROE)*EXP(-TMP*RN%RT3_TROE) + &
@@ -722,7 +722,7 @@ REAL(EB) FUNCTION DDC_TROE(PR, F, DPRDC, TMP, RNI)
               RN%A_TROE*EXP(-TMP*RN%RT1_TROE) + EXP(-RN%T2_TROE/TMP),TWO_EPSILON_EB))
 ENDIF
 
-DLOGPRDC = DPRDC/PR/LOGTEN;
+DLOGPRDC = DPRDC/P_RATIO/LOGTEN;
 C = -0.4_EB - 0.67_EB*LOGFCENT
 N = 0.75_EB - 1.27_EB*LOGFCENT
 
@@ -736,20 +736,20 @@ END FUNCTION DDC_TROE
 
 
 !> \brief Calculate derivative of TROE function w.r.t temperature  
-!> \param PR is the pressure ratio.
+!> \param P_RATIO is the pressure ratio.
 !> \param F is the falloff function value.
 !> \param DPRDT is the derivative of TROE function w.r.t temperature.
 !> \param TMP is the current temperature.
 !> \param RNI is the reaction index
-REAL(EB) FUNCTION DDTMP_TROE(PR, F, DPRDT, TMP, RNI) 
-REAL(EB), INTENT(IN) :: PR, F, DPRDT, TMP
+REAL(EB) FUNCTION DDTMP_TROE(P_RATIO, F, DPRDT, TMP, RNI) 
+REAL(EB), INTENT(IN) :: P_RATIO, F, DPRDT, TMP
 INTEGER, INTENT(IN) :: RNI
 REAL(EB) :: FCENT, LOGPR, LOGTEN, LOGFCENT, DFCENTDT, C, N, DCDT, DNDT, DPARENTDT, DLOGFCENTDT, DLOGPRDT
 TYPE(REACTION_TYPE), POINTER :: RN
 REAL(EB), PARAMETER :: D=0.14_EB
 
 RN => REACTION(RNI)
-LOGPR = LOG10(MAX(PR, TWO_EPSILON_EB));
+LOGPR = LOG10(MAX(P_RATIO, TWO_EPSILON_EB));
 LOGTEN = LOG(10.0);
 IF (RN%T2_TROE <-1.E20_EB) THEN
    FCENT = MAX((1 - RN%A_TROE)*EXP(-TMP*RN%RT3_TROE) + &
@@ -768,7 +768,7 @@ REAL(EB) FUNCTION DDTMP_TROE(PR, F, DPRDT, TMP, RNI)
 N = 0.75_EB - 1.27_EB*LOGFCENT
 DCDT = -0.67*DLOGFCENTDT
 DNDT = -1.27*DLOGFCENTDT
-DLOGPRDT = DPRDT/PR/LOGTEN
+DLOGPRDT = DPRDT/P_RATIO/LOGTEN
 
 DPARENTDT = 2.0*(LOGPR + C)/((N - D*(LOGPR + C))**2)* &
    ((DLOGPRDT + DCDT) - (LOGPR + C)*(DNDT - D*(DLOGPRDT + DCDT))/(N - D*(LOGPR + C)))

Source/cons.f90

@@ -325,8 +325,8 @@ MODULE GLOBAL_CONSTANTS
 ! Miscellaneous real constants
 
 REAL(EB) :: CPOPR                              !< Specific heat divided by the Prandtl number (J/kg/K)
-REAL(EB) :: RSC                                !< Reciprocal of the Schmidt number
-REAL(EB) :: RPR                                !< Reciprocal of the Prandtl number
+REAL(EB) :: RSC_T                              !< Reciprocal of the turbulent Schmidt number
+REAL(EB) :: RPR_T                              !< Reciprocal of the turbulent Prandtl number
 REAL(EB) :: TMPA                               !< Ambient temperature (K)
 REAL(EB) :: TMPA4                              !< Ambient temperature to the fourth power (K^4)
 REAL(EB) :: RHOA                               !< Ambient density (kg/m3)
@@ -354,8 +354,8 @@ MODULE GLOBAL_CONSTANTS
 REAL(EB) :: CFL_MIN=0.8_EB                     !< Lower bound of CFL constraint
 REAL(EB) :: VN_MAX=1.0_EB                      !< Upper bound of von Neumann constraint
 REAL(EB) :: VN_MIN=0.8_EB                      !< Lower bound of von Neumann constraint
-REAL(EB) :: PR                                 !< Prandtl number
-REAL(EB) :: SC                                 !< Schmidt number
+REAL(EB) :: PR_T                               !< Turbulent Prandtl number
+REAL(EB) :: SC_T                               !< Turbulent Schmidt number
 REAL(EB) :: GROUND_LEVEL=0._EB                 !< Height of the ground, used for establishing atmospheric profiles (m)
 REAL(EB) :: LIMITING_DT_RATIO=1.E-4_EB         !< Ratio of current to initial time step when code is stopped
 REAL(EB) :: NOISE_VELOCITY=0.005_EB            !< Velocity of random noise vectors (m/s)

Source/data.f90

@@ -2456,7 +2456,7 @@ END SUBROUTINE THERMO_TABLE_LIQUID
 
 SUBROUTINE GAS_PROPS(GAS_INDEX,SIGMA,EPSOK,PR_GAS,MW,FORMULA,LISTED,ATOM_COUNTS,H_F,RADCAL_NAME)
 
-USE GLOBAL_CONSTANTS, ONLY: PR
+USE GLOBAL_CONSTANTS, ONLY: PR_T
 REAL(EB), INTENT(INOUT) :: SIGMA,EPSOK,MW,H_F,PR_GAS
 INTEGER, INTENT (IN) :: GAS_INDEX
 LOGICAL, INTENT(OUT) :: LISTED
@@ -2472,7 +2472,7 @@ SUBROUTINE GAS_PROPS(GAS_INDEX,SIGMA,EPSOK,PR_GAS,MW,FORMULA,LISTED,ATOM_COUNTS,
 MWIN = MW
 MW = -1._EB
 PR_GASIN = PR_GAS
-PR_GAS = PR
+PR_GAS = PR_T
 FORMULAIN = FORMULA
 FORMULA = 'null'
 
@@ -2707,7 +2707,7 @@ END SUBROUTINE LOOKUP_LOWER_OXYGEN_LIMIT
 
 SUBROUTINE CALC_MIX_PROPS(J,D_TMP,MU_TMP,K_TMP,CP_TMP,EPSK,SIG,D_USER,MU_USER,K_USER,MW,CP_USER,PR_USER)
 USE TYPES, ONLY:SPECIES_TYPE,SPECIES,SPECIES_MIXTURE_TYPE,SPECIES_MIXTURE
-USE GLOBAL_CONSTANTS, ONLY: PR
+USE GLOBAL_CONSTANTS, ONLY: PR_T
 INTEGER,INTENT(IN) :: J
 INTEGER :: I(1)
 REAL(EB), INTENT(IN) :: EPSK,SIG,D_USER,MU_USER,K_USER,MW,CP_USER,PR_USER
@@ -2734,7 +2734,7 @@ SUBROUTINE CALC_MIX_PROPS(J,D_TMP,MU_TMP,K_TMP,CP_TMP,EPSK,SIG,D_USER,MU_USER,K_
 IF (D_USER>=0._EB) D_TMP = D_USER
 IF (MU_USER>=0._EB) MU_TMP = MU_USER / SQRT(MW)
 IF (CP_USER > 0._EB) CP_TMP = CP_USER
-PR_TMP = PR
+PR_TMP = PR_T
 IF (PR_USER > 0._EB) PR_TMP = PR_USER
 IF (SIG > 0._EB .AND. EPSK > 0._EB) K_TMP = MU_TMP*CP_TMP/PR_TMP
 IF (K_USER>=0._EB) K_TMP = K_USER/SQRT(MW)

Source/divg.f90

@@ -120,9 +120,9 @@ SUBROUTINE DIVERGENCE_PART_1(T,DT,NM)
    IF (SIM_MODE/=DNS_MODE) THEN
       IF (SIM_MODE==LES_MODE) THEN
          RHO_D_TURB => WORK9
-         RHO_D_TURB = MAX(0._EB,MU-MU_DNS)*RSC
+         RHO_D_TURB = MAX(0._EB,MU-MU_DNS)*RSC_T
       ELSE
-         RHO_D = MAX(0._EB,MU)*RSC
+         RHO_D = MAX(0._EB,MU)*RSC_T
       ENDIF
    ENDIF
 
@@ -144,7 +144,7 @@ SUBROUTINE DIVERGENCE_PART_1(T,DT,NM)
       IF (SIM_MODE==LES_MODE .AND. .NOT.TENSOR_DIFFUSIVITY) THEN
          SM=>SPECIES_MIXTURE(N)
          IF (SM%SC_T_USER>TWO_EPSILON_EB) THEN
-            RHO_D = RHO_D + RHO_D_TURB*SC/SM%SC_T_USER
+            RHO_D = RHO_D + RHO_D_TURB*SC_T/SM%SC_T_USER
          ELSE
             RHO_D = RHO_D + RHO_D_TURB
          ENDIF
@@ -470,7 +470,7 @@ SUBROUTINE DIVERGENCE_PART_1(T,DT,NM)
 
    IF (SIM_MODE==LES_MODE .AND. .NOT.TENSOR_DIFFUSIVITY) THEN
       IF(.NOT.CONSTANT_SPECIFIC_HEAT_RATIO) THEN
-         KP = KP + MAX(0._EB,(MU-MU_DNS))*CP*RPR
+         KP = KP + MAX(0._EB,(MU-MU_DNS))*CP*RPR_T
       ELSE
          KP = KP + MAX(0._EB,(MU-MU_DNS))*CPOPR
       ENDIF

Source/dump.f90

@@ -3083,8 +3083,8 @@ SUBROUTINE INITIALIZE_DIAGNOSTIC_FILE(DT)
          END SELECT
       ENDIF
    ENDDO
-   WRITE(LU_OUTPUT,'(A,F8.2)')   '   Turbulent Prandtl Number:     ',PR
-   WRITE(LU_OUTPUT,'(A,F8.2)')   '   Turbulent Schmidt Number:     ',SC
+   WRITE(LU_OUTPUT,'(A,F8.2)')   '   Turbulent Prandtl Number:     ',PR_T
+   WRITE(LU_OUTPUT,'(A,F8.2)')   '   Turbulent Schmidt Number:     ',SC_T
    IF (ANY(SPECIES_MIXTURE(:)%SC_T_USER>0._EB)) &
         WRITE(LU_OUTPUT,'(A)')   '   Differential turbulent transport specified, see Tracked Species Information'
 
@@ -8684,9 +8684,7 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
    CASE(37)  ! DIFFUSIVITY
       SELECT CASE (SIM_MODE)
          CASE DEFAULT
-            GAS_PHASE_OUTPUT_RES = MU(II,JJ,KK)*RSC/RHO(II,JJ,KK)
-         CASE (LES_MODE)
-            GAS_PHASE_OUTPUT_RES = (MU(II,JJ,KK)-MU_DNS(II,JJ,KK)*RSC)/RHO(II,JJ,KK)
+            GAS_PHASE_OUTPUT_RES = MU(II,JJ,KK)*RSC_T/RHO(II,JJ,KK)
          CASE (DNS_MODE)
             D_Z_N = D_Z(:,Z_INDEX)
             CALL INTERPOLATE1D_UNIFORM(LBOUND(D_Z_N,1),D_Z_N,TMP(II,JJ,KK),GAS_PHASE_OUTPUT_RES)
@@ -8807,7 +8805,7 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
       ELSE
          R_DX2 = RDX(II)**2 + RDY(JJ)**2 + RDZ(KK)**2
       ENDIF
-      GAS_PHASE_OUTPUT_RES = DT*2._EB*R_DX2*MAX(D_Z_MAX(II,JJ,KK),MAX(RPR,RSC)*MU(II,JJ,KK)/RHO(II,JJ,KK))
+      GAS_PHASE_OUTPUT_RES = DT*2._EB*R_DX2*MAX(D_Z_MAX(II,JJ,KK),MAX(RPR_T,RSC_T)*MU(II,JJ,KK)/RHO(II,JJ,KK))
 
    CASE(72)  ! CFL MAX
       GAS_PHASE_OUTPUT_RES = CFL