format fix

Author: Brad Carman

src/Hydraulic/IsothermalCompressible/IsothermalCompressible.jl

@@ -16,5 +16,4 @@ include("utils.jl")
 export Source, InputSource, FixedVolume, Pipe
 include("components.jl")
 
-
-end
+end

src/Hydraulic/IsothermalCompressible/components.jl

@@ -63,24 +63,18 @@ Caps a hydrualic port to prevent mass flow in or out.
 - `port`: hydraulic port
 """
 @component function Cap(; p_int, name)
-    pars = @parameters p_int = p_int 
+    pars = @parameters p_int = p_int
 
     vars = @variables p(t) = p_int
 
     systems = @named begin port = HydraulicPort(; p_int = p_int) end
 
-    eqs = [
-        port.p ~ p
-        port.dm ~ 0
-    ]
+    eqs = [port.p ~ p
+           port.dm ~ 0]
 
     ODESystem(eqs, t, vars, pars; name, systems)
 end
 
-
-
-
-
 """
     FixedVolume(; vol, p_int, name)
 

test/Hydraulic/isothermal_compressible.jl

@@ -7,13 +7,12 @@ import ModelingToolkitStandardLibrary.Mechanical.Translational as T
 D = Differential(t)
 
 function system(N; bulk_modulus, name)
-    pars = @parameters begin
-        bulk_modulus = bulk_modulus
-    end
+    pars = @parameters begin bulk_modulus = bulk_modulus end
 
     systems = @named begin
-        fluid = IC.HydraulicFluid(;bulk_modulus)
-        stp = B.Step(; height = 10e5, offset = 0, start_time = 0.005, duration = Inf, smooth = true)
+        fluid = IC.HydraulicFluid(; bulk_modulus)
+        stp = B.Step(; height = 10e5, offset = 0, start_time = 0.005, duration = Inf,
+                     smooth = true)
         src = IC.InputSource(; p_int = 0)
         vol = IC.FixedVolume(; p_int = 0, vol = 10.0)
     end
@@ -25,23 +24,24 @@ function system(N; bulk_modulus, name)
     end
     push!(systems, res)
 
-    eqs = [ connect(stp.output, src.input)
-            connect(fluid, src.port)
-            connect(src.port, res.port_a)
-            connect(res.port_b, vol.port)]
+    eqs = [connect(stp.output, src.input)
+           connect(fluid, src.port)
+           connect(src.port, res.port_a)
+           connect(res.port_b, vol.port)]
 
     ODESystem(eqs, t, [], pars; name, systems)
 end
 
-@named sys1_2 = system(1; bulk_modulus=2e9)
-@named sys1_1 = system(1; bulk_modulus=1e9)
-@named sys5_1 = system(5; bulk_modulus=1e9)
+@named sys1_2 = system(1; bulk_modulus = 2e9)
+@named sys1_1 = system(1; bulk_modulus = 1e9)
+@named sys5_1 = system(5; bulk_modulus = 1e9)
 
 NEWTON = NLNewton(check_div = false, always_new = true, max_iter = 100, relax = 4 // 10)
 
 syss = structural_simplify.([sys1_2, sys1_1, sys5_1])
 probs = [ODEProblem(sys, [], (0, 0.2)) for sys in syss];
-sols = [solve(prob, ImplicitEuler(nlsolve=NEWTON); initializealg=NoInit()) for prob in probs];
+sols = [solve(prob, ImplicitEuler(nlsolve = NEWTON); initializealg = NoInit())
+        for prob in probs];
 
 s1_2 = complete(sys1_2)
 s1_1 = complete(sys1_1)
@@ -64,50 +64,46 @@ s5_1 = complete(sys5_1)
 # Legend(fig[1,2], ax)
 # fig
 
-
-
-
 function system(; bulk_modulus, name)
-    pars = @parameters begin
-        bulk_modulus = bulk_modulus
-    end
+    pars = @parameters begin bulk_modulus = bulk_modulus end
 
     systems = @named begin
-        fluid = IC.HydraulicFluid(;bulk_modulus)
-        stp = B.Step(; height = 10e5, offset = 0, start_time = 0.05, duration = Inf, smooth = 0.001)
+        fluid = IC.HydraulicFluid(; bulk_modulus)
+        stp = B.Step(; height = 10e5, offset = 0, start_time = 0.05, duration = Inf,
+                     smooth = 0.001)
         src = IC.InputSource(; p_int = 0)
-        vol1 = IC.DynamicVolume(; p_int = 0, area=0.01, direction=+1)
-        vol2 = IC.DynamicVolume(; p_int = 0, area=0.01, direction=-1, x_int=1.0)
-        mass = T.Mass(; m=1000, s_0=0)
+        vol1 = IC.DynamicVolume(; p_int = 0, area = 0.01, direction = +1)
+        vol2 = IC.DynamicVolume(; p_int = 0, area = 0.01, direction = -1, x_int = 1.0)
+        mass = T.Mass(; m = 1000, s_0 = 0)
         res = IC.PipeBase(; p_int = 0, area = 0.001, length = 50.0)
-        cap = IC.Cap(;p_int=0)
+        cap = IC.Cap(; p_int = 0)
     end
 
-    eqs = [ connect(stp.output, src.input)
-            connect(fluid, src.port, cap.port)
-            connect(src.port, res.port_a)
-            connect(res.port_b, vol1.port)
-            connect(vol1.flange, mass.flange, vol2.flange)
-            connect(vol2.port, cap.port)]
+    eqs = [connect(stp.output, src.input)
+           connect(fluid, src.port, cap.port)
+           connect(src.port, res.port_a)
+           connect(res.port_b, vol1.port)
+           connect(vol1.flange, mass.flange, vol2.flange)
+           connect(vol2.port, cap.port)]
 
     ODESystem(eqs, t, [], pars; name, systems)
 end
 
-@named sys1 = system(; bulk_modulus=1e9)
-@named sys2 = system(; bulk_modulus=2e9)
+@named sys1 = system(; bulk_modulus = 1e9)
+@named sys2 = system(; bulk_modulus = 2e9)
 
 syss = structural_simplify.([sys1, sys2])
 probs = [ODEProblem(sys, [], (0, 0.2)) for sys in syss];
 dt = 1e-4
-sols = [solve(prob, ImplicitEuler(nlsolve=NEWTON); adaptive=false, dt, initializealg=NoInit()) for prob in probs];
+sols = [solve(prob, ImplicitEuler(nlsolve = NEWTON); adaptive = false, dt,
+              initializealg = NoInit()) for prob in probs];
 
 s1 = complete(sys1)
 s2 = complete(sys2)
 
 # less stiff will compress more
 @test maximum(sols[1][s1.mass.s]) > maximum(sols[2][s2.mass.s])
 
-
 # fig = Figure()
 # ax = Axis(fig[1,1])
 # lines!(ax, sols[1].t, sols[1][s1.src.port.p]; label="sorce", color=:black)
@@ -117,15 +113,13 @@ s2 = complete(sys2)
 # Legend(fig[1,2], ax)
 # fig
 
-
 # fig = Figure()
 # ax = Axis(fig[1,1])
 # scatterlines!(ax, sols[1].t, sols[1][s1.mass.s]; label="bulk=1e9")
 # scatterlines!(ax, sols[2].t, sols[2][s2.mass.s]; label="bulk=2e9")
 # Legend(fig[1,2], ax)
 # fig
 
-
 # fig = Figure()
 # ax = Axis(fig[1,1])
 # lines!(ax, sols[1].t, sols[1][s1.vol1.dx]; label="bulk=2e9")