Updated per merge comments

convexengineering · Apr 18, 2018 · d18d059 · d18d059
1 parent ec4eb08
commit d18d059
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 321 deletions.
diff --git a/gpkitmodels/GP/aircraft/motor/motor.py b/gpkitmodels/GP/aircraft/motor/motor.py
@@ -37,7 +37,7 @@ class Motor(Model):
 
     Variables
     ---------
-    Qstar       .5           [kg/(N*m)]         motor specific torque
+    Qstar       .5          [kg/(N*m)]         motor specific torque
     W                       [lbf]              motor weight
     Qmax                    [N*m]              motor max. torque
     V_max       300         [V]                motor max voltage
@@ -56,10 +56,6 @@ def setup(self):
 class PropulsorPerf(Model):
     """Propulsor Performance Model
 
-    Variables
-    ---------
-    V_static       1      [cm/s]           inflow velocity for static thrust
-
     """
 
     def setup(self, static, state):

diff --git a/gpkitmodels/GP/aircraft/motor/motor_test.py b/gpkitmodels/GP/aircraft/motor/motor_test.py
@@ -12,7 +12,6 @@ def setup(self):
         p = Propulsor()
         pp = p.flight_model(p,fs)
         pp.substitutions[pp.prop.T] = 100
-        #pp.substitutions[pp.prop.AR_b] = 15
         self.cost = 1./pp.motor.etam + p.W/(1000*units('lbf')) + 1./pp.prop.eta
 
         return fs,p,pp
@@ -27,7 +26,6 @@ def setup(self):
         p = Propulsor()
         pp = p.flight_model(p,fs)
         pp.substitutions[pp.prop.T] = 100
-        #pp.substitutions[pp.prop.AR_b] = 15
         self.cost = pp.motor.Pelec/(1000*units('W')) + p.W/(1000*units('lbf'))
 
         return fs,p,pp
@@ -36,18 +34,14 @@ def setup(self):
 def actuator_propulsor_test():
 
     test = Actuator_Propulsor_Test()
-    #sol = test.debug()
     sol = test.solve()
-    #sol = test.solve()
     #print sol.table()
 
 
 
 def propulsor_test():
 
     test = Propulsor_Test()
-    #sol = test.debug()
-    #sol = test.localsolve(iteration_limit = 400)
     sol = test.solve()
     #print sol.table()
 
@@ -91,7 +85,6 @@ def setup(self):
 def motor_test():
     test = Motor_P_Test()
     sol = test.solve()
-    #sol = test.debug()
     #print sol.table()
 
 def test():
@@ -102,4 +95,3 @@ def test():
 
 if __name__ == "__main__":
     test()
-    #speed_280_test()
diff --git a/gpkitmodels/GP/aircraft/prop/arccos_fit.py b/gpkitmodels/GP/aircraft/prop/arccos_fit.py
diff --git a/gpkitmodels/GP/aircraft/prop/dae51_fitdata.csv b/gpkitmodels/GP/aircraft/prop/dae51_fitdata.csv
diff --git a/gpkitmodels/GP/aircraft/prop/dae51polars/dae51.dat b/gpkitmodels/GP/aircraft/prop/dae51polars/dae51.dat
diff --git a/gpkitmodels/GP/aircraft/prop/dae51polars/dae51.txt b/gpkitmodels/GP/aircraft/prop/dae51polars/dae51.txt
diff --git a/gpkitmodels/GP/aircraft/prop/dae51polars/dae_polarfits.py b/gpkitmodels/GP/aircraft/prop/dae51polars/dae_polarfits.py
diff --git a/gpkitmodels/GP/aircraft/prop/propeller.py b/gpkitmodels/GP/aircraft/prop/propeller.py
@@ -33,7 +33,7 @@ class ActuatorProp(Model):
     def helper(self, c):
         return 2. - 1./c[self.etaadd]
 
-    def setup(self, static, state = None, rho = None, V = None):
+    def setup(self, static, state):
         exec parse_variables(ActuatorProp.__doc__)
 
         V = state.V