Skip to content

Commit da65d2b

Browse files
cxp484cxp484
committed
Merge remote-tracking branch 'firemodels/master' into FireX
2 parents ac188b2 + b67b9b0 commit da65d2b

File tree

70 files changed

+3157
-2834
lines changed

Some content is hidden

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

70 files changed

+3157
-2834
lines changed

‎.github/workflows/linux.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,13 @@ jobs:
104104
cache: 'pip' # caching pip dependencies
105105
- run: |
106106
echo $GITHUB_WORKSPACE
107-
cd $GITHUB_WORKSPACE/.github
108-
pip install -r requirements.txt
107+
cd $GITHUB_WORKSPACE/Utilities/Python
108+
source setup_python_env.sh --batchmode
109109
110110
- name: Python test
111111
run: |
112112
echo $GITHUB_WORKSPACE
113113
cd $GITHUB_WORKSPACE/Utilities/Python
114+
source $GITHUB_WORKSPACE/.github/fds_python_env/bin/activate
114115
python hello_world.py
115116
: # python FDS_verification_script.py

‎Manuals/FDS_Validation_Guide/Burning_Rate_Chapter.tex‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3058,7 +3058,7 @@ \section{Summary of Burning and Spread Rates}
30583058
\begin{figure}[!ht]
30593059
\centering
30603060
\begin{tabular}{c}
3061-
\includegraphics[height=3.5in]{SCRIPT_FIGURES/ScatterPlots/FDS_Heat_Release_Rates}
3061+
\includegraphics[height=3.5in]{SCRIPT_FIGURES/Scatterplots/FDS_Heat_Release_Rates}
30623062
\end{tabular}
30633063
\caption[Summary of heat release rate predictions]{Summary of heat release rate predictions.}
30643064
\label{Heat_Release_Rate}
@@ -3068,7 +3068,7 @@ \section{Summary of Burning and Spread Rates}
30683068
\begin{figure}[!ht]
30693069
\centering
30703070
\begin{tabular}{c}
3071-
\includegraphics[height=3.5in]{SCRIPT_FIGURES/ScatterPlots/FDS_Burning_Rates}
3071+
\includegraphics[height=3.5in]{SCRIPT_FIGURES/Scatterplots/FDS_Burning_Rates}
30723072
\end{tabular}
30733073
\caption[Summary of burning rate predictions]{Summary of burning rate predictions.}
30743074
\label{Burning_Rate}
@@ -3078,7 +3078,7 @@ \section{Summary of Burning and Spread Rates}
30783078
\begin{figure}[!ht]
30793079
\centering
30803080
\begin{tabular}{c}
3081-
\includegraphics[height=3.5in]{SCRIPT_FIGURES/ScatterPlots/FDS_Liquid_Pool_Burning_Rates}
3081+
\includegraphics[height=3.5in]{SCRIPT_FIGURES/Scatterplots/FDS_Liquid_Pool_Burning_Rates}
30823082
\end{tabular}
30833083
\caption[Summary of liquid pool burning rate predictions]{Summary of liquid pool burning rate predictions.}
30843084
\label{Liquid_Pool_Burning_Rate}
@@ -3087,7 +3087,7 @@ \section{Summary of Burning and Spread Rates}
30873087
\begin{figure}[!ht]
30883088
\centering
30893089
\begin{tabular}{c}
3090-
\includegraphics[height=3.5in]{SCRIPT_FIGURES/ScatterPlots/FDS_Scaling_HRRPUA}
3090+
\includegraphics[height=3.5in]{SCRIPT_FIGURES/Scatterplots/FDS_Scaling_HRRPUA}
30913091
\end{tabular}
30923092
\caption[Summary of scaling heat release rate per unit area predictions]{Summary of scaling heat release rate per unit area predictions.}
30933093
\label{Scaling_Heat_Release_Rate_Per_Unit_Area}
@@ -3096,7 +3096,7 @@ \section{Summary of Burning and Spread Rates}
30963096
\begin{figure}[!ht]
30973097
\centering
30983098
\begin{tabular}{c}
3099-
\includegraphics[height=3.5in]{SCRIPT_FIGURES/ScatterPlots/FDS_Rate_of_Spread}
3099+
\includegraphics[height=3.5in]{SCRIPT_FIGURES/Scatterplots/FDS_Rate_of_Spread}
31003100
\end{tabular}
31013101
\caption[Summary, Wildfire Rate of Spread]
31023102
{Summary, Wildfire Rate of Spread.}

