Using SP propeller model, adding plotting to makefile

convexengineering · May 1, 2018 · 3f2f6f9 · 3f2f6f9
1 parent c89ef7a
commit 3f2f6f9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/solar/Makefile b/solar/Makefile
@@ -7,3 +7,4 @@ all:
 	ipython tau_trade.py ./figs/ GEN
 	ipython battsolarcon.py ./figs/ GEN
 	ipython payloadcon.py ./figs/ GEN
+	ipython Nprop_W1_trade.py ./figs/ GEN
diff --git a/solar/Nprop_W1_trade.py b/solar/Nprop_W1_trade.py
@@ -103,10 +103,10 @@ def test():
 if __name__ == "__main__":
     if len(sys.argv) > 1:
         path = sys.argv[1]
+        GENERATE = True if sys.argv[2] == "GEN" else False
     else:
         path = ""
-
-    GENERATE = False
+        GENERATE = False
 
     if GENERATE:
         N = [1,2, 3, 4, 5, 7, 9]

diff --git a/solar/solar.py b/solar/solar.py
@@ -465,7 +465,7 @@ def setup(self, aircraft, latitude=35, day=355):
 
         self.aircraft = aircraft
         self.fs = FlightState(latitude=latitude, day=day)
-        self.aircraftPerf = self.aircraft.flight_model(aircraft, self.fs, False)
+        self.aircraftPerf = self.aircraft.flight_model(aircraft, self.fs, True)
         self.slf = SteadyLevelFlight(self.fs, self.aircraft,
                                      self.aircraftPerf)