Added glass type notes to DD6 - closes #751

code/drasil-example/Drasil/GlassBR/DataDefs.hs

@@ -4,6 +4,7 @@ module Drasil.GlassBR.DataDefs (aspRat, dataDefns, dimLL, gbQDefns, glaTyFac,
 import Language.Drasil
 import Prelude hiding (log, exp, sqrt)
 
+import Drasil.GlassBR.Concepts (annealed, fullyT, heatS)
 import Drasil.GlassBR.Unitals (actualThicknesses, aspectR, 
  demand, dimlessLoad, gTF, glassTypeAbbrsStr, glassTypeFactors, glass_type, 
  lDurFac, load_dur, mod_elas, nom_thick, nominalThicknesses, nonFactorL, pb_tol, 
@@ -112,7 +113,7 @@ glaTyFac = mkDataDef gTF glaTyFac_eq
 
 glaTyFacDD :: DataDefinition
 glaTyFacDD = mkDD glaTyFac [{-references-}] [{-derivation-}] ""--temporary
- Nothing
+ (Just $ anGlass : ftGlass : hsGlass : [])
 
 --DD7--
 
@@ -182,18 +183,27 @@ aspRatDD = mkDD aspRat [{-references-}] [{-derivation-}] ""--temporary
 --Additional Notes--
 
 aGrtrThanB :: Sentence
-aGrtrThanB = ((ch plate_len) `sC` (ch plate_width) +:+ 
+aGrtrThanB = (ch plate_len `sC` ch plate_width +:+ 
  S "are" +:+ plural dimension +:+ S "of the plate" `sC` S "where" +:+. 
  sParen (E (sy plate_len $> sy plate_width)))
 
+anGlass :: Sentence
+anGlass = (getAcc annealed +:+ S "is" +:+ phrase annealed +:+ S "glass")
+
 arRef :: Sentence
 arRef = (ch aspectR +:+ S "is the" +:+ phrase aspectR +:+.
  S "defined in DD11")
 
+ftGlass :: Sentence
+ftGlass = (getAcc fullyT +:+ S "is" +:+ phrase fullyT +:+ S "glass")
+
 hRef :: Sentence
 hRef = (ch min_thick +:+ S "is the minimum thickness" `sC` 
  S "which is based on the nominal thicknesses" +:+. S "as shown in DD2")
 
+hsGlass :: Sentence
+hsGlass = (getAcc heatS +:+ S "is" +:+ phrase heatS +:+ S "glass")
+
 ldfRef :: Sentence
 ldfRef = (ch lDurFac +:+ S "is the" +:+ phrase lDurFac +:+. 
  S "as defined by DD3")

code/stable/glassbr/SRS/GlassBR_SRS.tex

@@ -283,7 +283,7 @@ \subsubsection{Terminology and Definitions}
 \item{Fully tempered (FT) - 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 69 MPa (10 000 psi) or the edge compression not less than 67 MPa (9700 psi), as defined in [2].}
 \item{Heat strengthened (HS) - 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 (3500psi) or greater than 52 MPa (7500 psi), as defined in [2].}
 \end{itemize}
-\item{Load - A uniformly distributed lateral pressure.}
+\item{Load- A uniformly distributed lateral pressure.}
 \begin{itemize}
 \item{Load resistance (LR) - The uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in [1 (pg. 1, 53)], following A2 and A1 respectively.}
 \item{Non-factored load (NFL) - Three second duration uniform load associated with a probability of breakage less than or equal to 8 lites per 1000 for monolithic AN glass.}
@@ -612,6 +612,10 @@ \subsubsection{Data Definitions}
  \item{$g$ is the glass type $g\in{}\{AN,FT,HS\}$ (Unitless)}
  \end{symbDescription}
 \\ \midrule \\
+Notes & AN is annealed glass
+ FT is fully tempered glass
+ HS is heat strengthened glass
+\\ \midrule \\
 Source & FIXME: This needs to be filled in
 \\ \midrule \\
 RefBy & FIXME: This needs to be filled in

code/stable/glassbr/Website/GlassBR_SRS.html

@@ -975,7 +975,7 @@ <h3>
 </ul>
 </li>
 <li>
-Load - A uniformly distributed lateral pressure.
+Load- A uniformly distributed lateral pressure.
 <ul class="list">
 <li>
 Load resistance (LR) - The uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in [1 (pg. 1, 53)], following A2 and A1 respectively.
@@ -1993,6 +1993,22 @@ <h3>
 </tr>
 <tr>
 <th>
+Notes
+</th>
+<td>
+<p class="paragraph">
+AN is annealed glass
+</p>
+<p class="paragraph">
+FT is fully tempered glass
+</p>
+<p class="paragraph">
+HS is heat strengthened glass
+</p>
+</td>
+</tr>
+<tr>
+<th>
 Source
 </th>
 <td>