requiring 2.5 to work and updating plotting

Author: planes

B737_AVL_Tutorial/tut_mission_B737_AVL.py

@@ -8,8 +8,11 @@
 
 # SUAVE Imports
 import SUAVE
+if not SUAVE.__version__=='2.5.0':
+    assert('These tutorials only work with the SUAVE 2.5.0 release')
+
 from SUAVE.Core import Data, Units
-from SUAVE.Plots.Mission_Plots import *
+from SUAVE.Plots.Performance.Mission_Plots import *
 from SUAVE.Methods.Propulsion.turbofan_sizing import turbofan_sizing
 from SUAVE.Methods.Geometry.Two_Dimensional.Cross_Section.Propulsion import compute_turbofan_geometry
 from SUAVE.Input_Output.Results import  print_parasite_drag,  \
@@ -22,6 +25,7 @@
 import numpy as np
 import pylab as plt
 
+
 # ----------------------------------------------------------------------
 #   Main
 # ----------------------------------------------------------------------

BWB_CFD/BWB.py

@@ -8,6 +8,8 @@
 # ----------------------------------------------------------------------
 
 import SUAVE
+if not SUAVE.__version__=='2.5.0':
+    assert('These tutorials only work with the SUAVE 2.5.0 release')
 
 import numpy as np
 import pylab as plt
@@ -20,7 +22,11 @@
 from SUAVE.Methods.Propulsion.turbofan_sizing import turbofan_sizing
 from SUAVE.Methods.Geometry.Two_Dimensional.Cross_Section.Propulsion import compute_turbofan_geometry
 
-from SUAVE.Plots.Mission_Plots import *
+from SUAVE.Plots.Performance.Mission_Plots import *
+
+if not SUAVE.__version__=='2.5.0':
+    assert('These tutorials only work with the SUAVE 2.5.0 release')
+
 
 # ----------------------------------------------------------------------
 #   Main

Regional_Jet_Optimization/Optimize.py

@@ -8,6 +8,8 @@
 # ----------------------------------------------------------------------    
 
 import SUAVE
+if not SUAVE.__version__=='2.5.0':
+    assert('These tutorials only work with the SUAVE 2.5.0 release')
 from SUAVE.Core import Units, Data
 import numpy as np
 import Vehicles

Regional_Jet_Optimization/Plot_Mission.py

@@ -9,7 +9,7 @@
 
 import SUAVE
 from SUAVE.Core import Units
-from SUAVE.Plots.Mission_Plots import *
+from SUAVE.Plots.Performance.Mission_Plots import *
 import pylab as plt
 
 # ----------------------------------------------------------------------

Solar_UAV_Optimization/Optimize.py

@@ -7,6 +7,10 @@
 #   Imports
 # ----------------------------------------------------------------------    
 
+import SUAVE
+if not SUAVE.__version__=='2.5.0':
+    assert('These tutorials only work with the SUAVE 2.5.0 release')
+
 from SUAVE.Core import Units, Data
 import numpy as np
 import Vehicles

Solar_UAV_Optimization/Plot_Mission.py

@@ -7,7 +7,7 @@
 #   Imports
 # ----------------------------------------------------------------------    
 
-from SUAVE.Plots.Mission_Plots import *
+from SUAVE.Plots.Performance.Mission_Plots import *
 from SUAVE.Core import Units
 import pylab as plt
 

tut_concorde.py

@@ -12,13 +12,18 @@
 # ----------------------------------------------------------------------
 
 import SUAVE
+if not SUAVE.__version__=='2.5.0':
+    assert('These tutorials only work with the SUAVE 2.5.0 release')
+
 from SUAVE.Core import Units, Data
-from SUAVE.Plots.Mission_Plots import *
+from SUAVE.Plots.Performance.Mission_Plots import *
 from SUAVE.Methods.Propulsion.turbojet_sizing import turbojet_sizing
 
 import numpy as np
 import pylab as plt
 
+
+
 # ----------------------------------------------------------------------
 #   Main
 # ----------------------------------------------------------------------

tut_mission_B737.py

@@ -19,6 +19,8 @@
 
 # SUAVE Imports
 import SUAVE
+if not SUAVE.__version__=='2.5.0':
+    assert('These tutorials only work with the SUAVE 2.5.0 release')
 from SUAVE.Core import Data, Units 
 # The Data import here is a native SUAVE data structure that functions similarly to a dictionary.
 #   However, iteration directly returns values, and values can be retrieved either with the 
@@ -28,7 +30,7 @@
 #   This is because SUAVE functions generally operate using metric units, so inputs must be 
 #   converted. To use a length of 20 feet, set l = 20 * Units.ft . Additionally, to convert to SUAVE
 #   output back to a desired units, use l_ft = l_m / Units.ft
-from SUAVE.Plots.Mission_Plots import *
+from SUAVE.Plots.Performance.Mission_Plots import *
 # These are a variety of plotting routines that simplify the plotting process for commonly 
 # requested metrics. Plots of specifically desired metrics can also be manually created.
 from SUAVE.Methods.Propulsion.turbofan_sizing import turbofan_sizing
@@ -139,8 +141,8 @@ def base_analysis(vehicle):
 
     # ------------------------------------------------------------------
     #  Energy
-    energy= SUAVE.Analyses.Energy.Energy()
-    energy.network = vehicle.propulsors 
+    energy = SUAVE.Analyses.Energy.Energy()
+    energy.network = vehicle.networks
     analyses.append(energy)
 
     # ------------------------------------------------------------------

tut_payload_range.py

@@ -9,15 +9,18 @@
 # ----------------------------------------------------------------------
 
 import SUAVE
+if not SUAVE.__version__=='2.5.0':
+    assert('These tutorials only work with the SUAVE 2.5.0 release')
 from SUAVE.Core import Units, Data 
 from SUAVE.Methods.Propulsion.turbofan_sizing import turbofan_sizing
 from SUAVE.Methods.Performance  import payload_range
 from SUAVE.Methods.Geometry.Two_Dimensional.Planform import wing_planform
-from SUAVE.Plots.Mission_Plots import *
+from SUAVE.Plots.Performance.Mission_Plots import *
 
 import numpy as np
 import pylab as plt
 
+
 # ----------------------------------------------------------------------
 #   Main
 # ----------------------------------------------------------------------

tut_solar_uav.py

@@ -7,17 +7,20 @@
 #   Imports
 # ----------------------------------------------------------------------
 import SUAVE
+if not SUAVE.__version__=='2.5.0':
+    assert('These tutorials only work with the SUAVE 2.5.0 release')
 from SUAVE.Core import Units, Data
 
 import numpy as np
 import pylab as plt
 import time
 
-from SUAVE.Plots.Mission_Plots import *
+from SUAVE.Plots.Performance.Mission_Plots import *
 from SUAVE.Components.Energy.Networks.Solar import Solar
 from SUAVE.Methods.Propulsion import propeller_design
 from SUAVE.Methods.Power.Battery.Sizing import initialize_from_mass
 
+
 # ----------------------------------------------------------------------
 #   Main
 # ----------------------------------------------------------------------