Merge branch 'develop'

suavecode · Jun 24, 2015 · e896d27 · e896d27
2 parents 6862295 + bb8a7f2
commit e896d27
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/doc/uml/suave code example/class_diagram.png b/doc/uml/suave code example/class_diagram.png
diff --git a/doc/uml/suave code example/class_diagram.xmind b/doc/uml/suave code example/class_diagram.xmind
diff --git a/doc/uml/suave code example/code example.png b/doc/uml/suave code example/code example.png
diff --git a/doc/uml/suave code example/code_example.py b/doc/uml/suave code example/code_example.py
@@ -1,8 +1,8 @@
 # Build a Wing
 main_wing = Components.Wings.Wing(
     tag = 'main_wing',    
-    ref_area     = 1344.0 , #[sq-ft]
-    aspect_ratio = 10.19  , #[-]
+    ref_area     = 1344.0 * Units['sq-ft'],
+    aspect_ratio = 10.19,
     # <...>
 )
 
@@ -16,15 +16,16 @@
 config.Wings.Main_Wing.flaps = 'down'
 
 # Plan a Segment
-climb = Missions.Segments.ClimbDescent( 
+climb = Segments.Climb.Constant_Speed_Constant_Rate( 
     tag = 'Climb',
-    altitude   = [0.0, 3.0],  # [km]
-    config     = climb_config,
+    altitude_start = 0.0 * Units.km,
+    altitude_end   = 5.2 * Units.km,
+    analyses = climb_analyses
     #<...>
 )
 
 # Create a Mission
-mission = Missions.Mission()
+mission = Analyses.Missions.Mission()
 mission.add_segment(climb)
 # <...>
 

diff --git a/doc/uml/suave code example/code_example.xmind b/doc/uml/suave code example/code_example.xmind
diff --git a/trunk/SUAVE/__init__.py b/trunk/SUAVE/__init__.py
@@ -20,3 +20,6 @@
 
 # the vehicle class
 from Vehicle import Vehicle
+
+from warnings import simplefilter
+simplefilter('ignore')