diff --git a/gpkitmodels/GP/aircraft/motor/motor_test.py b/gpkitmodels/GP/aircraft/motor/motor_test.py index 71e4c178..80ad8a8d 100644 --- a/gpkitmodels/GP/aircraft/motor/motor_test.py +++ b/gpkitmodels/GP/aircraft/motor/motor_test.py @@ -20,7 +20,7 @@ def propulsor_test(): test = Propulsor_Test() #sol = test.debug() sol = test.solve() - #print sol.table() + print sol.table() class Motor_P_Test(Model): def setup(self): @@ -62,4 +62,4 @@ def test(): propulsor_test() if __name__ == "__main__": - test() \ No newline at end of file + test() diff --git a/gpkitmodels/GP/aircraft/prop/propeller.py b/gpkitmodels/GP/aircraft/prop/propeller.py index 34b7400c..c6066f1d 100644 --- a/gpkitmodels/GP/aircraft/prop/propeller.py +++ b/gpkitmodels/GP/aircraft/prop/propeller.py @@ -16,7 +16,7 @@ class Propeller(Model): def setup(self): exec parse_variables(Propeller.__doc__) - constraints = [W == K*T_m_static*R**2] + constraints = [W >= K*T_m_static*R**2] return constraints @@ -59,13 +59,13 @@ def setup(self,parent, state): constraints = [eta <= etav*etai, - Tc == T/(0.5*rho*V**2*pi*R**2), + Tc >= T/(0.5*rho*V**2*pi*R**2), z2 >= Tc + 1, etai*(z1 + z2**0.5/etaadd) <= 2, - lam == V/(omega*R), - CT == Tc*lam**2, - CP == Q*omega/(.5*rho*(omega*R)**3*pi*R**2), - eta == CT*lam/CP, + lam >= V/(omega*R), + CT >= Tc*lam**2, + CP <= Q*omega/(.5*rho*(omega*R)**3*pi*R**2), + eta >= CT*lam/CP, omega <= omega_max, P_shaft == Q*omega, (M_tip*a)**2 >= (omega*R)**2 + V**2