Fix the symptom of #891. It does not fix the issue of ExprRelat itsel…

…f, but may result in more relToQD being removed, so that the issue may become less important.

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

@@ -62,7 +62,7 @@ import Drasil.GlassBR.DataDefs (aspRat, dataDefns, gbQDefns, hFromt, strDisFac,
 import Drasil.GlassBR.ModuleDefs (allMods)
 import Drasil.GlassBR.References (rbrtsn2012)
 import Drasil.GlassBR.Symbols (this_symbols)
-import Drasil.GlassBR.TMods (gbrTMods, pbIsSafe, lrIsSafe, tModels, lrSafetyReq, pbSafetyReq)
+import Drasil.GlassBR.TMods (gbrTMods, pbIsSafe, lrIsSafe, lrSafetyReq, pbSafetyReq)
 import Drasil.GlassBR.IMods (probOfBreak, 
   calofCapacity, calofDemand, gbrIMods)
 
@@ -176,7 +176,7 @@ glassSystInfo = SI {
   _quants      = this_symbols,
   _concepts    = [] :: [DefinedQuantityDict],
   _definitions = (map (relToQD gbSymbMap) gbrIMods) ++ 
-                 --(map (relToQD gbSymbMap) tModels{-gbrTMods-}) ++ --FIXME: #891
+                 (concatMap (^. defined_quant) gbrTMods) ++
                   [wtntWithEqn, sdWithEqn],  -- wtntWithEqn is defined in Unitals but only appears
                                              -- in the description of the Calculation of Demand instance model;
                                              -- should this be included as a Data Definition?

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

@@ -1,4 +1,4 @@
-module Drasil.GlassBR.TMods (gbrTMods, tModels, pbSafetyReq, lrSafetyReq, pbIsSafe, lrIsSafe) where
+module Drasil.GlassBR.TMods (gbrTMods, pbSafetyReq, lrSafetyReq, pbIsSafe, lrIsSafe) where
 
 import Drasil.GlassBR.Unitals (demand, demandq, is_safePb, is_safeLR, lRe,
   pb_tol, prob_br)
@@ -12,10 +12,6 @@ import Data.Drasil.SentenceStructures (foldlSent, isThe, sAnd)
 
 {--}
 
---FIXME: should be removed with closure of #891
-tModels :: [RelationConcept]
-tModels = [pbSafetyReq, lrSafetyReq]
-
 gbrTMods :: [TheoryModel]
 gbrTMods = [pbIsSafe, lrIsSafe]