‎Manuals/FDS_Validation_Guide/Ceiling_Jet_Chapter.tex‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,7 @@ \subsection{Summary of Ceiling Jet Temperature Predictions}
11061106
\begin{figure}[h!]
11071107
\begin{center}
11081108
\begin{tabular}{c}
1109-
\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Flat_Ceiling_Jet_Temperature}
1109+
\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Flat_Ceiling_Jet_Temperature}
11101110
\end{tabular}
11111111
\end{center}
11121112
\caption[Summary of ceiling jet temperature predictions]{Summary of ceiling jet temperature predictions.}
@@ -1129,7 +1129,7 @@ \subsection{Time to First Sprinkler Activation}
11291129

11301130
\begin{figure}[h]
11311131
\begin{center}
1132-
\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Sprinkler_Actuation_Time}
1132+
\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Sprinkler_Actuation_Time}
11331133
\end{center}
11341134
\caption[Comparison of measured and predicted sprinkler actuation times]{Comparison of measured and predicted sprinkler actuation times.}
11351135
\label{Sprinkler_Activation_Times}
@@ -1232,7 +1232,7 @@ \subsection{Number of Sprinkler Activations}
12321232

12331233
\begin{figure}[p]
12341234
\begin{center}
1235-
\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Sprinkler_Actuations}
1235+
\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Sprinkler_Actuations}
12361236
\end{center}
12371237
\caption[Comparison of the number of predicted and measured sprinkler activations]
12381238
{Comparison of the number of predicted and measured sprinkler activations.}
@@ -1253,7 +1253,7 @@ \section{Smoke Detector Activation Times}
12531253
\begin{figure}[!h]
12541254
\begin{center}
12551255
\begin{tabular}{c}
1256-
\includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Smoke_Detector_Activation_Time_Temp_Rise}
1256+
\includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Smoke_Detector_Activation_Time_Temp_Rise}
12571257
\end{tabular}
12581258
\end{center}
12591259
\caption[Summary of smoke detector activation times (temperature rise), NIST Smoke Alarms]
@@ -1267,7 +1267,7 @@ \section{Smoke Detector Activation Times}
12671267
\begin{figure}[!h]
12681268
\begin{center}
12691269
\begin{tabular}{c}
1270-
\includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Smoke_Detector_Activation_Time}
1270+
\includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Smoke_Detector_Activation_Time}
12711271
\end{tabular}
12721272
\end{center}
12731273
\caption[Summary of activation times, smoke detector model, NIST Smoke Alarms]

‎Manuals/FDS_Validation_Guide/FDS_Validation_Guide.tex‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ \section{Summary of FDS Model Uncertainty Statistics}
272272

273273
For further details about model uncertainty and the meaning of these statistics, see Chapter~\ref{Error_Chapter}.
274274

275-
\IfFileExists{SCRIPT_FIGURES/ScatterPlots/validation_statistics.tex}{\input{SCRIPT_FIGURES/ScatterPlots/validation_statistics.tex}}{\typeout{Error: Missing file SCRIPT_FIGURES/ScatterPlots/validation_statistics.tex}}
275+
\IfFileExists{SCRIPT_FIGURES/Scatterplots/validation_statistics.tex}{\input{SCRIPT_FIGURES/Scatterplots/validation_statistics.tex}}{\typeout{Error: Missing file SCRIPT_FIGURES/Scatterplots/validation_statistics.tex}}
276276

