Merge pull request #4233 from mcgratta/development

FDS Source: Bump version number to 6.5.1 plus misc other things for maintenance release. Former-commit-id: ef84f90f23de0ac114c33d771102255a0fa1856d [formerly d6c8dfb44f5038dc4bb43367878bb10f789f4a75] Former-commit-id: eae0ce1ce56aa7bd8829443c8006dbccc3ec37af Former-commit-id: 84c41ec
firemodels · Aug 23, 2016 · 75f6cc8 · 75f6cc8
2 parents 86502f0 + 5aa94ad
commit 75f6cc8
Show file tree

Hide file tree

Showing 5 changed files with 124 additions and 99 deletions.
diff --git a/FDS_Source/main.f90 b/FDS_Source/main.f90
@@ -98,7 +98,7 @@ PROGRAM FDS
 
 ! Assign a compilation date (All Nodes)
 
-WRITE(VERSION_STRING,'(A)') 'FDS 6.5.1'
+WRITE(VERSION_STRING,'(A)') 'FDS 6.5.2'
 
 CALL GET_INFO (REVISION,REVISION_DATE,COMPILE_DATE)
 

diff --git a/Manuals/Bibliography/FDS_general.bib b/Manuals/Bibliography/FDS_general.bib
@@ -1769,6 +1769,16 @@ @INPROCEEDINGS{Hamins:IAFSS2002
   publisher    = {International Association for Fire Safety Science}
 }
 
+@TECHREPORT{Hamins:TN2016,
+  author       = {A. Hamins},
+  title        = {{Energetics of Small and Moderate-Scale Gaseous Pool Fires}},
+  institution  = {National Institute of Standards and Technology},
+  year         = {2016},
+  type         = {NIST Technical Note},
+  number       = {XXXX},
+  address      = {Gaithersburg, Maryland}
+}
+
 @INPROCEEDINGS{Harris:ISTSS2010,
   author       = {Harris, K.J.},
   title        = {{Water Application Rates for Fixed Fire Fighting Systems in Road Tunnels}},

diff --git a/Manuals/Bibliography/commoncommands.tex b/Manuals/Bibliography/commoncommands.tex
@@ -54,10 +54,10 @@
 \usepackage{morefloats}
 
 % FDS Version String
-\newcommand{\fdsversion}{6.5.1}
+\newcommand{\fdsversion}{6.5.2}
 
 % Smokeview Version String
-\newcommand{\smvversion}{6.3.9}
+\newcommand{\smvversion}{6.3.11}
 
 \newcommand{\nopart}{\expandafter\def\csname Parent-1\endcsname{}} % To fix table of contents in pdf.
 \newcommand{\ct}{\tt\small} % eventually will be deprecated due to http://www.tex.ac.uk/cgi-bin/texfaq2html?label=2letterfontcmd

diff --git a/Manuals/FDS_Validation_Guide/FDS_Validation_Guide.tex b/Manuals/FDS_Validation_Guide/FDS_Validation_Guide.tex
@@ -18,7 +18,7 @@
 
 \includeonly{Overview_Chapter,Survey_Chapter,Experiment_Chapter, Error_Chapter, HGL_Chapter, Plume_Chapter, Ceiling_Jet_Chapter,Velocity_Chapter, Species_Chapter,Pressure_Chapter, Surface_Temperature_Chapter, Heat_Flux_Chapter, Suppression_Chapter, Burning_Rate_Chapter}
 
-%\includeonly{Experiment_Chapter}
+%\includeonly{Heat_Flux_Chapter}
 
 \begin{document}