Fixed references: C1036, C1048, C1172 (#104)

smiths · Jun 27, 2018 · 7d5d9fc · 7d5d9fc
1 parent d7d9a96
commit 7d5d9fc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/CaseStudies/glass/docs/SRS/glassbr_srs.tex b/CaseStudies/glass/docs/SRS/glassbr_srs.tex
@@ -458,16 +458,16 @@ \subsubsection{Terminology and  Definitions}
 \begin{enumerate}
 \item \textit{Annealed (AN) glass -} A flat,monolithic, glass lite which has uniform 
 thickness where the residual surface stresses are almost zero, as defined in 
-\cite{C1036}
+\cite{ASTM2016}
 \item \textit{Fully tempered (FT) glass -} A flat and monolithic, glass lite of 
 uniform thickness that has been subjected to a special heat treatment process 
 where the residual surface compression is not less than 69 MPa (10 000 psi) or 
-the edge compression not less than 67 MPa (9700 psi)as defined in \cite{C1048}.
+the edge compression not less than 67 MPa (9700 psi)as defined in \cite{ASTM2012}.
 
 \item \textit{Heat strengthened (HS) glass -} A flat, monolithic, glass lite of 
 uniform thickness that has been subjected to a special heat treatment process 
 where the residual surface compression is not less than 24 MPa (3500 psi) or 
-greater than 52 MPa (7500 psi)as defined in \cite{C1048}.
+greater than 52 MPa (7500 psi)as defined in \cite{ASTM2012}.
 
 \end{enumerate}
 
@@ -498,7 +498,7 @@ \subsubsection{Terminology and  Definitions}
 
 \item \textit{Probability of breakage ($P_b$) -} The fraction of glass lites or 
 plies that would break at the first occurrence of a specified load and duration, 
-typically expressed in lites per 1000 \cite{C1036}.
+typically expressed in lites per 1000 \cite{ASTM2016}.
 
 \item \textit{Specifying authority -} The design professional responsible for 
 interpreting applicable regulations of authorities having jurisdiction and 

diff --git a/CaseStudies/glass/refs/References.bib b/CaseStudies/glass/refs/References.bib
@@ -133,6 +133,7 @@ @misc{ResearchPrinciples
 	Title = {Research Integrity Policy},
 	Year = {2013}}
 
+<<<<<<< HEAD
 @misc{C1036,
 	Author = {{ASTM, developed by subcommittee C1408, Book of standards 15.02}},
 	Date-Modified = {2018-06-26 18:52:06 +0000},
@@ -147,6 +148,25 @@ @misc{C1172
 	Author = {{ASTM, developed by subcommittee C1408, Book of standards 15.02}},
 	Date-Modified = {2018-06-26 18:53:07 +0000},
 	Title = {{specification for laminated architectural flat glass, C1172}}}
+=======
+@misc{ASTM2016,
+	Author = {ASTM},
+	Title = {Standard Specification for Flat Glass},
+	URL = {https://doi.org/10.1520/C1036-16},
+	Year = {2016}}
+
+@misc{ASTM2012,
+	Author = {ASTM},
+	Title = {Standard Specification for Heat-Strengthened and Fully Tempered Flat Glass},
+	URL = {https://doi.org/10.1520/C1048-12E01},
+	Year = {2012}}
+
+@misc{ASTM2014,
+	Author = {ASTM},
+	Title = {Standard Specification for Laminated Architectural Flat Glass},
+	URL = {https://doi.org/10.1520/C1172-14},
+	Year = {2014}}
+>>>>>>> Fixed references: C1036, C1048, C1172 (#104)
 
 @misc{D4065,
 	Author = {{ASTM, developed by subcommittee D20.10, Book of standards 08.02}},