Skip to content

Commit c789075

Browse files
authored
Merge pull request #14952 from cxp484/FireX
FireX: Merge with firemodels/master
2 parents ddbcf7d + 18c970f commit c789075

File tree

73 files changed

+1003
-605
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1003
-605
lines changed

Manuals/FDS_User_Guide/FDS_User_Guide.tex

Lines changed: 36 additions & 37 deletions
Large diffs are not rendered by default.

Manuals/FDS_Validation_Guide/Experiment_Chapter.tex

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3020,10 +3020,14 @@ \section{TUS Facade Experiments}
30203020

30213021
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.
30223022

3023+
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.
3024+
30233025
\subsubsection{Modeling Notes}
30243026

30253027
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.
30263028

3029+
The JIS~A~1310 simulations use propane with a radiative fraction of 0.30.
3030+
30273031

30283032
\section{UL/NIST Vent Experiments}
30293033
\label{UL_NIST_Vents_Description}

Manuals/FDS_Validation_Guide/Heat_Flux_Chapter.tex

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ \subsection{TUS Facade Experiments}
747747

748748
\end{picture}
749749
\end{minipage}
750-
\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.}
750+
\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.}
751751
\label{TUS_Facade_HF_Positions}
752752
\end{figure}
753753

@@ -806,6 +806,38 @@ \subsection{TUS Facade Experiments}
806806
\label{TUS Facade_Heat_Flux_4}
807807
\end{figure}
808808

809+
\clearpage
810+
811+
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.
812+
813+
\begin{figure}[!ht]
814+
\begin{minipage}{16cm}
815+
\setlength{\unitlength}{1.0in}
816+
\begin{picture}(4.0,6.0)(-2.5,0.0)
817+
\put(0.0,0.0){\framebox(1.82,4.095){ }}
818+
\put(0.455,0.455){\framebox(0.91,0.91){Window}}
819+
\put(0.91,2.265){\circle{0.05}}
820+
\put(0.91,2.865){\circle{0.05}}
821+
\put(0.91,3.265){\circle{0.05}}
822+
\put(0.91,3.765){\circle{0.05}}
823+
\end{picture}
824+
\end{minipage}
825+
\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.}
826+
\label{JIS_Facade_HF_Positions}
827+
\end{figure}
828+
829+
\newpage
830+
831+
\begin{figure}[p]
832+
\centering
833+
\includegraphics[height=2.15in]{SCRIPT_FIGURES/TUS_Facade/JIS_A_1310_5cm_HF_600_kW} \\
834+
\includegraphics[height=2.15in]{SCRIPT_FIGURES/TUS_Facade/JIS_A_1310_5cm_HF_750_kW} \\
835+
\includegraphics[height=2.15in]{SCRIPT_FIGURES/TUS_Facade/JIS_A_1310_5cm_HF_900_kW}
836+
\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.}
837+
\label{JIS_Facade_Heat_Flux}
838+
\end{figure}
839+
840+
809841

810842
\clearpage
811843

