Revert "Fix Pendulum model, and break AbsoluteAccCentrifugal while doing so"

This reverts commit f454f1b.

Author: AbdulrhmnGhanem

src/Mechanical/PlanarMechanics/components.jl

@@ -12,8 +12,6 @@ Frame fixed in the planar world frame at a given position and orientation
 # Connectors:
 
   - `frame: 2-dim. Coordinate system
-
-https://github.com/dzimmer/PlanarMechanics/blob/743462f58858a808202be93b708391461cbe2523/PlanarMechanics/Parts/Fixed.mo
 """
 @mtkmodel Fixed begin
     @parameters begin
@@ -60,8 +58,6 @@ Body component with mass and inertia
 # Connectors:
 
   - `frame`: 2-dim. Coordinate system
-
-https://github.com/dzimmer/PlanarMechanics/blob/743462f58858a808202be93b708391461cbe2523/PlanarMechanics/Parts/Body.mo
 """
 @component function Body(; name, m, j, rx = 0, ry = 0, gy = -9.807)
     @named frame = Frame()
@@ -119,11 +115,9 @@ A fixed translation between two components (rigid rod)
   - `ry`: [m] Fixed y-length of the rod resolved w.r.t to body frame_a at phi = 0
 
 # Connectors:
-
+    
       - `frame_a` [Frame](@ref) Coordinate system fixed to the component with one cut-force and cut-torque
       - `frame_b` [Frame](@ref) Coordinate system fixed to the component with one cut-force and cut-torque
-
-https://github.com/dzimmer/PlanarMechanics/blob/743462f58858a808202be93b708391461cbe2523/PlanarMechanics/Parts/FixedTranslation.mo
 """
 @mtkmodel FixedTranslation begin
     @extend frame_a, frame_b = partial_frames = PartialTwoFrames()
@@ -147,12 +141,12 @@ https://github.com/dzimmer/PlanarMechanics/blob/743462f58858a808202be93b70839146
 
     @equations begin
         # rigidly connect positions
-        frame_a.x + rx ~ frame_b.x
-        frame_a.y + ry ~ frame_b.y
+        frame_a.x + r0[1] ~ frame_b.x
+        frame_a.y + r0[2] ~ frame_b.y
         frame_a.phi ~ frame_b.phi
         # balancing force including lever principle
         frame_a.fx + frame_b.fx ~ 0
         frame_a.fy + frame_b.fy ~ 0
-        frame_a.j + frame_b.j + r0' * [frame_b.fy, -frame_b.fx] ~ 0
+        frame_a.j + frame_b.j + r0[1] * frame_b.fy - r0[2] * frame_b.fx ~ 0
     end
 end

src/Mechanical/PlanarMechanics/joints.jl

@@ -19,14 +19,14 @@ A revolute joint
   - `fixed` [Fixed](@ref) if `use_flange == false`
   - `flange_a` [Flange](@ref) if `use_flange == true`
   - `support` [Support](@ref) if `use_flange == true`
-https://github.com/dzimmer/PlanarMechanics/blob/master/PlanarMechanics/Joints/Revolute.mo
+
 """
 @component function Revolute(;
-        name,
-        constant_phi = nothing,
-        constant_ω = nothing,
-        constat_tau = nothing,
-        use_flange = false)
+    name,
+    constant_phi = nothing,
+    constant_ω = nothing,
+    constat_tau = nothing,
+    use_flange = false)
     @named partial_frames = PartialTwoFrames()
     @unpack frame_a, frame_b = partial_frames
     @named fixed = Rotational.Fixed()
@@ -98,12 +98,12 @@ A prismatic joint
   - `support` [Support](@ref) if `use_flange == true`
 """
 @component function Prismatic(;
-        name,
-        x,
-        y,
-        constant_f = 0,
-        constant_s = 0,
-        use_flange = false)
+    name,
+    x,
+    y,
+    constant_f = 0,
+    constant_s = 0,
+    use_flange = false)
     @named partial_frames = PartialTwoFrames()
     @unpack frame_a, frame_b = partial_frames
     @named fixed = TranslationalModelica.Support()

src/Mechanical/PlanarMechanics/sensors.jl

@@ -309,9 +309,9 @@ Measure relative position and orientation between the origins of two frame conne
 end
 
 @component function BasicTransformAbsoluteVector(;
-        name,
-        frame_in = :frame_a,
-        frame_out = frame_in)
+    name,
+    frame_in = :frame_a,
+    frame_out = frame_in)
     @named x_in = RealInput()
     @named y_in = RealInput()
     @named phi_in = RealInput()
@@ -399,9 +399,9 @@ end
 end
 
 @component function TransformAbsoluteVector(;
-        name,
-        frame_in = :frame_a,
-        frame_out = frame_in)
+    name,
+    frame_in = :frame_a,
+    frame_out = frame_in)
     @named frame_a = Frame()
 
     @named x_in = RealInput()
@@ -493,9 +493,9 @@ end
 end
 
 @component function BasicTransformRelativeVector(;
-        name,
-        frame_in = :frame_a,
-        frame_out = frame_in)
+    name,
+    frame_in = :frame_a,
+    frame_out = frame_in)
     @named x_in = RealInput()
     @named y_in = RealInput()
     @named phi_in = RealInput()
@@ -578,9 +578,9 @@ end
 end
 
 @component function TransformRelativeVector(;
-        name,
-        frame_in = :frame_a,
-        frame_out = frame_in)
+    name,
+    frame_in = :frame_a,
+    frame_out = frame_in)
     @named x_in = RealInput()
     @named y_in = RealInput()
     @named phi_in = RealInput()
@@ -801,4 +801,4 @@ function connect_sensor(component_frame, sensor_frame)
         component_frame.y ~ sensor_frame.y,
         component_frame.phi ~ sensor_frame.phi,
     ]
-end
+end

test/Mechanical/planar_mechanics.jl

@@ -48,11 +48,8 @@ end
         [],
         systems = [body, revolute, rod, ceiling])
     sys = structural_simplify(model)
-    @test length(states(sys)) == 2
-    unset_vars = setdiff(states(sys), keys(ModelingToolkit.defaults(sys)))
-    prob = ODEProblem(sys, unset_vars .=> 0.0, tspan, [])
-    sol = solve(prob, Rodas5P())
-    @test SciMLBase.successful_retcode(sol)
+
+    @test length(states(sys)) == 7
 end
 
 @testset "Prismatic" begin
@@ -95,7 +92,7 @@ end
             abs_v_sensor,
         ])
     sys = structural_simplify(model)
-    u0 = [0.0, ω]
+    u0 = [0.0, ω, 0.0]
     prob = ODEProblem(sys, u0, tspan, []; jac = true)
     sol = solve(prob, Rodas5P())
 
@@ -107,11 +104,11 @@ end
 
     # instantaneous linear velocity
     v_singal(t) = -ω^2 * sin.(ω .* t)
-    @test_broken all(v_singal.(test_points) .≈ sol.(test_points; idxs = abs_v_sensor.v_x.u))
+    @test all(v_singal.(test_points) .≈ sol.(test_points; idxs = abs_v_sensor.v_x.u))
 
     # instantaneous linear acceleration
     a_singal(t) = -ω^3 * cos.(ω .* t)
-    @test_broken all(a_singal.(test_points) .≈ sol.(test_points; idxs = body.ax))
+    @test all(a_singal.(test_points) .≈ sol.(test_points; idxs = body.ax))
 end
 
 @testset "Sensors (two free falling bodies)" begin