277277

278278
\section{Normality Tests}
@@ -294,7 +294,7 @@ \section{Normality Tests}
294294

295295
The flaw in most normality tests is that they tend to reject the assumption of normality when the number of samples is relatively large. As can be seen in some of the histograms on the following pages, some fairly ``normal'' looking distributions fail while decidedly non-normal distributions pass. For this reason, the $p$-value is less important than the qualitative appearance of the histogram. If the histogram exhibits the typical bell-shaped curve, this adds confidence to the statistical treatment of the data. If the histogram is not bell-shaped, this might cast doubt on the statistical treatment for that particular quantity.
296296

297-
\IfFileExists{SCRIPT_FIGURES/ScatterPlots/validation_histograms.tex}{\input{SCRIPT_FIGURES/ScatterPlots/validation_histograms.tex}}{\typeout{Error: Missing file SCRIPT_FIGURES/ScatterPlots/validation_histograms.tex}}
297+
\IfFileExists{SCRIPT_FIGURES/Scatterplots/validation_histograms.tex}{\input{SCRIPT_FIGURES/Scatterplots/validation_histograms.tex}}{\typeout{Error: Missing file SCRIPT_FIGURES/Scatterplots/validation_histograms.tex}}
298298

299299

300300
\clearpage
@@ -304,7 +304,7 @@ \section{Summary of FDS Validation Git Statistics}
304304

305305
Table~\ref{validation_git_stats} shows the Git repository statistics for all of the validation datasets. For each dataset, the corresponding last changed date and Git revision string are shown. This indicates the Git revision string and date for which the most recent validation results for a given dataset were committed to the repository.
306306

307-
\IfFileExists{SCRIPT_FIGURES/ScatterPlots/validation_git_stats.tex}{\input{SCRIPT_FIGURES/ScatterPlots/validation_git_stats.tex}}{\typeout{Error: Missing file SCRIPT_FIGURES/ScatterPlots/validation_git_stats.tex}}
307+
\IfFileExists{SCRIPT_FIGURES/Scatterplots/validation_git_stats.tex}{\input{SCRIPT_FIGURES/Scatterplots/validation_git_stats.tex}}{\typeout{Error: Missing file SCRIPT_FIGURES/Scatterplots/validation_git_stats.tex}}
308308

309309

310310
\bibliography{../Bibliography/FDS_refs,../Bibliography/FDS_general,../Bibliography/FDS_mathcomp}

‎Manuals/FDS_Validation_Guide/HGL_Chapter.tex‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1500,8 +1500,8 @@ \section{Summary of Hot Gas Layer Temperature and Height}
15001500
\begin{figure}[!h]
15011501
\centering
15021502
\begin{tabular}{l}
1503-
\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_HGL_Temperature_Natural_Ventilation} \\
1504-
\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_HGL_Temperature_Forced_Ventilation}
1503+
\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_HGL_Temperature_Natural_Ventilation} \\
1504+
\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_HGL_Temperature_Forced_Ventilation}
15051505
\end{tabular}
15061506
\caption[Summary, HGL temperature, natural and forced ventilation]
15071507
{Summary, HGL temperature, natural and forced ventilation.}
@@ -1513,8 +1513,8 @@ \section{Summary of Hot Gas Layer Temperature and Height}
15131513
\begin{figure}[!h]
15141514
\centering
15151515
\begin{tabular}{l}
1516-
\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_HGL_Temperature_No_Ventilation} \\
1517-
\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_HGL_Depth}
1516+
\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_HGL_Temperature_No_Ventilation} \\
1517+
\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_HGL_Depth}
15181518
\end{tabular}
15191519
\caption[Summary, HGL temperature, unventilated compartments; HGL depth]
15201520
{Summary, HGL temperature, unventilated compartments; HGL depth.}