Source/ccib.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10636,15 +10636,15 @@ SUBROUTINE GET_CC_CELL_DIFFUSIVITY(RHO_CELL,D_Z_N,MU_CELL,MU_DNS_CELL,TMP_CELL,D
1063610636
SELECT CASE(SIM_MODE)
1063710637
CASE(LES_MODE)
1063810638
CALL INTERPOLATE1D_UNIFORM(LBOUND(D_Z_N,1),D_Z_N,TMP_CELL,D_Z_TEMP_DNS)
10639-
D_Z_TEMP = D_Z_TEMP_DNS + MAX(0._EB,MU_CELL-MU_DNS_CELL)*RSC/RHO_CELL
10639+
D_Z_TEMP = D_Z_TEMP_DNS + MAX(0._EB,MU_CELL-MU_DNS_CELL)*RSC_T/RHO_CELL
1064010640
CASE(DNS_MODE)
1064110641
IF(PERIODIC_TEST==7) THEN
1064210642
D_Z_TEMP = DIFF_MMS / RHO_CELL
1064310643
ELSE
1064410644
CALL INTERPOLATE1D_UNIFORM(LBOUND(D_Z_N,1),D_Z_N,TMP_CELL,D_Z_TEMP)
1064510645
ENDIF
1064610646
CASE DEFAULT
10647-
D_Z_TEMP = MU_CELL*RSC/RHO_CELL ! VLES
10647+
D_Z_TEMP = MU_CELL*RSC_T/RHO_CELL ! VLES
1064810648
END SELECT
1064910649

1065010650
RETURN
@@ -10667,7 +10667,7 @@ SUBROUTINE GET_CC_CELL_CONDUCTIVITY(ZZ_CELL,MU_CELL,MU_DNS_CELL,TMP_CELL,KP_CELL
1066710667
IF (SIM_MODE==LES_MODE) THEN
1066810668
IF (.NOT.CONSTANT_SPECIFIC_HEAT_RATIO) THEN
1066910669
CALL GET_SPECIFIC_HEAT(ZZ_CELL,CP_CELL,TMP_CELL)
10670-
KP_CELL = KP_CELL + MAX(0._EB,MU_CELL-MU_DNS_CELL)*CP_CELL*RPR
10670+
KP_CELL = KP_CELL + MAX(0._EB,MU_CELL-MU_DNS_CELL)*CP_CELL*RPR_T
1067110671
ELSE
1067210672
KP_CELL = KP_CELL + MAX(0._EB,MU_CELL-MU_DNS_CELL)*CPOPR
1067310673
ENDIF

Source/chem.f90

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@ SUBROUTINE DERIVATIVE(CVEC,FVEC, TN, USER_DATA)
9898
TYPE(USERDATA), INTENT(IN):: USER_DATA
9999

100100
REAL(EB) :: R_F,MIN_SPEC(N_TRACKED_SPECIES), KG, TMP, RHO, &
101-
K_0, K_INF, P_RI, FCENT, B_I, RRTMP, THIRD_BODY_ENHANCEMENT, PR
101+
K_0, K_INF, P_RI, FCENT, B_I, RRTMP, THIRD_BODY_ENHANCEMENT, PRES
102102
INTEGER :: I,NS, ITMP
103103
REAL(EB) :: ZZ(N_TRACKED_SPECIES), CP, HS_I, DG, TMPI
104104
REAL(EB) :: ZETA, MIXING_FACTOR, VOL_CHANGE_TERM, SUM_OMEGA_DOT, SUM_CC, MW0, MW, SUM_H_ZZ0, EXPONENT, CONC
105105
TYPE(REACTION_TYPE), POINTER :: RN
106106

107107
TMP = MAX(CVEC(N_TRACKED_SPECIES+1), MIN_CHEM_TMP)
108108
TMPI = 1._EB/TMP
109-
PR = CVEC(N_TRACKED_SPECIES+2) ! PA
109+
PRES = CVEC(N_TRACKED_SPECIES+2) ! PA
110110
RRTMP = 1._EB/(R0*TMP)
111111
ZETA = USER_DATA%ZETA0*EXP(-TN/USER_DATA%TAU_MIX)
112112
MIXING_FACTOR = 0._EB
@@ -118,7 +118,7 @@ SUBROUTINE DERIVATIVE(CVEC,FVEC, TN, USER_DATA)
118118
CALL MOLAR_CONC_TO_MASS_FRAC(CVEC(1:N_TRACKED_SPECIES), ZZ(1:N_TRACKED_SPECIES))
119119
CALL GET_MOLECULAR_WEIGHT(ZZ(1:N_TRACKED_SPECIES),MW)
120120
ELSE ! Enters at the first timestep when ZETA0=1.
121-
RHO = PR*MW0/R0/TMP
121+
RHO = PRES*MW0/R0/TMP
122122
MW = MW0
123123
ZZ(1:N_TRACKED_SPECIES) = USER_DATA%ZZ_0(1:N_TRACKED_SPECIES)
124124
ENDIF
@@ -160,7 +160,7 @@ SUBROUTINE DERIVATIVE(CVEC,FVEC, TN, USER_DATA)
160160
IF (RN%N_THIRD > 0) THEN
161161
THIRD_BODY_ENHANCEMENT = DOT_PRODUCT(CVEC(1:N_SPECIES),RN%THIRD_EFF(1:N_SPECIES))
162162
ELSE
163-
THIRD_BODY_ENHANCEMENT = PR*RRTMP
163+
THIRD_BODY_ENHANCEMENT = PRES*RRTMP
164164
ENDIF
165165

166166
IF (RN%REACTYPE==THREE_BODY_ARRHENIUS_TYPE) THEN
@@ -343,7 +343,7 @@ SUBROUTINE JACOBIAN(CVEC,FVEC,JMAT,TN,USER_DATA)
343343
TYPE(USERDATA), INTENT(IN):: USER_DATA
344344

345345
REAL(EB) :: R_F,DCVEC1,DCVEC2, MIN_SPEC(N_TRACKED_SPECIES), KG, TMP, RHO, &
346-
K_0, K_INF, P_RI, FCENT, B_I, RRTMP, THIRD_BODY_ENHANCEMENT, PR
346+
K_0, K_INF, P_RI, FCENT, B_I, RRTMP, THIRD_BODY_ENHANCEMENT, PRES
347347
REAL(EB) :: ZZ(N_TRACKED_SPECIES), CP_I(N_TRACKED_SPECIES), HS_I(N_TRACKED_SPECIES)
348348
REAL(EB) :: DKCDTBYKC, DBIDC(N_TRACKED_SPECIES), DBIDT, CP, DCPDT, DKINFDTMPBYKINF, DTMPDT, DG, TMPI, RHOI, CPI
349349
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)
354354

355355
TMP = MAX(CVEC(N_TRACKED_SPECIES+1), MIN_CHEM_TMP)
356356
TMPI = 1._EB/TMP
357-
PR = CVEC(N_TRACKED_SPECIES+2) ! PA
357+
PRES = CVEC(N_TRACKED_SPECIES+2) ! PA
358358
RRTMP = 1._EB/(R0*TMP)
359359
ZETA = USER_DATA%ZETA0*EXP(-TN/USER_DATA%TAU_MIX)
360360
MIXING_FACTOR = 0._EB
@@ -366,7 +366,7 @@ SUBROUTINE JACOBIAN(CVEC,FVEC,JMAT,TN,USER_DATA)
366366
CALL MOLAR_CONC_TO_MASS_FRAC(CVEC(1:N_TRACKED_SPECIES), ZZ(1:N_TRACKED_SPECIES))
367367
CALL GET_MOLECULAR_WEIGHT(ZZ(1:N_TRACKED_SPECIES),MW)
368368
ELSE ! Enters at the first timestep when ZETA0=1.
369-
RHO = PR*MW0/R0/TMP
369+
RHO = PRES*MW0/R0/TMP
370370
MW = MW0
371371
ZZ(1:N_TRACKED_SPECIES) = USER_DATA%ZZ_0(1:N_TRACKED_SPECIES)
372372
ENDIF
@@ -409,7 +409,7 @@ SUBROUTINE JACOBIAN(CVEC,FVEC,JMAT,TN,USER_DATA)
409409
IF (RN%N_THIRD > 0) THEN
410410
THIRD_BODY_ENHANCEMENT = DOT_PRODUCT(CVEC(1:N_SPECIES),RN%THIRD_EFF(1:N_SPECIES))
411411
ELSE
412-
THIRD_BODY_ENHANCEMENT = PR*RRTMP
412+
THIRD_BODY_ENHANCEMENT = PRES*RRTMP
413413
ENDIF
414414
IF (RN%REACTYPE==THREE_BODY_ARRHENIUS_TYPE) THEN
415415
R_F = R_F * THIRD_BODY_ENHANCEMENT
@@ -661,13 +661,13 @@ END SUBROUTINE PRINT_JMAT
661661
!> \param RNI is the reaction index.
662662
!> \param K0 is the low pressure rate coeff.
663663
!> \param KINF is the high pressure rate coeff.
664-
!> \param PR is the pressure ratio.
664+
!> \param P_RATIO is the pressure ratio.
665665
!> \param F is the falloff function value.
666666
!> \param DBIDC is the derivative of modification factor w.r.t concentration (out).
667667
!> \param DBIDT is the derivative of modification factor w.r.t temperature (out).
668668

669-
SUBROUTINE CALC_FALLOFF_DBIDC_AND_DBIDT(TMP, RNI, K0, KINF, PR, F, DBIDC, DBIDT)
670-
REAL(EB), INTENT(IN) :: TMP, PR, K0, KINF, F
669+
SUBROUTINE CALC_FALLOFF_DBIDC_AND_DBIDT(TMP, RNI, K0, KINF, P_RATIO, F, DBIDC, DBIDT)
670+
REAL(EB), INTENT(IN) :: TMP, P_RATIO, K0, KINF, F
671671
INTEGER, INTENT(IN) :: RNI
672672
REAL(EB), INTENT(INOUT) :: DBIDC(N_TRACKED_SPECIES)
673673
REAL(EB), INTENT(INOUT) :: DBIDT
@@ -682,37 +682,37 @@ SUBROUTINE CALC_FALLOFF_DBIDC_AND_DBIDT(TMP, RNI, K0, KINF, PR, F, DBIDC, DBIDT)
682682
DPRDBI = -RN%THIRD_EFF(NS )*K0/KINF
683683
DFDBI = 0._EB
684684
IF (RN%REACTYPE==FALLOFF_TROE_TYPE) THEN
685-
DFDBI = DDC_TROE(PR, F, DPRDBI, TMP, RNI)
685+
DFDBI = DDC_TROE(P_RATIO, F, DPRDBI, TMP, RNI)
686686
ENDIF
687-
DBIDC(NS) = (DPRDBI/(PR*(1 + PR)) + DFDBI/F)
687+
DBIDC(NS) = (DPRDBI/(P_RATIO*(1 + P_RATIO)) + DFDBI/F)
688688
ENDDO
689689

690690

691-
DPRDT = PR/TMP*( RN%N_T_LOW_PR + RN%E_LOW_PR*RRTMP - RN%N_T - RN%E*RRTMP - 1)
691+
DPRDT = P_RATIO/TMP*( RN%N_T_LOW_PR + RN%E_LOW_PR*RRTMP - RN%N_T - RN%E*RRTMP - 1)
692692
DFDT = 0._EB
693693
IF (RN%REACTYPE==FALLOFF_TROE_TYPE) THEN
694-
DFDT = DDTMP_TROE(PR, F, DPRDT, TMP, RNI)
694+
DFDT = DDTMP_TROE(P_RATIO, F, DPRDT, TMP, RNI)
695695
ENDIF
696-
DBIDT = (DPRDT/(PR*(1 + PR)) + DFDT/F)
696+
DBIDT = (DPRDT/(P_RATIO*(1 + P_RATIO)) + DFDT/F)
697697

698698
RETURN
699699
END SUBROUTINE CALC_FALLOFF_DBIDC_AND_DBIDT
700700

701701
!> \brief Calculate derivative of TROE function w.r.t concentration
702-
!> \param PR is the pressure ratio.
702+
!> \param P_RATIO is the pressure ratio.
703703
!> \param F is the falloff function value.
704704
!> \param DPRDC is the derivative of TROE function w.r.t concentration.
705705
!> \param TMP is the current temperature.
706706
!> \param RNI is the reaction index
707-
REAL(EB) FUNCTION DDC_TROE(PR, F, DPRDC, TMP, RNI)
708-
REAL(EB), INTENT(IN) :: PR, F, DPRDC, TMP
707+
REAL(EB) FUNCTION DDC_TROE(P_RATIO, F, DPRDC, TMP, RNI)
708+
REAL(EB), INTENT(IN) :: P_RATIO, F, DPRDC, TMP
709709
INTEGER, INTENT(IN) :: RNI
710710
REAL(EB) :: LOGPR, LOGTEN, LOGFCENT, C, N, DLOGPRDC, DPARENTDC
711711
TYPE(REACTION_TYPE), POINTER :: RN
712712
REAL(EB), PARAMETER :: D=0.14_EB
713713

714714
RN => REACTION(RNI)
715-
LOGPR = LOG10(MAX(PR, TWO_EPSILON_EB))
715+
LOGPR = LOG10(MAX(P_RATIO, TWO_EPSILON_EB))
716716
LOGTEN = LOG(10.0)
717717
IF (RN%T2_TROE <-1.E20_EB) THEN
718718
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)
722722
RN%A_TROE*EXP(-TMP*RN%RT1_TROE) + EXP(-RN%T2_TROE/TMP),TWO_EPSILON_EB))
723723
ENDIF
724724

