Skip to content

Commit

Permalink
spacing added
Browse files Browse the repository at this point in the history
  • Loading branch information
NoahCardoso committed Jun 18, 2024
1 parent 30a4e88 commit 0e13e04
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ scipyCall info = externalLibCall [
(returnExprListFill $ odeSyst info)],
uncurry choiceStepFill (chooseMethod $ solveMethod $ odeOpts info),
mandatoryStepsFill [callStepFill $ libCallFill $ map basicArgFill
[matrix[initVal info], tInit info],
initSolListWithValFill (depVar info) (matrix[initVal info]),
[matrix [initVal info], tInit info],
initSolListWithValFill (depVar info) (matrix [initVal info]),
solveAndPopulateWhileFill (libCallFill []) (tFinal info)
(libCallFill [basicArgFill ((field r t) $+ (stepSize (odeOpts info)))])
(libCallFill [basicArgFill (field r t $+ stepSize (odeOpts info))])
(depVar info)]]
where chooseMethod Adams = (0, solveMethodFill)
chooseMethod BDF = (1, solveMethodFill)
Expand Down Expand Up @@ -182,7 +182,7 @@ oslo = externalLib [

osloCall :: ODEInfo -> ExternalLibraryCall
osloCall info = externalLibCall [
mandatoryStepFill $ callStepFill $ libCallFill [basicArgFill $ matrix[initVal info]],
mandatoryStepFill $ callStepFill $ libCallFill [basicArgFill $ matrix [initVal info]],
choiceStepFill (chooseMethod $ solveMethod $ odeOpts info) $ callStepFill $
libCallFill [basicArgFill $ tInit info,
functionArgFill (map unnamedParamFill [indepVar info, vecDepVar info]) $
Expand Down
10 changes: 5 additions & 5 deletions code/drasil-example/glassbr/lib/Drasil/GlassBR/IMods.hs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ risk = imNoDeriv (equationalModelN (riskFun ^. term) riskQD)
-- FIXME [4] !!!
riskQD :: SimpleQDef
riskQD = mkQuantDef riskFun ((sy sflawParamK $/
((sy plateLen) $* (sy plateWidth) $^ (sy sflawParamM $- exactDbl 1))) $*
(sy plateLen $* sy plateWidth $^ (sy sflawParamM $- exactDbl 1))) $*
((sy modElas $* square (sy minThick)) $^ sy sflawParamM) $* sy lDurFac $* exp (sy stressDistFac))

{--}
Expand Down Expand Up @@ -87,8 +87,8 @@ nonFL = imNoDeriv (equationalModelN (nonFactorL ^. term) nonFLQD)
[qHtTlTolRef, stdVals [modElas], hRef, aGrtrThanB]

nonFLEq :: Expr
nonFLEq = ((sy tolLoad) $* (sy modElas)) $* (sy minThick $^ exactDbl 4) $/
square ((sy plateLen) $* (sy plateWidth))
nonFLEq = (sy tolLoad $* sy modElas) $* (sy minThick $^ exactDbl 4) $/
square (sy plateLen $* sy plateWidth)

nonFLQD :: SimpleQDef
nonFLQD = mkQuantDef nonFactorL nonFLEq
Expand All @@ -102,8 +102,8 @@ dimLL = imNoDeriv (equationalModelN (dimlessLoad ^. term) dimLLQD)
"dimlessLoad" [qRef, aGrtrThanB, stdVals [modElas], hRef, gtfRef]

dimLLEq :: Expr
dimLLEq = sy demand $* (square ((sy plateLen) $* (sy plateWidth)))
$/ ((sy modElas) $* (sy minThick $^ exactDbl 4)) $* (sy gTF)
dimLLEq = sy demand $* square (sy plateLen $* sy plateWidth)
$/ (sy modElas $* (sy minThick $^ exactDbl 4)) $* sy gTF

dimLLQD :: SimpleQDef
dimLLQD = mkQuantDef dimlessLoad dimLLEq
Expand Down

0 comments on commit 0e13e04

Please sign in to comment.