Fix test for gear and multirotor

Author: jguarato

ross/tests/test_gear_element.py

@@ -15,7 +15,6 @@ def gear():
         m=726.4,
         Id=56.95,
         Ip=113.9,
-        width=0.101,
         n_teeth=328,
         pitch_diameter=1.1,
         pr_angle=Q_(22.5, "deg"),
@@ -67,7 +66,7 @@ def gear_tvms():
         module=Q_(2, "mm"),
         width=Q_(20, "mm"),
         n_teeth=62,
-        hub_bore_radius=Q_(17.5, "mm"),
+        bore_diameter=Q_(2 * 17.5, "mm"),
         pr_angle=Q_(20, "deg"),
     )
 
@@ -141,11 +140,11 @@ def test_mesh_params(mesh):
     assert mesh.gear_ratio == 1.0
     assert mesh.contact_ratio == 1.7897798668330458
     assert mesh.hertzian_stiffness == 3555868607.9093266
-    assert mesh.stiffness == 419569471.549574
+    assert mesh.stiffness == 419569438.98401976
     assert mesh.stiffness_range[:5] == [
         396622921.3581085,
-        396739094.9154279,
-        396854969.16330755,
-        396970544.1596158,
-        397085819.9616697,
+        396738680.0375346,
+        396854147.2919756,
+        396969323.136738,
+        397084207.5865779,
     ]

ross/tests/test_multi_rotor.py

@@ -5,11 +5,6 @@
 
 import ross as rs
 
-from ross.units import Q_
-from ross.materials import Material, steel
-from ross.gear_element import GearElement
-from ross.multi_rotor import MultiRotor
-
 
 @pytest.fixture
 def multi_rotor():
@@ -45,26 +40,25 @@ def multi_rotor():
         Ip=6.23,
     )
 
-    pressure_angle = rs.Q_(22.5, "deg")
+    pressure_angle = rs.Q_(22.5, "deg").to_base_units().m
     base_radius = 0.5086
     pitch_diameter = 2 * base_radius / np.cos(pressure_angle)
 
-    N1 = 328  # Number of teeth of gear 1
+    N1 = 328
     m = 726.4
     Id = 56.95
     Ip = 113.9
-    width = (4 * m) / (material.rho * np.pi * (pitch_diameter**2 - d1[-1] ** 2))
+
     gear1 = rs.GearElement(
         n=4,
         m=m,
         Id=Id,
         Ip=Ip,
-        width=width,
         n_teeth=N1,
         pitch_diameter=pitch_diameter,
-        pressure_angle=pressure_angle,
+        pr_angle=pressure_angle,
+        bore_diameter=d1[-1],
         material=material,
-        helix_angle=0,
     )
 
     bearing1 = rs.BearingElement(n=0, kxx=183.9e6, kyy=200.4e6, cxx=3e3)
@@ -95,21 +89,19 @@ def multi_rotor():
     base_radius = 0.03567
     pitch_diameter = 2 * base_radius / np.cos(pressure_angle)
 
-    N2 = 23  # Number of teeth of gear 2
+    N2 = 23
     m = 5
     Id = 0.002
     Ip = 0.004
+
     gear2 = rs.GearElement(
         n=0,
         m=m,
         Id=Id,
         Ip=Ip,
-        width=width,
         n_teeth=N2,
         pitch_diameter=pitch_diameter,
-        pressure_angle=pressure_angle,
-        material=material,
-        helix_angle=0,
+        pr_angle=pressure_angle,
     )
 
     turbine = rs.DiskElement(n=2, m=7.45, Id=0.0745, Ip=0.149)
@@ -123,7 +115,7 @@ def multi_rotor():
         [bearing3, bearing4],
     )
 
-    return MultiRotor(
+    return rs.MultiRotor(
         rotor1,
         rotor2,
         coupled_nodes=(4, 0),
@@ -132,9 +124,9 @@ def multi_rotor():
     )
 
 
-def test_multi_rotor(multi_rotor):
-    assert multi_rotor.contact_ratio == 1.6377334309511224
-    assert multi_rotor.gear_mesh_stiffness == 1918871975.9364796
+def test_mesh(multi_rotor):
+    assert multi_rotor.mesh.contact_ratio == 1.6377334309511222
+    assert multi_rotor.mesh.stiffness == 1937234387.18946
 
 
 def test_coupling_matrix_gear(multi_rotor):