725-
DLOGPRDC = DPRDC/PR/LOGTEN;
725+
DLOGPRDC = DPRDC/P_RATIO/LOGTEN;
726726
C = -0.4_EB - 0.67_EB*LOGFCENT
727727
N = 0.75_EB - 1.27_EB*LOGFCENT
728728

@@ -736,20 +736,20 @@ END FUNCTION DDC_TROE
736736

737737

738738
!> \brief Calculate derivative of TROE function w.r.t temperature
739-
!> \param PR is the pressure ratio.
739+
!> \param P_RATIO is the pressure ratio.
740740
!> \param F is the falloff function value.
741741
!> \param DPRDT is the derivative of TROE function w.r.t temperature.
742742
!> \param TMP is the current temperature.
743743
!> \param RNI is the reaction index
744-
REAL(EB) FUNCTION DDTMP_TROE(PR, F, DPRDT, TMP, RNI)
745-
REAL(EB), INTENT(IN) :: PR, F, DPRDT, TMP
744+
REAL(EB) FUNCTION DDTMP_TROE(P_RATIO, F, DPRDT, TMP, RNI)
745+
REAL(EB), INTENT(IN) :: P_RATIO, F, DPRDT, TMP
746746
INTEGER, INTENT(IN) :: RNI
747747
REAL(EB) :: FCENT, LOGPR, LOGTEN, LOGFCENT, DFCENTDT, C, N, DCDT, DNDT, DPARENTDT, DLOGFCENTDT, DLOGPRDT
748748
TYPE(REACTION_TYPE), POINTER :: RN
749749
REAL(EB), PARAMETER :: D=0.14_EB
750750

