Merge a1eb1a0 into eb3fac6

suavecode · Jul 28, 2017 · 593c2e6 · 593c2e6
2 parents eb3fac6 + a1eb1a0
commit 593c2e6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/regression/scripts/Vehicles/Concorde.py b/regression/scripts/Vehicles/Concorde.py
@@ -1,7 +1,7 @@
 # Concorde.py
 #
 # Created:  Feb 2017, M. Vegh (created from data taken from concorde/concorde.py)
-# Modified: 
+# Modified: Jul 2017, T. MacDonald
 
 """ setup file for the Concorde 
 """
@@ -54,19 +54,22 @@ def vehicle_setup(source_ratio=1.):
     wing.tag = 'main_wing'
 
     wing.aspect_ratio            = 1.83
-    wing.sweeps.quarter_chord     = 59.5 * Units.deg
+    wing.sweeps.quarter_chord    = 59.5 * Units.deg
     wing.thickness_to_chord      = 0.03
     wing.taper                   = 0.
-    wing.span_efficiency         = 0.74
+    wing.span_efficiency         = .8
 
     wing.spans.projected         = 25.6    
 
     wing.chords.root             = 33.8
     wing.total_length            = 33.8
     wing.chords.tip              = 1.1
-    wing.chords.mean_aerodynamic = 18.4
+    wing.chords.mean_aerodynamic = 16.6
 
     wing.areas.reference         = 358.25 
+    wing.areas.wetted            = 653. - 12.*2.4*2 # 2.4 is engine area on one side
+    wing.areas.exposed           = 326.5
+    wing.areas.affected          = .6*wing.areas.reference
 
     wing.twists.root             = 0.0 * Units.degrees
     wing.twists.tip              = 0.0 * Units.degrees
@@ -159,9 +162,12 @@ def vehicle_setup(source_ratio=1.):
     wing.chords.root             = 14.5
     wing.total_length            = 14.5
     wing.chords.tip              = 2.7
-    wing.chords.mean_aerodynamic = 8.66
+    wing.chords.mean_aerodynamic = 6.9
 
     wing.areas.reference         = 33.91    #
+    wing.areas.wetted            = 76. 
+    wing.areas.exposed           = 38.
+    wing.areas.affected          = 33.91
 
     wing.twists.root             = 0.0 * Units.degrees
     wing.twists.tip              = 0.0 * Units.degrees  
@@ -241,8 +247,8 @@ def vehicle_setup(source_ratio=1.):
     fuselage.heights.at_wing_root_quarter_chord     = 3.32    #
     fuselage.heights.at_three_quarters_length       = 3.32    #
 
-    fuselage.areas.wetted          = 523.
-    fuselage.areas.front_projected = 7.55
+    fuselage.areas.wetted          = 447.
+    fuselage.areas.front_projected = 11.9
 
 
     fuselage.effective_diameter    = 3.1
@@ -263,10 +269,11 @@ def vehicle_setup(source_ratio=1.):
 
     # setup
     turbojet.number_of_engines = 4.0
-    turbojet.engine_length     = 12.5
-    turbojet.nacelle_diameter  = 1.60
+    turbojet.engine_length     = 12.0
+    turbojet.nacelle_diameter  = 1.3
+    turbojet.inlet_diameter    = 1.1
     turbojet.areas             = Data()
-    turbojet.areas.wetted      = 12.5*1.6*8. # essentially rectangles attached to the wings
+    turbojet.areas.wetted      = 12.5*4.7*2. # 4.7 is outer perimeter on one side
     turbojet.origin            = [[37.,6.,-1.3],[37.,5.3,-1.3],[37.,-5.3,-1.3],[37.,-6.,-1.3]]
 
     # working fluid

diff --git a/regression/scripts/concorde/concorde.py b/regression/scripts/concorde/concorde.py
@@ -2,6 +2,7 @@
 # 
 # Created:  Aug 2014, SUAVE Team
 # Modified: Nov 2016, T. MacDonald
+#           Jul 2017, T. MacDonald
 
 """ setup file for a mission with Concorde
 """
@@ -427,12 +428,6 @@ def simple_sizing(configs):
     # zero fuel weight
     base.mass_properties.max_zero_fuel = 0.9 * base.mass_properties.max_takeoff 
 
-    # wing areas
-    for wing in base.wings:
-        wing.areas.wetted   = 2.0 * wing.areas.reference
-        wing.areas.exposed  = 0.8 * wing.areas.wetted
-        wing.areas.affected = 0.6 * wing.areas.wetted
-
     # fuselage seats
     base.fuselages['fuselage'].number_coach_seats = base.passengers
 

diff --git a/regression/scripts/concorde/results_mission_concorde.res b/regression/scripts/concorde/results_mission_concorde.res
diff --git a/trunk/SUAVE/Methods/Aerodynamics/Supersonic_Zero/Drag/compressibility_drag_total.py b/trunk/SUAVE/Methods/Aerodynamics/Supersonic_Zero/Drag/compressibility_drag_total.py
@@ -2,6 +2,7 @@
 # 
 # Created:  Aug 2014, T. MacDonald
 # Modified: Jun 2017, T. MacDonald
+#           Jul 2017, T. MacDonald
 
 # ----------------------------------------------------------------------
 #  Imports
@@ -139,7 +140,8 @@ def compressibility_drag_total(state,settings,geometry):
         raise ValueError('Main fuselage does not have a total length')
 
     # Propulsor wave drag	
-    prop_wave               = wave_drag_body_of_rev(propulsor.engine_length,propulsor.nacelle_diameter/2.0,Sref_main)*propulsor.number_of_engines
+    effective_radius        = (propulsor.nacelle_diameter - propulsor.inlet_diameter)/2.
+    prop_wave               = wave_drag_body_of_rev(propulsor.engine_length,effective_radius,Sref_main)*propulsor.number_of_engines
     prop_drag[mach >= .99]  = prop_wave*(mach[mach>=.99]-.99)/1.05
     prop_drag[mach >= 1.05] = prop_wave