fixed input variable name change

Author: Brad Carman

src/Hydraulic/IsothermalCompressible/sources.jl

@@ -6,19 +6,19 @@ Hydraulic mass flow input source
 # Connectors:
 
   - `port`: hydraulic port
-  - `input`: real input 
+  - `dm`: real input 
 """
 @component function MassFlow(; name, p_int)
     pars = @parameters p_int = p_int
 
     systems = @named begin
         port = HydraulicPort(; p_int)
-        input = RealInput()
+        dm = RealInput()
     end
 
     vars = []
     eqs = [
-        port.dm ~ -input.u,
+        port.dm ~ -dm.u,
     ]
 
     ODESystem(eqs, t, vars, pars; name, systems)
@@ -60,7 +60,7 @@ input pressure source
 
 # Connectors:
 - `port`: hydraulic port
-- `input`: real input 
+- `p`: real input 
 """
 @component function Pressure(; p_int, name)
     pars = @parameters begin p_int = p_int end
@@ -69,11 +69,11 @@ input pressure source
 
     systems = @named begin
         port = HydraulicPort(; p_int)
-        input = RealInput()
+        p = RealInput()
     end
 
     eqs = [
-        port.p ~ input.u,
+        port.p ~ p.u,
     ]
 
     ODESystem(eqs, t, vars, pars; name, systems)

src/Mechanical/Translational/sources.jl

@@ -6,17 +6,17 @@ Linear 1D force input source
 # Connectors:
 
   - `flange`: 1-dim. translational flange
-  - `input`: real input 
+  - `f`: real input 
 """
 @component function Force(; name)
     systems = @named begin
         flange = MechanicalPort()
-        input = RealInput()
+        f = RealInput()
     end
 
     vars = pars = []
     eqs = [
-        flange.f ~ -input.u,
+        flange.f ~ -f.u,
     ]
 
     ODESystem(eqs, t, vars, pars; name, systems, defaults = [flange.v => 0])
@@ -34,19 +34,19 @@ Linear 1D position input source
 # Connectors:
 
   - `flange`: 1-dim. translational flange
-  - `input`: real input 
+  - `s`: real input 
 """
 @component function Position(; s_0 = 0, name)
     systems = @named begin
         flange = MechanicalPort()
-        input = RealInput()
+        s = RealInput()
     end
 
     pars = @parameters s_0 = s_0
-    vars = @variables s(t) = s_0
+    vars = @variables x(t) = s_0
 
-    eqs = [D(s) ~ flange.v
-           input.u ~ s]
+    eqs = [D(x) ~ flange.v
+           s.u ~ x]
 
-    ODESystem(eqs, t, vars, pars; name, systems, defaults = [flange.v => 0, input.u => s_0])
+    ODESystem(eqs, t, vars, pars; name, systems, defaults = [flange.v => 0, s.u => s_0])
 end

src/Mechanical/TranslationalPosition/sources.jl

@@ -6,8 +6,8 @@ Input signal acting as external force on a flange
 @component function Force(; name, use_support = false)
     @named partial_element = PartialElementaryOneFlangeAndSupport2(use_support = use_support)
     @unpack flange = partial_element
-    @named input = RealInput() # Accelerating force acting at flange (= -flange.tau)
-    eqs = [flange.f ~ -input.u]
-    return extend(ODESystem(eqs, t, [], []; name = name, systems = [input]),
+    @named f = RealInput() # Accelerating force acting at flange (= -flange.tau)
+    eqs = [flange.f ~ -f.u]
+    return extend(ODESystem(eqs, t, [], []; name = name, systems = [f]),
                   partial_element)
 end

test/Hydraulic/isothermal_compressible.jl

@@ -29,7 +29,7 @@ NEWTON = NLNewton(check_div = false, always_new = true, max_iter = 100, relax =
         end
         push!(systems, res)
 
-        eqs = [connect(stp.output, src.input)
+        eqs = [connect(stp.output, src.p)
                connect(fluid, src.port)
                connect(src.port, res.port_a)
                connect(res.port_b, vol.port)]
@@ -119,8 +119,8 @@ end
                connect(src1.port, vol1.port)
                connect(src2.port, vol2.port)
                connect(vol1.flange, mass.flange, vol2.flange)
-               connect(src1.input, sin1.output)
-               connect(src2.input, sin2.output)]
+               connect(src1.p, sin1.output)
+               connect(src2.p, sin2.output)]
 
         ODESystem(eqs, t, [], pars; name, systems)
     end
@@ -211,7 +211,7 @@ end
 
         push!(systems, input)
 
-        eqs = [connect(input.output, pos.input)
+        eqs = [connect(input.output, pos.s)
                connect(valve.flange, pos.flange)
                connect(valve.port_a, piston.port_a)
                connect(piston.flange, body.flange)

test/Mechanical/translational.jl

@@ -63,7 +63,7 @@ end
     @named source = Sine(frequency = 3, amplitude = 2)
 
     function System(damping, spring, body, ground, f, source)
-        eqs = [connect(f.input, source.output)
+        eqs = [connect(f.f, source.output)
                connect(f.flange, body.flange)
                connect(spring.flange_a, body.flange, damping.flange_a)
                connect(spring.flange_b, damping.flange_b, ground.flange)]
@@ -108,8 +108,8 @@ end
             force_output = RealOutput()
         end
 
-        eqs = [connect(pos.input, src1.output)
-               connect(force.input, src2.output)
+        eqs = [connect(pos.s, src1.output)
+               connect(force.f, src2.output)
                connect(spring.flange_a, pos.flange, force_sensor.flange)
                connect(spring.flange_b, force.flange, pos_sensor.flange)
                connect(pos_value, pos_sensor.output)