751751
RN => REACTION(RNI)
752-
LOGPR = LOG10(MAX(PR, TWO_EPSILON_EB));
752+
LOGPR = LOG10(MAX(P_RATIO, TWO_EPSILON_EB));
753753
LOGTEN = LOG(10.0);
754754
IF (RN%T2_TROE <-1.E20_EB) THEN
755755
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)
768768
N = 0.75_EB - 1.27_EB*LOGFCENT
769769
DCDT = -0.67*DLOGFCENTDT
770770
DNDT = -1.27*DLOGFCENTDT
771-
DLOGPRDT = DPRDT/PR/LOGTEN
771+
DLOGPRDT = DPRDT/P_RATIO/LOGTEN
772772

773773
DPARENTDT = 2.0*(LOGPR + C)/((N - D*(LOGPR + C))**2)* &
774774
((DLOGPRDT + DCDT) - (LOGPR + C)*(DNDT - D*(DLOGPRDT + DCDT))/(N - D*(LOGPR + C)))

Source/cons.f90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,8 @@ MODULE GLOBAL_CONSTANTS
325325
! Miscellaneous real constants
326326

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

Source/data.f90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2456,7 +2456,7 @@ END SUBROUTINE THERMO_TABLE_LIQUID
24562456

24572457
SUBROUTINE GAS_PROPS(GAS_INDEX,SIGMA,EPSOK,PR_GAS,MW,FORMULA,LISTED,ATOM_COUNTS,H_F,RADCAL_NAME)
24582458

