tested and approved

1 files changed, 26 insertions, 25 deletions

diff --git a/throw.py b/throw.py
index b57d06b..12bd75d 100644
--- a/throw.py
+++ b/throw.py
@@ -89,33 +89,34 @@ Area = numpy.pi * radius **2 # for a sphere
 quad_co = kappa * density * Area
 # fric_quad = quad_co * (r * phi1 * vcm_co)**2
 
-### mass:
-global m, Mass, dia, l, max_tension
-m = 39.7 #kilograms -- mass of the satellite cage (overestimate)
-l = 0.16 #kilograms/meter -- density of Super Max cable, 16mm: 269.8kN
-l = 0.41 #kilograms/meter -- density of Super Max cable, 26mm: 647.4kN
-#diameter in m: [l in kg/100m, breaking point in kN]
-cables = {.006: [ 2.3,   41.2], .008: [ 3.9,   65.7],
-          .009: [ 4.2,   82.4], .010: [ 5.9,  105.9],
-          .011: [ 6.3,  133.4], .012: [ 9.5,  161.9],
-          .014: [12.8,  215.8], .016: [  16,  269.8],
-          .018: [20.8,  343.3], .020: [25.5,  407.1],
-          .022: [30.5,  490.5], .024: [35.8,  569.0],
-          .026: [41.0,  647.4], .028: [46.5,  725.9],
-          .030: [52.0,  799.5], .032: [  57,  868.1],
-          .034: [62.5,  941.2], .036: [  68, 1020.2],
-          .038: [74.0, 1098.7], .040: [  84, 1245.8],
-          .042: [93.0, 1373.4], .044: [ 102, 1491.1],
-          .046: [ 111, 1618.6], .048: [ 121, 1755.9],
-          .050: [ 131, 1893.3], .052: [ 141, 2020.8],
-          .056: [ 163, 2315.1], .060: [ 175, 2472.0],
-          .064: [ 200, 2766.3], .068: [ 226, 3099.9],
-          .072: [ 254, 3413.8], .080: [ 313, 4139.7],
-          .088: [ 379, 4934.3], .096: [ 451, 5768.1]}
-dia = .016
+### cable data:
+global dia, l, max_tension
+#diameter in m: [l in kg/m, breaking point in kN]
+cables = {.006: [.023,   41.2], .008: [.039,   65.7],
+          .009: [.042,   82.4], .010: [.059,  105.9],
+          .011: [.063,  133.4], .012: [.095,  161.9],
+          .014: [.128,  215.8], .016: [.160,  269.8],
+          .018: [.208,  343.3], .020: [.255,  407.1],
+          .022: [.305,  490.5], .024: [.358,  569.0],
+          .026: [.410,  647.4], .028: [.465,  725.9],
+          .030: [.520,  799.5], .032: [.570,  868.1],
+          .034: [.625,  941.2], .036: [.680, 1020.2],
+          .038: [.740, 1098.7], .040: [.840, 1245.8],
+          .042: [.930, 1373.4], .044: [1.02, 1491.1],
+          .046: [1.11, 1618.6], .048: [1.21, 1755.9],
+          .050: [1.31, 1893.3], .052: [1.41, 2020.8],
+          .056: [1.63, 2315.1], .060: [1.75, 2472.0],
+          .064: [2.00, 2766.3], .068: [2.26, 3099.9],
+          .072: [2.54, 3413.8], .080: [3.13, 4139.7],
+          .088: [3.79, 4934.3], .096: [4.51, 5768.1]}
+dia = .026
 cable_choices = numpy.array(cables.keys())
-nearest = lambda dia: cable_choices[numpy.abs(dia - cable_choices).minarg()]
+nearest = lambda dia: cable_choices[numpy.abs(dia - cable_choices).argmin()]
 l, max_tension = cables[nearest(dia)]
+
+### masses:
+global m, Mass
+m = 39.7 #kilograms -- mass of the satellite cage (overestimate)
 Mass = 670 #kilograms -- mass of /everything/
 M = lambda phi: Mass - m - l*r(phi)
 r_cm = lambda phi: (m*r(phi) + .5*l*r(phi)**2) / (m + l*r(phi) + M(phi))