From 5adb76b4f5ae578b079223559c6e8e7f27b193f1 Mon Sep 17 00:00:00 2001 From: Sam Crawford Date: Mon, 17 Jun 2019 16:27:46 -0400 Subject: [PATCH] Removed duplicate references with RefBy --- .../drasil-docLang/Drasil/DocumentLanguage.hs | 2 +- .../Drasil/DocumentLanguage/Definitions.hs | 4 ++-- code/drasil-example/Drasil/SWHS/IMods.hs | 24 +++++++++---------- code/stable/gamephys/SRS/Chipmunk_SRS.tex | 2 +- .../stable/gamephys/Website/Chipmunk_SRS.html | 2 +- code/stable/glassbr/SRS/GlassBR_SRS.tex | 4 ++-- code/stable/glassbr/Website/GlassBR_SRS.html | 4 ++-- code/stable/nopcm/SRS/NoPCM_SRS.tex | 2 +- code/stable/nopcm/Website/NoPCM_SRS.html | 2 +- code/stable/ssp/SRS/SSP_SRS.tex | 20 ++++++++-------- code/stable/ssp/Website/SSP_SRS.html | 24 ++++++++----------- code/stable/swhs/SRS/SWHS_SRS.tex | 12 +++++----- code/stable/swhs/Website/SWHS_SRS.html | 12 +++++----- 13 files changed, 54 insertions(+), 60 deletions(-) diff --git a/code/drasil-docLang/Drasil/DocumentLanguage.hs b/code/drasil-docLang/Drasil/DocumentLanguage.hs index 7dbd1eae0f..a879a49eab 100644 --- a/code/drasil-docLang/Drasil/DocumentLanguage.hs +++ b/code/drasil-docLang/Drasil/DocumentLanguage.hs @@ -449,7 +449,7 @@ mkSolChSpec si (SCSProg l) = SSD.inModelF pdStub ddStub tmStub (SRS.genDefn [] []) $ map mkParagraph intro ++ map (LlC . instanceModel fields si') ims mkSubSCS si' Assumptions = - SSD.assumpF $ mkEnumSimpleD . map (`helperCI` si') .filter (\x -> sDom (cdom x) == assumpDom ^. uid) . + SSD.assumpF $ mkEnumSimpleD . map (`helperCI` si') . filter (\x -> sDom (cdom x) == assumpDom ^. uid) . asOrderedList $ _sysinfodb si' ^. conceptinsTable {-where -- Duplicated here to avoid "leaking" the definition from drasil-lang diff --git a/code/drasil-docLang/Drasil/DocumentLanguage/Definitions.hs b/code/drasil-docLang/Drasil/DocumentLanguage/Definitions.hs index 82eaa7a8a9..b9f0d3b7bb 100644 --- a/code/drasil-docLang/Drasil/DocumentLanguage/Definitions.hs +++ b/code/drasil-docLang/Drasil/DocumentLanguage/Definitions.hs @@ -14,7 +14,7 @@ module Drasil.DocumentLanguage.Definitions ( ) where import Data.Map (keys) -import Data.List (elem) +import Data.List (elem, nub) import Control.Lens ((^.)) import Language.Drasil @@ -108,7 +108,7 @@ mkTMField _ _ label _ = error $ "Label " ++ show label ++ " not supported " ++ "for theory models" helperRefs :: HasUID t => t -> SystemInformation -> Sentence -helperRefs t s = foldlList Comma List $ map (`helpToRefField` s) $ refbyLookup (t ^. uid) (_sysinfodb s ^. refbyTable) +helperRefs t s = foldlList Comma List $ map (`helpToRefField` s) $ nub $ refbyLookup (t ^. uid) (_sysinfodb s ^. refbyTable) helpToRefField :: UID -> SystemInformation -> Sentence helpToRefField t si diff --git a/code/drasil-example/Drasil/SWHS/IMods.hs b/code/drasil-example/Drasil/SWHS/IMods.hs index 693c853b96..84c8198e24 100644 --- a/code/drasil-example/Drasil/SWHS/IMods.hs +++ b/code/drasil-example/Drasil/SWHS/IMods.hs @@ -475,16 +475,14 @@ htPCMDesc = foldlSent [S "The above", phrase equation `sIs` S "derived using" +: ----------- instModIntro :: Sentence -instModIntro = S "The" +:+ plural goal +:+ makeRef2S waterTempGS `sC` - makeRef2S pcmTempGS `sC` makeRef2S waterEnergyGS `sC` S "and" +:+ - makeRef2S pcmEnergyGS +:+ S "are solved by" +:+ makeRef2S eBalanceOnWtr `sC` - makeRef2S eBalanceOnPCM `sC` makeRef2S heatEInWtr `sC` S "and" +:+. - makeRef2S heatEInPCM +:+ S "The" +:+ plural solution +:+ S "for" +:+ - makeRef2S eBalanceOnWtr `sAnd` makeRef2S eBalanceOnPCM +:+ - S "are coupled since the" +:+ plural solution +:+ S "for" +:+ ch tempW `sAnd` - ch tempPCM +:+. S "depend on one another" +:+ makeRef2S heatEInWtr +:+ - S "can be solved once" +:+ makeRef2S eBalanceOnWtr +:+. - S "has been solved" +:+ S "The" +:+ plural solution `sOf` - makeRef2S eBalanceOnPCM `sAnd` makeRef2S heatEInPCM +:+ - S "are also coupled" `sC` S "since the" +:+ phrase tempPCM `andThe` - phrase pcmE +:+ S "depend on the" +:+. phrase phaseChange +instModIntro = foldlSent [S "The", plural goal, (foldlList Comma List $ + map makeRef2S [waterTempGS, pcmTempGS, waterEnergyGS, pcmEnergyGS]) `sAre` + S "solved by" +:+. (foldlList Comma List $ map makeRef2S + [eBalanceOnWtr, eBalanceOnPCM, heatEInWtr, heatEInPCM]), S "The", + plural solution, S "for", makeRef2S eBalanceOnWtr `sAnd` + makeRef2S eBalanceOnPCM `sAre` S "coupled since the", plural solution, + S "for", ch tempW `sAnd` ch tempPCM +:+. S "depend on one another", + makeRef2S heatEInWtr, S "can be solved once", makeRef2S eBalanceOnWtr +:+. + S "has been solved", S "The", plural solution `sOf` makeRef2S eBalanceOnPCM `sAnd` + makeRef2S heatEInPCM `sAre` S "also coupled" `sC` S "since the", + phrase tempPCM `andThe` phrase pcmE,S "depend on the", phrase phaseChange] diff --git a/code/stable/gamephys/SRS/Chipmunk_SRS.tex b/code/stable/gamephys/SRS/Chipmunk_SRS.tex index 19f6ad9865..4e529b9850 100644 --- a/code/stable/gamephys/SRS/Chipmunk_SRS.tex +++ b/code/stable/gamephys/SRS/Chipmunk_SRS.tex @@ -316,7 +316,7 @@ \subsubsection{Assumptions} \label{Sec:Assumps} This section simplifies the original problem and helps in developing the theoretical models by filling in the missing information for the physical system. \begin{itemize} -\item[objectTy:\phantomsection\label{assumpOT}]All objects are rigid bodies. (RefBy: \hyperref[DD:chalses]{DD: chalses}, \hyperref[DD:chalses]{DD: chalses}, \hyperref[DD:reVeInColl]{DD: reVeInColl}, \hyperref[IM:transMot]{IM: transMot}, \hyperref[IM:rotMot]{IM: rotMot}, \hyperref[DD:potEnergy]{DD: potEnergy}, \hyperref[DD:ctrOfMass]{DD: ctrOfMass}, \hyperref[DD:momentOfInertia]{DD: momentOfInertia}, \hyperref[DD:linVel]{DD: linVel}, \hyperref[DD:linDisp]{DD: linDisp}, \hyperref[DD:linAcc]{DD: linAcc}, \hyperref[DD:kEnergy]{DD: kEnergy}, \hyperref[DD:impulseV]{DD: impulseV}, \hyperref[DD:impulse]{DD: impulse}, \hyperref[IM:col2D]{IM: col2D}, \hyperref[TM:ChaslesThm]{TM: ChaslesThm}, \hyperref[DD:angVel]{DD: angVel}, \hyperref[DD:angDisp]{DD: angDisp}, and \hyperref[DD:angAccel]{DD: angAccel}.) +\item[objectTy:\phantomsection\label{assumpOT}]All objects are rigid bodies. (RefBy: \hyperref[DD:chalses]{DD: chalses}, \hyperref[DD:reVeInColl]{DD: reVeInColl}, \hyperref[IM:transMot]{IM: transMot}, \hyperref[IM:rotMot]{IM: rotMot}, \hyperref[DD:potEnergy]{DD: potEnergy}, \hyperref[DD:ctrOfMass]{DD: ctrOfMass}, \hyperref[DD:momentOfInertia]{DD: momentOfInertia}, \hyperref[DD:linVel]{DD: linVel}, \hyperref[DD:linDisp]{DD: linDisp}, \hyperref[DD:linAcc]{DD: linAcc}, \hyperref[DD:kEnergy]{DD: kEnergy}, \hyperref[DD:impulseV]{DD: impulseV}, \hyperref[DD:impulse]{DD: impulse}, \hyperref[IM:col2D]{IM: col2D}, \hyperref[TM:ChaslesThm]{TM: ChaslesThm}, \hyperref[DD:angVel]{DD: angVel}, \hyperref[DD:angDisp]{DD: angDisp}, and \hyperref[DD:angAccel]{DD: angAccel}.) \item[objectDimension:\phantomsection\label{assumpOD}]All objects are 2D. (RefBy: \hyperref[DD:chalses]{DD: chalses}, \hyperref[IM:transMot]{IM: transMot}, \hyperref[IM:rotMot]{IM: rotMot}, \hyperref[DD:potEnergy]{DD: potEnergy}, \hyperref[DD:ctrOfMass]{DD: ctrOfMass}, \hyperref[TM:NewtonSecLawRotMot]{TM: NewtonSecLawRotMot}, \hyperref[DD:linVel]{DD: linVel}, \hyperref[DD:linDisp]{DD: linDisp}, \hyperref[DD:linAcc]{DD: linAcc}, \hyperref[DD:kEnergy]{DD: kEnergy}, \hyperref[DD:impulse]{DD: impulse}, \hyperref[IM:col2D]{IM: col2D}, \hyperref[DD:angVel]{DD: angVel}, \hyperref[DD:angDisp]{DD: angDisp}, and \hyperref[DD:angAccel]{DD: angAccel}.) \item[coordinateSystemTy:\phantomsection\label{assumpCST}]The library uses a Cartesian coordinate system. \item[axesDefined:\phantomsection\label{assumpAD}]The axes are defined using right-handed coordinate system. (RefBy: \hyperref[IM:rotMot]{IM: rotMot}, \hyperref[DD:impulse]{DD: impulse}, and \hyperref[IM:col2D]{IM: col2D}.) diff --git a/code/stable/gamephys/Website/Chipmunk_SRS.html b/code/stable/gamephys/Website/Chipmunk_SRS.html index d15309a5dd..935665b351 100644 --- a/code/stable/gamephys/Website/Chipmunk_SRS.html +++ b/code/stable/gamephys/Website/Chipmunk_SRS.html @@ -656,7 +656,7 @@

Assumptions

diff --git a/code/stable/glassbr/SRS/GlassBR_SRS.tex b/code/stable/glassbr/SRS/GlassBR_SRS.tex index 3f0bbb281c..f471547264 100644 --- a/code/stable/glassbr/SRS/GlassBR_SRS.tex +++ b/code/stable/glassbr/SRS/GlassBR_SRS.tex @@ -600,7 +600,7 @@ \subsubsection{Data Definitions} \\ \midrule \\ Source & \cite{astm2009} \\ \midrule \\ -RefBy & \hyperref[DD:calofCapacity]{DD: calofCapacity} and \hyperref[DD:calofCapacity]{DD: calofCapacity} +RefBy & \hyperref[DD:calofCapacity]{DD: calofCapacity} \\ \bottomrule \end{tabular} \end{minipage} \par~ @@ -636,7 +636,7 @@ \subsubsection{Data Definitions} \\ \midrule \\ Source & \cite{astm2009} \\ \midrule \\ -RefBy & \hyperref[DD:calofCapacity]{DD: calofCapacity}, \hyperref[DD:calofCapacity]{DD: calofCapacity}, and \hyperref[DD:dimlessLoad]{DD: dimlessLoad} +RefBy & \hyperref[DD:calofCapacity]{DD: calofCapacity} and \hyperref[DD:dimlessLoad]{DD: dimlessLoad} \\ \bottomrule \end{tabular} \end{minipage} \par~ diff --git a/code/stable/glassbr/Website/GlassBR_SRS.html b/code/stable/glassbr/Website/GlassBR_SRS.html index d88e3b45e8..212e5bd511 100644 --- a/code/stable/glassbr/Website/GlassBR_SRS.html +++ b/code/stable/glassbr/Website/GlassBR_SRS.html @@ -1234,7 +1234,7 @@

Data Definitions

RefBy

- DD: calofCapacity and DD: calofCapacity + DD: calofCapacity

@@ -1294,7 +1294,7 @@

Data Definitions

RefBy

- DD: calofCapacity, DD: calofCapacity, and DD: dimlessLoad + DD: calofCapacity and DD: dimlessLoad

diff --git a/code/stable/nopcm/SRS/NoPCM_SRS.tex b/code/stable/nopcm/SRS/NoPCM_SRS.tex index daf9814ccb..6cf4896a29 100644 --- a/code/stable/nopcm/SRS/NoPCM_SRS.tex +++ b/code/stable/nopcm/SRS/NoPCM_SRS.tex @@ -476,7 +476,7 @@ \subsubsection{Data Definitions} \\ \midrule \\ Source & \cite{koothoor2013} \\ \midrule \\ -RefBy & \hyperref[IM:eBalanceOnWtr]{IM: eBalanceOnWtr} and \hyperref[IM:eBalanceOnWtr]{IM: eBalanceOnWtr} +RefBy & \hyperref[IM:eBalanceOnWtr]{IM: eBalanceOnWtr} \\ \bottomrule \end{tabular} \end{minipage} \subsubsection{Instance Models} diff --git a/code/stable/nopcm/Website/NoPCM_SRS.html b/code/stable/nopcm/Website/NoPCM_SRS.html index a80dd9a8b1..ab0bc9bbb0 100644 --- a/code/stable/nopcm/Website/NoPCM_SRS.html +++ b/code/stable/nopcm/Website/NoPCM_SRS.html @@ -999,7 +999,7 @@

Data Definitions

RefBy

- IM: eBalanceOnWtr and IM: eBalanceOnWtr + IM: eBalanceOnWtr

diff --git a/code/stable/ssp/SRS/SSP_SRS.tex b/code/stable/ssp/SRS/SSP_SRS.tex index 18551c4dbc..4bd4a33a56 100644 --- a/code/stable/ssp/SRS/SSP_SRS.tex +++ b/code/stable/ssp/SRS/SSP_SRS.tex @@ -422,7 +422,7 @@ \subsubsection{Assumptions} \item[Soil-Properties:\phantomsection\label{assumpSP}]The soil properties are independent of dry or saturated conditions, with the exception of unit weight. (RefBy: \hyperref[GD:resShr]{GD: resShr}.) \item[Soil-Layers-Isotropic:\phantomsection\label{assumpSLI}]The soil mass is treated as if the effective cohesion and effective angle of friction are isotropic properties. (RefBy: \hyperref[GD:resShr]{GD: resShr}.) \item[Interslice-Norm-Shear-Forces-Linear:\phantomsection\label{assumpINSFL}]Following the assumption of Morgenstern and Price (\cite{morgenstern1965}), interslice normal forces and interslice shear forces have a proportional relationship, depending on a proportionality constant ($λ$) and a function ($\mathbf{f}$) describing variation depending on $x$ position. (RefBy: \hyperref[IM:nrmShrFor]{IM: nrmShrFor}, \hyperref[GD:normShrR]{GD: normShrR}, \hyperref[IM:fctSfty]{IM: fctSfty}, and \hyperref[UC_normshearlinear]{UC: Normal-And-Shear-Linear-Only}.) -\item[Plane-Strain-Conditions:\phantomsection\label{assumpPSC}]The slope and slip surface extends far into and out of the geometry ($z$ coordinate). This implies plane strain conditions, making 2D analysis appropriate. (RefBy: \hyperref[GD:srfWtrF]{GD: srfWtrF}, \hyperref[GD:sliceWght]{GD: sliceWght}, \hyperref[GD:sliceWght]{GD: sliceWght}, \hyperref[GD:sliceWght]{GD: sliceWght}, \hyperref[GD:resShr]{GD: resShr}, \hyperref[GD:effNormF]{GD: effNormF}, and \hyperref[GD:baseWtrF]{GD: baseWtrF}.) +\item[Plane-Strain-Conditions:\phantomsection\label{assumpPSC}]The slope and slip surface extends far into and out of the geometry ($z$ coordinate). This implies plane strain conditions, making 2D analysis appropriate. (RefBy: \hyperref[GD:srfWtrF]{GD: srfWtrF}, \hyperref[GD:sliceWght]{GD: sliceWght}, \hyperref[GD:resShr]{GD: resShr}, \hyperref[GD:effNormF]{GD: effNormF}, and \hyperref[GD:baseWtrF]{GD: baseWtrF}.) \item[Effective-Norm-Stress-Large:\phantomsection\label{assumpENSL}]The effective normal stress is large enough that the shear strength to effective normal stress relationship can be approximated as a linear relationship. (RefBy: \hyperref[TM:equilibrium]{TM: equilibrium} and \hyperref[UC_2donly]{UC: 2D-Analysis-Only}.) \item[Surface-Base-Slice-between-Interslice-Straight-Lines:\phantomsection\label{assumpSBSBISL}]The surface and base of a slice are approximated as straight lines. (RefBy: \hyperref[GD:srfWtrF]{GD: srfWtrF}, \hyperref[GD:sliceWght]{GD: sliceWght}, \hyperref[TM:mcShrStrgth]{TM: mcShrStrgth}, \hyperref[DD:slcHeight]{DD: slcHeight}, \hyperref[DD:angleB]{DD: angleB}, \hyperref[GD:baseWtrF]{GD: baseWtrF}, and \hyperref[DD:angleA]{DD: angleA}.) \item[Edge-Slices:\phantomsection\label{assumpES}]The interslice forces at the 0th and $n$th interslice interfaces are zero. (RefBy: \hyperref[IM:nrmShrFor]{IM: nrmShrFor}, \hyperref[IM:intsliceFs]{IM: intsliceFs}, and \hyperref[IM:fctSfty]{IM: fctSfty}.) @@ -431,7 +431,7 @@ \subsubsection{Assumptions} \item[Water-Intersects-Base-Edge:\phantomsection\label{assumpWIBE}]The water table only intersects the base of a slice at an edge of the slice. (RefBy: \hyperref[GD:sliceWght]{GD: sliceWght} and \hyperref[GD:baseWtrF]{GD: baseWtrF}.) \item[Water-Intersects-Surface-Edge:\phantomsection\label{assumpWISE}]The water table only intersects the slope surface at the edge of a slice. (RefBy: \hyperref[GD:srfWtrF]{GD: srfWtrF} and \hyperref[GD:sliceWght]{GD: sliceWght}.) \item[Negligible-Effect-Surface-Slope-Seismic:\phantomsection\label{assumpNESSS}]The effect of the slope of the surface of the soil on the seismic force is assumed to be negligible. (RefBy: \hyperref[GD:momentEql]{GD: momentEql}.) -\item[Hydrostatic-Force-Slice-Midpoint:\phantomsection\label{assumpHFSM}]The resultant surface hydrostatic forces act into the midpoint of each slice surface and the resultant base hydrostatic forces act into the midpoint of each slice base. (RefBy: \hyperref[GD:srfWtrF]{GD: srfWtrF}, \hyperref[GD:momentEql]{GD: momentEql}, \hyperref[GD:momentEql]{GD: momentEql}, and \hyperref[GD:baseWtrF]{GD: baseWtrF}.) +\item[Hydrostatic-Force-Slice-Midpoint:\phantomsection\label{assumpHFSM}]The resultant surface hydrostatic forces act into the midpoint of each slice surface and the resultant base hydrostatic forces act into the midpoint of each slice base. (RefBy: \hyperref[GD:srfWtrF]{GD: srfWtrF}, \hyperref[GD:momentEql]{GD: momentEql}, and \hyperref[GD:baseWtrF]{GD: baseWtrF}.) \end{itemize} \subsubsection{Theoretical Models} \label{Sec:TMs} @@ -784,7 +784,7 @@ \subsubsection{General Definitions} \\ \midrule \\ Source & \cite{chen2005} and \cite{karchewski2012} \\ \midrule \\ -RefBy & \hyperref[IM:intsliceFs]{IM: intsliceFs}, \hyperref[IM:fctSfty]{IM: fctSfty}, \hyperref[IM:fctSfty]{IM: fctSfty}, and \hyperref[IM:fctSfty]{IM: fctSfty} +RefBy & \hyperref[IM:intsliceFs]{IM: intsliceFs} and \hyperref[IM:fctSfty]{IM: fctSfty} \\ \bottomrule \end{tabular} \end{minipage} \par~ @@ -817,7 +817,7 @@ \subsubsection{General Definitions} \\ \midrule \\ Source & \cite{chen2005} and \cite{karchewski2012} \\ \midrule \\ -RefBy & \hyperref[IM:intsliceFs]{IM: intsliceFs}, \hyperref[IM:fctSfty]{IM: fctSfty}, and \hyperref[IM:fctSfty]{IM: fctSfty} +RefBy & \hyperref[IM:intsliceFs]{IM: intsliceFs} and \hyperref[IM:fctSfty]{IM: fctSfty} \\ \bottomrule \end{tabular} \end{minipage} \par~ @@ -971,7 +971,7 @@ \subsubsection{General Definitions} \\ \midrule \\ Source & \hyperref{https://en.wikipedia.org/wiki/Weight}{}{}{Definition of Weight} \\ \midrule \\ -RefBy & \hyperref[GD:sliceWght]{GD: sliceWght}, \hyperref[GD:sliceWght]{GD: sliceWght}, \hyperref[GD:sliceWght]{GD: sliceWght}, \hyperref[GD:momentEql]{GD: momentEql}, and \hyperref[GD:momentEql]{GD: momentEql} +RefBy & \hyperref[GD:sliceWght]{GD: sliceWght} and \hyperref[GD:momentEql]{GD: momentEql} \\ \bottomrule \end{tabular} \end{minipage} Under the influence of gravity, and assuming a 2D Cartesian coordinate system with down as positive, an object has an acceleration vector of: @@ -1571,7 +1571,7 @@ \subsubsection{Data Definitions} \\ \midrule \\ Source & \cite{chen2005} and \cite{karchewski2012} \\ \midrule \\ -RefBy & \hyperref[IM:intsliceFs]{IM: intsliceFs}, \hyperref[IM:fctSfty]{IM: fctSfty}, and \hyperref[IM:fctSfty]{IM: fctSfty} +RefBy & \hyperref[IM:intsliceFs]{IM: intsliceFs} and \hyperref[IM:fctSfty]{IM: fctSfty} \\ \bottomrule \end{tabular} \end{minipage} \par~ @@ -1733,7 +1733,7 @@ \subsubsection{Instance Models} \\ \midrule \\ Source & \cite{chen2005} and \cite{karchewski2012} \\ \midrule \\ -RefBy & \hyperref[IM:nrmShrFor]{IM: nrmShrFor}, \hyperref[IM:intsliceFs]{IM: intsliceFs}, \hyperref[IM:intsliceFs]{IM: intsliceFs}, \hyperref[IM:fctSfty]{IM: fctSfty}, \hyperref[displayShear]{FR: Display-Interslice-Shear-Forces}, \hyperref[displayNormal]{FR: Display-Interslice-Normal-Forces}, \hyperref[displayFS]{FR: Display-Factor-of-Safety}, and \hyperref[determineCritSlip]{FR: Determine-Critical-Slip-Surface} +RefBy & \hyperref[IM:nrmShrFor]{IM: nrmShrFor}, \hyperref[IM:intsliceFs]{IM: intsliceFs}, \hyperref[IM:fctSfty]{IM: fctSfty}, \hyperref[displayShear]{FR: Display-Interslice-Shear-Forces}, \hyperref[displayNormal]{FR: Display-Interslice-Normal-Forces}, \hyperref[displayFS]{FR: Display-Factor-of-Safety}, and \hyperref[determineCritSlip]{FR: Determine-Critical-Slip-Surface} \\ \bottomrule \end{tabular} \end{minipage} The mobilized shear force defined in \hyperref[GD:bsShrFEq]{GD: bsShrFEq} can be substituted into the definition of mobilized shear force based on the factor of safety, from \hyperref[GD:mobShr]{GD: mobShr} yielding Equation (1) below: @@ -1927,7 +1927,7 @@ \subsubsection{Instance Models} \\ \midrule \\ Source & \cite{chen2005} and \cite{karchewski2012} \\ \midrule \\ -RefBy & \hyperref[IM:nrmShrFor]{IM: nrmShrFor} and \hyperref[IM:nrmShrFor]{IM: nrmShrFor} +RefBy & \hyperref[IM:nrmShrFor]{IM: nrmShrFor} \\ \bottomrule \end{tabular} \end{minipage} See \hyperref[IM:nrmShrFor]{IM: nrmShrFor} for the derivation of ${\mathbf{C}_{num}}$. @@ -1970,7 +1970,7 @@ \subsubsection{Instance Models} \\ \midrule \\ Source & \cite{chen2005} and \cite{karchewski2012} \\ \midrule \\ -RefBy & \hyperref[IM:nrmShrFor]{IM: nrmShrFor} and \hyperref[IM:nrmShrFor]{IM: nrmShrFor} +RefBy & \hyperref[IM:nrmShrFor]{IM: nrmShrFor} \\ \bottomrule \end{tabular} \end{minipage} See \hyperref[IM:nrmShrFor]{IM: nrmShrFor} for the derivation of ${\mathbf{C}_{den}}$. @@ -2015,7 +2015,7 @@ \subsubsection{Instance Models} \\ \midrule \\ Source & \cite{chen2005} \\ \midrule \\ -RefBy & \hyperref[IM:nrmShrFor]{IM: nrmShrFor}, \hyperref[IM:intsliceFs]{IM: intsliceFs}, \hyperref[IM:intsliceFs]{IM: intsliceFs}, \hyperref[IM:fctSfty]{IM: fctSfty}, \hyperref[displayShear]{FR: Display-Interslice-Shear-Forces}, \hyperref[displayNormal]{FR: Display-Interslice-Normal-Forces}, \hyperref[displayFS]{FR: Display-Factor-of-Safety}, and \hyperref[determineCritSlip]{FR: Determine-Critical-Slip-Surface} +RefBy & \hyperref[IM:nrmShrFor]{IM: nrmShrFor}, \hyperref[IM:intsliceFs]{IM: intsliceFs}, \hyperref[IM:fctSfty]{IM: fctSfty}, \hyperref[displayShear]{FR: Display-Interslice-Shear-Forces}, \hyperref[displayNormal]{FR: Display-Interslice-Normal-Forces}, \hyperref[displayFS]{FR: Display-Factor-of-Safety}, and \hyperref[determineCritSlip]{FR: Determine-Critical-Slip-Surface} \\ \bottomrule \end{tabular} \end{minipage} This derivation is identical to the derivation for \hyperref[IM:fctSfty]{IM: fctSfty} up until Equation (3) shown again below: diff --git a/code/stable/ssp/Website/SSP_SRS.html b/code/stable/ssp/Website/SSP_SRS.html index 51500177d3..ee74997f35 100644 --- a/code/stable/ssp/Website/SSP_SRS.html +++ b/code/stable/ssp/Website/SSP_SRS.html @@ -1048,7 +1048,7 @@

Assumptions

- Plane-Strain-Conditions: The slope and slip surface extends far into and out of the geometry (z coordinate). This implies plane strain conditions, making 2D analysis appropriate. (RefBy: GD: srfWtrF, GD: sliceWght, GD: sliceWght, GD: sliceWght, GD: resShr, GD: effNormF, and GD: baseWtrF.) + Plane-Strain-Conditions: The slope and slip surface extends far into and out of the geometry (z coordinate). This implies plane strain conditions, making 2D analysis appropriate. (RefBy: GD: srfWtrF, GD: sliceWght, GD: resShr, GD: effNormF, and GD: baseWtrF.)

@@ -1093,7 +1093,7 @@

Assumptions

- Hydrostatic-Force-Slice-Midpoint: The resultant surface hydrostatic forces act into the midpoint of each slice surface and the resultant base hydrostatic forces act into the midpoint of each slice base. (RefBy: GD: srfWtrF, GD: momentEql, GD: momentEql, and GD: baseWtrF.) + Hydrostatic-Force-Slice-Midpoint: The resultant surface hydrostatic forces act into the midpoint of each slice surface and the resultant base hydrostatic forces act into the midpoint of each slice base. (RefBy: GD: srfWtrF, GD: momentEql, and GD: baseWtrF.)

@@ -1719,7 +1719,7 @@

General Definitions

RefBy

- IM: intsliceFs, IM: fctSfty, IM: fctSfty, and IM: fctSfty + IM: intsliceFs and IM: fctSfty

@@ -1787,7 +1787,7 @@

General Definitions

RefBy

- IM: intsliceFs, IM: fctSfty, and IM: fctSfty + IM: intsliceFs and IM: fctSfty

@@ -2202,7 +2202,7 @@

General Definitions

RefBy

- GD: sliceWght, GD: sliceWght, GD: sliceWght, GD: momentEql, and GD: momentEql + GD: sliceWght and GD: momentEql

@@ -3434,7 +3434,7 @@

Data Definitions

RefBy

- IM: intsliceFs, IM: fctSfty, and IM: fctSfty + IM: intsliceFs and IM: fctSfty

@@ -3747,7 +3747,7 @@

Instance Models

RefBy

- IM: nrmShrFor, IM: intsliceFs, IM: intsliceFs, IM: fctSfty, FR: Display-Interslice-Shear-Forces, FR: Display-Interslice-Normal-Forces, FR: Display-Factor-of-Safety, and FR: Determine-Critical-Slip-Surface + IM: nrmShrFor, IM: intsliceFs, IM: fctSfty, FR: Display-Interslice-Shear-Forces, FR: Display-Interslice-Normal-Forces, FR: Display-Factor-of-Safety, and FR: Determine-Critical-Slip-Surface

@@ -4333,9 +4333,7 @@

Instance Models

RefBy -

- IM: nrmShrFor and IM: nrmShrFor -

+

IM: nrmShrFor

@@ -4434,9 +4432,7 @@

Instance Models

RefBy -

- IM: nrmShrFor and IM: nrmShrFor -

+

IM: nrmShrFor

@@ -4546,7 +4542,7 @@

Instance Models

RefBy

- IM: nrmShrFor, IM: intsliceFs, IM: intsliceFs, IM: fctSfty, FR: Display-Interslice-Shear-Forces, FR: Display-Interslice-Normal-Forces, FR: Display-Factor-of-Safety, and FR: Determine-Critical-Slip-Surface + IM: nrmShrFor, IM: intsliceFs, IM: fctSfty, FR: Display-Interslice-Shear-Forces, FR: Display-Interslice-Normal-Forces, FR: Display-Factor-of-Safety, and FR: Determine-Critical-Slip-Surface

diff --git a/code/stable/swhs/SRS/SWHS_SRS.tex b/code/stable/swhs/SRS/SWHS_SRS.tex index 9a318af87d..9d2d202d10 100644 --- a/code/stable/swhs/SRS/SWHS_SRS.tex +++ b/code/stable/swhs/SRS/SWHS_SRS.tex @@ -433,7 +433,7 @@ \subsubsection{Theoretical Models} \\ \midrule \\ Source & \hyperref{http://en.wikipedia.org/wiki/Sensible_heat}{}{}{Definition of Sensible Heat} \\ \midrule \\ -RefBy & \hyperref[IM:heatEInWtr]{IM: heatEInWtr}, \hyperref[IM:heatEInPCM]{IM: heatEInPCM}, \hyperref[IM:heatEInPCM]{IM: heatEInPCM}, and \hyperref[IM:heatEInPCM]{IM: heatEInPCM} +RefBy & \hyperref[IM:heatEInWtr]{IM: heatEInWtr} and \hyperref[IM:heatEInPCM]{IM: heatEInPCM} \\ \bottomrule \end{tabular} \end{minipage} \par~ @@ -585,7 +585,7 @@ \subsubsection{Data Definitions} \\ \midrule \\ Source & \cite{koothoor2013} \\ \midrule \\ -RefBy & \hyperref[IM:eBalanceOnWtr]{IM: eBalanceOnWtr} and \hyperref[IM:eBalanceOnWtr]{IM: eBalanceOnWtr} +RefBy & \hyperref[IM:eBalanceOnWtr]{IM: eBalanceOnWtr} \\ \bottomrule \end{tabular} \end{minipage} \par~ @@ -618,7 +618,7 @@ \subsubsection{Data Definitions} \\ \midrule \\ Source & \cite{koothoor2013} \\ \midrule \\ -RefBy & \hyperref[IM:eBalanceOnWtr]{IM: eBalanceOnWtr}, \hyperref[IM:eBalanceOnWtr]{IM: eBalanceOnWtr}, and \hyperref[IM:eBalanceOnPCM]{IM: eBalanceOnPCM} +RefBy & \hyperref[IM:eBalanceOnWtr]{IM: eBalanceOnWtr} and \hyperref[IM:eBalanceOnPCM]{IM: eBalanceOnPCM} \\ \bottomrule \end{tabular} \end{minipage} \par~ @@ -709,7 +709,7 @@ \subsubsection{Data Definitions} \\ \midrule \\ Source & \cite[(pg. 282)]{bueche1986} \\ \midrule \\ -RefBy & \hyperref[DD:meltFrac]{DD: meltFrac}, \hyperref[TM:latentHtE]{TM: latentHtE}, \hyperref[IM:heatEInPCM]{IM: heatEInPCM}, \hyperref[IM:eBalanceOnWtr]{IM: eBalanceOnWtr}, and \hyperref[IM:eBalanceOnWtr]{IM: eBalanceOnWtr} +RefBy & \hyperref[DD:meltFrac]{DD: meltFrac}, \hyperref[TM:latentHtE]{TM: latentHtE}, \hyperref[IM:heatEInPCM]{IM: heatEInPCM}, and \hyperref[IM:eBalanceOnWtr]{IM: eBalanceOnWtr} \\ \bottomrule \end{tabular} \end{minipage} \par~ @@ -788,7 +788,7 @@ \subsubsection{Instance Models} \\ \midrule \\ Source & \cite{koothoor2013} \\ \midrule \\ -RefBy & \hyperref[unlikeChgNIHG]{UC: No-Internal-Heat-Generation}, \hyperref[outputInputDerivQuants]{FR: Output-Input-Derived-Quantities}, \hyperref[outputInputDerivQuants]{FR: Output-Input-Derived-Quantities}, \hyperref[findMass]{FR: Find-Mass}, \hyperref[IM:eBalanceOnWtr]{IM: eBalanceOnWtr}, \hyperref[IM:eBalanceOnPCM]{IM: eBalanceOnPCM}, \hyperref[IM:eBalanceOnPCM]{IM: eBalanceOnPCM}, and \hyperref[calcTempWtrOverTime]{FR: Calculate-Temperature-Water-Over-Time} +RefBy & \hyperref[unlikeChgNIHG]{UC: No-Internal-Heat-Generation}, \hyperref[outputInputDerivQuants]{FR: Output-Input-Derived-Quantities}, \hyperref[findMass]{FR: Find-Mass}, \hyperref[IM:eBalanceOnWtr]{IM: eBalanceOnWtr}, \hyperref[IM:eBalanceOnPCM]{IM: eBalanceOnPCM}, and \hyperref[calcTempWtrOverTime]{FR: Calculate-Temperature-Water-Over-Time} \\ \bottomrule \end{tabular} \end{minipage} Derivation of the energy balance on water: @@ -865,7 +865,7 @@ \subsubsection{Instance Models} \\ \midrule \\ Source & \cite{koothoor2013} \\ \midrule \\ -RefBy & \hyperref[unlikeChgNIHG]{UC: No-Internal-Heat-Generation}, \hyperref[unlikeChgNGS]{UC: No-Gaseous-State}, \hyperref[outputInputDerivQuants]{FR: Output-Input-Derived-Quantities}, \hyperref[outputInputDerivQuants]{FR: Output-Input-Derived-Quantities}, \hyperref[findMass]{FR: Find-Mass}, \hyperref[IM:eBalanceOnWtr]{IM: eBalanceOnWtr}, \hyperref[calcTempPCMOverTime]{FR: Calculate-Temperature-PCM-Over-Time}, \hyperref[calcPCMMeltEnd]{FR: Calculate-PCM-Melt-End-Time}, and \hyperref[calcPCMMeltBegin]{FR: Calculate-PCM-Melt-Begin-Time} +RefBy & \hyperref[unlikeChgNIHG]{UC: No-Internal-Heat-Generation}, \hyperref[unlikeChgNGS]{UC: No-Gaseous-State}, \hyperref[outputInputDerivQuants]{FR: Output-Input-Derived-Quantities}, \hyperref[findMass]{FR: Find-Mass}, \hyperref[IM:eBalanceOnWtr]{IM: eBalanceOnWtr}, \hyperref[calcTempPCMOverTime]{FR: Calculate-Temperature-PCM-Over-Time}, \hyperref[calcPCMMeltEnd]{FR: Calculate-PCM-Melt-End-Time}, and \hyperref[calcPCMMeltBegin]{FR: Calculate-PCM-Melt-Begin-Time} \\ \bottomrule \end{tabular} \end{minipage} Detailed derivation of the energy balance on the PCM during sensible heating phase: diff --git a/code/stable/swhs/Website/SWHS_SRS.html b/code/stable/swhs/Website/SWHS_SRS.html index 0005f75e94..73b6122057 100644 --- a/code/stable/swhs/Website/SWHS_SRS.html +++ b/code/stable/swhs/Website/SWHS_SRS.html @@ -973,7 +973,7 @@

Theoretical Models

RefBy

- IM: heatEInWtr, IM: heatEInPCM, IM: heatEInPCM, and IM: heatEInPCM + IM: heatEInWtr and IM: heatEInPCM

@@ -1305,7 +1305,7 @@

Data Definitions

RefBy

- IM: eBalanceOnWtr and IM: eBalanceOnWtr + IM: eBalanceOnWtr

@@ -1371,7 +1371,7 @@

Data Definitions

RefBy

- IM: eBalanceOnWtr, IM: eBalanceOnWtr, and IM: eBalanceOnPCM + IM: eBalanceOnWtr and IM: eBalanceOnPCM

@@ -1564,7 +1564,7 @@

Data Definitions

RefBy

- DD: meltFrac, TM: latentHtE, IM: heatEInPCM, IM: eBalanceOnWtr, and IM: eBalanceOnWtr + DD: meltFrac, TM: latentHtE, IM: heatEInPCM, and IM: eBalanceOnWtr

@@ -1751,7 +1751,7 @@

Instance Models

RefBy

- UC: No-Internal-Heat-Generation, FR: Output-Input-Derived-Quantities, FR: Output-Input-Derived-Quantities, FR: Find-Mass, IM: eBalanceOnWtr, IM: eBalanceOnPCM, IM: eBalanceOnPCM, and FR: Calculate-Temperature-Water-Over-Time + UC: No-Internal-Heat-Generation, FR: Output-Input-Derived-Quantities, FR: Find-Mass, IM: eBalanceOnWtr, IM: eBalanceOnPCM, and FR: Calculate-Temperature-Water-Over-Time

@@ -2030,7 +2030,7 @@

Instance Models

RefBy

- UC: No-Internal-Heat-Generation, UC: No-Gaseous-State, FR: Output-Input-Derived-Quantities, FR: Output-Input-Derived-Quantities, FR: Find-Mass, IM: eBalanceOnWtr, FR: Calculate-Temperature-PCM-Over-Time, FR: Calculate-PCM-Melt-End-Time, and FR: Calculate-PCM-Melt-Begin-Time + UC: No-Internal-Heat-Generation, UC: No-Gaseous-State, FR: Output-Input-Derived-Quantities, FR: Find-Mass, IM: eBalanceOnWtr, FR: Calculate-Temperature-PCM-Over-Time, FR: Calculate-PCM-Melt-End-Time, and FR: Calculate-PCM-Melt-Begin-Time