2459-
USE GLOBAL_CONSTANTS, ONLY: PR
2459+
USE GLOBAL_CONSTANTS, ONLY: PR_T
24602460
REAL(EB), INTENT(INOUT) :: SIGMA,EPSOK,MW,H_F,PR_GAS
24612461
INTEGER, INTENT (IN) :: GAS_INDEX
24622462
LOGICAL, INTENT(OUT) :: LISTED
@@ -2472,7 +2472,7 @@ SUBROUTINE GAS_PROPS(GAS_INDEX,SIGMA,EPSOK,PR_GAS,MW,FORMULA,LISTED,ATOM_COUNTS,
24722472
MWIN = MW
24732473
MW = -1._EB
24742474
PR_GASIN = PR_GAS
2475-
PR_GAS = PR
2475+
PR_GAS = PR_T
24762476
FORMULAIN = FORMULA
24772477
FORMULA = 'null'
24782478

@@ -2707,7 +2707,7 @@ END SUBROUTINE LOOKUP_LOWER_OXYGEN_LIMIT
27072707

27082708
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)
27092709
USE TYPES, ONLY:SPECIES_TYPE,SPECIES,SPECIES_MIXTURE_TYPE,SPECIES_MIXTURE
2710-
USE GLOBAL_CONSTANTS, ONLY: PR
2710+
USE GLOBAL_CONSTANTS, ONLY: PR_T
27112711
INTEGER,INTENT(IN) :: J
27122712
INTEGER :: I(1)
27132713
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_
27342734
IF (D_USER>=0._EB) D_TMP = D_USER
27352735
IF (MU_USER>=0._EB) MU_TMP = MU_USER / SQRT(MW)
27362736
IF (CP_USER > 0._EB) CP_TMP = CP_USER
2737-
PR_TMP = PR
2737+
PR_TMP = PR_T
27382738
IF (PR_USER > 0._EB) PR_TMP = PR_USER
27392739
IF (SIG > 0._EB .AND. EPSK > 0._EB) K_TMP = MU_TMP*CP_TMP/PR_TMP
27402740
IF (K_USER>=0._EB) K_TMP = K_USER/SQRT(MW)

