From d4968ba0e730d881b548da7760880fcfa1c6b8f2 Mon Sep 17 00:00:00 2001 From: Brooks MacLachlan Date: Tue, 13 Aug 2019 10:23:31 -0400 Subject: [PATCH 1/6] Add definitions to Doxygen comments --- .../Language/Drasil/Code/Imperative/Comments.hs | 17 +++++++++++++---- code/drasil-database/Database/Drasil.hs | 13 +++++++------ code/drasil-database/Database/Drasil/ChunkDB.hs | 2 +- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/code/drasil-code/Language/Drasil/Code/Imperative/Comments.hs b/code/drasil-code/Language/Drasil/Code/Imperative/Comments.hs index d7a24659e9..c0149ab0d1 100644 --- a/code/drasil-code/Language/Drasil/Code/Imperative/Comments.hs +++ b/code/drasil-code/Language/Drasil/Code/Imperative/Comments.hs @@ -3,17 +3,18 @@ module Language.Drasil.Code.Imperative.Comments ( ) where import Language.Drasil +import Database.Drasil (defTable) import Language.Drasil.Code.Imperative.State (State(..)) import Language.Drasil.CodeSpec (CodeSpec(..), CodeSystInfo(..)) -import Language.Drasil.Printers (Linearity(Linear), sentenceDoc, - unitDoc) +import Language.Drasil.Printers (Linearity(Linear), sentenceDoc, unitDoc) import Data.Map (Map) import qualified Data.Map as Map (lookup) import Data.Maybe (maybe) import Control.Monad.Reader (Reader, ask) import Control.Lens (view) -import Text.PrettyPrint.HughesPJ (Doc, (<+>), empty, parens, render, text) +import Text.PrettyPrint.HughesPJ (Doc, (<+>), colon, empty, parens, render, + text) getTermDoc :: (NamedIdea c) => UID -> Map UID c -> Reader State Doc getTermDoc cname m = do @@ -22,6 +23,13 @@ getTermDoc cname m = do return $ (maybe (text "No description given") (sentenceDoc db Implementation Linear . phraseNP . view term) . Map.lookup cname) m +getDefnDoc :: UID -> Reader State Doc +getDefnDoc cname = do + g <- ask + let db = sysinfodb $ csi $ codeSpec g + return $ maybe empty ((<+>) colon . sentenceDoc db Implementation Linear . + view defn . fst) (Map.lookup cname $ defTable db) + getUnitsDoc :: (MayHaveUnit c) => UID -> Map UID c -> Doc getUnitsDoc cname m = maybe empty (parens . unitDoc Linear . usymb) (Map.lookup cname m >>= getUnit) @@ -30,8 +38,9 @@ getComment :: (NamedIdea c, MayHaveUnit c) => UID -> Map UID c -> Reader State String getComment l m = do t <- getTermDoc l m + d <- getDefnDoc l let u = getUnitsDoc l m - return $ render $ t <+> u + return $ render $ (t <> d) <+> u paramComment :: UID -> Reader State String paramComment l = do diff --git a/code/drasil-database/Database/Drasil.hs b/code/drasil-database/Database/Drasil.hs index e7c38a244a..955241c5dd 100644 --- a/code/drasil-database/Database/Drasil.hs +++ b/code/drasil-database/Database/Drasil.hs @@ -1,12 +1,13 @@ {- re-export many things to simplify external use -} module Database.Drasil ( -- ChunkDB - ChunkDB, RefbyMap, TraceMap, UMap, asOrderedList, cdb, collectUnits, conceptMap - , conceptinsLookup, conceptinsTable, dataDefnTable, datadefnLookup, defResolve - , gendefLookup, gendefTable, generateRefbyMap, insmodelLookup, insmodelTable - , labelledconLookup, labelledcontentTable, refbyLookup, refbyTable - , sectionLookup, sectionTable, symbResolve, termResolve, termTable - , theoryModelLookup, theoryModelTable, traceLookup, traceMap, traceTable + ChunkDB(defTable), RefbyMap, TraceMap, UMap, asOrderedList, cdb, collectUnits + , conceptMap, conceptinsLookup, conceptinsTable, dataDefnTable + , datadefnLookup, defResolve, gendefLookup, gendefTable, generateRefbyMap + , insmodelLookup, insmodelTable, labelledconLookup, labelledcontentTable + , refbyLookup, refbyTable, sectionLookup, sectionTable, symbResolve + , termResolve, termTable, theoryModelLookup, theoryModelTable, traceLookup + , traceMap, traceTable -- ChunkDB.GetChunk , ccss, ccss', combine, getIdeaDict, vars -- SystemInformation diff --git a/code/drasil-database/Database/Drasil/ChunkDB.hs b/code/drasil-database/Database/Drasil/ChunkDB.hs index f27c92d6dd..3f70ecf22a 100644 --- a/code/drasil-database/Database/Drasil/ChunkDB.hs +++ b/code/drasil-database/Database/Drasil/ChunkDB.hs @@ -1,5 +1,5 @@ {-# LANGUAGE TemplateHaskell #-} -module Database.Drasil.ChunkDB (ChunkDB, RefbyMap, TraceMap, UMap, +module Database.Drasil.ChunkDB (ChunkDB(defTable), RefbyMap, TraceMap, UMap, asOrderedList, cdb, collectUnits, conceptMap, conceptinsLookup, conceptinsTable, dataDefnTable, datadefnLookup, defResolve, gendefLookup, gendefTable, generateRefbyMap, insmodelLookup, insmodelTable, From 5a7a24f80eb58cb896b64b4b6e9113039244b481 Mon Sep 17 00:00:00 2001 From: Brooks MacLachlan Date: Tue, 13 Aug 2019 13:03:45 -0400 Subject: [PATCH 2/6] Fixed NoPCM definition --- code/drasil-example/Drasil/SWHS/Unitals.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/drasil-example/Drasil/SWHS/Unitals.hs b/code/drasil-example/Drasil/SWHS/Unitals.hs index e5ee65760f..96f9df94e3 100644 --- a/code/drasil-example/Drasil/SWHS/Unitals.hs +++ b/code/drasil-example/Drasil/SWHS/Unitals.hs @@ -402,7 +402,7 @@ timeFinal = uqc "timeFinal" (nounPhraseSP "final time") sfwrc $ UpTo (Exc, sy timeFinalMax)] (dbl 50000) defaultUncrt timeStep = uqc "timeStep" (nounPhraseSP "time step for simulation") - ("The finite discretization of time used in the numerical method" ++ + ("The finite discretization of time used in the numerical method " ++ "for solving the computational model") (sub (eqSymb time) lStep) second Rational [physc $ Bounded (Exc,0) (Exc, sy timeFinal)] From de914958d796b7b36da00bd31016d6b2c46c0665 Mon Sep 17 00:00:00 2001 From: Brooks MacLachlan Date: Tue, 13 Aug 2019 13:04:08 -0400 Subject: [PATCH 3/6] Added missing definitions to Projectile ChunkDB --- code/drasil-example/Drasil/Projectile/Body.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/drasil-example/Drasil/Projectile/Body.hs b/code/drasil-example/Drasil/Projectile/Body.hs index 95d51d5514..1f9b0ac627 100644 --- a/code/drasil-example/Drasil/Projectile/Body.hs +++ b/code/drasil-example/Drasil/Projectile/Body.hs @@ -127,7 +127,7 @@ symbMap = cdb (qw pi_ : map qw physicscon ++ unitalQuants ++ symbols) (nw projectileTitle : nw mass : nw inParam : [nw errMsg, nw program] ++ map nw doccon ++ map nw doccon' ++ map nw physicCon ++ map nw physicCon' ++ map nw physicscon ++ map nw mathcon ++ concepts ++ unitalIdeas ++ - map nw acronyms ++ map nw symbols ++ map nw [metre, radian, second]) (cw pi_ : srsDomains) + map nw acronyms ++ map nw symbols ++ map nw [metre, radian, second]) (cw pi_ : map cw constrained ++ srsDomains) (map unitWrapper [metre, radian, second]) dataDefs iMods genDefns tMods concIns [] [] usedDB :: ChunkDB From 2cb591bb12b551fc1131ecc7723e765d606aab58 Mon Sep 17 00:00:00 2001 From: Brooks MacLachlan Date: Tue, 13 Aug 2019 13:04:38 -0400 Subject: [PATCH 4/6] Added/fixed missing GlassBR definitions in ChunkDB --- code/drasil-example/Drasil/GlassBR/Body.hs | 2 +- .../Drasil/GlassBR/Requirements.hs | 2 +- code/drasil-example/Drasil/GlassBR/Unitals.hs | 76 ++++++++----------- code/drasil-lang/Language/Drasil.hs | 2 +- .../Language/Drasil/Plain/Print.hs | 2 +- 5 files changed, 34 insertions(+), 50 deletions(-) diff --git a/code/drasil-example/Drasil/GlassBR/Body.hs b/code/drasil-example/Drasil/GlassBR/Body.hs index c27162fea0..45c4b7432e 100644 --- a/code/drasil-example/Drasil/GlassBR/Body.hs +++ b/code/drasil-example/Drasil/GlassBR/Body.hs @@ -142,7 +142,7 @@ symbMap = cdb thisSymbols (map nw acronyms ++ map nw thisSymbols ++ map nw con ++ map nw softwarecon ++ map nw terms ++ [nw lateralLoad, nw materialProprty] ++ [nw distance, nw algorithm] ++ map nw fundamentals ++ map nw derived ++ map nw physicalcon) - (map cw symb ++ Doc.srsDomains) (map unitWrapper [metre, second, kilogram] + (map cw symb ++ terms ++ Doc.srsDomains) (map unitWrapper [metre, second, kilogram] ++ map unitWrapper [pascal, newton]) GB.dataDefs iMods [] tMods concIns section labCon diff --git a/code/drasil-example/Drasil/GlassBR/Requirements.hs b/code/drasil-example/Drasil/GlassBR/Requirements.hs index 177c35b129..dc7f7ccfe8 100644 --- a/code/drasil-example/Drasil/GlassBR/Requirements.hs +++ b/code/drasil-example/Drasil/GlassBR/Requirements.hs @@ -66,7 +66,7 @@ sysSetValsFollowingAssumpsTable :: LabelledContent sysSetValsFollowingAssumpsTable = mkValsSourceTable (mkQRTupleRef r2AQs r2ARs ++ mkQRTuple r2DDs) "ReqAssignments" (S "Required Assignments" `follows` sysSetValsFollowingAssumps) where - r2AQs = loadSF : map qw (take 4 assumptionConstants) + r2AQs = qw loadSF : map qw (take 4 assumptionConstants) r2ARs = assumpGL : replicate 4 assumpSV r2DDs = [loadDF, hFromt, glaTyFac, standOffDis, aspRat] diff --git a/code/drasil-example/Drasil/GlassBR/Unitals.hs b/code/drasil-example/Drasil/GlassBR/Unitals.hs index d5cbe8caf5..66712bc793 100644 --- a/code/drasil-example/Drasil/GlassBR/Unitals.hs +++ b/code/drasil-example/Drasil/GlassBR/Unitals.hs @@ -5,7 +5,6 @@ import Language.Drasil.ShortHands import Theory.Drasil (mkQuantDef) import Utils.Drasil -import Control.Lens ((^.)) import Prelude hiding (log) import Data.Drasil.Concepts.Math (xComp, yComp, zComp) @@ -36,9 +35,10 @@ constrained :: [ConstrainedChunk] constrained = map cnstrw inputDataConstraints ++ [cnstrw probBr, cnstrw probFail] -plateLen, plateWidth, charWeight, standOffDist :: UncertQ -aspectRatio, pbTol, tNT :: UncertainChunk -glassTypeCon, nomThick :: ConstrainedChunk +plateLen, plateWidth, aspectRatio, charWeight, standOffDist :: UncertQ +pbTol, tNT :: UncertainChunk +nomThick :: ConstrainedChunk +glassTypeCon :: ConstrConcept {--} @@ -59,12 +59,12 @@ inputsWUncrtn :: [UncertainChunk] inputsWUncrtn = [pbTol, tNT] --derived inputs with uncertainties and no units -derivedInsWUncrtn :: [UncertainChunk] +derivedInsWUncrtn :: [UncertQ] derivedInsWUncrtn = [aspectRatio] --inputs with no uncertainties inputsNoUncrtn :: [ConstrainedChunk] -inputsNoUncrtn = [glassTypeCon, nomThick] +inputsNoUncrtn = [cnstrw glassTypeCon, nomThick] inputDataConstraints :: [UncertainChunk] inputDataConstraints = map uncrtnw inputsWUnitsUncrtn ++ @@ -82,10 +82,9 @@ plateWidth = uqcND "plateWidth" (nounPhraseSP "plate width (short dimension)") [ physc $ Bounded (Exc, 0) (Inc, sy plateLen), sfwrc $ Bounded (Inc, sy dimMin) (Inc, sy dimMax)] (dbl 1.2) defaultUncrt -aspectRatio = uvc "aspectRatio" (aR ^. term) - (Variable "AR") Real +aspectRatio = uq (constrained' (dqdNoUnit aspectRatioCon (Variable "AR") Real) [ physc $ UpFrom (Inc, 1), - sfwrc $ UpTo (Inc, sy arMax)] (dbl 1.5) defaultUncrt + sfwrc $ UpTo (Inc, sy arMax)] (dbl 1.5)) defaultUncrt pbTol = uvc "pbTol" (nounPhraseSP "tolerable probability of breakage") (sub cP (Concat [lBreak, lTol])) Real @@ -101,12 +100,9 @@ tNT = uvc "tNT" (nounPhraseSP "TNT equivalent factor") (Variable "TNT") Real [ gtZeroConstr ] (dbl 1.0) defaultUncrt -standOffDist = uqcND "standOffDist" (nounPhraseSP "stand off distance") - (Variable "SD") metre Real +standOffDist = uq (constrained' (dqd sD (Variable "SD") Real metre) [ gtZeroConstr, - sfwrc $ Bounded (Inc, sy sdMin) (Inc, sy sdMax)] - (dbl 45) defaultUncrt ---FIXME: ^ incorporate definition in here? + sfwrc $ Bounded (Inc, sy sdMin) (Inc, sy sdMax)] (dbl 45)) defaultUncrt nomThick = cuc "nomThick" (nounPhraseSent $ S "nominal thickness" +:+ displayDblConstrntsAsSet @@ -114,14 +110,8 @@ nomThick = cuc "nomThick" lT millimetre {-DiscreteD nominalThicknesses-} Rational [enumc nominalThicknesses] 8 --- the S "glass type" is supposed to be using "phrase glassTy" --- but the problem is still the Capitalization issue with new --- constructor `Ch` of generating the sentence. So for the sentence --- only "S" can be capitalized -glassTypeCon = cvc "glassTypeCon" (nounPhraseSent $ S "glass type" +:+ - displayStrConstrntsAsSet glassTypeCon (map (getAccStr . snd) glassType)) - lG {-DiscreteS (map (getAccStr . snd) glassType)-} String - [EnumeratedStr Software $ map (getAccStr . snd) glassType] Nothing +glassTypeCon = constrainedNRV' (dqdNoUnit glassTy lG String) + [EnumeratedStr Software $ map (getAccStr . snd) glassType] {--} @@ -188,31 +178,25 @@ sdMin = mkQuantDef (unitary "sdMin" {--} symbols :: [UnitaryChunk] -symbols = [minThick, sflawParamK, sflawParamM, demand, tmDemand, lRe, tmLRe, nonFactorL, loadDur, - eqTNTWeight] +symbols = [minThick, sflawParamK, sflawParamM, loadDur] ++ + map mkUnitary [demand, tmDemand, lRe, tmLRe, nonFactorL, eqTNTWeight] -minThick, sflawParamK, sflawParamM, demand, tmDemand, sdx, sdy, sdz, lRe, tmLRe, nonFactorL, loadDur, - eqTNTWeight :: UnitaryChunk +minThick, sflawParamK, sflawParamM, sdx, sdy, sdz, loadDur :: UnitaryChunk -demand = unitary "demand" (nounPhraseSP "applied load (demand)") - lQ pascal Rational --correct Space used? +demand, tmDemand, lRe, tmLRe, nonFactorL, eqTNTWeight :: UnitalChunk -tmDemand = unitary "tmDemand" (nounPhraseSP "applied load (demand) or pressure") - (Variable "Load") pascal Rational --correct Space used? - -lRe = unitary "lRe" (nounPhraseSP "load resistance") - (Variable "LR") pascal Rational --correct Space used? +demand = ucs' demandq lQ Rational pascal --correct Space used? -tmLRe = unitary "tmLRe" (nounPhraseSP "capacity or load resistance") - (Variable "capacity") pascal Rational --correct Space used? +tmDemand = ucs' load (Variable "Load") Rational pascal --correct Space used? + +lRe = ucs' loadResis (Variable "LR") Rational pascal --correct Space used? -nonFactorL = unitary "nonFactorL" (nounPhraseSP "non-factored load") - (Variable "NFL") pascal Rational --correct Space used? +tmLRe = ucs' capacity (Variable "capacity") Rational pascal --correct Space used? +nonFactorL = ucs' nonFactoredL (Variable "NFL") Rational pascal --correct Space used? -eqTNTWeight = unitary "eqTNTWeight" - (nounPhraseSP "explosive mass in equivalent weight of TNT") - (sub (eqSymb charWeight) (eqSymb tNT)) kilogram Real +eqTNTWeight = ucs' eqTNTChar (sub (eqSymb charWeight) (eqSymb tNT)) Real + kilogram loadDur = unitary "loadDur" (nounPhraseSP "duration of load") (sub lT lDur) second Real @@ -238,17 +222,18 @@ sflawParamM = unitary "sflawParamM" (nounPhraseSP "surface flaw parameter") --pa {-Quantities-} unitless :: [QuantityDict] -unitless = [riskFun, isSafePb, isSafeProb, isSafeLR, isSafeLoad, stressDistFac, sdfTol, - dimlessLoad, tolLoad, loadSF, gTF, lDurFac] +unitless = [riskFun, isSafePb, isSafeProb, isSafeLR, isSafeLoad, stressDistFac, + sdfTol, dimlessLoad, tolLoad, lDurFac] ++ map qw [gTF, loadSF] riskFun, isSafePb, isSafeProb, isSafeLR, isSafeLoad, stressDistFac, sdfTol, - dimlessLoad, tolLoad, loadSF, gTF, lDurFac :: QuantityDict + dimlessLoad, tolLoad, lDurFac :: QuantityDict +gTF, loadSF :: DefinedQuantityDict dimlessLoad = vc "dimlessLoad" (nounPhraseSP "dimensionless load") (hat lQ) Real -gTF = vc "gTF" (glassTypeFac ^. term) (Variable "GTF") Integer +gTF = dqdNoUnit glTyFac (Variable "GTF") Integer isSafePb = vc "isSafePb" (nounPhraseSP $ "variable that is assigned true when calculated" ++ " probability is less than tolerable probability") @@ -268,8 +253,7 @@ isSafeLoad = vc "isSafeLoad" (nounPhraseSP $ "variable that is assig lDurFac = vc'' loadDurFactor (Variable "LDF") Real -loadSF = vc'' lShareFac (Variable "LSF") Natural - +loadSF = dqdNoUnit loadShareFac (Variable "LSF") Natural riskFun = vc "riskFun" (nounPhraseSP "risk of failure") cB Real diff --git a/code/drasil-lang/Language/Drasil.hs b/code/drasil-lang/Language/Drasil.hs index fabf16902c..1d3a9f4be8 100644 --- a/code/drasil-lang/Language/Drasil.hs +++ b/code/drasil-lang/Language/Drasil.hs @@ -74,7 +74,7 @@ module Language.Drasil ( , UnitalChunk(..), makeUCWDS , uc, uc', ucs, ucs', ucsWS -- Chunk.Unitary - , Unitary(..), UnitaryChunk, unitary, unitary', unit_symb + , Unitary(..), UnitaryChunk, unitary, unitary', mkUnitary, unit_symb -- Chunk.Relation , RelationConcept, makeRC --Chunk.DefinedQuantity diff --git a/code/drasil-printers/Language/Drasil/Plain/Print.hs b/code/drasil-printers/Language/Drasil/Plain/Print.hs index 70e33cb4a9..220514410a 100644 --- a/code/drasil-printers/Language/Drasil/Plain/Print.hs +++ b/code/drasil-printers/Language/Drasil/Plain/Print.hs @@ -55,7 +55,7 @@ specDoc f (E e) = pExprDoc f e specDoc _ (S s) = text s specDoc f (Sy u) = unitDoc f u specDoc _ (Sp s) = specialDoc s -specDoc f (Ref _ r s) = specDoc f s <+> parens (text r) +specDoc f (Ref _ r s) = specDoc f s <+> text ("Ref: " ++ r) specDoc f (s1 :+: s2) = specDoc f s1 <> specDoc f s2 specDoc _ EmptyS = empty specDoc f (Quote s) = doubleQuotes $ specDoc f s From b1044005c35b17d13a0d60f86faa096d0eee3568 Mon Sep 17 00:00:00 2001 From: Brooks MacLachlan Date: Tue, 13 Aug 2019 13:21:41 -0400 Subject: [PATCH 5/6] Updated stable --- code/stable/glassbr/SRS/GlassBR_SRS.tex | 34 ++++++------- code/stable/glassbr/Website/GlassBR_SRS.html | 46 ++++++++---------- code/stable/glassbr/src/cpp/Calculations.hpp | 26 +++++----- code/stable/glassbr/src/cpp/OutputFormat.hpp | 2 +- .../stable/glassbr/src/csharp/Calculations.cs | 26 +++++----- .../stable/glassbr/src/csharp/OutputFormat.cs | 2 +- .../src/java/GlassBR/Calculations.java | 26 +++++----- .../src/java/GlassBR/OutputFormat.java | 2 +- .../stable/glassbr/src/python/Calculations.py | 26 +++++----- .../stable/glassbr/src/python/OutputFormat.py | 2 +- code/stable/nopcm/src/cpp/InputParameters.hpp | 48 +++++++++---------- code/stable/nopcm/src/cpp/OutputFormat.hpp | 4 +- .../nopcm/src/csharp/InputParameters.cs | 48 +++++++++---------- code/stable/nopcm/src/csharp/OutputFormat.cs | 4 +- .../nopcm/src/java/SWHS/InputParameters.java | 48 +++++++++---------- .../nopcm/src/java/SWHS/OutputFormat.java | 4 +- .../nopcm/src/python/InputParameters.py | 48 +++++++++---------- code/stable/nopcm/src/python/OutputFormat.py | 4 +- .../projectile/src/cpp/Calculations.hpp | 16 +++---- .../projectile/src/cpp/OutputFormat.hpp | 2 +- .../projectile/src/csharp/Calculations.cs | 16 +++---- .../projectile/src/csharp/OutputFormat.cs | 2 +- .../src/java/Projectile/Calculations.java | 16 +++---- .../src/java/Projectile/OutputFormat.java | 2 +- .../projectile/src/python/Calculations.py | 16 +++---- .../projectile/src/python/OutputFormat.py | 2 +- 26 files changed, 234 insertions(+), 238 deletions(-) diff --git a/code/stable/glassbr/SRS/GlassBR_SRS.tex b/code/stable/glassbr/SRS/GlassBR_SRS.tex index 9ee64c78f0..cce9d02e83 100644 --- a/code/stable/glassbr/SRS/GlassBR_SRS.tex +++ b/code/stable/glassbr/SRS/GlassBR_SRS.tex @@ -75,7 +75,7 @@ \subsection{Table of Symbols} \\ $b$ & Plate width (short dimension) & m \\ -$capacity$ & Capacity or load resistance & Pa +$capacity$ & Capacity & Pa \\ ${d_{\text{max}}}$ & Maximum value for one of the dimensions of the glass plate & m \\ @@ -83,7 +83,7 @@ \subsection{Table of Symbols} \\ $E$ & Modulus of elasticity of glass & Pa \\ -$g$ & Glass type $g\in{}\{\text{``AN''},\text{``FT''},\text{``HS''}\}$ & -- +$g$ & Glass type & -- \\ $GTF$ & Glass type factor & -- \\ @@ -109,7 +109,7 @@ \subsection{Table of Symbols} \\ $LDF$ & Load duration factor & -- \\ -$Load$ & Applied load (demand) or pressure & Pa +$Load$ & Load & Pa \\ $LR$ & Load resistance & Pa \\ @@ -127,7 +127,7 @@ \subsection{Table of Symbols} \\ ${P_{\text{f}\text{tol}}}$ & Tolerable probability of failure & -- \\ -$q$ & Applied load (demand) & Pa +$q$ & Demand & Pa \\ $\hat{q}$ & Dimensionless load & -- \\ @@ -157,7 +157,7 @@ \subsection{Table of Symbols} \\ ${w_{\text{min}}}$ & Minimum permissible input charge weight & kg \\ -${w_{TNT}}$ & Explosive mass in equivalent weight of TNT & kg +${w_{TNT}}$ & Equivalent TNT charge mass & kg \\ \bottomrule \caption{} @@ -197,6 +197,8 @@ \subsection{Abbreviations and Acronyms} \\ LR & Load Resistance \\ +LSF & Load Share Factor +\\ N/A & Not Applicable \\ NFL & Non-Factored Load @@ -432,8 +434,8 @@ \subsubsection{Theoretical Models} \\ \midrule \\ Description & \begin{symbDescription} \item{$is-safeLoad$ is the variable that is assigned true when load resistance (capacity) is greater than applied load (demand) (Unitless)} - \item{$capacity$ is the capacity or load resistance (Pa)} - \item{$Load$ is the applied load (demand) or pressure (Pa)} + \item{$capacity$ is the capacity (Pa)} + \item{$Load$ is the load (Pa)} \end{symbDescription} \\ \midrule \\ Notes & If $is-safeLoad$, the glass is considered safe. $is-safeProb$ (from \hyperref[TM:isSafeProb]{TM: isSafeProb}) and $is-safeLoad$ are either both True or both False. LR is the load resistance (also called capacity), $Load$ (also referred as the Demand) is the 3 second duration equivalent pressure. @@ -717,7 +719,7 @@ \subsubsection{Data Definitions} \\ \midrule \\ Description & \begin{symbDescription} \item{$GTF$ is the glass type factor (Unitless)} - \item{$g$ is the glass type $g\in{}\{\text{``AN''},\text{``FT''},\text{``HS''}\}$ (Unitless)} + \item{$g$ is the glass type (Unitless)} \end{symbDescription} \\ \midrule \\ Notes & AN is annealed glass. @@ -759,7 +761,7 @@ \subsubsection{Data Definitions} \\ \midrule \\ Description & \begin{symbDescription} \item{$\hat{q}$ is the dimensionless load (Unitless)} - \item{$q$ is the applied load (demand) (Pa)} + \item{$q$ is the demand (Pa)} \item{$a$ is the plate length (long dimension) (m)} \item{$b$ is the plate width (short dimension) (m)} \item{$E$ is the modulus of elasticity of glass (Pa)} @@ -968,7 +970,7 @@ \subsubsection{Data Definitions} \phantomsection \label{DD:eqTNTW} \\ \midrule \\ -Label & Explosive mass in equivalent weight of TNT +Label & Equivalent TNT charge mass \\ \midrule \\ Symbol & ${w_{TNT}}$ @@ -982,7 +984,7 @@ \subsubsection{Data Definitions} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{${w_{TNT}}$ is the explosive mass in equivalent weight of TNT (kg)} + \item{${w_{TNT}}$ is the equivalent TNT charge mass (kg)} \item{$w$ is the charge weight (kg)} \item{$TNT$ is the TNT equivalent factor (Unitless)} \end{symbDescription} @@ -1088,7 +1090,7 @@ \subsubsection{Data Definitions} \phantomsection \label{DD:calofDemand} \\ \midrule \\ -Label & Applied load (demand) +Label & Demand \\ \midrule \\ Symbol & $q$ @@ -1102,10 +1104,10 @@ \subsubsection{Data Definitions} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$q$ is the applied load (demand) (Pa)} + \item{$q$ is the demand (Pa)} \item{$interpY$ is the interpY (Unitless)} \item{$SD$ is the stand off distance (m)} - \item{${w_{TNT}}$ is the explosive mass in equivalent weight of TNT (kg)} + \item{${w_{TNT}}$ is the equivalent TNT charge mass (kg)} \end{symbDescription} \\ \midrule \\ Notes & $q$, or demand, is the 3 second duration equivalent pressure obtained from \hyperref[Figure:demandVSsod]{Fig:demandVSsod} by interpolation using stand off distance ($SD$) and ${w_{TNT}}$ as parameters. ${w_{TNT}}$ is defined in \hyperref[DD:eqTNTW]{DD: eqTNTW}. $SD$ is the stand off distance as defined in \hyperref[DD:standOffDist]{DD: standOffDist}. @@ -1206,7 +1208,7 @@ \subsubsection{Instance Models} Description & \begin{symbDescription} \item{$is-safeLR$ is the variable that is assigned true when load resistance (capacity) is greater than load (demand) (Unitless)} \item{$LR$ is the load resistance (Pa)} - \item{$q$ is the applied load (demand) (Pa)} + \item{$q$ is the demand (Pa)} \end{symbDescription} \\ \midrule \\ Notes & If $is-safeLR$, the glass is considered safe. $is-safePb$ (from \hyperref[IM:isSafePb]{IM: isSafePb}) and $is-safeLR$ are either both True or both False. LR is the load resistance (also called capacity), as defined in \hyperref[DD:calofCapacity]{DD: calofCapacity}. $q$ (also referred as the Demand) is the 3 second duration equivalent pressure, as defined in \hyperref[DD:calofDemand]{DD: calofDemand}. @@ -1290,7 +1292,7 @@ \subsection{Functional Requirements} \\ $b$ & Plate width (short dimension) & m \\ -$g$ & Glass type $g\in{}\{\text{``AN''},\text{``FT''},\text{``HS''}\}$ & -- +$g$ & Glass type & -- \\ ${P_{\text{b}\text{tol}}}$ & Tolerable probability of breakage & -- \\ diff --git a/code/stable/glassbr/Website/GlassBR_SRS.html b/code/stable/glassbr/Website/GlassBR_SRS.html index bebf58f492..9f23430d36 100644 --- a/code/stable/glassbr/Website/GlassBR_SRS.html +++ b/code/stable/glassbr/Website/GlassBR_SRS.html @@ -101,7 +101,7 @@

Table of Symbols

capacity - Capacity or load resistance + Capacity Pa @@ -121,9 +121,7 @@

Table of Symbols

g - - Glass type g ∈ {"AN","FT","HS"} - + Glass type -- @@ -196,7 +194,7 @@

Table of Symbols

Load - Applied load (demand) or pressure + Load Pa @@ -241,7 +239,7 @@

Table of Symbols

q - Applied load (demand) + Demand Pa @@ -318,7 +316,7 @@

Table of Symbols

wTNT - Explosive mass in equivalent weight of TNT + Equivalent TNT charge mass kg @@ -386,6 +384,10 @@

Abbreviations and Acronyms

LR Load Resistance + + LSF + Load Share Factor + N/A Not Applicable @@ -840,10 +842,8 @@

Theoretical Models

  • is-safeLoad is the variable that is assigned true when load resistance (capacity) is greater than applied load (demand) (Unitless)
    • -
  • capacity is the capacity or load resistance (Pa)
    • -
  • - Load is the applied load (demand) or pressure (Pa) -
    • +
  • capacity is the capacity (Pa)
    • +
  • Load is the load (Pa)
    • @@ -1317,9 +1317,7 @@

    Data Definitions

    • GTF is the glass type factor (Unitless)
      • -
    • - g is the glass type g ∈ {"AN","FT","HS"} (Unitless) -
      • +
    • g is the glass type (Unitless)
    @@ -1380,7 +1378,7 @@

    Data Definitions

    • q̂ is the dimensionless load (Unitless)
      • -
    • q is the applied load (demand) (Pa)
      • +
    • q is the demand (Pa)
    • a is the plate length (long dimension) (m)
    • b is the plate width (short dimension) (m)
    • E is the modulus of elasticity of glass (Pa)
      • @@ -1717,9 +1715,7 @@

      Data Definitions

      Label - -

      Explosive mass in equivalent weight of TNT

      - +

      Equivalent TNT charge mass

      Symbol @@ -1740,7 +1736,7 @@

      Data Definitions

      • - wTNT is the explosive mass in equivalent weight of TNT (kg) + wTNT is the equivalent TNT charge mass (kg)
      • w is the charge weight (kg)
      • TNT is the TNT equivalent factor (Unitless)
        • @@ -1891,7 +1887,7 @@

        Data Definitions

        Label -

        Applied load (demand)

        +

        Demand

        Symbol @@ -1913,11 +1909,11 @@

        Data Definitions

        Description
          -
        • q is the applied load (demand) (Pa)
          • +
        • q is the demand (Pa)
        • interpY is the interpY (Unitless)
        • SD is the stand off distance (m)
        • - wTNT is the explosive mass in equivalent weight of TNT (kg) + wTNT is the equivalent TNT charge mass (kg)
        @@ -2086,7 +2082,7 @@

        Instance Models

        is-safeLR is the variable that is assigned true when load resistance (capacity) is greater than load (demand) (Unitless)
      • LR is the load resistance (Pa)
        • -
      • q is the applied load (demand) (Pa)
        • +
      • q is the demand (Pa)
      @@ -2283,9 +2279,7 @@

      Functional Requirements

      g - - Glass type g ∈ {"AN","FT","HS"} - + Glass type -- diff --git a/code/stable/glassbr/src/cpp/Calculations.hpp b/code/stable/glassbr/src/cpp/Calculations.hpp index 840e3a4acb..83e7a23d98 100644 --- a/code/stable/glassbr/src/cpp/Calculations.hpp +++ b/code/stable/glassbr/src/cpp/Calculations.hpp @@ -22,15 +22,15 @@ using std::ofstream; */ double func_J_tol(InputParameters &inParams); -/** \brief Calculates applied load (demand) (Pa) +/** \brief Calculates demand: 3 second duration equivalent pressure (Pa) \param inParams structure holding the input values - \return applied load (demand) (Pa) + \return demand: 3 second duration equivalent pressure (Pa) */ double func_q(InputParameters &inParams); /** \brief Calculates dimensionless load \param inParams structure holding the input values - \param q applied load (demand) (Pa) + \param q demand: 3 second duration equivalent pressure (Pa) \return dimensionless load */ double func_q_hat(InputParameters &inParams, double q); @@ -49,10 +49,10 @@ double func_q_hat_tol(InputParameters &inParams, double J_tol); */ double func_J(InputParameters &inParams, double q_hat); -/** \brief Calculates non-factored load (Pa) +/** \brief Calculates non-factored load: Three second duration uniform load associated with a probability of breakage less than or equal to 8 lites per 1000 for monolithic AN glass. (Pa) \param inParams structure holding the input values \param q_hat_tol tolerable load - \return non-factored load (Pa) + \return non-factored load: Three second duration uniform load associated with a probability of breakage less than or equal to 8 lites per 1000 for monolithic AN glass. (Pa) */ double func_NFL(InputParameters &inParams, double q_hat_tol); @@ -63,29 +63,29 @@ double func_NFL(InputParameters &inParams, double q_hat_tol); */ double func_B(InputParameters &inParams, double J); -/** \brief Calculates load resistance (Pa) +/** \brief Calculates load resistance: The uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in (pp. 1 and 53) Ref: astm2009. (Pa) \param inParams structure holding the input values - \param NFL non-factored load (Pa) - \return load resistance (Pa) + \param NFL non-factored load: Three second duration uniform load associated with a probability of breakage less than or equal to 8 lites per 1000 for monolithic AN glass. (Pa) + \return load resistance: The uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in (pp. 1 and 53) Ref: astm2009. (Pa) */ double func_LR(InputParameters &inParams, double NFL); /** \brief Calculates variable that is assigned true when load resistance (capacity) is greater than load (demand) - \param LR load resistance (Pa) - \param q applied load (demand) (Pa) + \param LR load resistance: The uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in (pp. 1 and 53) Ref: astm2009. (Pa) + \param q demand: 3 second duration equivalent pressure (Pa) \return variable that is assigned true when load resistance (capacity) is greater than load (demand) */ bool func_is_safeLR(double LR, double q); -/** \brief Calculates probability of breakage +/** \brief Calculates probability of breakage: 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 (Ref: astm2016). \param B risk of failure - \return probability of breakage + \return probability of breakage: 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 (Ref: astm2016). */ double func_P_b(double B); /** \brief Calculates variable that is assigned true when calculated probability is less than tolerable probability \param inParams structure holding the input values - \param P_b probability of breakage + \param P_b probability of breakage: 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 (Ref: astm2016). \return variable that is assigned true when calculated probability is less than tolerable probability */ bool func_is_safePb(InputParameters &inParams, double P_b); diff --git a/code/stable/glassbr/src/cpp/OutputFormat.hpp b/code/stable/glassbr/src/cpp/OutputFormat.hpp index ee210a1dd5..9205c3689f 100644 --- a/code/stable/glassbr/src/cpp/OutputFormat.hpp +++ b/code/stable/glassbr/src/cpp/OutputFormat.hpp @@ -16,7 +16,7 @@ using std::ofstream; /** \brief Writes the output values to output.txt \param is_safePb variable that is assigned true when calculated probability is less than tolerable probability \param is_safeLR variable that is assigned true when load resistance (capacity) is greater than load (demand) - \param P_b probability of breakage + \param P_b probability of breakage: 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 (Ref: astm2016). */ void write_output(bool is_safePb, bool is_safeLR, double P_b); diff --git a/code/stable/glassbr/src/csharp/Calculations.cs b/code/stable/glassbr/src/csharp/Calculations.cs index c472d5bae4..f41cd3f1a3 100644 --- a/code/stable/glassbr/src/csharp/Calculations.cs +++ b/code/stable/glassbr/src/csharp/Calculations.cs @@ -25,9 +25,9 @@ public static double func_J_tol(InputParameters inParams) { return Math.Log(Math.Log(1 / (1 - inParams.P_btol)) * (Math.Pow(inParams.a * inParams.b, 7.0 - 1) / (2.86e-53 * Math.Pow(7.17e10 * Math.Pow(inParams.h, 2), 7.0) * inParams.LDF))); } - /** \brief Calculates applied load (demand) (Pa) + /** \brief Calculates demand: 3 second duration equivalent pressure (Pa) \param inParams structure holding the input values - \return applied load (demand) (Pa) + \return demand: 3 second duration equivalent pressure (Pa) */ public static double func_q(InputParameters inParams) { StreamWriter outfile; @@ -43,7 +43,7 @@ public static double func_q(InputParameters inParams) { /** \brief Calculates dimensionless load \param inParams structure holding the input values - \param q applied load (demand) (Pa) + \param q demand: 3 second duration equivalent pressure (Pa) \return dimensionless load */ public static double func_q_hat(InputParameters inParams, double q) { @@ -101,10 +101,10 @@ public static double func_J(InputParameters inParams, double q_hat) { return Interpolation.func_interpZ("SDF.txt", inParams.AR, q_hat); } - /** \brief Calculates non-factored load (Pa) + /** \brief Calculates non-factored load: Three second duration uniform load associated with a probability of breakage less than or equal to 8 lites per 1000 for monolithic AN glass. (Pa) \param inParams structure holding the input values \param q_hat_tol tolerable load - \return non-factored load (Pa) + \return non-factored load: Three second duration uniform load associated with a probability of breakage less than or equal to 8 lites per 1000 for monolithic AN glass. (Pa) */ public static double func_NFL(InputParameters inParams, double q_hat_tol) { StreamWriter outfile; @@ -141,10 +141,10 @@ public static double func_B(InputParameters inParams, double J) { return 2.86e-53 / Math.Pow(inParams.a * inParams.b, 7.0 - 1) * Math.Pow(7.17e10 * Math.Pow(inParams.h, 2), 7.0) * inParams.LDF * Math.Exp(J); } - /** \brief Calculates load resistance (Pa) + /** \brief Calculates load resistance: The uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in (pp. 1 and 53) Ref: astm2009. (Pa) \param inParams structure holding the input values - \param NFL non-factored load (Pa) - \return load resistance (Pa) + \param NFL non-factored load: Three second duration uniform load associated with a probability of breakage less than or equal to 8 lites per 1000 for monolithic AN glass. (Pa) + \return load resistance: The uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in (pp. 1 and 53) Ref: astm2009. (Pa) */ public static double func_LR(InputParameters inParams, double NFL) { StreamWriter outfile; @@ -162,8 +162,8 @@ public static double func_LR(InputParameters inParams, double NFL) { } /** \brief Calculates variable that is assigned true when load resistance (capacity) is greater than load (demand) - \param LR load resistance (Pa) - \param q applied load (demand) (Pa) + \param LR load resistance: The uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in (pp. 1 and 53) Ref: astm2009. (Pa) + \param q demand: 3 second duration equivalent pressure (Pa) \return variable that is assigned true when load resistance (capacity) is greater than load (demand) */ public static Boolean func_is_safeLR(double LR, double q) { @@ -181,9 +181,9 @@ public static Boolean func_is_safeLR(double LR, double q) { return LR > q; } - /** \brief Calculates probability of breakage + /** \brief Calculates probability of breakage: 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 (Ref: astm2016). \param B risk of failure - \return probability of breakage + \return probability of breakage: 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 (Ref: astm2016). */ public static double func_P_b(double B) { StreamWriter outfile; @@ -199,7 +199,7 @@ public static double func_P_b(double B) { /** \brief Calculates variable that is assigned true when calculated probability is less than tolerable probability \param inParams structure holding the input values - \param P_b probability of breakage + \param P_b probability of breakage: 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 (Ref: astm2016). \return variable that is assigned true when calculated probability is less than tolerable probability */ public static Boolean func_is_safePb(InputParameters inParams, double P_b) { diff --git a/code/stable/glassbr/src/csharp/OutputFormat.cs b/code/stable/glassbr/src/csharp/OutputFormat.cs index 09bfce8581..93beb2e1fc 100644 --- a/code/stable/glassbr/src/csharp/OutputFormat.cs +++ b/code/stable/glassbr/src/csharp/OutputFormat.cs @@ -12,7 +12,7 @@ public class OutputFormat { /** \brief Writes the output values to output.txt \param is_safePb variable that is assigned true when calculated probability is less than tolerable probability \param is_safeLR variable that is assigned true when load resistance (capacity) is greater than load (demand) - \param P_b probability of breakage + \param P_b probability of breakage: 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 (Ref: astm2016). */ public static void write_output(Boolean is_safePb, Boolean is_safeLR, double P_b) { StreamWriter outfile; diff --git a/code/stable/glassbr/src/java/GlassBR/Calculations.java b/code/stable/glassbr/src/java/GlassBR/Calculations.java index 93fdf366e4..a31d5f4e9a 100644 --- a/code/stable/glassbr/src/java/GlassBR/Calculations.java +++ b/code/stable/glassbr/src/java/GlassBR/Calculations.java @@ -30,9 +30,9 @@ public static double func_J_tol(InputParameters inParams) throws Exception { return Math.log(Math.log(1 / (1 - inParams.P_btol)) * (Math.pow(inParams.a * inParams.b, 7.0 - 1) / (2.86e-53 * Math.pow(7.17e10 * Math.pow(inParams.h, 2), 7.0) * inParams.LDF))); } - /** \brief Calculates applied load (demand) (Pa) + /** \brief Calculates demand: 3 second duration equivalent pressure (Pa) \param inParams structure holding the input values - \return applied load (demand) (Pa) + \return demand: 3 second duration equivalent pressure (Pa) */ public static double func_q(InputParameters inParams) throws Exception { PrintWriter outfile; @@ -48,7 +48,7 @@ public static double func_q(InputParameters inParams) throws Exception { /** \brief Calculates dimensionless load \param inParams structure holding the input values - \param q applied load (demand) (Pa) + \param q demand: 3 second duration equivalent pressure (Pa) \return dimensionless load */ public static double func_q_hat(InputParameters inParams, double q) throws Exception { @@ -106,10 +106,10 @@ public static double func_J(InputParameters inParams, double q_hat) throws Excep return Interpolation.func_interpZ("SDF.txt", inParams.AR, q_hat); } - /** \brief Calculates non-factored load (Pa) + /** \brief Calculates non-factored load: Three second duration uniform load associated with a probability of breakage less than or equal to 8 lites per 1000 for monolithic AN glass. (Pa) \param inParams structure holding the input values \param q_hat_tol tolerable load - \return non-factored load (Pa) + \return non-factored load: Three second duration uniform load associated with a probability of breakage less than or equal to 8 lites per 1000 for monolithic AN glass. (Pa) */ public static double func_NFL(InputParameters inParams, double q_hat_tol) throws Exception { PrintWriter outfile; @@ -146,10 +146,10 @@ public static double func_B(InputParameters inParams, double J) throws Exception return 2.86e-53 / Math.pow(inParams.a * inParams.b, 7.0 - 1) * Math.pow(7.17e10 * Math.pow(inParams.h, 2), 7.0) * inParams.LDF * Math.exp(J); } - /** \brief Calculates load resistance (Pa) + /** \brief Calculates load resistance: The uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in (pp. 1 and 53) Ref: astm2009. (Pa) \param inParams structure holding the input values - \param NFL non-factored load (Pa) - \return load resistance (Pa) + \param NFL non-factored load: Three second duration uniform load associated with a probability of breakage less than or equal to 8 lites per 1000 for monolithic AN glass. (Pa) + \return load resistance: The uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in (pp. 1 and 53) Ref: astm2009. (Pa) */ public static double func_LR(InputParameters inParams, double NFL) throws Exception { PrintWriter outfile; @@ -167,8 +167,8 @@ public static double func_LR(InputParameters inParams, double NFL) throws Except } /** \brief Calculates variable that is assigned true when load resistance (capacity) is greater than load (demand) - \param LR load resistance (Pa) - \param q applied load (demand) (Pa) + \param LR load resistance: The uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in (pp. 1 and 53) Ref: astm2009. (Pa) + \param q demand: 3 second duration equivalent pressure (Pa) \return variable that is assigned true when load resistance (capacity) is greater than load (demand) */ public static Boolean func_is_safeLR(double LR, double q) throws Exception { @@ -186,9 +186,9 @@ public static Boolean func_is_safeLR(double LR, double q) throws Exception { return LR > q; } - /** \brief Calculates probability of breakage + /** \brief Calculates probability of breakage: 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 (Ref: astm2016). \param B risk of failure - \return probability of breakage + \return probability of breakage: 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 (Ref: astm2016). */ public static double func_P_b(double B) throws Exception { PrintWriter outfile; @@ -204,7 +204,7 @@ public static double func_P_b(double B) throws Exception { /** \brief Calculates variable that is assigned true when calculated probability is less than tolerable probability \param inParams structure holding the input values - \param P_b probability of breakage + \param P_b probability of breakage: 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 (Ref: astm2016). \return variable that is assigned true when calculated probability is less than tolerable probability */ public static Boolean func_is_safePb(InputParameters inParams, double P_b) throws Exception { diff --git a/code/stable/glassbr/src/java/GlassBR/OutputFormat.java b/code/stable/glassbr/src/java/GlassBR/OutputFormat.java index 628303e60d..ad5059d8c3 100644 --- a/code/stable/glassbr/src/java/GlassBR/OutputFormat.java +++ b/code/stable/glassbr/src/java/GlassBR/OutputFormat.java @@ -17,7 +17,7 @@ public class OutputFormat { /** \brief Writes the output values to output.txt \param is_safePb variable that is assigned true when calculated probability is less than tolerable probability \param is_safeLR variable that is assigned true when load resistance (capacity) is greater than load (demand) - \param P_b probability of breakage + \param P_b probability of breakage: 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 (Ref: astm2016). */ public static void write_output(Boolean is_safePb, Boolean is_safeLR, double P_b) throws Exception { PrintWriter outfile; diff --git a/code/stable/glassbr/src/python/Calculations.py b/code/stable/glassbr/src/python/Calculations.py index f9463c28fd..1c101835f6 100644 --- a/code/stable/glassbr/src/python/Calculations.py +++ b/code/stable/glassbr/src/python/Calculations.py @@ -21,9 +21,9 @@ def func_J_tol(inParams): return math.log(math.log(1 / (1 - inParams.P_btol)) * ((inParams.a * inParams.b) ** (7.0 - 1) / (2.86e-53 * (7.17e10 * inParams.h ** 2) ** 7.0 * inParams.LDF))) -## \brief Calculates applied load (demand) (Pa) +## \brief Calculates demand: 3 second duration equivalent pressure (Pa) # \param inParams structure holding the input values -# \return applied load (demand) (Pa) +# \return demand: 3 second duration equivalent pressure (Pa) def func_q(inParams): outfile = open("log.txt", "a") print("function func_q called with inputs: {", file=outfile) @@ -36,7 +36,7 @@ def func_q(inParams): ## \brief Calculates dimensionless load # \param inParams structure holding the input values -# \param q applied load (demand) (Pa) +# \param q demand: 3 second duration equivalent pressure (Pa) # \return dimensionless load def func_q_hat(inParams, q): outfile = open("log.txt", "a") @@ -85,10 +85,10 @@ def func_J(inParams, q_hat): return Interpolation.func_interpZ("SDF.txt", inParams.AR, q_hat) -## \brief Calculates non-factored load (Pa) +## \brief Calculates non-factored load: Three second duration uniform load associated with a probability of breakage less than or equal to 8 lites per 1000 for monolithic AN glass. (Pa) # \param inParams structure holding the input values # \param q_hat_tol tolerable load -# \return non-factored load (Pa) +# \return non-factored load: Three second duration uniform load associated with a probability of breakage less than or equal to 8 lites per 1000 for monolithic AN glass. (Pa) def func_NFL(inParams, q_hat_tol): outfile = open("log.txt", "a") print("function func_NFL called with inputs: {", file=outfile) @@ -119,10 +119,10 @@ def func_B(inParams, J): return 2.86e-53 / (inParams.a * inParams.b) ** (7.0 - 1) * (7.17e10 * inParams.h ** 2) ** 7.0 * inParams.LDF * math.exp(J) -## \brief Calculates load resistance (Pa) +## \brief Calculates load resistance: The uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in (pp. 1 and 53) Ref: astm2009. (Pa) # \param inParams structure holding the input values -# \param NFL non-factored load (Pa) -# \return load resistance (Pa) +# \param NFL non-factored load: Three second duration uniform load associated with a probability of breakage less than or equal to 8 lites per 1000 for monolithic AN glass. (Pa) +# \return load resistance: The uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in (pp. 1 and 53) Ref: astm2009. (Pa) def func_LR(inParams, NFL): outfile = open("log.txt", "a") print("function func_LR called with inputs: {", file=outfile) @@ -137,8 +137,8 @@ def func_LR(inParams, NFL): return NFL * inParams.GTF * 1 ## \brief Calculates variable that is assigned true when load resistance (capacity) is greater than load (demand) -# \param LR load resistance (Pa) -# \param q applied load (demand) (Pa) +# \param LR load resistance: The uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in (pp. 1 and 53) Ref: astm2009. (Pa) +# \param q demand: 3 second duration equivalent pressure (Pa) # \return variable that is assigned true when load resistance (capacity) is greater than load (demand) def func_is_safeLR(LR, q): outfile = open("log.txt", "a") @@ -153,9 +153,9 @@ def func_is_safeLR(LR, q): return LR > q -## \brief Calculates probability of breakage +## \brief Calculates probability of breakage: 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 (Ref: astm2016). # \param B risk of failure -# \return probability of breakage +# \return probability of breakage: 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 (Ref: astm2016). def func_P_b(B): outfile = open("log.txt", "a") print("function func_P_b called with inputs: {", file=outfile) @@ -168,7 +168,7 @@ def func_P_b(B): ## \brief Calculates variable that is assigned true when calculated probability is less than tolerable probability # \param inParams structure holding the input values -# \param P_b probability of breakage +# \param P_b probability of breakage: 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 (Ref: astm2016). # \return variable that is assigned true when calculated probability is less than tolerable probability def func_is_safePb(inParams, P_b): outfile = open("log.txt", "a") diff --git a/code/stable/glassbr/src/python/OutputFormat.py b/code/stable/glassbr/src/python/OutputFormat.py index 28626440a9..0e3c8bd9ba 100644 --- a/code/stable/glassbr/src/python/OutputFormat.py +++ b/code/stable/glassbr/src/python/OutputFormat.py @@ -8,7 +8,7 @@ ## \brief Writes the output values to output.txt # \param is_safePb variable that is assigned true when calculated probability is less than tolerable probability # \param is_safeLR variable that is assigned true when load resistance (capacity) is greater than load (demand) -# \param P_b probability of breakage +# \param P_b probability of breakage: 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 (Ref: astm2016). def write_output(is_safePb, is_safeLR, P_b): outfile = open("log.txt", "a") print("function write_output called with inputs: {", file=outfile) diff --git a/code/stable/nopcm/src/cpp/InputParameters.hpp b/code/stable/nopcm/src/cpp/InputParameters.hpp index ed505e32da..122c911d52 100644 --- a/code/stable/nopcm/src/cpp/InputParameters.hpp +++ b/code/stable/nopcm/src/cpp/InputParameters.hpp @@ -15,36 +15,36 @@ using std::ofstream; /** \brief Reads input from a file with the given file name \param filename name of the input file - \param A_C heating coil surface area (m^2) - \param C_W specific heat capacity of water (J/(kg degreeC)) - \param h_C convective heat transfer coefficient between coil and water (W/(m^2 degreeC)) - \param T_init initial temperature (degreeC) - \param t_final final time (s) - \param L length of tank (m) - \param T_C temperature of the heating coil (degreeC) - \param t_step time step for simulation (s) - \param rho_W density of water (kg/m^3) - \param D diameter of tank (m) + \param A_C heating coil surface area: Area covered by the outermost layer of the coil (m^2) + \param C_W specific heat capacity of water: The amount of energy required to raise the temperature of a given unit mass of water by a given amount (J/(kg degreeC)) + \param h_C convective heat transfer coefficient between coil and water: The convective heat transfer coefficient that models the thermal flux from the coil to the surrounding water (W/(m^2 degreeC)) + \param T_init initial temperature: The temperature at the beginning of the simulation (degreeC) + \param t_final final time: The amount of time elapsed from the beginning of the simulation to its conclusion (s) + \param L length of tank: The length of the tank (m) + \param T_C temperature of the heating coil: The average kinetic energy of the particles within the coil (degreeC) + \param t_step time step for simulation: The finite discretization of time used in the numerical method for solving the computational model (s) + \param rho_W density of water: Mass per unit volume of water (kg/m^3) + \param D diameter of tank: The diameter of the tank (m) \param A_tol absolute tolerance \param R_tol relative tolerance - \param T_W temperature of the water (degreeC) - \param E_W change in heat energy in the water (J) + \param T_W temperature of the water: The average kinetic energy of the particles within the water (degreeC) + \param E_W change in heat energy in the water: Change in thermal energy within the water (J) */ void get_input(string filename, double &A_C, double &C_W, double &h_C, double &T_init, double &t_final, double &L, double &T_C, double &t_step, double &rho_W, double &D, double &A_tol, double &R_tol, double &T_W, double &E_W); /** \brief Verifies that input values satisfy the physical constraints and software constraints - \param A_C heating coil surface area (m^2) - \param C_W specific heat capacity of water (J/(kg degreeC)) - \param h_C convective heat transfer coefficient between coil and water (W/(m^2 degreeC)) - \param T_init initial temperature (degreeC) - \param t_final final time (s) - \param L length of tank (m) - \param T_C temperature of the heating coil (degreeC) - \param t_step time step for simulation (s) - \param rho_W density of water (kg/m^3) - \param D diameter of tank (m) - \param T_W temperature of the water (degreeC) - \param E_W change in heat energy in the water (J) + \param A_C heating coil surface area: Area covered by the outermost layer of the coil (m^2) + \param C_W specific heat capacity of water: The amount of energy required to raise the temperature of a given unit mass of water by a given amount (J/(kg degreeC)) + \param h_C convective heat transfer coefficient between coil and water: The convective heat transfer coefficient that models the thermal flux from the coil to the surrounding water (W/(m^2 degreeC)) + \param T_init initial temperature: The temperature at the beginning of the simulation (degreeC) + \param t_final final time: The amount of time elapsed from the beginning of the simulation to its conclusion (s) + \param L length of tank: The length of the tank (m) + \param T_C temperature of the heating coil: The average kinetic energy of the particles within the coil (degreeC) + \param t_step time step for simulation: The finite discretization of time used in the numerical method for solving the computational model (s) + \param rho_W density of water: Mass per unit volume of water (kg/m^3) + \param D diameter of tank: The diameter of the tank (m) + \param T_W temperature of the water: The average kinetic energy of the particles within the water (degreeC) + \param E_W change in heat energy in the water: Change in thermal energy within the water (J) */ void input_constraints(double A_C, double C_W, double h_C, double T_init, double t_final, double L, double T_C, double t_step, double rho_W, double D, double T_W, double E_W); diff --git a/code/stable/nopcm/src/cpp/OutputFormat.hpp b/code/stable/nopcm/src/cpp/OutputFormat.hpp index 66db3e7a39..6fc440cba4 100644 --- a/code/stable/nopcm/src/cpp/OutputFormat.hpp +++ b/code/stable/nopcm/src/cpp/OutputFormat.hpp @@ -14,8 +14,8 @@ using std::ifstream; using std::ofstream; /** \brief Writes the output values to output.txt - \param T_W temperature of the water (degreeC) - \param E_W change in heat energy in the water (J) + \param T_W temperature of the water: The average kinetic energy of the particles within the water (degreeC) + \param E_W change in heat energy in the water: Change in thermal energy within the water (J) */ void write_output(double T_W, double E_W); diff --git a/code/stable/nopcm/src/csharp/InputParameters.cs b/code/stable/nopcm/src/csharp/InputParameters.cs index 9afbf4f5ab..cecc9b26c4 100644 --- a/code/stable/nopcm/src/csharp/InputParameters.cs +++ b/code/stable/nopcm/src/csharp/InputParameters.cs @@ -11,20 +11,20 @@ public class InputParameters { /** \brief Reads input from a file with the given file name \param filename name of the input file - \param A_C heating coil surface area (m^2) - \param C_W specific heat capacity of water (J/(kg degreeC)) - \param h_C convective heat transfer coefficient between coil and water (W/(m^2 degreeC)) - \param T_init initial temperature (degreeC) - \param t_final final time (s) - \param L length of tank (m) - \param T_C temperature of the heating coil (degreeC) - \param t_step time step for simulation (s) - \param rho_W density of water (kg/m^3) - \param D diameter of tank (m) + \param A_C heating coil surface area: Area covered by the outermost layer of the coil (m^2) + \param C_W specific heat capacity of water: The amount of energy required to raise the temperature of a given unit mass of water by a given amount (J/(kg degreeC)) + \param h_C convective heat transfer coefficient between coil and water: The convective heat transfer coefficient that models the thermal flux from the coil to the surrounding water (W/(m^2 degreeC)) + \param T_init initial temperature: The temperature at the beginning of the simulation (degreeC) + \param t_final final time: The amount of time elapsed from the beginning of the simulation to its conclusion (s) + \param L length of tank: The length of the tank (m) + \param T_C temperature of the heating coil: The average kinetic energy of the particles within the coil (degreeC) + \param t_step time step for simulation: The finite discretization of time used in the numerical method for solving the computational model (s) + \param rho_W density of water: Mass per unit volume of water (kg/m^3) + \param D diameter of tank: The diameter of the tank (m) \param A_tol absolute tolerance \param R_tol relative tolerance - \param T_W temperature of the water (degreeC) - \param E_W change in heat energy in the water (J) + \param T_W temperature of the water: The average kinetic energy of the particles within the water (degreeC) + \param E_W change in heat energy in the water: Change in thermal energy within the water (J) */ public static void get_input(string filename, out double A_C, out double C_W, out double h_C, out double T_init, out double t_final, out double L, out double T_C, out double t_step, out double rho_W, out double D, out double A_tol, out double R_tol, out double T_W, out double E_W) { StreamReader infile; @@ -61,18 +61,18 @@ public static void get_input(string filename, out double A_C, out double C_W, ou } /** \brief Verifies that input values satisfy the physical constraints and software constraints - \param A_C heating coil surface area (m^2) - \param C_W specific heat capacity of water (J/(kg degreeC)) - \param h_C convective heat transfer coefficient between coil and water (W/(m^2 degreeC)) - \param T_init initial temperature (degreeC) - \param t_final final time (s) - \param L length of tank (m) - \param T_C temperature of the heating coil (degreeC) - \param t_step time step for simulation (s) - \param rho_W density of water (kg/m^3) - \param D diameter of tank (m) - \param T_W temperature of the water (degreeC) - \param E_W change in heat energy in the water (J) + \param A_C heating coil surface area: Area covered by the outermost layer of the coil (m^2) + \param C_W specific heat capacity of water: The amount of energy required to raise the temperature of a given unit mass of water by a given amount (J/(kg degreeC)) + \param h_C convective heat transfer coefficient between coil and water: The convective heat transfer coefficient that models the thermal flux from the coil to the surrounding water (W/(m^2 degreeC)) + \param T_init initial temperature: The temperature at the beginning of the simulation (degreeC) + \param t_final final time: The amount of time elapsed from the beginning of the simulation to its conclusion (s) + \param L length of tank: The length of the tank (m) + \param T_C temperature of the heating coil: The average kinetic energy of the particles within the coil (degreeC) + \param t_step time step for simulation: The finite discretization of time used in the numerical method for solving the computational model (s) + \param rho_W density of water: Mass per unit volume of water (kg/m^3) + \param D diameter of tank: The diameter of the tank (m) + \param T_W temperature of the water: The average kinetic energy of the particles within the water (degreeC) + \param E_W change in heat energy in the water: Change in thermal energy within the water (J) */ public static void input_constraints(double A_C, double C_W, double h_C, double T_init, double t_final, double L, double T_C, double t_step, double rho_W, double D, double T_W, double E_W) { if (!(A_C <= 100000)) { diff --git a/code/stable/nopcm/src/csharp/OutputFormat.cs b/code/stable/nopcm/src/csharp/OutputFormat.cs index 12afa249da..6ca330b416 100644 --- a/code/stable/nopcm/src/csharp/OutputFormat.cs +++ b/code/stable/nopcm/src/csharp/OutputFormat.cs @@ -10,8 +10,8 @@ public class OutputFormat { /** \brief Writes the output values to output.txt - \param T_W temperature of the water (degreeC) - \param E_W change in heat energy in the water (J) + \param T_W temperature of the water: The average kinetic energy of the particles within the water (degreeC) + \param E_W change in heat energy in the water: Change in thermal energy within the water (J) */ public static void write_output(double T_W, double E_W) { StreamWriter outputfile; diff --git a/code/stable/nopcm/src/java/SWHS/InputParameters.java b/code/stable/nopcm/src/java/SWHS/InputParameters.java index 47cc1db37f..99387f064a 100644 --- a/code/stable/nopcm/src/java/SWHS/InputParameters.java +++ b/code/stable/nopcm/src/java/SWHS/InputParameters.java @@ -17,20 +17,20 @@ public class InputParameters { /** \brief Reads input from a file with the given file name \param filename name of the input file \return array containing the following values: - \return heating coil surface area (m^2) - \return specific heat capacity of water (J/(kg degreeC)) - \return convective heat transfer coefficient between coil and water (W/(m^2 degreeC)) - \return initial temperature (degreeC) - \return final time (s) - \return length of tank (m) - \return temperature of the heating coil (degreeC) - \return time step for simulation (s) - \return density of water (kg/m^3) - \return diameter of tank (m) + \return heating coil surface area: Area covered by the outermost layer of the coil (m^2) + \return specific heat capacity of water: The amount of energy required to raise the temperature of a given unit mass of water by a given amount (J/(kg degreeC)) + \return convective heat transfer coefficient between coil and water: The convective heat transfer coefficient that models the thermal flux from the coil to the surrounding water (W/(m^2 degreeC)) + \return initial temperature: The temperature at the beginning of the simulation (degreeC) + \return final time: The amount of time elapsed from the beginning of the simulation to its conclusion (s) + \return length of tank: The length of the tank (m) + \return temperature of the heating coil: The average kinetic energy of the particles within the coil (degreeC) + \return time step for simulation: The finite discretization of time used in the numerical method for solving the computational model (s) + \return density of water: Mass per unit volume of water (kg/m^3) + \return diameter of tank: The diameter of the tank (m) \return absolute tolerance \return relative tolerance - \return temperature of the water (degreeC) - \return change in heat energy in the water (J) + \return temperature of the water: The average kinetic energy of the particles within the water (degreeC) + \return change in heat energy in the water: Change in thermal energy within the water (J) */ public static Object[] get_input(String filename) throws Exception { double A_C; @@ -99,18 +99,18 @@ public static Object[] get_input(String filename) throws Exception { } /** \brief Verifies that input values satisfy the physical constraints and software constraints - \param A_C heating coil surface area (m^2) - \param C_W specific heat capacity of water (J/(kg degreeC)) - \param h_C convective heat transfer coefficient between coil and water (W/(m^2 degreeC)) - \param T_init initial temperature (degreeC) - \param t_final final time (s) - \param L length of tank (m) - \param T_C temperature of the heating coil (degreeC) - \param t_step time step for simulation (s) - \param rho_W density of water (kg/m^3) - \param D diameter of tank (m) - \param T_W temperature of the water (degreeC) - \param E_W change in heat energy in the water (J) + \param A_C heating coil surface area: Area covered by the outermost layer of the coil (m^2) + \param C_W specific heat capacity of water: The amount of energy required to raise the temperature of a given unit mass of water by a given amount (J/(kg degreeC)) + \param h_C convective heat transfer coefficient between coil and water: The convective heat transfer coefficient that models the thermal flux from the coil to the surrounding water (W/(m^2 degreeC)) + \param T_init initial temperature: The temperature at the beginning of the simulation (degreeC) + \param t_final final time: The amount of time elapsed from the beginning of the simulation to its conclusion (s) + \param L length of tank: The length of the tank (m) + \param T_C temperature of the heating coil: The average kinetic energy of the particles within the coil (degreeC) + \param t_step time step for simulation: The finite discretization of time used in the numerical method for solving the computational model (s) + \param rho_W density of water: Mass per unit volume of water (kg/m^3) + \param D diameter of tank: The diameter of the tank (m) + \param T_W temperature of the water: The average kinetic energy of the particles within the water (degreeC) + \param E_W change in heat energy in the water: Change in thermal energy within the water (J) */ public static void input_constraints(double A_C, double C_W, double h_C, double T_init, double t_final, double L, double T_C, double t_step, double rho_W, double D, double T_W, double E_W) throws Exception { if (!(A_C <= 100000)) { diff --git a/code/stable/nopcm/src/java/SWHS/OutputFormat.java b/code/stable/nopcm/src/java/SWHS/OutputFormat.java index 792f38c448..c4255bf965 100644 --- a/code/stable/nopcm/src/java/SWHS/OutputFormat.java +++ b/code/stable/nopcm/src/java/SWHS/OutputFormat.java @@ -15,8 +15,8 @@ public class OutputFormat { /** \brief Writes the output values to output.txt - \param T_W temperature of the water (degreeC) - \param E_W change in heat energy in the water (J) + \param T_W temperature of the water: The average kinetic energy of the particles within the water (degreeC) + \param E_W change in heat energy in the water: Change in thermal energy within the water (J) */ public static void write_output(double T_W, double E_W) throws Exception { PrintWriter outputfile; diff --git a/code/stable/nopcm/src/python/InputParameters.py b/code/stable/nopcm/src/python/InputParameters.py index 5011fa251c..16f3cbc657 100644 --- a/code/stable/nopcm/src/python/InputParameters.py +++ b/code/stable/nopcm/src/python/InputParameters.py @@ -7,20 +7,20 @@ ## \brief Reads input from a file with the given file name # \param filename name of the input file -# \return heating coil surface area (m^2) -# \return specific heat capacity of water (J/(kg degreeC)) -# \return convective heat transfer coefficient between coil and water (W/(m^2 degreeC)) -# \return initial temperature (degreeC) -# \return final time (s) -# \return length of tank (m) -# \return temperature of the heating coil (degreeC) -# \return time step for simulation (s) -# \return density of water (kg/m^3) -# \return diameter of tank (m) +# \return heating coil surface area: Area covered by the outermost layer of the coil (m^2) +# \return specific heat capacity of water: The amount of energy required to raise the temperature of a given unit mass of water by a given amount (J/(kg degreeC)) +# \return convective heat transfer coefficient between coil and water: The convective heat transfer coefficient that models the thermal flux from the coil to the surrounding water (W/(m^2 degreeC)) +# \return initial temperature: The temperature at the beginning of the simulation (degreeC) +# \return final time: The amount of time elapsed from the beginning of the simulation to its conclusion (s) +# \return length of tank: The length of the tank (m) +# \return temperature of the heating coil: The average kinetic energy of the particles within the coil (degreeC) +# \return time step for simulation: The finite discretization of time used in the numerical method for solving the computational model (s) +# \return density of water: Mass per unit volume of water (kg/m^3) +# \return diameter of tank: The diameter of the tank (m) # \return absolute tolerance # \return relative tolerance -# \return temperature of the water (degreeC) -# \return change in heat energy in the water (J) +# \return temperature of the water: The average kinetic energy of the particles within the water (degreeC) +# \return change in heat energy in the water: Change in thermal energy within the water (J) def get_input(filename): infile = open(filename, "r") infile.readline() @@ -56,18 +56,18 @@ def get_input(filename): return A_C, C_W, h_C, T_init, t_final, L, T_C, t_step, rho_W, D, A_tol, R_tol, T_W, E_W ## \brief Verifies that input values satisfy the physical constraints and software constraints -# \param A_C heating coil surface area (m^2) -# \param C_W specific heat capacity of water (J/(kg degreeC)) -# \param h_C convective heat transfer coefficient between coil and water (W/(m^2 degreeC)) -# \param T_init initial temperature (degreeC) -# \param t_final final time (s) -# \param L length of tank (m) -# \param T_C temperature of the heating coil (degreeC) -# \param t_step time step for simulation (s) -# \param rho_W density of water (kg/m^3) -# \param D diameter of tank (m) -# \param T_W temperature of the water (degreeC) -# \param E_W change in heat energy in the water (J) +# \param A_C heating coil surface area: Area covered by the outermost layer of the coil (m^2) +# \param C_W specific heat capacity of water: The amount of energy required to raise the temperature of a given unit mass of water by a given amount (J/(kg degreeC)) +# \param h_C convective heat transfer coefficient between coil and water: The convective heat transfer coefficient that models the thermal flux from the coil to the surrounding water (W/(m^2 degreeC)) +# \param T_init initial temperature: The temperature at the beginning of the simulation (degreeC) +# \param t_final final time: The amount of time elapsed from the beginning of the simulation to its conclusion (s) +# \param L length of tank: The length of the tank (m) +# \param T_C temperature of the heating coil: The average kinetic energy of the particles within the coil (degreeC) +# \param t_step time step for simulation: The finite discretization of time used in the numerical method for solving the computational model (s) +# \param rho_W density of water: Mass per unit volume of water (kg/m^3) +# \param D diameter of tank: The diameter of the tank (m) +# \param T_W temperature of the water: The average kinetic energy of the particles within the water (degreeC) +# \param E_W change in heat energy in the water: Change in thermal energy within the water (J) def input_constraints(A_C, C_W, h_C, T_init, t_final, L, T_C, t_step, rho_W, D, T_W, E_W): if (not(A_C <= 100000)) : print("Warning: ", end='') diff --git a/code/stable/nopcm/src/python/OutputFormat.py b/code/stable/nopcm/src/python/OutputFormat.py index 0f156646fd..d6a9e09a02 100644 --- a/code/stable/nopcm/src/python/OutputFormat.py +++ b/code/stable/nopcm/src/python/OutputFormat.py @@ -6,8 +6,8 @@ import math ## \brief Writes the output values to output.txt -# \param T_W temperature of the water (degreeC) -# \param E_W change in heat energy in the water (J) +# \param T_W temperature of the water: The average kinetic energy of the particles within the water (degreeC) +# \param E_W change in heat energy in the water: Change in thermal energy within the water (J) def write_output(T_W, E_W): outputfile = open("output.txt", "w") print("T_W = ", end='', file=outputfile) diff --git a/code/stable/projectile/src/cpp/Calculations.hpp b/code/stable/projectile/src/cpp/Calculations.hpp index 674b8b6316..981371c07b 100644 --- a/code/stable/projectile/src/cpp/Calculations.hpp +++ b/code/stable/projectile/src/cpp/Calculations.hpp @@ -15,28 +15,28 @@ using std::ofstream; #include "InputParameters.hpp" -/** \brief Calculates flight duration (s) +/** \brief Calculates flight duration: The time when the projectile lands. (s) \param inParams structure holding the input values - \return flight duration (s) + \return flight duration: The time when the projectile lands. (s) */ double func_t_flight(InputParameters &inParams); -/** \brief Calculates landing position (m) +/** \brief Calculates landing position: The distance from the launcher to the final position of the projectile. (m) \param inParams structure holding the input values - \return landing position (m) + \return landing position: The distance from the launcher to the final position of the projectile. (m) */ double func_p_land(InputParameters &inParams); -/** \brief Calculates distance between the target position and the landing position (m) +/** \brief Calculates distance between the target position and the landing position: The offset between the target position and the landing position. (m) \param inParams structure holding the input values - \param p_land landing position (m) - \return distance between the target position and the landing position (m) + \param p_land landing position: The distance from the launcher to the final position of the projectile. (m) + \return distance between the target position and the landing position: The offset between the target position and the landing position. (m) */ double func_d_offset(InputParameters &inParams, double p_land); /** \brief Calculates output message as a string \param inParams structure holding the input values - \param d_offset distance between the target position and the landing position (m) + \param d_offset distance between the target position and the landing position: The offset between the target position and the landing position. (m) \return output message as a string */ string func_s(InputParameters &inParams, double d_offset); diff --git a/code/stable/projectile/src/cpp/OutputFormat.hpp b/code/stable/projectile/src/cpp/OutputFormat.hpp index a685ff4077..fdfca7f281 100644 --- a/code/stable/projectile/src/cpp/OutputFormat.hpp +++ b/code/stable/projectile/src/cpp/OutputFormat.hpp @@ -15,7 +15,7 @@ using std::ofstream; /** \brief Writes the output values to output.txt \param s output message as a string - \param d_offset distance between the target position and the landing position (m) + \param d_offset distance between the target position and the landing position: The offset between the target position and the landing position. (m) */ void write_output(string s, double d_offset); diff --git a/code/stable/projectile/src/csharp/Calculations.cs b/code/stable/projectile/src/csharp/Calculations.cs index 49b2ea581f..0b90bbe944 100644 --- a/code/stable/projectile/src/csharp/Calculations.cs +++ b/code/stable/projectile/src/csharp/Calculations.cs @@ -9,26 +9,26 @@ public class Calculations { - /** \brief Calculates flight duration (s) + /** \brief Calculates flight duration: The time when the projectile lands. (s) \param inParams structure holding the input values - \return flight duration (s) + \return flight duration: The time when the projectile lands. (s) */ public static double func_t_flight(InputParameters inParams) { return 2 * inParams.v_launch * Math.Sin(inParams.theta) / 9.8; } - /** \brief Calculates landing position (m) + /** \brief Calculates landing position: The distance from the launcher to the final position of the projectile. (m) \param inParams structure holding the input values - \return landing position (m) + \return landing position: The distance from the launcher to the final position of the projectile. (m) */ public static double func_p_land(InputParameters inParams) { return 2 * Math.Pow(inParams.v_launch, 2) * Math.Sin(inParams.theta) * Math.Cos(inParams.theta) / 9.8; } - /** \brief Calculates distance between the target position and the landing position (m) + /** \brief Calculates distance between the target position and the landing position: The offset between the target position and the landing position. (m) \param inParams structure holding the input values - \param p_land landing position (m) - \return distance between the target position and the landing position (m) + \param p_land landing position: The distance from the launcher to the final position of the projectile. (m) + \return distance between the target position and the landing position: The offset between the target position and the landing position. (m) */ public static double func_d_offset(InputParameters inParams, double p_land) { return p_land - inParams.p_target; @@ -36,7 +36,7 @@ public static double func_d_offset(InputParameters inParams, double p_land) { /** \brief Calculates output message as a string \param inParams structure holding the input values - \param d_offset distance between the target position and the landing position (m) + \param d_offset distance between the target position and the landing position: The offset between the target position and the landing position. (m) \return output message as a string */ public static string func_s(InputParameters inParams, double d_offset) { diff --git a/code/stable/projectile/src/csharp/OutputFormat.cs b/code/stable/projectile/src/csharp/OutputFormat.cs index 20e03e51fe..743dc719ac 100644 --- a/code/stable/projectile/src/csharp/OutputFormat.cs +++ b/code/stable/projectile/src/csharp/OutputFormat.cs @@ -11,7 +11,7 @@ public class OutputFormat { /** \brief Writes the output values to output.txt \param s output message as a string - \param d_offset distance between the target position and the landing position (m) + \param d_offset distance between the target position and the landing position: The offset between the target position and the landing position. (m) */ public static void write_output(string s, double d_offset) { StreamWriter outputfile; diff --git a/code/stable/projectile/src/java/Projectile/Calculations.java b/code/stable/projectile/src/java/Projectile/Calculations.java index 092042a210..f7f296e473 100644 --- a/code/stable/projectile/src/java/Projectile/Calculations.java +++ b/code/stable/projectile/src/java/Projectile/Calculations.java @@ -14,26 +14,26 @@ public class Calculations { - /** \brief Calculates flight duration (s) + /** \brief Calculates flight duration: The time when the projectile lands. (s) \param inParams structure holding the input values - \return flight duration (s) + \return flight duration: The time when the projectile lands. (s) */ public static double func_t_flight(InputParameters inParams) throws Exception { return 2 * inParams.v_launch * Math.sin(inParams.theta) / 9.8; } - /** \brief Calculates landing position (m) + /** \brief Calculates landing position: The distance from the launcher to the final position of the projectile. (m) \param inParams structure holding the input values - \return landing position (m) + \return landing position: The distance from the launcher to the final position of the projectile. (m) */ public static double func_p_land(InputParameters inParams) throws Exception { return 2 * Math.pow(inParams.v_launch, 2) * Math.sin(inParams.theta) * Math.cos(inParams.theta) / 9.8; } - /** \brief Calculates distance between the target position and the landing position (m) + /** \brief Calculates distance between the target position and the landing position: The offset between the target position and the landing position. (m) \param inParams structure holding the input values - \param p_land landing position (m) - \return distance between the target position and the landing position (m) + \param p_land landing position: The distance from the launcher to the final position of the projectile. (m) + \return distance between the target position and the landing position: The offset between the target position and the landing position. (m) */ public static double func_d_offset(InputParameters inParams, double p_land) throws Exception { return p_land - inParams.p_target; @@ -41,7 +41,7 @@ public static double func_d_offset(InputParameters inParams, double p_land) thro /** \brief Calculates output message as a string \param inParams structure holding the input values - \param d_offset distance between the target position and the landing position (m) + \param d_offset distance between the target position and the landing position: The offset between the target position and the landing position. (m) \return output message as a string */ public static String func_s(InputParameters inParams, double d_offset) throws Exception { diff --git a/code/stable/projectile/src/java/Projectile/OutputFormat.java b/code/stable/projectile/src/java/Projectile/OutputFormat.java index bc8b5594f6..0b3b8908c9 100644 --- a/code/stable/projectile/src/java/Projectile/OutputFormat.java +++ b/code/stable/projectile/src/java/Projectile/OutputFormat.java @@ -16,7 +16,7 @@ public class OutputFormat { /** \brief Writes the output values to output.txt \param s output message as a string - \param d_offset distance between the target position and the landing position (m) + \param d_offset distance between the target position and the landing position: The offset between the target position and the landing position. (m) */ public static void write_output(String s, double d_offset) throws Exception { PrintWriter outputfile; diff --git a/code/stable/projectile/src/python/Calculations.py b/code/stable/projectile/src/python/Calculations.py index 1579336bde..3cbfecf6e0 100644 --- a/code/stable/projectile/src/python/Calculations.py +++ b/code/stable/projectile/src/python/Calculations.py @@ -7,28 +7,28 @@ import InputParameters -## \brief Calculates flight duration (s) +## \brief Calculates flight duration: The time when the projectile lands. (s) # \param inParams structure holding the input values -# \return flight duration (s) +# \return flight duration: The time when the projectile lands. (s) def func_t_flight(inParams): return 2 * inParams.v_launch * math.sin(inParams.theta) / 9.8 -## \brief Calculates landing position (m) +## \brief Calculates landing position: The distance from the launcher to the final position of the projectile. (m) # \param inParams structure holding the input values -# \return landing position (m) +# \return landing position: The distance from the launcher to the final position of the projectile. (m) def func_p_land(inParams): return 2 * inParams.v_launch ** 2 * math.sin(inParams.theta) * math.cos(inParams.theta) / 9.8 -## \brief Calculates distance between the target position and the landing position (m) +## \brief Calculates distance between the target position and the landing position: The offset between the target position and the landing position. (m) # \param inParams structure holding the input values -# \param p_land landing position (m) -# \return distance between the target position and the landing position (m) +# \param p_land landing position: The distance from the launcher to the final position of the projectile. (m) +# \return distance between the target position and the landing position: The offset between the target position and the landing position. (m) def func_d_offset(inParams, p_land): return p_land - inParams.p_target ## \brief Calculates output message as a string # \param inParams structure holding the input values -# \param d_offset distance between the target position and the landing position (m) +# \param d_offset distance between the target position and the landing position: The offset between the target position and the landing position. (m) # \return output message as a string def func_s(inParams, d_offset): if (math.fabs(d_offset / inParams.p_target) < 2.0e-2) : diff --git a/code/stable/projectile/src/python/OutputFormat.py b/code/stable/projectile/src/python/OutputFormat.py index 80a882f36a..318c93903e 100644 --- a/code/stable/projectile/src/python/OutputFormat.py +++ b/code/stable/projectile/src/python/OutputFormat.py @@ -7,7 +7,7 @@ ## \brief Writes the output values to output.txt # \param s output message as a string -# \param d_offset distance between the target position and the landing position (m) +# \param d_offset distance between the target position and the landing position: The offset between the target position and the landing position. (m) def write_output(s, d_offset): outputfile = open("output.txt", "w") print("s = ", end='', file=outputfile) From d9e1f1da5bcdd8443e92a06d0c9d22c44471454d Mon Sep 17 00:00:00 2001 From: Brooks MacLachlan Date: Wed, 14 Aug 2019 13:00:25 -0400 Subject: [PATCH 6/6] Used previous terms for capacity, load, demand --- code/drasil-example/Drasil/GlassBR/Unitals.hs | 6 ++-- code/stable/glassbr/SRS/GlassBR_SRS.tex | 28 ++++++++-------- code/stable/glassbr/Website/GlassBR_SRS.html | 32 ++++++++++--------- code/stable/glassbr/src/cpp/Calculations.hpp | 8 ++--- .../stable/glassbr/src/csharp/Calculations.cs | 8 ++--- .../src/java/GlassBR/Calculations.java | 8 ++--- .../stable/glassbr/src/python/Calculations.py | 8 ++--- 7 files changed, 50 insertions(+), 48 deletions(-) diff --git a/code/drasil-example/Drasil/GlassBR/Unitals.hs b/code/drasil-example/Drasil/GlassBR/Unitals.hs index 66712bc793..c3ab53c776 100644 --- a/code/drasil-example/Drasil/GlassBR/Unitals.hs +++ b/code/drasil-example/Drasil/GlassBR/Unitals.hs @@ -306,9 +306,9 @@ blastTy = dcc "blastTy" (nounPhraseSP "blast type") "equivalent factor, and stand off distance from the point of explosion.") bomb = dcc "bomb" (nounPhraseSP "bomb") ("a container filled " ++ "with a destructive substance designed to exlode on impact or via detonation") -capacity = dcc "capacity" (nounPhraseSP "capacity") +capacity = dcc "capacity" (nounPhraseSP "capacity or load resistance") "load resistance calculated" -demandq = dcc "demandq" (nounPhraseSP "demand") +demandq = dcc "demandq" (nounPhraseSP "applied load (demand)") "3 second duration equivalent pressure" eqTNTChar = dcc "eqTNTChar" (nounPhraseSP "equivalent TNT charge mass") ("Mass of TNT placed on the ground in a hemisphere that represents the " ++ @@ -344,7 +344,7 @@ lateral = dcc "lateral" (nounPhraseSP "lateral") lite = dcc "lite" (cn' "lite") ("Pieces of glass that are cut, prepared, and used to create the window " ++ "or door.") -load = dcc "load" (nounPhraseSP "load") +load = dcc "load" (nounPhraseSP "applied load (demand) or pressure") "A uniformly distributed lateral pressure." loadResis = cc' lResistance (foldlSent [S "The uniform lateral load that a glass construction can sustain", diff --git a/code/stable/glassbr/SRS/GlassBR_SRS.tex b/code/stable/glassbr/SRS/GlassBR_SRS.tex index cce9d02e83..56439b763f 100644 --- a/code/stable/glassbr/SRS/GlassBR_SRS.tex +++ b/code/stable/glassbr/SRS/GlassBR_SRS.tex @@ -75,7 +75,7 @@ \subsection{Table of Symbols} \\ $b$ & Plate width (short dimension) & m \\ -$capacity$ & Capacity & Pa +$capacity$ & Capacity or load resistance & Pa \\ ${d_{\text{max}}}$ & Maximum value for one of the dimensions of the glass plate & m \\ @@ -109,7 +109,7 @@ \subsection{Table of Symbols} \\ $LDF$ & Load duration factor & -- \\ -$Load$ & Load & Pa +$Load$ & Applied load (demand) or pressure & Pa \\ $LR$ & Load resistance & Pa \\ @@ -127,7 +127,7 @@ \subsection{Table of Symbols} \\ ${P_{\text{f}\text{tol}}}$ & Tolerable probability of failure & -- \\ -$q$ & Demand & Pa +$q$ & Applied load (demand) & Pa \\ $\hat{q}$ & Dimensionless load & -- \\ @@ -326,7 +326,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 \cite{astm2012}.} \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 \cite{astm2012}.} \end{itemize} -\item{Load - A uniformly distributed lateral pressure.} +\item{Applied load (demand) or pressure - 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 \cite[(pp. 1 and 53)]{astm2009}.} \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.} @@ -434,11 +434,11 @@ \subsubsection{Theoretical Models} \\ \midrule \\ Description & \begin{symbDescription} \item{$is-safeLoad$ is the variable that is assigned true when load resistance (capacity) is greater than applied load (demand) (Unitless)} - \item{$capacity$ is the capacity (Pa)} - \item{$Load$ is the load (Pa)} + \item{$capacity$ is the capacity or load resistance (Pa)} + \item{$Load$ is the applied load (demand) or pressure (Pa)} \end{symbDescription} \\ \midrule \\ -Notes & If $is-safeLoad$, the glass is considered safe. $is-safeProb$ (from \hyperref[TM:isSafeProb]{TM: isSafeProb}) and $is-safeLoad$ are either both True or both False. LR is the load resistance (also called capacity), $Load$ (also referred as the Demand) is the 3 second duration equivalent pressure. +Notes & If $is-safeLoad$, the glass is considered safe. $is-safeProb$ (from \hyperref[TM:isSafeProb]{TM: isSafeProb}) and $is-safeLoad$ are either both True or both False. LR is the load resistance (also called capacity), $Load$ (also referred as the Applied Load (demand)) is the 3 second duration equivalent pressure. \\ \midrule \\ Source & \cite{astm2009} @@ -761,7 +761,7 @@ \subsubsection{Data Definitions} \\ \midrule \\ Description & \begin{symbDescription} \item{$\hat{q}$ is the dimensionless load (Unitless)} - \item{$q$ is the demand (Pa)} + \item{$q$ is the applied load (demand) (Pa)} \item{$a$ is the plate length (long dimension) (m)} \item{$b$ is the plate width (short dimension) (m)} \item{$E$ is the modulus of elasticity of glass (Pa)} @@ -1090,7 +1090,7 @@ \subsubsection{Data Definitions} \phantomsection \label{DD:calofDemand} \\ \midrule \\ -Label & Demand +Label & Applied load (demand) \\ \midrule \\ Symbol & $q$ @@ -1104,13 +1104,13 @@ \subsubsection{Data Definitions} \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} - \item{$q$ is the demand (Pa)} + \item{$q$ is the applied load (demand) (Pa)} \item{$interpY$ is the interpY (Unitless)} \item{$SD$ is the stand off distance (m)} \item{${w_{TNT}}$ is the equivalent TNT charge mass (kg)} \end{symbDescription} \\ \midrule \\ -Notes & $q$, or demand, is the 3 second duration equivalent pressure obtained from \hyperref[Figure:demandVSsod]{Fig:demandVSsod} by interpolation using stand off distance ($SD$) and ${w_{TNT}}$ as parameters. ${w_{TNT}}$ is defined in \hyperref[DD:eqTNTW]{DD: eqTNTW}. $SD$ is the stand off distance as defined in \hyperref[DD:standOffDist]{DD: standOffDist}. +Notes & $q$, or applied load (demand), is the 3 second duration equivalent pressure obtained from \hyperref[Figure:demandVSsod]{Fig:demandVSsod} by interpolation using stand off distance ($SD$) and ${w_{TNT}}$ as parameters. ${w_{TNT}}$ is defined in \hyperref[DD:eqTNTW]{DD: eqTNTW}. $SD$ is the stand off distance as defined in \hyperref[DD:standOffDist]{DD: standOffDist}. \\ \midrule \\ Source & \cite{astm2009} @@ -1208,10 +1208,10 @@ \subsubsection{Instance Models} Description & \begin{symbDescription} \item{$is-safeLR$ is the variable that is assigned true when load resistance (capacity) is greater than load (demand) (Unitless)} \item{$LR$ is the load resistance (Pa)} - \item{$q$ is the demand (Pa)} + \item{$q$ is the applied load (demand) (Pa)} \end{symbDescription} \\ \midrule \\ -Notes & If $is-safeLR$, the glass is considered safe. $is-safePb$ (from \hyperref[IM:isSafePb]{IM: isSafePb}) and $is-safeLR$ are either both True or both False. LR is the load resistance (also called capacity), as defined in \hyperref[DD:calofCapacity]{DD: calofCapacity}. $q$ (also referred as the Demand) is the 3 second duration equivalent pressure, as defined in \hyperref[DD:calofDemand]{DD: calofDemand}. +Notes & If $is-safeLR$, the glass is considered safe. $is-safePb$ (from \hyperref[IM:isSafePb]{IM: isSafePb}) and $is-safeLR$ are either both True or both False. LR is the load resistance (also called capacity), as defined in \hyperref[DD:calofCapacity]{DD: calofCapacity}. $q$ (also referred as the Applied Load (demand)) is the 3 second duration equivalent pressure, as defined in \hyperref[DD:calofDemand]{DD: calofDemand}. \\ \midrule \\ Source & \cite{astm2009} @@ -1699,7 +1699,7 @@ \section{Appendix} \begin{figure} \begin{center} \includegraphics[width=\textwidth]{../../../datafiles/GlassBR/ASTM_F2248-09_BeasonEtAl.png} -\caption{Non dimensional lateral load ($\hat{q}$) versus Aspect Ratio (AR) versus Stress distribution factor (Function) ($J$)} +\caption{Non dimensional lateral applied load (demand) or pressure ($\hat{q}$) versus Aspect Ratio (AR) versus Stress distribution factor (Function) ($J$)} \label{Figure:dimlessloadVSaspect} \end{center} \end{figure} diff --git a/code/stable/glassbr/Website/GlassBR_SRS.html b/code/stable/glassbr/Website/GlassBR_SRS.html index 9f23430d36..33d02b52a5 100644 --- a/code/stable/glassbr/Website/GlassBR_SRS.html +++ b/code/stable/glassbr/Website/GlassBR_SRS.html @@ -101,7 +101,7 @@

      Table of Symbols

      capacity - Capacity + Capacity or load resistance Pa @@ -194,7 +194,7 @@

      Table of Symbols

      Load - Load + Applied load (demand) or pressure Pa @@ -239,7 +239,7 @@

      Table of Symbols

      q - Demand + Applied load (demand) Pa @@ -624,7 +624,7 @@

      Terminology and Definitions

  • - Load - A uniformly distributed lateral pressure. + Applied load (demand) or pressure - A uniformly distributed lateral pressure.
    • 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 astm2009 (pp. 1 and 53). @@ -842,8 +842,10 @@

      Theoretical Models

    • is-safeLoad is the variable that is assigned true when load resistance (capacity) is greater than applied load (demand) (Unitless)
      • -
    • capacity is the capacity (Pa)
      • -
    • Load is the load (Pa)
      • +
    • capacity is the capacity or load resistance (Pa)
      • +
    • + Load is the applied load (demand) or pressure (Pa) +
    @@ -851,7 +853,7 @@

    Theoretical Models

    Notes

    - If is-safeLoad, the glass is considered safe. is-safeProb (from TM: isSafeProb) and is-safeLoad are either both True or both False. LR is the load resistance (also called capacity), Load (also referred as the Demand) is the 3 second duration equivalent pressure. + If is-safeLoad, the glass is considered safe. is-safeProb (from TM: isSafeProb) and is-safeLoad are either both True or both False. LR is the load resistance (also called capacity), Load (also referred as the Applied Load (demand)) is the 3 second duration equivalent pressure.

    @@ -1378,7 +1380,7 @@

    Data Definitions

    • q̂ is the dimensionless load (Unitless)
      • -
    • q is the demand (Pa)
      • +
    • q is the applied load (demand) (Pa)
    • a is the plate length (long dimension) (m)
    • b is the plate width (short dimension) (m)
    • E is the modulus of elasticity of glass (Pa)
      • @@ -1887,7 +1889,7 @@

      Data Definitions

      Label -

      Demand

      +

      Applied load (demand)

      Symbol @@ -1909,7 +1911,7 @@

      Data Definitions

      Description
        -
      • q is the demand (Pa)
        • +
      • q is the applied load (demand) (Pa)
      • interpY is the interpY (Unitless)
      • SD is the stand off distance (m)
      • @@ -1922,7 +1924,7 @@

        Data Definitions

        Notes

        - q, or demand, is the 3 second duration equivalent pressure obtained from Fig:demandVSsod by interpolation using stand off distance (SD) and wTNT as parameters. wTNT is defined in DD: eqTNTW. SD is the stand off distance as defined in DD: standOffDist. + q, or applied load (demand), is the 3 second duration equivalent pressure obtained from Fig:demandVSsod by interpolation using stand off distance (SD) and wTNT as parameters. wTNT is defined in DD: eqTNTW. SD is the stand off distance as defined in DD: standOffDist.

        @@ -2082,7 +2084,7 @@

        Instance Models

        is-safeLR is the variable that is assigned true when load resistance (capacity) is greater than load (demand) (Unitless)
      • LR is the load resistance (Pa)
        • -
      • q is the demand (Pa)
        • +
      • q is the applied load (demand) (Pa)
      @@ -2090,7 +2092,7 @@

      Instance Models

      Notes

      - If is-safeLR, the glass is considered safe. is-safePb (from IM: isSafePb) and is-safeLR are either both True or both False. LR is the load resistance (also called capacity), as defined in DD: calofCapacity. q (also referred as the Demand) is the 3 second duration equivalent pressure, as defined in DD: calofDemand. + If is-safeLR, the glass is considered safe. is-safePb (from IM: isSafePb) and is-safeLR are either both True or both False. LR is the load resistance (also called capacity), as defined in DD: calofCapacity. q (also referred as the Applied Load (demand)) is the 3 second duration equivalent pressure, as defined in DD: calofDemand.

      @@ -4134,9 +4136,9 @@

      Appendix

      - Non dimensional lateral load (<em>q̂</em>) versus Aspect Ratio (AR) versus Stress distribution factor (Function) (<em>J</em>) + Non dimensional lateral applied load (demand) or pressure (<em>q̂</em>) versus Aspect Ratio (AR) versus Stress distribution factor (Function) (<em>J</em>)
      - Non dimensional lateral load (q̂) versus Aspect Ratio (AR) versus Stress distribution factor (Function) (J) + Non dimensional lateral applied load (demand) or pressure (q̂) versus Aspect Ratio (AR) versus Stress distribution factor (Function) (J)
      diff --git a/code/stable/glassbr/src/cpp/Calculations.hpp b/code/stable/glassbr/src/cpp/Calculations.hpp index 83e7a23d98..b26e6d85ef 100644 --- a/code/stable/glassbr/src/cpp/Calculations.hpp +++ b/code/stable/glassbr/src/cpp/Calculations.hpp @@ -22,15 +22,15 @@ using std::ofstream; */ double func_J_tol(InputParameters &inParams); -/** \brief Calculates demand: 3 second duration equivalent pressure (Pa) +/** \brief Calculates applied load (demand): 3 second duration equivalent pressure (Pa) \param inParams structure holding the input values - \return demand: 3 second duration equivalent pressure (Pa) + \return applied load (demand): 3 second duration equivalent pressure (Pa) */ double func_q(InputParameters &inParams); /** \brief Calculates dimensionless load \param inParams structure holding the input values - \param q demand: 3 second duration equivalent pressure (Pa) + \param q applied load (demand): 3 second duration equivalent pressure (Pa) \return dimensionless load */ double func_q_hat(InputParameters &inParams, double q); @@ -72,7 +72,7 @@ double func_LR(InputParameters &inParams, double NFL); /** \brief Calculates variable that is assigned true when load resistance (capacity) is greater than load (demand) \param LR load resistance: The uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in (pp. 1 and 53) Ref: astm2009. (Pa) - \param q demand: 3 second duration equivalent pressure (Pa) + \param q applied load (demand): 3 second duration equivalent pressure (Pa) \return variable that is assigned true when load resistance (capacity) is greater than load (demand) */ bool func_is_safeLR(double LR, double q); diff --git a/code/stable/glassbr/src/csharp/Calculations.cs b/code/stable/glassbr/src/csharp/Calculations.cs index f41cd3f1a3..4141c3be9e 100644 --- a/code/stable/glassbr/src/csharp/Calculations.cs +++ b/code/stable/glassbr/src/csharp/Calculations.cs @@ -25,9 +25,9 @@ public static double func_J_tol(InputParameters inParams) { return Math.Log(Math.Log(1 / (1 - inParams.P_btol)) * (Math.Pow(inParams.a * inParams.b, 7.0 - 1) / (2.86e-53 * Math.Pow(7.17e10 * Math.Pow(inParams.h, 2), 7.0) * inParams.LDF))); } - /** \brief Calculates demand: 3 second duration equivalent pressure (Pa) + /** \brief Calculates applied load (demand): 3 second duration equivalent pressure (Pa) \param inParams structure holding the input values - \return demand: 3 second duration equivalent pressure (Pa) + \return applied load (demand): 3 second duration equivalent pressure (Pa) */ public static double func_q(InputParameters inParams) { StreamWriter outfile; @@ -43,7 +43,7 @@ public static double func_q(InputParameters inParams) { /** \brief Calculates dimensionless load \param inParams structure holding the input values - \param q demand: 3 second duration equivalent pressure (Pa) + \param q applied load (demand): 3 second duration equivalent pressure (Pa) \return dimensionless load */ public static double func_q_hat(InputParameters inParams, double q) { @@ -163,7 +163,7 @@ public static double func_LR(InputParameters inParams, double NFL) { /** \brief Calculates variable that is assigned true when load resistance (capacity) is greater than load (demand) \param LR load resistance: The uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in (pp. 1 and 53) Ref: astm2009. (Pa) - \param q demand: 3 second duration equivalent pressure (Pa) + \param q applied load (demand): 3 second duration equivalent pressure (Pa) \return variable that is assigned true when load resistance (capacity) is greater than load (demand) */ public static Boolean func_is_safeLR(double LR, double q) { diff --git a/code/stable/glassbr/src/java/GlassBR/Calculations.java b/code/stable/glassbr/src/java/GlassBR/Calculations.java index a31d5f4e9a..83116b901e 100644 --- a/code/stable/glassbr/src/java/GlassBR/Calculations.java +++ b/code/stable/glassbr/src/java/GlassBR/Calculations.java @@ -30,9 +30,9 @@ public static double func_J_tol(InputParameters inParams) throws Exception { return Math.log(Math.log(1 / (1 - inParams.P_btol)) * (Math.pow(inParams.a * inParams.b, 7.0 - 1) / (2.86e-53 * Math.pow(7.17e10 * Math.pow(inParams.h, 2), 7.0) * inParams.LDF))); } - /** \brief Calculates demand: 3 second duration equivalent pressure (Pa) + /** \brief Calculates applied load (demand): 3 second duration equivalent pressure (Pa) \param inParams structure holding the input values - \return demand: 3 second duration equivalent pressure (Pa) + \return applied load (demand): 3 second duration equivalent pressure (Pa) */ public static double func_q(InputParameters inParams) throws Exception { PrintWriter outfile; @@ -48,7 +48,7 @@ public static double func_q(InputParameters inParams) throws Exception { /** \brief Calculates dimensionless load \param inParams structure holding the input values - \param q demand: 3 second duration equivalent pressure (Pa) + \param q applied load (demand): 3 second duration equivalent pressure (Pa) \return dimensionless load */ public static double func_q_hat(InputParameters inParams, double q) throws Exception { @@ -168,7 +168,7 @@ public static double func_LR(InputParameters inParams, double NFL) throws Except /** \brief Calculates variable that is assigned true when load resistance (capacity) is greater than load (demand) \param LR load resistance: The uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in (pp. 1 and 53) Ref: astm2009. (Pa) - \param q demand: 3 second duration equivalent pressure (Pa) + \param q applied load (demand): 3 second duration equivalent pressure (Pa) \return variable that is assigned true when load resistance (capacity) is greater than load (demand) */ public static Boolean func_is_safeLR(double LR, double q) throws Exception { diff --git a/code/stable/glassbr/src/python/Calculations.py b/code/stable/glassbr/src/python/Calculations.py index 1c101835f6..90fdd35bdd 100644 --- a/code/stable/glassbr/src/python/Calculations.py +++ b/code/stable/glassbr/src/python/Calculations.py @@ -21,9 +21,9 @@ def func_J_tol(inParams): return math.log(math.log(1 / (1 - inParams.P_btol)) * ((inParams.a * inParams.b) ** (7.0 - 1) / (2.86e-53 * (7.17e10 * inParams.h ** 2) ** 7.0 * inParams.LDF))) -## \brief Calculates demand: 3 second duration equivalent pressure (Pa) +## \brief Calculates applied load (demand): 3 second duration equivalent pressure (Pa) # \param inParams structure holding the input values -# \return demand: 3 second duration equivalent pressure (Pa) +# \return applied load (demand): 3 second duration equivalent pressure (Pa) def func_q(inParams): outfile = open("log.txt", "a") print("function func_q called with inputs: {", file=outfile) @@ -36,7 +36,7 @@ def func_q(inParams): ## \brief Calculates dimensionless load # \param inParams structure holding the input values -# \param q demand: 3 second duration equivalent pressure (Pa) +# \param q applied load (demand): 3 second duration equivalent pressure (Pa) # \return dimensionless load def func_q_hat(inParams, q): outfile = open("log.txt", "a") @@ -138,7 +138,7 @@ def func_LR(inParams, NFL): ## \brief Calculates variable that is assigned true when load resistance (capacity) is greater than load (demand) # \param LR load resistance: The uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in (pp. 1 and 53) Ref: astm2009. (Pa) -# \param q demand: 3 second duration equivalent pressure (Pa) +# \param q applied load (demand): 3 second duration equivalent pressure (Pa) # \return variable that is assigned true when load resistance (capacity) is greater than load (demand) def func_is_safeLR(LR, q): outfile = open("log.txt", "a")