From 0e13e048e420462db54b0a1e4f8c7c1c270c73c9 Mon Sep 17 00:00:00 2001 From: Noah Date: Tue, 18 Jun 2024 10:38:16 -0400 Subject: [PATCH] spacing added --- .../lib/Data/Drasil/ExternalLibraries/ODELibraries.hs | 8 ++++---- .../drasil-example/glassbr/lib/Drasil/GlassBR/IMods.hs | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/drasil-code/lib/Data/Drasil/ExternalLibraries/ODELibraries.hs b/code/drasil-code/lib/Data/Drasil/ExternalLibraries/ODELibraries.hs index 5ffeca4515..8cdc9da0a8 100644 --- a/code/drasil-code/lib/Data/Drasil/ExternalLibraries/ODELibraries.hs +++ b/code/drasil-code/lib/Data/Drasil/ExternalLibraries/ODELibraries.hs @@ -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) @@ -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]) $ diff --git a/code/drasil-example/glassbr/lib/Drasil/GlassBR/IMods.hs b/code/drasil-example/glassbr/lib/Drasil/GlassBR/IMods.hs index 1f7287c263..d8768ebb4d 100644 --- a/code/drasil-example/glassbr/lib/Drasil/GlassBR/IMods.hs +++ b/code/drasil-example/glassbr/lib/Drasil/GlassBR/IMods.hs @@ -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)) {--} @@ -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 @@ -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