Updated motor tests and propulsor model

convexengineering · Apr 17, 2018 · 2f021e6 · 2f021e6
1 parent da89baf
commit 2f021e6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 28 deletions.
diff --git a/gpkitmodels/GP/aircraft/motor/motor.py b/gpkitmodels/GP/aircraft/motor/motor.py
@@ -1,7 +1,7 @@
 "Electric motor model "
 from gpkit import Model, parse_variables
 from gpkit.constraints.tight import Tight as TCS
-from gpkitmodels.GP.aircraft.prop.propeller import Propeller, Actuator_Propeller
+from gpkitmodels.GP.aircraft.prop.propeller import Propeller, ActuatorProp
 from gpkitmodels import g
 
 class MotorPerf(Model):
@@ -84,35 +84,20 @@ class Propulsor(Model):
 
     """
     flight_model = PropulsorPerf
+    prop_flight_model = ActuatorProp
+
 
     def setup(self):
         exec parse_variables(Propulsor.__doc__)
 
+        Propeller.flight_model = self.prop_flight_model
         self.prop = Propeller()
         self.motor = Motor()
 
         components = [self.prop, self.motor]
 
         return [self.W >= self.prop.W + self.motor.W], components
 
-class Actuator_Propulsor(Model):
-    """Propulsor model
-
-    Variables
-    ---------
-    W                       [lbf]              propulsor weight
-
-    """
-    flight_model = PropulsorPerf
 
-    def setup(self):
-        exec parse_variables(Propulsor.__doc__)
-
-        self.prop = Actuator_Propeller()
-        self.motor = Motor()
-
-        components = [self.prop, self.motor]
-
-        return [self.W >= self.prop.W + self.motor.W], components
 
 
diff --git a/gpkitmodels/GP/aircraft/motor/motor_test.py b/gpkitmodels/GP/aircraft/motor/motor_test.py
@@ -1,6 +1,6 @@
 from gpkit import Model, parse_variables, SignomialsEnabled, SignomialEquality, units
-from motor import Actuator_Propulsor,Propulsor, Motor, MotorPerf
-from gpkitmodels.GP.aircraft.prop.propeller import Propeller
+from motor import Propulsor, Motor, MotorPerf
+from gpkitmodels.GP.aircraft.prop.propeller import Propeller, ActuatorProp
 from gpkitmodels.GP.aircraft.wing.wing_test import FlightState
 
 class Propulsor_Test(Model):
@@ -23,7 +23,8 @@ class Actuator_Propulsor_Test(Model):
 
     def setup(self):
         fs = FlightState()
-        p = Actuator_Propulsor()
+        Propulsor.prop_flight_model = ActuatorProp
+        p = Propulsor()
         pp = p.flight_model(p,fs)
         pp.substitutions[pp.prop.T] = 100
         #pp.substitutions[pp.prop.AR_b] = 15
@@ -42,8 +43,8 @@ def propulsor_test():
 
     test = Propulsor_Test()
     #sol = test.debug()
-    sol = test.localsolve(iteration_limit = 400)
-    #sol = test.solve()
+    #sol = test.localsolve(iteration_limit = 400)
+    sol = test.solve()
     print sol.table()
 
 class Motor_P_Test(Model):
@@ -54,8 +55,8 @@ def setup(self):
         self.mp = mp
         mp.substitutions[m.Qmax] = 100
         mp.substitutions[mp.Q]    = 10
-        self.cost = 1./mp.etam 
-        return self.mp, fs
+        self.cost = 1./mp.etam + m.W/(100.*units('lbf'))
+        return self.mp, fs, m
 
 class speed_280_motor(Model):
     def setup(self):
@@ -136,9 +137,9 @@ def motor_eta_speed():
     print sol.table()
 
 def test():
-    #motor_test()
+    motor_test()
     actuator_propulsor_test()
-    #propulsor_test()
+    propulsor_test()
 
 
 if __name__ == "__main__":