From df9f936977d0fdd8f4bdacfc62bc3e2a705dada7 Mon Sep 17 00:00:00 2001 From: Sam Crawford <35857611+samm82@users.noreply.github.com> Date: Mon, 23 Jul 2018 14:49:07 -0400 Subject: [PATCH] Sorting in GlassBR (#899) * Sorted Table of Aux Constants in Glass and SWHS as per #886 * Moved compareBySymbol to docLang to be reused; sorted Input Data Constraints - closes #864 * Moved sortBy in GlassBR to sortBySymbol in Misc to be used in docLang for all examples --- code/drasil-code/drasil-code.cabal | 2 +- code/drasil-data/drasil-data.cabal | 2 +- code/drasil-docLang/Drasil/DocLang.hs | 20 +- .../drasil-docLang/Drasil/DocumentLanguage.hs | 5 +- .../Drasil/Sections/SolutionCharacterSpec.hs | 4 +- .../Sections/SpecificSystemDescription.hs | 12 +- code/drasil-docLang/drasil-docLang.cabal | 2 +- code/drasil-example/Drasil/GlassBR/Body.hs | 4 +- code/drasil-example/drasil-example.cabal | 12 +- code/drasil-gen/drasil-gen.cabal | 2 +- code/drasil-lang/Language/Drasil.hs | 2 +- code/drasil-lang/Language/Drasil/Misc.hs | 13 +- code/drasil-lang/drasil-lang.cabal | 2 +- code/drasil-printers/drasil-printers.cabal | 2 +- code/stable/gamephys/SRS/Chipmunk_SRS.tex | 20 +- .../stable/gamephys/Website/Chipmunk_SRS.html | 72 ++--- code/stable/glassbr/SRS/GlassBR_SRS.tex | 30 +- code/stable/glassbr/Website/GlassBR_SRS.html | 132 ++++----- code/stable/nopcm/SRS/NoPCM_SRS.tex | 16 +- code/stable/nopcm/Website/NoPCM_SRS.html | 64 ++-- code/stable/ssp/SRS/SSP_SRS.tex | 14 +- code/stable/ssp/Website/SSP_SRS.html | 40 +-- code/stable/swhs/SRS/SWHS_SRS.tex | 68 ++--- code/stable/swhs/Website/SWHS_SRS.html | 280 +++++++++--------- 24 files changed, 417 insertions(+), 403 deletions(-) diff --git a/code/drasil-code/drasil-code.cabal b/code/drasil-code/drasil-code.cabal index 4a09eec9b3..c30aeb5d45 100644 --- a/code/drasil-code/drasil-code.cabal +++ b/code/drasil-code/drasil-code.cabal @@ -37,7 +37,7 @@ library split >= 0.2.3.1, MissingH >= 1.4.0.1, parsec >= 3.1.9, - drasil-lang >= 0.1.5 + drasil-lang >= 0.1.6 default-language: Haskell2010 ghc-options: -Wall -O2 diff --git a/code/drasil-data/drasil-data.cabal b/code/drasil-data/drasil-data.cabal index e4e94abb6f..df960c19b1 100644 --- a/code/drasil-data/drasil-data.cabal +++ b/code/drasil-data/drasil-data.cabal @@ -45,7 +45,7 @@ library MissingH >= 1.4.0.1, parsec >= 3.1.9, data-fix (>= 0.0.4 && <= 1.0), - drasil-lang >= 0.1.5 + drasil-lang >= 0.1.6 default-language: Haskell2010 ghc-options: -Wall diff --git a/code/drasil-docLang/Drasil/DocLang.hs b/code/drasil-docLang/Drasil/DocLang.hs index a9a477f0cd..3465a179fa 100644 --- a/code/drasil-docLang/Drasil/DocLang.hs +++ b/code/drasil-docLang/Drasil/DocLang.hs @@ -8,8 +8,8 @@ module Drasil.DocLang ( SCSSub(..), SSDSec(..), SSDSub(..), SolChSpec(..), ExistingSolnSec(..), StkhldrSec(StkhldrProg2), StkhldrSub(Client, Cstmr), TConvention(..), TraceabilitySec(TraceabilityProg), - TSIntro(..), UCsSec(..), mkDoc, mkLklyChnk, mkRequirement, mkUnLklyChnk, - tsymb, tsymb'', + TSIntro(..), UCsSec(..), mkDoc, mkLklyChnk, mkRequirement, + mkUnLklyChnk, tsymb, tsymb'', -- DocumentLanguage.Definitions Field(..), Fields, InclUnits(IncludeUnits), Verbosity(Verbose), -- DocumentLanguage.RefHelpers @@ -40,14 +40,14 @@ module Drasil.DocLang ( ) where import Drasil.DocumentLanguage (AppndxSec(..), AuxConstntSec(..), - DerivationDisplay(..), DocDesc, DocSection(..), Emphasis(..), GSDSec(GSDProg2), - GSDSub(UsrChars, SystCons, SysCntxt), IntroSec(..), IntroSub(..), LCsSec(..), LFunc(..), - Literature(Doc', Lit, Manual), ProblemDescription(..), RefSec(..), RefTab(..), - ReqrmntSec(..), ReqsSub(FReqsSub, NonFReqsSub), ScpOfProjSec(ScpOfProjProg), - SCSSub(..), SSDSec(..), SSDSub(..), SolChSpec(..), StkhldrSec(StkhldrProg2), - StkhldrSub(Client, Cstmr), TConvention(..), TraceabilitySec(TraceabilityProg), - TSIntro(..), UCsSec(..), mkDoc, mkLklyChnk, mkRequirement, mkUnLklyChnk, - tsymb, tsymb'', ExistingSolnSec(..)) + DerivationDisplay(..), DocDesc, DocSection(..), Emphasis(..), ExistingSolnSec(..), + GSDSec(GSDProg2), GSDSub(UsrChars, SystCons, SysCntxt), IntroSec(..), IntroSub(..), + LCsSec(..), LFunc(..), Literature(Doc', Lit, Manual), ProblemDescription(..), + RefSec(..), RefTab(..), ReqrmntSec(..), ReqsSub(FReqsSub, NonFReqsSub), + ScpOfProjSec(ScpOfProjProg), SCSSub(..), SSDSec(..), SSDSub(..), SolChSpec(..), + StkhldrSec(StkhldrProg2), StkhldrSub(Client, Cstmr), TConvention(..), + TraceabilitySec(TraceabilityProg), TSIntro(..), UCsSec(..), mkDoc, + mkLklyChnk, mkRequirement, mkUnLklyChnk, tsymb, tsymb'') import Drasil.DocumentLanguage.Definitions (Field(..), Fields, InclUnits(IncludeUnits), Verbosity(Verbose)) import Drasil.DocumentLanguage.RefHelpers (ModelDB, cite, ddRefDB, mdb, refA, diff --git a/code/drasil-docLang/Drasil/DocumentLanguage.hs b/code/drasil-docLang/Drasil/DocumentLanguage.hs index 483c546434..04f49e0353 100644 --- a/code/drasil-docLang/Drasil/DocumentLanguage.hs +++ b/code/drasil-docLang/Drasil/DocumentLanguage.hs @@ -40,6 +40,7 @@ import Data.Drasil.Concepts.Documentation (refmat) import Data.Function (on) import Data.List (nub, sortBy) +import Data.Ord (comparing) type System = Sentence type DocKind = Sentence @@ -254,7 +255,7 @@ mkSections si l = map doit l doit (IntroSec is) = mkIntroSec si is doit (StkhldrSec sts) = mkStkhldrSec sts doit (SSDSec ss) = mkSSDSec si ss - doit (AuxConstntSec acs) = mkAuxConsSec acs + doit (AuxConstntSec acs) = mkAuxConsSec acs doit Bibliography = mkBib (citeDB si) doit (GSDSec gs') = mkGSDSec gs' doit (ScpOfProjSec sop) = mkScpOfProjSec sop @@ -533,7 +534,7 @@ mkExistingSolnSec (ExistSolnProg cs) = SRS.offShelfSol cs [] -- | Helper for making the 'Values of Auxiliary Constants' section mkAuxConsSec :: AuxConstntSec -> Section mkAuxConsSec (AuxConsVerb s) = s -mkAuxConsSec (AuxConsProg key listOfCons) = AC.valsOfAuxConstantsF key listOfCons +mkAuxConsSec (AuxConsProg key listOfCons) = AC.valsOfAuxConstantsF key $ sortBySymbol listOfCons {--} diff --git a/code/drasil-docLang/Drasil/Sections/SolutionCharacterSpec.hs b/code/drasil-docLang/Drasil/Sections/SolutionCharacterSpec.hs index de0e7c6da6..71f239b1f3 100644 --- a/code/drasil-docLang/Drasil/Sections/SolutionCharacterSpec.hs +++ b/code/drasil-docLang/Drasil/Sections/SolutionCharacterSpec.hs @@ -26,10 +26,10 @@ import Data.Drasil.SentenceStructures (ofThe, foldlSP, foldlSent, foldlList, sAn import qualified Data.Drasil.Concepts.Documentation as Doc import Data.List (find) import Control.Lens ((^.)) -import Drasil.Sections.SpecificSystemDescription (inDataConstTbl, outDataConstTbl, - listofTablesToRefs) import Drasil.Sections.GeneralSystDesc(genSysIntro) +import Drasil.Sections.SpecificSystemDescription (inDataConstTbl, outDataConstTbl, + listofTablesToRefs) import qualified Drasil.DocLang.SRS as SRS diff --git a/code/drasil-docLang/Drasil/Sections/SpecificSystemDescription.hs b/code/drasil-docLang/Drasil/Sections/SpecificSystemDescription.hs index 9a36488a75..604842c254 100644 --- a/code/drasil-docLang/Drasil/Sections/SpecificSystemDescription.hs +++ b/code/drasil-docLang/Drasil/Sections/SpecificSystemDescription.hs @@ -27,6 +27,8 @@ import Data.Drasil.Concepts.Software (program) import Data.Drasil.Utils (foldle, fmtU, getRVal) import Data.Drasil.SentenceStructures (fmtPhys, fmtSfwr, mkTableFromColumns, foldlSent, foldlSP, typUncr, ofThe, foldlList) +import Data.List (sortBy) + import qualified Drasil.DocLang.SRS as SRS @@ -208,11 +210,11 @@ dataConstraintUncertainty = foldlSent [S "The", phrase uncertainty, phrase colum inDataConstTbl :: (UncertainQuantity c, Constrained c, HasReasVal c) => [c] -> Contents inDataConstTbl qlst = Table titl cts (S "Input Data Constraints") True "InDataConstraints" where - columns = [(S "Var", map ch qlst), - (titleize' physicalConstraint, map fmtPhys qlst), - (titleize' softwareConstraint, map fmtSfwr qlst), - (S "Typical Value", map (\q -> fmtU (E $ getRVal q) q) qlst), - (short typUnc, map typUncr qlst)] + columns = [(S "Var", map ch $ sortBySymbol qlst), + (titleize' physicalConstraint, map fmtPhys $ sortBySymbol qlst), + (titleize' softwareConstraint, map fmtSfwr $ sortBySymbol qlst), + (S "Typical Value", map (\q -> fmtU (E $ getRVal q) q) $ sortBySymbol qlst), + (short typUnc, map typUncr $ sortBySymbol qlst)] tbl = mkTableFromColumns columns titl = fst tbl cts = snd tbl diff --git a/code/drasil-docLang/drasil-docLang.cabal b/code/drasil-docLang/drasil-docLang.cabal index 30a723a1b5..de70f0c4e4 100644 --- a/code/drasil-docLang/drasil-docLang.cabal +++ b/code/drasil-docLang/drasil-docLang.cabal @@ -39,7 +39,7 @@ library MissingH >= 1.4.0.1, parsec >= 3.1.9, data-fix (>= 0.0.4 && <= 1.0), - drasil-lang >= 0.1.5, + drasil-lang >= 0.1.6, drasil-data >= 0.1.1 default-language: Haskell2010 ghc-options: -Wall diff --git a/code/drasil-example/Drasil/GlassBR/Body.hs b/code/drasil-example/Drasil/GlassBR/Body.hs index 70964e859e..34adf338ae 100644 --- a/code/drasil-example/Drasil/GlassBR/Body.hs +++ b/code/drasil-example/Drasil/GlassBR/Body.hs @@ -15,8 +15,8 @@ import Drasil.DocLang (AppndxSec(..), AuxConstntSec(..), DerivationDisplay(..), ReqsSub(FReqsSub, NonFReqsSub), ScpOfProjSec(ScpOfProjProg), SCSSub(..), SSDSec(..), SSDSub(..), SolChSpec(..), StkhldrSec(StkhldrProg2), StkhldrSub(Client, Cstmr), TraceabilitySec(TraceabilityProg), - TSIntro(SymbOrder, TSPurpose), UCsSec(..), Verbosity(Verbose), cite, - dataConstraintUncertainty, goalStmtF, inDataConstTbl, intro, mkDoc, + TSIntro(SymbOrder, TSPurpose), UCsSec(..), Verbosity(Verbose), + cite, dataConstraintUncertainty, goalStmtF, inDataConstTbl, intro, mkDoc, mkRequirement, outDataConstTbl, physSystDesc, probDescF, termDefnF, traceGIntro, tsymb) diff --git a/code/drasil-example/drasil-example.cabal b/code/drasil-example/drasil-example.cabal index 3ef74db461..858ec398d8 100644 --- a/code/drasil-example/drasil-example.cabal +++ b/code/drasil-example/drasil-example.cabal @@ -19,7 +19,7 @@ executable tiny mtl >= 2.2.1, directory >= 1.2.6.2, split >= 0.2.3.1, - drasil-lang >= 0.1.5, + drasil-lang >= 0.1.6, drasil-data >= 0.1.1, drasil-code >= 0.1.1, drasil-printers >= 0.1.0, @@ -58,7 +58,7 @@ executable nopcm mtl >= 2.2.1, directory >= 1.2.6.2, split >= 0.2.3.1, - drasil-lang >= 0.1.5, + drasil-lang >= 0.1.6, drasil-data >= 0.1.1, drasil-code >= 0.1.1, drasil-printers >= 0.1.0, @@ -93,7 +93,7 @@ executable ssp mtl >= 2.2.1, directory >= 1.2.6.2, split >= 0.2.3.1, - drasil-lang >= 0.1.5, + drasil-lang >= 0.1.6, drasil-data >= 0.1.1, drasil-code >= 0.1.1, drasil-printers >= 0.1.0, @@ -126,7 +126,7 @@ executable glassbr mtl >= 2.2.1, directory >= 1.2.6.2, split >= 0.2.3.1, - drasil-lang >= 0.1.5, + drasil-lang >= 0.1.6, drasil-data >= 0.1.1, drasil-code >= 0.1.1, drasil-printers >= 0.1.0, @@ -155,7 +155,7 @@ executable chipmunkdocs mtl >= 2.2.1, directory >= 1.2.6.2, split >= 0.2.3.1, - drasil-lang >= 0.1.5, + drasil-lang >= 0.1.6, drasil-data >= 0.1.1, drasil-code >= 0.1.1, drasil-printers >= 0.1.0, @@ -188,7 +188,7 @@ executable swhs pretty >= 1.1.1.1, mtl >= 2.2.1, directory >= 1.2.6.2, - drasil-lang >= 0.1.5, + drasil-lang >= 0.1.6, drasil-data >= 0.1.1, drasil-code >= 0.1.1, drasil-printers >= 0.1.0, diff --git a/code/drasil-gen/drasil-gen.cabal b/code/drasil-gen/drasil-gen.cabal index af125f4749..9c11f1f188 100644 --- a/code/drasil-gen/drasil-gen.cabal +++ b/code/drasil-gen/drasil-gen.cabal @@ -19,7 +19,7 @@ library split >= 0.2.3.1, MissingH >= 1.4.0.1, parsec >= 3.1.9, - drasil-lang >= 0.1.5, + drasil-lang >= 0.1.6, drasil-code >= 0.1.3, drasil-printers >= 0.1.0 default-language: Haskell2010 diff --git a/code/drasil-lang/Language/Drasil.hs b/code/drasil-lang/Language/Drasil.hs index ba304da338..539ea34598 100644 --- a/code/drasil-lang/Language/Drasil.hs +++ b/code/drasil-lang/Language/Drasil.hs @@ -153,7 +153,7 @@ module Language.Drasil ( -- Misc , mkTable, unit_symb, introduceAbb, phrase, plural, phrase's , plural's, at_start, at_start' - , unitToSentence, unitToSentenceUnitless + , unitToSentence, unitToSentenceUnitless, sortBySymbol -- Generate --, gen, genCode -- People diff --git a/code/drasil-lang/Language/Drasil/Misc.hs b/code/drasil-lang/Language/Drasil/Misc.hs index 2f3fae47a2..c1c924fe77 100644 --- a/code/drasil-lang/Language/Drasil/Misc.hs +++ b/code/drasil-lang/Language/Drasil/Misc.hs @@ -1,12 +1,16 @@ module Language.Drasil.Misc where -import Language.Drasil.Classes (HasUnitSymbol(usymb), NamedIdea(term), Idea) +import Language.Drasil.Classes (HasSymbol(symbol), HasUnitSymbol(usymb), + NamedIdea(term), Idea) import Language.Drasil.Chunk.NamedIdea (short) import Language.Drasil.Chunk.Quantity (Quantity, getUnit) import Language.Drasil.Chunk.Unitary (Unitary, unit) import Language.Drasil.Spec ((+:+), Sentence((:+:), S, Sy), sParen) +import Language.Drasil.Symbol (Stage(Implementation), compsy) import Language.Drasil.Development.UnitLang (USymb) +import Data.List (sortBy) + import qualified Language.Drasil.NounPhrase as NP import Control.Lens ((^.)) @@ -85,6 +89,13 @@ noSpaces s | not (' ' `elem` s) = s | otherwise = error "String has at least one space in it." +-- Sorts a list of HasSymbols by Symbol +sortBySymbol :: (HasSymbol a) => [a] -> [a] +sortBySymbol = sortBy compareBySymbol + where + compareBySymbol :: (HasSymbol a) => a -> a -> Ordering + compareBySymbol a b = compsy (symbol a Implementation) (symbol b Implementation) + {- --------------------- WIP --------------------- Function used to derive the unit of an equation. Takes a Relation, sorts the diff --git a/code/drasil-lang/drasil-lang.cabal b/code/drasil-lang/drasil-lang.cabal index 346c6abc4d..be9487d822 100644 --- a/code/drasil-lang/drasil-lang.cabal +++ b/code/drasil-lang/drasil-lang.cabal @@ -1,5 +1,5 @@ Name: drasil-lang -Version: 0.1.5 +Version: 0.1.6 Cabal-Version: >= 1.18 Author: Dan Szymczak, Steven Palmer, Jacques Carette, Spencer Smith build-type: Simple diff --git a/code/drasil-printers/drasil-printers.cabal b/code/drasil-printers/drasil-printers.cabal index 1b6b69e178..2d66a2332e 100644 --- a/code/drasil-printers/drasil-printers.cabal +++ b/code/drasil-printers/drasil-printers.cabal @@ -39,7 +39,7 @@ library MissingH >= 1.4.0.1, parsec >= 3.1.9, data-fix (>= 0.0.4 && <= 1.0), - drasil-lang >= 0.1.4 + drasil-lang >= 0.1.6 default-language: Haskell2010 ghc-options: -Wall diff --git a/code/stable/gamephys/SRS/Chipmunk_SRS.tex b/code/stable/gamephys/SRS/Chipmunk_SRS.tex index fd24c4733d..b4137bf7cd 100644 --- a/code/stable/gamephys/SRS/Chipmunk_SRS.tex +++ b/code/stable/gamephys/SRS/Chipmunk_SRS.tex @@ -848,27 +848,27 @@ \subsubsection{Data Constraints} Var & Physical Constraints & Typical Value & Uncert. \\ \midrule -$L$ & $L\geq{}0$ & $44.2$ m & 10.0\% -\\ -$m$ & $m\geq{}0$ & $56.2$ kg & 10.0\% +${C_{R}}$ & $0\leq{}{C_{R}}\leq{}1$ & $0.8$ & 10.0\% \\ -$\mathbf{I}$ & $\mathbf{I}\geq{}0$ & $74.5$ kg$\text{m}^{2}$ & 10.0\% +$\mathbf{F}$ & -- & $98.1$ N & 10.0\% \\ $G$ & -- & $9.8$ $\frac{\text{m}^{3}}{(\text{kg}\text{s}^{2})}$ & 10.0\% \\ -$\mathbf{p}$ & -- & $0.412$ m & 10.0\% +$\mathbf{I}$ & $\mathbf{I}\geq{}0$ & $74.5$ kg$\text{m}^{2}$ & 10.0\% \\ -$ϕ$ & -- & $\frac{π}{2}$ rad & 10.0\% +$L$ & $L\geq{}0$ & $44.2$ m & 10.0\% \\ -$\mathbf{v}$ & -- & $2.51$ $\frac{\text{m}}{\text{s}}$ & 10.0\% +$m$ & $m\geq{}0$ & $56.2$ kg & 10.0\% \\ -$ω$ & -- & $2.1$ $\frac{\text{rad}}{\text{s}}$ & 10.0\% +$\mathbf{p}$ & -- & $0.412$ m & 10.0\% \\ -$\mathbf{F}$ & -- & $98.1$ N & 10.0\% +$\mathbf{v}$ & -- & $2.51$ $\frac{\text{m}}{\text{s}}$ & 10.0\% \\ $τ$ & -- & $200.0$ Nm & 10.0\% \\ -${C_{R}}$ & $0\leq{}{C_{R}}\leq{}1$ & $0.8$ & 10.0\% +$ω$ & -- & $2.1$ $\frac{\text{rad}}{\text{s}}$ & 10.0\% +\\ +$ϕ$ & -- & $\frac{π}{2}$ rad & 10.0\% \\ \bottomrule \caption{Input Data Constraints} diff --git a/code/stable/gamephys/Website/Chipmunk_SRS.html b/code/stable/gamephys/Website/Chipmunk_SRS.html index db39b83247..e2c13bf15f 100644 --- a/code/stable/gamephys/Website/Chipmunk_SRS.html +++ b/code/stable/gamephys/Website/Chipmunk_SRS.html @@ -2794,13 +2794,13 @@

-L +CR -L ≥ 0 +0 ≤ CR ≤ 1 -44.2 m +0.8 10.0% @@ -2808,13 +2808,13 @@

-m +F -m ≥ 0 +-- -56.2 kg +98.1 N 10.0% @@ -2822,13 +2822,13 @@

-I +G -I ≥ 0 +-- -74.5 kg⋅m2 +9.8 m3/(kg⋅s2) 10.0% @@ -2836,13 +2836,13 @@

-G +I --- +I ≥ 0 -9.8 m3/(kg⋅s2) +74.5 kg⋅m2 10.0% @@ -2850,13 +2850,13 @@

-p +L --- +L ≥ 0 -0.412 m +44.2 m 10.0% @@ -2864,20 +2864,13 @@

-ϕ +m --- +m ≥ 0 -
- -π - - -2 - -
 rad +56.2 kg 10.0% @@ -2885,13 +2878,13 @@

-v +p -- -2.51 m/s +0.412 m 10.0% @@ -2899,13 +2892,13 @@

-ω +v -- -2.1 rad/s +2.51 m/s 10.0% @@ -2913,13 +2906,13 @@

-F +τ -- -98.1 N +200.0 N⋅m 10.0% @@ -2927,13 +2920,13 @@

-τ +ω -- -200.0 N⋅m +2.1 rad/s 10.0% @@ -2941,13 +2934,20 @@

-CR +ϕ -0 ≤ CR ≤ 1 +-- -0.8 +
+ +π + + +2 + +
 rad 10.0% diff --git a/code/stable/glassbr/SRS/GlassBR_SRS.tex b/code/stable/glassbr/SRS/GlassBR_SRS.tex index 31b3c68753..10461591fc 100644 --- a/code/stable/glassbr/SRS/GlassBR_SRS.tex +++ b/code/stable/glassbr/SRS/GlassBR_SRS.tex @@ -283,7 +283,7 @@ \subsubsection{Terminology and Definitions} \item{Fully tempered (FT) - A flat, monolithic, glass lite of uniform thickness that has been subjected to a special heat treatment process where the residual surface compression is not less than 69 MPa (10 000 psi) or the edge compression not less than 67 MPa (9700 psi), as defined in [2].} \item{Heat strengthened (HS) - A flat, monolithic, glass lite of uniform thickness that has been subjected to a special heat treatment process where the residual surface compression is not less than 24 MPa (3500psi) or greater than 52 MPa (7500 psi), as defined in [2].} \end{itemize} -\item{Load - A uniformly distributed lateral pressure.} +\item{Load- A uniformly distributed lateral pressure.} \begin{itemize} \item{Load resistance (LR) - The uniform lateral load that a glass construction can sustain based upon a given probability of breakage and load duration as defined in [1 (pg. 1, 53)], following A2 and A1 respectively.} \item{Non-factored load (NFL) - Three second duration uniform load associated with a probability of breakage less than or equal to 8 lites per 1000 for monolithic AN glass.} @@ -920,14 +920,14 @@ \subsubsection{Data Constraints} \\ $b$ & $00$ & ${SD_{min}}0$ & ${w_{min}}\leq{}w\leq{}{w_{max}}$ & $42.0$ kg & 10.0\% -\\ ${P_{btol}}$ & $0<{P_{btol}}<1$ & -- & $0.008$ & 0.1\% \\ +$SD$ & $SD>0$ & ${SD_{min}}0$ & -- & $1.0$ & 10.0\% \\ +$w$ & $w>0$ & ${w_{min}}\leq{}w\leq{}{w_{max}}$ & $42.0$ kg & 10.0\% +\\ \bottomrule \caption{Input Data Constraints} \label{Table:InDataConstraints} @@ -1184,30 +1184,30 @@ \section{Values of Auxiliary Constants} Symbol & Description & Value & Unit \\ \midrule -$m$ & surface flaw parameter & $7$ & $\frac{\text{m}^{12}}{\text{N}^{7}}$ +${AR_{max}}$ & maximum aspect ratio & $5.0$ & -- \\ -$k$ & surface flaw parameter & $2.86 10^{-53}$ & $\frac{\text{m}^{12}}{\text{N}^{7}}$ +${d_{max}}$ & maximum value for one of the dimensions of the glass plate & $5.0$ & mm +\\ +${d_{min}}$ & minimum value for one of the dimensions of the glass plate & $0.1$ & mm \\ $E$ & modulus of elasticity of glass & $7.17 10^{7}$ & Pa \\ -${t_{d}}$ & duration of load & $3$ & s +$k$ & surface flaw parameter & $2.86 10^{-53}$ & $\frac{\text{m}^{12}}{\text{N}^{7}}$ \\ $LSF$ & load share factor & $1$ & -- \\ -${d_{max}}$ & maximum value for one of the dimensions of the glass plate & $5.0$ & mm +$m$ & surface flaw parameter & $7$ & $\frac{\text{m}^{12}}{\text{N}^{7}}$ \\ -${d_{min}}$ & minimum value for one of the dimensions of the glass plate & $0.1$ & mm +${SD_{max}}$ & maximum stand off distance permissible for input & $130.0$ & m \\ -${AR_{max}}$ & maximum aspect ratio & $5.0$ & -- +${SD_{min}}$ & minimum stand off distance permissible for input & $6.0$ & m +\\ +${t_{d}}$ & duration of load & $3$ & s \\ ${w_{max}}$ & maximum permissible input charge weight & $910.0$ & kg \\ ${w_{min}}$ & minimum permissible input charge weight & $4.5$ & kg \\ -${SD_{max}}$ & maximum stand off distance permissible for input & $130.0$ & m -\\ -${SD_{min}}$ & minimum stand off distance permissible for input & $6.0$ & m -\\ \bottomrule \caption{Auxiliary Constants} \label{Table:TAuxConsts} diff --git a/code/stable/glassbr/Website/GlassBR_SRS.html b/code/stable/glassbr/Website/GlassBR_SRS.html index d766ac0153..83c2753ff5 100644 --- a/code/stable/glassbr/Website/GlassBR_SRS.html +++ b/code/stable/glassbr/Website/GlassBR_SRS.html @@ -975,7 +975,7 @@

  • -Load - A uniformly distributed lateral pressure. +Load- 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 [1 (pg. 1, 53)], following A2 and A1 respectively. @@ -3004,33 +3004,33 @@

      -SD +Pbtol -SD > 0 +0 < Pbtol < 1 -SDmin < SD < SDmax +-- -45.0 m +0.008 -10.0% +0.1% -w +SD -w > 0 +SD > 0 -wmin ≤ w ≤ wmax +SDmin < SD < SDmax -42.0 kg +45.0 m 10.0% @@ -3038,33 +3038,33 @@

      -Pbtol +TNT -0 < Pbtol < 1 +TNT > 0 -- -0.008 +1.0 -0.1% +10.0% -TNT +w -TNT > 0 +w > 0 --- +wmin ≤ w ≤ wmax -1.0 +42.0 kg 10.0% @@ -5277,170 +5277,170 @@

      -m +ARmax -surface flaw parameter +maximum aspect ratio -7 +5.0 -m12/N7 +-- -k +dmax -surface flaw parameter +maximum value for one of the dimensions of the glass plate -2.86 10−53 +5.0 -m12/N7 +mm -E +dmin -modulus of elasticity of glass +minimum value for one of the dimensions of the glass plate -7.17 107 +0.1 -Pa +mm -td +E -duration of load +modulus of elasticity of glass -3 +7.17 107 -s +Pa -LSF +k -load share factor +surface flaw parameter -1 +2.86 10−53 --- +m12/N7 -dmax +LSF -maximum value for one of the dimensions of the glass plate +load share factor -5.0 +1 -mm +-- -dmin +m -minimum value for one of the dimensions of the glass plate +surface flaw parameter -0.1 +7 -mm +m12/N7 -ARmax +SDmax -maximum aspect ratio +maximum stand off distance permissible for input -5.0 +130.0 --- +m -wmax +SDmin -maximum permissible input charge weight +minimum stand off distance permissible for input -910.0 +6.0 -kg +m -wmin +td -minimum permissible input charge weight +duration of load -4.5 +3 -kg +s -SDmax +wmax -maximum stand off distance permissible for input +maximum permissible input charge weight -130.0 +910.0 -m +kg -SDmin +wmin -minimum stand off distance permissible for input +minimum permissible input charge weight -6.0 +4.5 -m +kg diff --git a/code/stable/nopcm/SRS/NoPCM_SRS.tex b/code/stable/nopcm/SRS/NoPCM_SRS.tex index 6e8fe230d7..f3b4169eaa 100644 --- a/code/stable/nopcm/SRS/NoPCM_SRS.tex +++ b/code/stable/nopcm/SRS/NoPCM_SRS.tex @@ -571,23 +571,23 @@ \subsubsection{Data Constraints} Var & Physical Constraints & Software Constraints & Typical Value & Uncert. \\ \midrule -$L$ & $L>0$ & ${L_{min}}\leq{}L\leq{}{L_{max}}$ & $1.5$ m & 10.0\% +${A_{C}}$ & ${A_{C}}>0$ & ${A_{C}}\leq{}{{A_{C}}^{max}}$ & $0.12$ $\text{m}^{2}$ & 10.0\% \\ -$D$ & $D>0$ & -- & $0.412$ m & 10.0\% +${C_{W}}$ & ${C_{W}}>0$ & ${{C_{W}}^{min}}<{C_{W}}<{{C_{W}}^{max}}$ & $4186.0$ $\frac{\text{J}}{(\text{kg}{}^{\circ}\text{C})}$ & 10.0\% \\ -${A_{C}}$ & ${A_{C}}>0$ & ${A_{C}}\leq{}{{A_{C}}^{max}}$ & $0.12$ $\text{m}^{2}$ & 10.0\% +$D$ & $D>0$ & -- & $0.412$ m & 10.0\% \\ -${T_{C}}$ & $0<{T_{C}}<100$ & -- & $50.0$ ${}^{\circ}$C & 10.0\% +${h_{C}}$ & ${h_{C}}>0$ & ${{h_{C}}^{min}}\leq{}{h_{C}}\leq{}{{h_{C}}^{max}}$ & $1000.0$ $\frac{\text{W}}{(\text{m}^{2}{}^{\circ}\text{C})}$ & 10.0\% \\ -${ρ_{W}}$ & ${ρ_{W}}>0$ & ${{ρ_{W}}^{min}}<{ρ_{W}}\leq{}{{ρ_{W}}^{max}}$ & $1000.0$ $\frac{\text{kg}}{\text{m}^{3}}$ & 10.0\% +$L$ & $L>0$ & ${L_{min}}\leq{}L\leq{}{L_{max}}$ & $1.5$ m & 10.0\% \\ -${C_{W}}$ & ${C_{W}}>0$ & ${{C_{W}}^{min}}<{C_{W}}<{{C_{W}}^{max}}$ & $4186.0$ $\frac{\text{J}}{(\text{kg}{}^{\circ}\text{C})}$ & 10.0\% +${T_{C}}$ & $0<{T_{C}}<100$ & -- & $50.0$ ${}^{\circ}$C & 10.0\% \\ -${h_{C}}$ & ${h_{C}}>0$ & ${{h_{C}}^{min}}\leq{}{h_{C}}\leq{}{{h_{C}}^{max}}$ & $1000.0$ $\frac{\text{W}}{(\text{m}^{2}{}^{\circ}\text{C})}$ & 10.0\% +${t_{final}}$ & ${t_{final}}>0$ & ${t_{final}}<{{t_{final}}^{max}}$ & $50000.0$ s & 10.0\% \\ ${T_{init}}$ & $0<{T_{init}}<100$ & -- & $40.0$ ${}^{\circ}$C & 10.0\% \\ -${t_{final}}$ & ${t_{final}}>0$ & ${t_{final}}<{{t_{final}}^{max}}$ & $50000.0$ s & 10.0\% +${ρ_{W}}$ & ${ρ_{W}}>0$ & ${{ρ_{W}}^{min}}<{ρ_{W}}\leq{}{{ρ_{W}}^{max}}$ & $1000.0$ $\frac{\text{kg}}{\text{m}^{3}}$ & 10.0\% \\ \bottomrule \caption{Input Data Constraints} diff --git a/code/stable/nopcm/Website/NoPCM_SRS.html b/code/stable/nopcm/Website/NoPCM_SRS.html index 77f0509e82..622b450b3a 100644 --- a/code/stable/nopcm/Website/NoPCM_SRS.html +++ b/code/stable/nopcm/Website/NoPCM_SRS.html @@ -1835,16 +1835,16 @@

      -L +AC -L > 0 +AC > 0 -Lmin ≤ L ≤ Lmax +AC ≤ ACmax -1.5 m +0.12 m2 10.0% @@ -1852,16 +1852,16 @@

      -D +CW -D > 0 +CW > 0 --- +CWmin < CW < CWmax -0.412 m +4186.0 J/(kg⋅°C) 10.0% @@ -1869,16 +1869,16 @@

      -AC +D -AC > 0 +D > 0 -AC ≤ ACmax +-- -0.12 m2 +0.412 m 10.0% @@ -1886,16 +1886,16 @@

      -TC +hC -0 < TC < 100 +hC > 0 --- +hCmin ≤ hC ≤ hCmax -50.0 °C +1000.0 W/(m2⋅°C) 10.0% @@ -1903,16 +1903,16 @@

      -ρW +L -ρW > 0 +L > 0 -ρWmin < ρW ≤ ρWmax +Lmin ≤ L ≤ Lmax -1000.0 kg/m3 +1.5 m 10.0% @@ -1920,16 +1920,16 @@

      -CW +TC -CW > 0 +0 < TC < 100 -CWmin < CW < CWmax +-- -4186.0 J/(kg⋅°C) +50.0 °C 10.0% @@ -1937,16 +1937,16 @@

      -hC +tfinal -hC > 0 +tfinal > 0 -hCmin ≤ hC ≤ hCmax +tfinal < tfinalmax -1000.0 W/(m2⋅°C) +50000.0 s 10.0% @@ -1971,16 +1971,16 @@

      -tfinal +ρW -tfinal > 0 +ρW > 0 -tfinal < tfinalmax +ρWmin < ρW ≤ ρWmax -50000.0 s +1000.0 kg/m3 10.0% diff --git a/code/stable/ssp/SRS/SSP_SRS.tex b/code/stable/ssp/SRS/SSP_SRS.tex index 2608c7f425..5fc5af0ddc 100644 --- a/code/stable/ssp/SRS/SSP_SRS.tex +++ b/code/stable/ssp/SRS/SSP_SRS.tex @@ -1970,13 +1970,13 @@ \subsubsection{Data Constraints} Var & Physical Constraints & Typical Value & Uncert. \\ \midrule -$E$ & $E>0$ & $15000.0$ Pa & 10.0\% +$a$ & -- & $0.0$ m & 10.0\% \\ -$c'$ & $c'>0$ & $10.0$ Pa & 10.0\% +$A$ & -- & $0.0$ m & 10.0\% \\ -$ν$ & $0<ν<1$ & $0.4$ & 10.0\% +$c'$ & $c'>0$ & $10.0$ Pa & 10.0\% \\ -$φ'$ & $0<φ'<90$ & $25.0$ ${}^{\circ}$ & 10.0\% +$E$ & $E>0$ & $15000.0$ Pa & 10.0\% \\ $γ$ & $γ>0$ & $20.0$ $\frac{\text{N}}{\text{m}^{3}}$ & 10.0\% \\ @@ -1984,11 +1984,11 @@ \subsubsection{Data Constraints} \\ ${γ_{w}}$ & ${γ_{w}}>0$ & $9.8$ $\frac{\text{N}}{\text{m}^{3}}$ & 10.0\% \\ -$a$ & -- & $0.0$ m & 10.0\% +$κ$ & -- & $0.0$ Pa & 10.0\% \\ -$A$ & -- & $0.0$ m & 10.0\% +$ν$ & $0<ν<1$ & $0.4$ & 10.0\% \\ -$κ$ & -- & $0.0$ Pa & 10.0\% +$φ'$ & $0<φ'<90$ & $25.0$ ${}^{\circ}$ & 10.0\% \\ \bottomrule \caption{Input Data Constraints} diff --git a/code/stable/ssp/Website/SSP_SRS.html b/code/stable/ssp/Website/SSP_SRS.html index d049598d48..c0302d51a8 100644 --- a/code/stable/ssp/Website/SSP_SRS.html +++ b/code/stable/ssp/Website/SSP_SRS.html @@ -6340,13 +6340,13 @@

      -E +a -E > 0 +-- -15000.0 Pa +0.0 m 10.0% @@ -6354,13 +6354,13 @@

      -c′ +A -c′ > 0 +-- -10.0 Pa +0.0 m 10.0% @@ -6368,13 +6368,13 @@

      -ν +c′ -0 < ν < 1 +c′ > 0 -0.4 +10.0 Pa 10.0% @@ -6382,13 +6382,13 @@

      -φ′ +E -0 < φ′ < 90 +E > 0 -25.0 ° +15000.0 Pa 10.0% @@ -6438,13 +6438,13 @@

      -a +κ -- -0.0 m +0.0 Pa 10.0% @@ -6452,13 +6452,13 @@

      -A +ν --- +0 < ν < 1 -0.0 m +0.4 10.0% @@ -6466,13 +6466,13 @@

      -κ +φ′ --- +0 < φ′ < 90 -0.0 Pa +25.0 ° 10.0% diff --git a/code/stable/swhs/SRS/SWHS_SRS.tex b/code/stable/swhs/SRS/SWHS_SRS.tex index 4730f26ca4..bc62aacff0 100644 --- a/code/stable/swhs/SRS/SWHS_SRS.tex +++ b/code/stable/swhs/SRS/SWHS_SRS.tex @@ -939,39 +939,39 @@ \subsubsection{Data Constraints} Var & Physical Constraints & Software Constraints & Typical Value & Uncert. \\ \midrule -$L$ & $L>0$ & ${L_{min}}\leq{}L\leq{}{L_{max}}$ & $1.5$ m & 10.0\% -\\ -$D$ & $D>0$ & -- & $0.412$ m & 10.0\% -\\ -${V_{P}}$ & $0<{V_{P}}<{V_{tank}}$ & -- & $0.05$ $\text{m}^{3}$ & 10.0\% +${A_{C}}$ & ${A_{C}}>0$ & ${A_{C}}\leq{}{{A_{C}}^{max}}$ & $0.12$ $\text{m}^{2}$ & 10.0\% \\ ${A_{P}}$ & ${A_{P}}>0$ & ${V_{P}}\leq{}{A_{P}}\leq{}\frac{2}{{h_{min}}} {V_{tank}}$ & $1.2$ $\text{m}^{2}$ & 10.0\% \\ -${ρ_{P}}$ & ${{ρ_{P}}^{min}}<{ρ_{P}}<{{ρ_{P}}^{max}}$ & -- & $1007.0$ $\frac{\text{kg}}{\text{m}^{3}}$ & 10.0\% -\\ -${{T_{melt}}^{P}}$ & $0<{{T_{melt}}^{P}}<{T_{C}}$ & -- & $44.2$ ${}^{\circ}$C & 10.0\% +${{C_{P}}^{L}}$ & ${{C_{P}}^{L}}>0$ & ${{{C_{P}}^{L}}_{min}}<{{C_{P}}^{L}}<{{{C_{P}}^{L}}_{max}}$ & $2270.0$ $\frac{\text{J}}{(\text{kg}{}^{\circ}\text{C})}$ & 10.0\% \\ ${{C_{P}}^{S}}$ & ${{C_{P}}^{S}}>0$ & ${{{C_{P}}^{S}}_{min}}<{{C_{P}}^{S}}<{{{C_{P}}^{S}}_{max}}$ & $1760.0$ $\frac{\text{J}}{(\text{kg}{}^{\circ}\text{C})}$ & 10.0\% \\ -${{C_{P}}^{L}}$ & ${{C_{P}}^{L}}>0$ & ${{{C_{P}}^{L}}_{min}}<{{C_{P}}^{L}}<{{{C_{P}}^{L}}_{max}}$ & $2270.0$ $\frac{\text{J}}{(\text{kg}{}^{\circ}\text{C})}$ & 10.0\% +${C_{W}}$ & ${C_{W}}>0$ & ${{C_{W}}^{min}}<{C_{W}}<{{C_{W}}^{max}}$ & $4186.0$ $\frac{\text{J}}{(\text{kg}{}^{\circ}\text{C})}$ & 10.0\% \\ -${H_{f}}$ & ${H_{f}}>0$ & ${{H_{f}}_{min}}<{H_{f}}<{{H_{f}}_{max}}$ & $211600.0$ $\frac{\text{J}}{\text{kg}}$ & 10.0\% +$D$ & $D>0$ & -- & $0.412$ m & 10.0\% \\ -${A_{C}}$ & ${A_{C}}>0$ & ${A_{C}}\leq{}{{A_{C}}^{max}}$ & $0.12$ $\text{m}^{2}$ & 10.0\% +${h_{C}}$ & ${h_{C}}>0$ & ${{h_{C}}^{min}}\leq{}{h_{C}}\leq{}{{h_{C}}^{max}}$ & $1000.0$ $\frac{\text{W}}{(\text{m}^{2}{}^{\circ}\text{C})}$ & 10.0\% \\ -${T_{C}}$ & $0<{T_{C}}<100$ & -- & $50.0$ ${}^{\circ}$C & 10.0\% +${H_{f}}$ & ${H_{f}}>0$ & ${{H_{f}}_{min}}<{H_{f}}<{{H_{f}}_{max}}$ & $211600.0$ $\frac{\text{J}}{\text{kg}}$ & 10.0\% \\ -${ρ_{W}}$ & ${ρ_{W}}>0$ & ${{ρ_{W}}^{min}}<{ρ_{W}}\leq{}{{ρ_{W}}^{max}}$ & $1000.0$ $\frac{\text{kg}}{\text{m}^{3}}$ & 10.0\% +${h_{P}}$ & ${h_{P}}>0$ & ${{h_{P}}^{min}}\leq{}{h_{P}}\leq{}{{h_{P}}^{max}}$ & $1000.0$ $\frac{\text{W}}{(\text{m}^{2}{}^{\circ}\text{C})}$ & 10.0\% \\ -${C_{W}}$ & ${C_{W}}>0$ & ${{C_{W}}^{min}}<{C_{W}}<{{C_{W}}^{max}}$ & $4186.0$ $\frac{\text{J}}{(\text{kg}{}^{\circ}\text{C})}$ & 10.0\% +$L$ & $L>0$ & ${L_{min}}\leq{}L\leq{}{L_{max}}$ & $1.5$ m & 10.0\% \\ -${h_{C}}$ & ${h_{C}}>0$ & ${{h_{C}}^{min}}\leq{}{h_{C}}\leq{}{{h_{C}}^{max}}$ & $1000.0$ $\frac{\text{W}}{(\text{m}^{2}{}^{\circ}\text{C})}$ & 10.0\% +${{T_{melt}}^{P}}$ & $0<{{T_{melt}}^{P}}<{T_{C}}$ & -- & $44.2$ ${}^{\circ}$C & 10.0\% \\ -${h_{P}}$ & ${h_{P}}>0$ & ${{h_{P}}^{min}}\leq{}{h_{P}}\leq{}{{h_{P}}^{max}}$ & $1000.0$ $\frac{\text{W}}{(\text{m}^{2}{}^{\circ}\text{C})}$ & 10.0\% +${T_{C}}$ & $0<{T_{C}}<100$ & -- & $50.0$ ${}^{\circ}$C & 10.0\% +\\ +${t_{final}}$ & ${t_{final}}>0$ & ${t_{final}}<{{t_{final}}^{max}}$ & $50000.0$ s & 10.0\% \\ ${T_{init}}$ & $0<{T_{init}}<{T_{melt}}$ & -- & $40.0$ ${}^{\circ}$C & 10.0\% \\ -${t_{final}}$ & ${t_{final}}>0$ & ${t_{final}}<{{t_{final}}^{max}}$ & $50000.0$ s & 10.0\% +${V_{P}}$ & $0<{V_{P}}<{V_{tank}}$ & -- & $0.05$ $\text{m}^{3}$ & 10.0\% +\\ +${ρ_{P}}$ & ${{ρ_{P}}^{min}}<{ρ_{P}}<{{ρ_{P}}^{max}}$ & -- & $1007.0$ $\frac{\text{kg}}{\text{m}^{3}}$ & 10.0\% +\\ +${ρ_{W}}$ & ${ρ_{W}}>0$ & ${{ρ_{W}}^{min}}<{ρ_{W}}\leq{}{{ρ_{W}}^{max}}$ & $1000.0$ $\frac{\text{kg}}{\text{m}^{3}}$ & 10.0\% \\ \bottomrule \caption{Input Data Constraints} @@ -1270,40 +1270,40 @@ \section{Values of Auxiliary Constants} Symbol & Description & Value & Unit \\ \midrule -${L_{min}}$ & minimum length of tank & $0.1$ & m -\\ -${L_{max}}$ & maximum length of tank & $50$ & m -\\ -${{ρ_{P}}^{min}}$ & minimum density of PCM & $500$ & $\frac{\text{kg}}{\text{m}^{3}}$ -\\ -${{ρ_{P}}^{max}}$ & maximum density of PCM & $20000$ & $\frac{\text{kg}}{\text{m}^{3}}$ -\\ -${{ρ_{W}}^{min}}$ & minimum density of water & $950$ & $\frac{\text{kg}}{\text{m}^{3}}$ -\\ -${{ρ_{W}}^{max}}$ & maximum density of water & $1000$ & $\frac{\text{kg}}{\text{m}^{3}}$ +${{{C_{P}}^{L}}_{max}}$ & maximum specific heat capacity of PCM as a liquid & $5000$ & $\frac{\text{J}}{(\text{kg}{}^{\circ}\text{C})}$ \\ -${{{C_{P}}^{S}}_{min}}$ & minimum specific heat capacity of PCM as a solid & $100$ & $\frac{\text{J}}{(\text{kg}{}^{\circ}\text{C})}$ +${{{C_{P}}^{L}}_{min}}$ & minimum specific heat capacity of PCM as a liquid & $100$ & $\frac{\text{J}}{(\text{kg}{}^{\circ}\text{C})}$ \\ ${{{C_{P}}^{S}}_{max}}$ & maximum specific heat capacity of PCM as a solid & $4000$ & $\frac{\text{J}}{(\text{kg}{}^{\circ}\text{C})}$ \\ -${{{C_{P}}^{L}}_{min}}$ & minimum specific heat capacity of PCM as a liquid & $100$ & $\frac{\text{J}}{(\text{kg}{}^{\circ}\text{C})}$ +${{{C_{P}}^{S}}_{min}}$ & minimum specific heat capacity of PCM as a solid & $100$ & $\frac{\text{J}}{(\text{kg}{}^{\circ}\text{C})}$ \\ -${{{C_{P}}^{L}}_{max}}$ & maximum specific heat capacity of PCM as a liquid & $5000$ & $\frac{\text{J}}{(\text{kg}{}^{\circ}\text{C})}$ +${{C_{W}}^{max}}$ & maximum specific heat capacity of water & $4210$ & $\frac{\text{J}}{(\text{kg}{}^{\circ}\text{C})}$ \\ ${{C_{W}}^{min}}$ & minimum specific heat capacity of water & $4170$ & $\frac{\text{J}}{(\text{kg}{}^{\circ}\text{C})}$ \\ -${{C_{W}}^{max}}$ & maximum specific heat capacity of water & $4210$ & $\frac{\text{J}}{(\text{kg}{}^{\circ}\text{C})}$ +${{h_{C}}^{max}}$ & maximum convective heat transfer coefficient between coil and water & $10000$ & $\frac{\text{W}}{(\text{m}^{2}{}^{\circ}\text{C})}$ \\ ${{h_{C}}^{min}}$ & minimum convective heat transfer coefficient between coil and water & $10$ & $\frac{\text{W}}{(\text{m}^{2}{}^{\circ}\text{C})}$ \\ -${{h_{C}}^{max}}$ & maximum convective heat transfer coefficient between coil and water & $10000$ & $\frac{\text{W}}{(\text{m}^{2}{}^{\circ}\text{C})}$ +${{h_{P}}^{max}}$ & maximum convective heat transfer coefficient between PCM and water & $10000$ & $\frac{\text{W}}{(\text{m}^{2}{}^{\circ}\text{C})}$ \\ ${{h_{P}}^{min}}$ & minimum convective heat transfer coefficient between PCM and water & $10$ & $\frac{\text{W}}{(\text{m}^{2}{}^{\circ}\text{C})}$ \\ -${{h_{P}}^{max}}$ & maximum convective heat transfer coefficient between PCM and water & $10000$ & $\frac{\text{W}}{(\text{m}^{2}{}^{\circ}\text{C})}$ +${L_{max}}$ & maximum length of tank & $50$ & m +\\ +${L_{min}}$ & minimum length of tank & $0.1$ & m \\ ${{t_{final}}^{max}}$ & maximum final time & $86400$ & s \\ +${{ρ_{P}}^{max}}$ & maximum density of PCM & $20000$ & $\frac{\text{kg}}{\text{m}^{3}}$ +\\ +${{ρ_{P}}^{min}}$ & minimum density of PCM & $500$ & $\frac{\text{kg}}{\text{m}^{3}}$ +\\ +${{ρ_{W}}^{max}}$ & maximum density of water & $1000$ & $\frac{\text{kg}}{\text{m}^{3}}$ +\\ +${{ρ_{W}}^{min}}$ & minimum density of water & $950$ & $\frac{\text{kg}}{\text{m}^{3}}$ +\\ \bottomrule \caption{Auxiliary Constants} \label{Table:TAuxConsts} diff --git a/code/stable/swhs/Website/SWHS_SRS.html b/code/stable/swhs/Website/SWHS_SRS.html index 92e72eaef1..eed9f1a588 100644 --- a/code/stable/swhs/Website/SWHS_SRS.html +++ b/code/stable/swhs/Website/SWHS_SRS.html @@ -3277,16 +3277,16 @@

      -L +AC -L > 0 +AC > 0 -Lmin ≤ L ≤ Lmax +AC ≤ ACmax -1.5 m +0.12 m2 10.0% @@ -3294,16 +3294,23 @@

      -D +AP -D > 0 +AP > 0 --- +VP ≤ AP ≤ 
      + +2 + + +hmin + +
       Vtank       -0.412 m +1.2 m2 10.0% @@ -3311,16 +3318,16 @@

      -VP +CPL -0 < VP < Vtank +CPL > 0 --- +CPLmin < CPL < CPLmax -0.05 m3 +2270.0 J/(kg⋅°C) 10.0% @@ -3328,23 +3335,16 @@

      -AP +CPS -AP > 0 +CPS > 0 -VP ≤ AP ≤ 
      - -2 - - -hmin - -
       Vtank       +CPSmin < CPS < CPSmax -1.2 m2 +1760.0 J/(kg⋅°C) 10.0% @@ -3352,16 +3352,16 @@

      -ρP +CW -ρPmin < ρP < ρPmax +CW > 0 --- +CWmin < CW < CWmax -1007.0 kg/m3 +4186.0 J/(kg⋅°C) 10.0% @@ -3369,16 +3369,16 @@

      -TmeltP +D -0 < TmeltP < TC +D > 0 -- -44.2 °C +0.412 m 10.0% @@ -3386,16 +3386,16 @@

      -CPS +hC -CPS > 0 +hC > 0 -CPSmin < CPS < CPSmax +hCmin ≤ hC ≤ hCmax -1760.0 J/(kg⋅°C) +1000.0 W/(m2⋅°C) 10.0% @@ -3403,16 +3403,16 @@

      -CPL +Hf -CPL > 0 +Hf > 0 -CPLmin < CPL < CPLmax +Hfmin < Hf < Hfmax -2270.0 J/(kg⋅°C) +211600.0 J/kg 10.0% @@ -3420,16 +3420,16 @@

      -Hf +hP -Hf > 0 +hP > 0 -Hfmin < Hf < Hfmax +hPmin ≤ hP ≤ hPmax -211600.0 J/kg +1000.0 W/(m2⋅°C) 10.0% @@ -3437,16 +3437,16 @@

      -AC +L -AC > 0 +L > 0 -AC ≤ ACmax +Lmin ≤ L ≤ Lmax -0.12 m2 +1.5 m 10.0% @@ -3454,16 +3454,16 @@

      -TC +TmeltP -0 < TC < 100 +0 < TmeltP < TC -- -50.0 °C +44.2 °C 10.0% @@ -3471,16 +3471,16 @@

      -ρW +TC -ρW > 0 +0 < TC < 100 -ρWmin < ρW ≤ ρWmax +-- -1000.0 kg/m3 +50.0 °C 10.0% @@ -3488,16 +3488,16 @@

      -CW +tfinal -CW > 0 +tfinal > 0 -CWmin < CW < CWmax +tfinal < tfinalmax -4186.0 J/(kg⋅°C) +50000.0 s 10.0% @@ -3505,16 +3505,16 @@

      -hC +Tinit -hC > 0 +0 < Tinit < Tmelt -hCmin ≤ hC ≤ hCmax +-- -1000.0 W/(m2⋅°C) +40.0 °C 10.0% @@ -3522,16 +3522,16 @@

      -hP +VP -hP > 0 +0 < VP < Vtank -hPmin ≤ hP ≤ hPmax +-- -1000.0 W/(m2⋅°C) +0.05 m3 10.0% @@ -3539,16 +3539,16 @@

      -Tinit +ρP -0 < Tinit < Tmelt +ρPmin < ρP < ρPmax -- -40.0 °C +1007.0 kg/m3 10.0% @@ -3556,16 +3556,16 @@

      -tfinal +ρW -tfinal > 0 +ρW > 0 -tfinal < tfinalmax +ρWmin < ρW ≤ ρWmax -50000.0 s +1000.0 kg/m3 10.0% @@ -6827,240 +6827,240 @@

      -Lmin +CPLmax -minimum length of tank +maximum specific heat capacity of PCM as a liquid -0.1 +5000 -m +J/(kg⋅°C) -Lmax +CPLmin -maximum length of tank +minimum specific heat capacity of PCM as a liquid -50 +100 -m +J/(kg⋅°C) -ρPmin +CPSmax -minimum density of PCM +maximum specific heat capacity of PCM as a solid -500 +4000 -kg/m3 +J/(kg⋅°C) -ρPmax +CPSmin -maximum density of PCM +minimum specific heat capacity of PCM as a solid -20000 +100 -kg/m3 +J/(kg⋅°C) -ρWmin +CWmax -minimum density of water +maximum specific heat capacity of water -950 +4210 -kg/m3 +J/(kg⋅°C) -ρWmax +CWmin -maximum density of water +minimum specific heat capacity of water -1000 +4170 -kg/m3 +J/(kg⋅°C) -CPSmin +hCmax -minimum specific heat capacity of PCM as a solid +maximum convective heat transfer coefficient between coil and water -100 +10000 -J/(kg⋅°C) +W/(m2⋅°C) -CPSmax +hCmin -maximum specific heat capacity of PCM as a solid +minimum convective heat transfer coefficient between coil and water -4000 +10 -J/(kg⋅°C) +W/(m2⋅°C) -CPLmin +hPmax -minimum specific heat capacity of PCM as a liquid +maximum convective heat transfer coefficient between PCM and water -100 +10000 -J/(kg⋅°C) +W/(m2⋅°C) -CPLmax +hPmin -maximum specific heat capacity of PCM as a liquid +minimum convective heat transfer coefficient between PCM and water -5000 +10 -J/(kg⋅°C) +W/(m2⋅°C) -CWmin +Lmax -minimum specific heat capacity of water +maximum length of tank -4170 +50 -J/(kg⋅°C) +m -CWmax +Lmin -maximum specific heat capacity of water +minimum length of tank -4210 +0.1 -J/(kg⋅°C) +m -hCmin +tfinalmax -minimum convective heat transfer coefficient between coil and water +maximum final time -10 +86400 -W/(m2⋅°C) +s -hCmax +ρPmax -maximum convective heat transfer coefficient between coil and water +maximum density of PCM -10000 +20000 -W/(m2⋅°C) +kg/m3 -hPmin +ρPmin -minimum convective heat transfer coefficient between PCM and water +minimum density of PCM -10 +500 -W/(m2⋅°C) +kg/m3 -hPmax +ρWmax -maximum convective heat transfer coefficient between PCM and water +maximum density of water -10000 +1000 -W/(m2⋅°C) +kg/m3 -tfinalmax +ρWmin -maximum final time +minimum density of water -86400 +950 -s +kg/m3