additional clean up

convexengineering · Apr 9, 2018 · f1d458f · f1d458f
1 parent fa84027
commit f1d458f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/gpkitmodels/GP/aircraft/motor/motor.py b/gpkitmodels/GP/aircraft/motor/motor.py
@@ -47,7 +47,7 @@ class Motor(Model):
     flight_model = MotorPerf
 
     def setup(self):
-        exec parse_variables(ElecMotor.__doc__)
+        exec parse_variables(Motor.__doc__)
 
         constraints = [W >= Qstar*Qmax*g]
 
@@ -83,7 +83,7 @@ class Propulsor(Model):
     W                       [lbf]              propulsor weight
 
     """
-    flight_model = Propulsor_Performance
+    flight_model = PropulsorPerf
 
     def setup(self):
         exec parse_variables(Propulsor.__doc__)

diff --git a/gpkitmodels/GP/aircraft/motor/motor_test.py b/gpkitmodels/GP/aircraft/motor/motor_test.py
@@ -28,8 +28,8 @@ def propulsor_test():
 class Motor_P_Test(Model):
     def setup(self):
         fs = FlightState()
-        m  = ElecMotor()
-        mp = ElecMotor_Performance(m,fs)
+        m  = Motor()
+        mp = MotorPerf(m,fs)
         self.mp = mp
         mp.substitutions[m.Qmax] = 100
         mp.substitutions[mp.Q]    = 10
@@ -39,8 +39,8 @@ def setup(self):
 class speed_280_motor(Model):
     def setup(self):
         fs = FlightState()
-        m  = ElecMotor()
-        mp = ElecMotor_Performance(m,fs)
+        m  = Motor()
+        mp = MotorPerf(m,fs)
         self.mp = mp
         mp.substitutions[m.Qmax] = 100
         mp.substitutions[mp.R]   = .7
@@ -52,8 +52,8 @@ def setup(self):
 class hacker_q150_45_motor(Model):
     def setup(self):
         fs = FlightState()
-        m  = ElecMotor()
-        mp = ElecMotor_Performance(m,fs)
+        m  = Motor()
+        mp = MotorPerf(m,fs)
         self.mp = mp
         mp.substitutions[m.Qmax] = 10000
         mp.substitutions[mp.R]   = .033