‎Manuals/FDS_Validation_Guide/Heat_Flux_Chapter.tex‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,7 @@ \subsection{Summary of Wall, Ceiling and Floor Heat Flux Predictions}
10131013
\begin{figure}[h!]
10141014
\begin{center}
10151015
\begin{tabular}{c}
1016-
\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Surface_Heat_Flux}
1016+
\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Surface_Heat_Flux}
10171017
\end{tabular}
10181018
\end{center}
10191019
\caption[Summary of compartment surface heat flux predictions]
@@ -2472,7 +2472,7 @@ \subsection{Summary of Target Heat Flux Predictions}
24722472
\begin{figure}[h!]
24732473
\begin{center}
24742474
\begin{tabular}{c}
2475-
\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Target_Heat_Flux}
2475+
\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Target_Heat_Flux}
24762476
\end{tabular}
24772477
\end{center}
24782478
\caption[Summary of target heat flux predictions]
@@ -2627,7 +2627,7 @@ \subsection{Bouchair Solar Chimney}
26272627
\begin{figure}[h!]
26282628
\begin{center}
26292629
\begin{tabular}{c}
2630-
\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Convective_Heat_Flux}
2630+
\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Convective_Heat_Flux}
26312631
\end{tabular}
26322632
\end{center}
26332633
\caption[Summary of Bouchair Solar Chimney results]{Summary of Bouchair Solar Chimney results.}
@@ -2688,7 +2688,7 @@ \subsection{SETCOM Experiments}
26882688
\begin{figure}[h!]
26892689
\begin{center}
26902690
\begin{tabular}{c}
2691-
\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Condensation}
2691+
\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Condensation}
26922692
\end{tabular}
26932693
\end{center}
26942694
\caption[Summary of SETCOM results]{Summary of SETCOM results.}

‎Manuals/FDS_Validation_Guide/Plume_Chapter.tex‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ \subsection{Summary of Plume Temperature Predictions}
838838
\begin{figure}[h!]
839839
\begin{center}
840840
\begin{tabular}{c}
841-
\includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Plume_Temperature}
841+
\includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Plume_Temperature}
842842
\end{tabular}
843843
\end{center}
844844
\caption[Summary of plume temperature predictions]
@@ -973,7 +973,7 @@ \subsection{Flame Height Summary}
973973

974974
\begin{figure}[!h]
975975
\begin{center}
976-
\includegraphics[height=4.in]{SCRIPT_FIGURES/ScatterPlots/FDS_Flame_Height}
976+
\includegraphics[height=4.in]{SCRIPT_FIGURES/Scatterplots/FDS_Flame_Height}
977977
\end{center}
978978
\caption[Summary of flame height predictions]
979979
{Summary of measured and predicted mean flame heights.}
@@ -991,7 +991,7 @@ \section{Flame Tilt}
991991

992992
\begin{figure}[!h]
993993
\begin{center}
994-
\includegraphics[height=4.in]{SCRIPT_FIGURES/ScatterPlots/FDS_Flame_Tilt}
994+
\includegraphics[height=4.in]{SCRIPT_FIGURES/Scatterplots/FDS_Flame_Tilt}
995995
\end{center}
996996
\caption[Summary of flame tilt angle predictions]
997997
{Summary of measured and predicted mean flame tilt angle.}
@@ -1012,7 +1012,7 @@ \section{Harrison Spill Plumes/Entrainment Experiments}
10121012

10131013
\begin{figure}[h]
10141014
\begin{center}
1015-
\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Entrainment}
1015+
\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Entrainment}
10161016
\caption[Summary of plume entrainment predictions]{A comparison of predicted and measured mass flow rates at various heights for the Harrison Spill Plume experiments.}
10171017
\label{Entrainment_Plot}
10181018
\end{center}

‎Manuals/FDS_Validation_Guide/Pressure_Chapter.tex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ \section{Summary of Pressure Predictions}
448448
\begin{figure}[h!]
449449
\begin{center}
450450
\begin{tabular}{c}
451-
\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Compartment_Pressure}
451+
\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Compartment_Pressure}
452452
\end{tabular}
453453
\end{center}
454454
\caption[Summary of pressure predictions]{Summary of pressure predictions for open and closed compartments.}