Source/divg.f90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ SUBROUTINE DIVERGENCE_PART_1(T,DT,NM)
120120
IF (SIM_MODE/=DNS_MODE) THEN
121121
IF (SIM_MODE==LES_MODE) THEN
122122
RHO_D_TURB => WORK9
123-
RHO_D_TURB = MAX(0._EB,MU-MU_DNS)*RSC
123+
RHO_D_TURB = MAX(0._EB,MU-MU_DNS)*RSC_T
124124
ELSE
125-
RHO_D = MAX(0._EB,MU)*RSC
125+
RHO_D = MAX(0._EB,MU)*RSC_T
126126
ENDIF
127127
ENDIF
128128

@@ -144,7 +144,7 @@ SUBROUTINE DIVERGENCE_PART_1(T,DT,NM)
144144
IF (SIM_MODE==LES_MODE .AND. .NOT.TENSOR_DIFFUSIVITY) THEN
145145
SM=>SPECIES_MIXTURE(N)
146146
IF (SM%SC_T_USER>TWO_EPSILON_EB) THEN
147-
RHO_D = RHO_D + RHO_D_TURB*SC/SM%SC_T_USER
147+
RHO_D = RHO_D + RHO_D_TURB*SC_T/SM%SC_T_USER
148148
ELSE
149149
RHO_D = RHO_D + RHO_D_TURB
150150
ENDIF
@@ -470,7 +470,7 @@ SUBROUTINE DIVERGENCE_PART_1(T,DT,NM)
470470

471471
IF (SIM_MODE==LES_MODE .AND. .NOT.TENSOR_DIFFUSIVITY) THEN
472472
IF(.NOT.CONSTANT_SPECIFIC_HEAT_RATIO) THEN
473-
KP = KP + MAX(0._EB,(MU-MU_DNS))*CP*RPR
473+
KP = KP + MAX(0._EB,(MU-MU_DNS))*CP*RPR_T
474474
ELSE
475475
KP = KP + MAX(0._EB,(MU-MU_DNS))*CPOPR
476476
ENDIF

Source/dump.f90

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3083,8 +3083,8 @@ SUBROUTINE INITIALIZE_DIAGNOSTIC_FILE(DT)
30833083
END SELECT
30843084
ENDIF
30853085
ENDDO
3086-
WRITE(LU_OUTPUT,'(A,F8.2)') ' Turbulent Prandtl Number: ',PR
3087-
WRITE(LU_OUTPUT,'(A,F8.2)') ' Turbulent Schmidt Number: ',SC
3086+
WRITE(LU_OUTPUT,'(A,F8.2)') ' Turbulent Prandtl Number: ',PR_T
3087+
WRITE(LU_OUTPUT,'(A,F8.2)') ' Turbulent Schmidt Number: ',SC_T
30883088
IF (ANY(SPECIES_MIXTURE(:)%SC_T_USER>0._EB)) &
30893089
WRITE(LU_OUTPUT,'(A)') ' Differential turbulent transport specified, see Tracked Species Information'
30903090

@@ -8684,9 +8684,7 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
86848684
CASE(37) ! DIFFUSIVITY
86858685
SELECT CASE (SIM_MODE)
86868686
CASE DEFAULT
8687-
GAS_PHASE_OUTPUT_RES = MU(II,JJ,KK)*RSC/RHO(II,JJ,KK)
8688-
CASE (LES_MODE)
8689-
GAS_PHASE_OUTPUT_RES = (MU(II,JJ,KK)-MU_DNS(II,JJ,KK)*RSC)/RHO(II,JJ,KK)
8687+
GAS_PHASE_OUTPUT_RES = MU(II,JJ,KK)*RSC_T/RHO(II,JJ,KK)
86908688
CASE (DNS_MODE)
86918689
D_Z_N = D_Z(:,Z_INDEX)
86928690
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
88078805
ELSE
88088806
R_DX2 = RDX(II)**2 + RDY(JJ)**2 + RDZ(KK)**2
88098807
ENDIF
8810-
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))
8808+
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))
88118809

88128810
CASE(72) ! CFL MAX
88138811
GAS_PHASE_OUTPUT_RES = CFL

0 commit comments

Comments
 (0)