Move around

Author: YingboMa

test/components.jl

@@ -1,7 +1,7 @@
 using Test
 using ModelingToolkit, OrdinaryDiffEq
 
-include("rc_model.jl")
+include("models/rc_model.jl")
 
 sys = structural_simplify(rc_model)
 @test !isempty(ModelingToolkit.defaults(sys))

test/rc_model.jl renamed to test/models/electrical_components.jl

@@ -55,29 +55,18 @@ function Capacitor(name; C = 1.0)
     ODESystem(eqs, t, [v], [C], systems=[p, n], defaults=Dict(C => val), name=name)
 end
 
-R = 1.0
-C = 1.0
-V = 1.0
-resistor = Resistor(:resistor, R=R)
-capacitor = Capacitor(:capacitor, C=C)
-source = ConstantVoltage(:source, V=V)
-ground = Ground(:ground)
-
-function connect(ps...)
+function Inductor(; name, L = 1.0)
+    val = L
+    @named p = Pin()
+    @named n = Pin()
+    @variables v(t) i(t)
+    @parameters L
+    D = Differential(t)
     eqs = [
-           0 ~ sum(p->p.i, ps) # KCL
+           v ~ p.v - n.v
+           0 ~ p.i + n.i
+           i ~ p.i
+           D(i) ~ v / L
           ]
-    # KVL
-    for i in 1:length(ps)-1
-        push!(eqs, ps[i].v ~ ps[i+1].v)
-    end
-
-    return eqs
+    ODESystem(eqs, t, [v, i], [L], systems=[p, n], defaults=Dict(L => val), name=name)
 end
-rc_eqs = [
-          connect(source.p, resistor.p)
-          connect(resistor.n, capacitor.p)
-          connect(capacitor.n, source.n, ground.g)
-         ]
-
-rc_model = ODESystem(rc_eqs, t, systems=[resistor, capacitor, source, ground], name=:rc)

test/models/rc_model.jl

@@ -0,0 +1,28 @@
+include("electrical_components.jl")
+
+R = 1.0
+C = 1.0
+V = 1.0
+resistor = Resistor(:resistor, R=R)
+capacitor = Capacitor(:capacitor, C=C)
+source = ConstantVoltage(:source, V=V)
+ground = Ground(:ground)
+
+function connect(ps...)
+    eqs = [
+           0 ~ sum(p->p.i, ps) # KCL
+          ]
+    # KVL
+    for i in 1:length(ps)-1
+        push!(eqs, ps[i].v ~ ps[i+1].v)
+    end
+
+    return eqs
+end
+rc_eqs = [
+          connect(source.p, resistor.p)
+          connect(resistor.n, capacitor.p)
+          connect(capacitor.n, source.n, ground.g)
+         ]
+
+rc_model = ODESystem(rc_eqs, t, systems=[resistor, capacitor, source, ground], name=:rc)

test/print_tree.jl

@@ -1,6 +1,6 @@
 using ModelingToolkit, AbstractTrees, Test
 
-include("rc_model.jl")
+include("models/rc_model.jl")
 
 io = IOBuffer()
 print_tree(io, rc_model)