Manuals/FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/.gitignore renamed to Manuals/FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/.gitignore

File renamed without changes.

‎Manuals/FDS_Validation_Guide/Species_Chapter.tex‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -594,8 +594,8 @@ \subsection{Summary of Major Combustion Products Predictions}
594594
\begin{figure}[!h]
595595
\centering
596596
\begin{tabular}{c}
597-
\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Carbon_Dioxide_Concentration} \\
598-
\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Oxygen_Concentration}
597+
\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Carbon_Dioxide_Concentration} \\
598+
\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Oxygen_Concentration}
599599
\end{tabular}
600600
\caption[Summary of major gas species predictions]
601601
{Summary of major gas species predictions.}
@@ -855,7 +855,7 @@ \subsection{NIST/NRC Experiments}
855855
\begin{figure}[p]
856856
\begin{center}
857857
\begin{tabular}{c}
858-
\includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Smoke_Concentration}
858+
\includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Smoke_Concentration}
859859
\end{tabular}
860860
\end{center}
861861
\caption[Summary of smoke concentration predictions]{Summary of smoke concentration predictions.}
@@ -885,7 +885,7 @@ \subsection{FAA Cargo Compartments}
885885
\begin{figure}[p]
886886
\begin{center}
887887
\begin{tabular}{c}
888-
\includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Smoke_Obscuration}
888+
\includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Smoke_Obscuration}
889889
\end{tabular}
890890
\end{center}
891891
\caption[Summary of smoke obscuration predictions]{Summary of smoke obscuration predictions.}
@@ -917,7 +917,7 @@ \subsection{Sippola Aerosol Deposition Experiments}
917917
\begin{figure}[!ht]
918918
\begin{center}
919919
\begin{tabular}{c}
920-
\includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Aerosol_Deposition_Velocity} \\
920+
\includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Aerosol_Deposition_Velocity} \\
921921
\vspace{0.25in} \\
922922
\end{tabular}
923923
\end{center}
@@ -946,7 +946,7 @@ \subsection{NIST Soot Deposition Gauge Experiments}
946946
\begin{figure}[!ht]
947947
\begin{center}
948948
\begin{tabular}{c}
949-
\includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Aerosol_Deposition} \\
949+
\includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Aerosol_Deposition} \\
950950
\vspace{0.25in} \\
951951
\end{tabular}
952952
\end{center}
@@ -989,7 +989,7 @@ \subsection{Ranz and Marshall}
989989
\begin{figure}[!ht]
990990
\begin{center}
991991
\begin{tabular}{c}
992-
\includegraphics[height=3.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Evaporation_Rate} \\
992+
\includegraphics[height=3.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Evaporation_Rate} \\
993993
\vspace{0.25in} \\
994994
\end{tabular}
995995
\end{center}
@@ -1912,7 +1912,7 @@ \subsection{Summary, Products of Incomplete Combustion}
19121912
\begin{figure}[h]
19131913
\begin{center}
19141914
\begin{tabular}{c}
1915-
\includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Carbon_Monoxide_Concentration}
1915+
\includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Carbon_Monoxide_Concentration}
19161916
\end{tabular}
19171917
\end{center}
19181918
\caption[Summary of carbon monoxide predictions]{Summary of carbon monoxide predictions.}
@@ -1999,7 +1999,7 @@ \section{Helium Release in a Reduced Scale Garage Geometry}
19991999
\begin{figure}[p]
20002000
\begin{center}
20012001
\begin{tabular}{c}
2002-
\includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Species_Concentration}
2002+
\includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Species_Concentration}
20032003
\end{tabular}
20042004
\end{center}
20052005
\caption[Summary of species concentration predictions]{Summary of species concentration predictions.}

0 commit comments

Comments
 (0)