Moved SP propeller models to SP folder

convexengineering · Apr 23, 2018 · 9067812 · 9067812
1 parent c2f3537
commit 9067812
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 2,241 deletions.
diff --git a/gpkitmodels/GP/aircraft/motor/motor_test.py b/gpkitmodels/GP/aircraft/motor/motor_test.py
@@ -1,6 +1,7 @@
 from gpkit import Model, parse_variables, SignomialsEnabled, SignomialEquality, units
 from motor import Propulsor, Motor, MotorPerf
-from gpkitmodels.GP.aircraft.prop.propeller import Propeller, ActuatorProp, MultiElementProp
+from gpkitmodels.GP.aircraft.prop.propeller import Propeller, ActuatorProp
+from gpkitmodels.SP.aircraft.prop.propeller import MultiElementProp
 from gpkitmodels.GP.aircraft.wing.wing_test import FlightState
 
 class Propulsor_Test(Model):

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/dae51_polarfits.py b/gpkitmodels/GP/aircraft/prop/dae51polars/dae51_polarfits.py