Skip to content

Commit 40e1987

Browse files
mcgrattamcgratta
authored
Merge pull request #15740 from mcgratta/master
Switch from bibtex to biblatex
2 parents dc99976 + f8fee56 commit 40e1987

File tree

50 files changed

+502
-271
lines changed

Some content is hidden

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

50 files changed

+502
-271
lines changed

‎Manuals/Bibliography/FDS_general.bib‎

Lines changed: 71 additions & 77 deletions
Large diffs are not rendered by default.

‎Manuals/Bibliography/commoncommands.tex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
\usepackage[section]{placeins}
6464
\usepackage{scrextend}
6565
\usepackage{needspace}
66+
\usepackage[backend=biber, style=numeric, sorting=none, backref=true]{biblatex}
6667

6768
\newcommand{\nopart}{\expandafter\def\csname Parent-1\endcsname{}} % To fix table of contents in pdf.
6869
\newcommand{\ct}[1]{\lstinline{#1}}
@@ -103,7 +104,6 @@
103104
citecolor=linkred, % citation number colors
104105
linkcolor=linknavy, % \ref{...} and \pageref{...}
105106
pdfproducer={pdflatex},
106-
pagebackref,
107107
pdfpagemode=UseNone,
108108
bookmarksopen=true,
109109
plainpages=false,

‎Manuals/FDS_Config_Management_Plan/FDS_Config_Management_Plan.tex‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,13 @@
1818
{\input{../Bibliography/gitrevision}}
1919
{\newcommand{\gitrevision}{unknown} }
2020

21+
\addbibresource{../Bibliography/FDS_refs.bib}
22+
\addbibresource{../Bibliography/FDS_general.bib}
23+
\addbibresource{../Bibliography/FDS_mathcomp.bib}
24+
25+
2126
\begin{document}
2227

23-
\bibliographystyle{unsrt}
2428
\pagestyle{empty}
2529

2630
\begin{minipage}[t][9in][s]{6.5in}
@@ -547,7 +551,7 @@ \section{Training}
547551
\backmatter
548552
\nopart
549553

550-
\bibliography{../Bibliography/FDS_refs,../Bibliography/FDS_general,../Bibliography/FDS_mathcomp}
554+
\printbibliography[heading=bibintoc,title={References}]
551555

552556
\printindex
553557

‎Manuals/FDS_Config_Management_Plan/make_guide.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ gitrevision=`git describe --abbrev=7 --long --dirty`
1111
echo "\\newcommand{\\gitrevision}{$gitrevision}" > ../Bibliography/gitrevision.tex
1212

1313
pdflatex -interaction nonstopmode FDS_Config_Management_Plan &> FDS_Config_Management_Plan.err
14-
bibtex FDS_Config_Management_Plan &> FDS_Config_Management_Plan.err
14+
biber FDS_Config_Management_Plan &> FDS_Config_Management_Plan.err
1515
pdflatex -interaction nonstopmode FDS_Config_Management_Plan &> FDS_Config_Management_Plan.err
1616
pdflatex -interaction nonstopmode FDS_Config_Management_Plan &> FDS_Config_Management_Plan.err
1717
pdflatex -interaction nonstopmode FDS_Config_Management_Plan &> FDS_Config_Management_Plan.err

‎Manuals/FDS_Technical_Reference_Guide/FDS_Technical_Reference_Guide.tex‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,13 @@
2424
\includeonly{Introduction_Chapter, Equation_Chapter, Mass_Chapter, Momentum_Chapter, Combustion_Chapter, Radiation_Chapter, Solid_Chapter, Aerosol_Chapter, Particle_Chapter, Device_Chapter, HVAC_Chapter, Wildland_Chapter, Appendices}
2525
\fi
2626

27+
\addbibresource{../Bibliography/FDS_refs.bib}
28+
\addbibresource{../Bibliography/FDS_general.bib}
29+
\addbibresource{../Bibliography/FDS_mathcomp.bib}
30+
2731
\begin{document}
2832

2933

30-
\bibliographystyle{unsrt}
3134
\pagestyle{empty}
3235

3336

@@ -189,7 +192,7 @@ \chapter{Acknowledgments}
189192
\fi
190193
\include{Wildland_Chapter}
191194

192-
\bibliography{../Bibliography/FDS_refs,../Bibliography/FDS_general,../Bibliography/FDS_mathcomp}
195+
\printbibliography[heading=bibintoc,title={References}]
193196

194197
\appendix
195198

‎Manuals/FDS_Technical_Reference_Guide/Momentum_Chapter.tex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ \subsection{Deardorff's Model (Default)}
155155
\subsection{Vreman's Model}
156156
\label{sec:vreman}
157157

158-
Vreman's eddy viscosity model \cite{vreman:2004} is given by
158+
Vreman's eddy viscosity model \cite{Vreman:2004} is given by
159159
\begin{equation}
160160
\label{eqn_mu_vreman}
161161
\mu_{\rm t} = \rho \, c \, \sqrt{ \frac{B_\beta}{\alpha_{ij}\alpha_{ij}} }
@@ -165,7 +165,7 @@ \subsection{Vreman's Model}
165165
B_\beta &= \beta_{11}\beta_{22} - \beta_{12}^2 + \beta_{11}\beta_{33} - \beta_{13}^2 + \beta_{22}\beta_{33} - \beta_{23}^2 \quad ; \quad \beta_{ij} = \Delta_m^2 \alpha_{mi} \alpha_{mj} \label{eq:vreman_beta}\\
166166
\alpha_{ij} &= \frac{\partial u_j}{\partial x_i}
167167
\end{align}
168-
The notation is selected to exactly match Vreman's paper \cite{vreman:2004}. The model considers a possible anisotropy in the filter width in direction $m$; contraction on $m$ is implied in Eq.~(\ref{eq:vreman_beta}). The basic idea behind Vreman's model is to expand the velocity field in a Taylor series and to test filter this field analytically, thus avoiding the expensive explicit test filtering operations necessary in the dynamic model. Therefore, this model is inexpensive. Unlike constant coefficient Smagorinsky, however, Vreman's model is convergent, making it applicable to highly resolved LES calculations.
168+
The notation is selected to exactly match Vreman's paper \cite{Vreman:2004}. The model considers a possible anisotropy in the filter width in direction $m$; contraction on $m$ is implied in Eq.~(\ref{eq:vreman_beta}). The basic idea behind Vreman's model is to expand the velocity field in a Taylor series and to test filter this field analytically, thus avoiding the expensive explicit test filtering operations necessary in the dynamic model. Therefore, this model is inexpensive. Unlike constant coefficient Smagorinsky, however, Vreman's model is convergent, making it applicable to highly resolved LES calculations.
169169

170170
The model constant may be related to the Smagorinsky constant, $c \approx 2.5 \, C_{\rm s}^2$. Since Vreman's model is most applicable to high resolution cases, we base the coefficient off of $C_{\rm s} = 0.17$, which yields accurate results for highly resolved decaying isotropic turbulence (see the FDS Verification Guide \cite{FDS_Verification_Guide}). The default Vreman constant is therefore set to $c = 0.07$.
171171

‎Manuals/FDS_Technical_Reference_Guide/make_guide.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ gitrevision=`git describe --abbrev=7 --long --dirty`
1111
echo "\\newcommand{\\gitrevision}{$gitrevision}" > ../Bibliography/gitrevision.tex
1212

1313
pdflatex -interaction nonstopmode FDS_Technical_Reference_Guide &> FDS_Technical_Reference_Guide.err
14-
bibtex FDS_Technical_Reference_Guide &> FDS_Technical_Reference_Guide.err
14+
biber FDS_Technical_Reference_Guide &> FDS_Technical_Reference_Guide.err
1515
pdflatex -interaction nonstopmode FDS_Technical_Reference_Guide &> FDS_Technical_Reference_Guide.err
1616
pdflatex -interaction nonstopmode FDS_Technical_Reference_Guide &> FDS_Technical_Reference_Guide.err
1717
pdflatex -interaction nonstopmode FDS_Technical_Reference_Guide &> FDS_Technical_Reference_Guide.err

‎Manuals/FDS_User_Guide/FDS_User_Guide.tex‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@
1818
{\input{../Bibliography/gitrevision}}
1919
{\newcommand{\gitrevision}{unknown}}
2020

21+
\addbibresource{../Bibliography/FDS_refs.bib}
22+
\addbibresource{../Bibliography/FDS_general.bib}
23+
\addbibresource{../Bibliography/FDS_mathcomp.bib}
24+
2125
\begin{document}
2226

23-
\bibliographystyle{unsrt}
2427
\pagestyle{empty}
2528

2629

@@ -15318,7 +15321,7 @@ \section{File Extension Glossary}
1531815321
%\backmatter
1531915322
\nopart %To Fix TOC in PDF output.
1532015323

15321-
\bibliography{../Bibliography/FDS_refs,../Bibliography/FDS_general,../Bibliography/FDS_mathcomp}
15324+
\printbibliography[heading=bibintoc,title={References}]
1532215325

1532315326

1532415327
\appendix

‎Manuals/FDS_User_Guide/make_guide.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ gitrevision=`git describe --abbrev=7 --long --dirty`
1111
echo "\\newcommand{\\gitrevision}{$gitrevision}" > ../Bibliography/gitrevision.tex
1212

1313
pdflatex -interaction nonstopmode FDS_User_Guide &> FDS_User_Guide.err
14-
bibtex FDS_User_Guide &> FDS_User_Guide.err
14+
biber FDS_User_Guide &> FDS_User_Guide.err
1515
pdflatex -interaction nonstopmode FDS_User_Guide &> FDS_User_Guide.err
1616
pdflatex -interaction nonstopmode FDS_User_Guide &> FDS_User_Guide.err
1717
pdflatex -interaction nonstopmode FDS_User_Guide &> FDS_User_Guide.err

‎Manuals/FDS_Validation_Guide/Burning_Rate_Chapter.tex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1331,7 +1331,7 @@ \subsection{Pool Fire Measurements}
13311331

13321332
\subsection{NIST Pool Fires}
13331333

1334-
Figure~\ref{NIST_1_m_methanol_MLRPUA} displays the measured and predicted burning rate of a 100~cm diameter methanol pool fire experiment conducted by Sung~et~al. at NIST~\cite{Sung:TN2019}.
1334+
Figure~\ref{NIST_1_m_methanol_MLRPUA} displays the measured and predicted burning rate of a 100~cm diameter methanol pool fire experiment conducted by Sung~et~al. at NIST~\cite{Sung:TN2083}.
13351335

13361336
\begin{figure}[!ht]
13371337
\centering

0 commit comments

Comments
 (0)