[Draft] BWB components in mass/flops_based subsysterms

aviary/docs/examples/modified_aircraft.csv

@@ -115,7 +115,7 @@ aircraft:wing:airfoil_technology,1.92669766647637,unitless
 aircraft:wing:area,1370.0,ft**2
 aircraft:wing:aspect_ratio,11.02091,unitless
 aircraft:wing:bending_material_mass_scaler,1.0,unitless
-aircraft:wing:chord_per_semispan,0.31,0.23,0.084,unitless
+aircraft:wing:chord_per_semispan_dist,0.31,0.23,0.084,unitless
 aircraft:wing:composite_fraction,0.2,unitless
 aircraft:wing:control_surface_area,137,ft**2
 aircraft:wing:control_surface_area_ratio,0.1,unitless

aviary/interface/test/sizing_problem_for_test.json

@@ -1050,7 +1050,7 @@
         "<class 'int'>"
     ],
     [
-        "aircraft:wing:chord_per_semispan",
+        "aircraft:wing:chord_per_semispan_dist",
         [
             0.31,
             0.23,

aviary/models/aircraft/advanced_single_aisle/advanced_single_aisle_FLOPS.csv

@@ -131,7 +131,7 @@ aircraft:wing:aspect_ratio,11.5587605382765,unitless
 aircraft:wing:aspect_ratio_reference,11.5587605382765,unitless
 aircraft:wing:bending_material_mass_scaler,1,unitless
 aircraft:wing:bwb_aft_body_mass_scaler,1,unitless
-aircraft:wing:chord_per_semispan,0.273522534166506,0.204274849507037,0.0888152947868224,0.0725353313595661,unitless
+aircraft:wing:chord_per_semispan_dist,0.273522534166506,0.204274849507037,0.0888152947868224,0.0725353313595661,unitless
 aircraft:wing:composite_fraction,0.33333,unitless
 aircraft:wing:control_surface_area_ratio,0.333,unitless
 aircraft:wing:dihedral,6,deg

aviary/models/aircraft/test_aircraft/aircraft_for_bench_FwFm.csv

@@ -115,7 +115,7 @@ aircraft:wing:airfoil_technology,1.92669766647637,unitless
 aircraft:wing:area,1370.0,ft**2
 aircraft:wing:aspect_ratio,11.22091,unitless
 aircraft:wing:bending_material_mass_scaler,1.0,unitless
-aircraft:wing:chord_per_semispan,0.31,0.23,0.084,unitless
+aircraft:wing:chord_per_semispan_dist,0.31,0.23,0.084,unitless
 aircraft:wing:composite_fraction,0.2,unitless
 aircraft:wing:control_surface_area,137,ft**2
 aircraft:wing:control_surface_area_ratio,0.1,unitless

aviary/models/aircraft/test_aircraft/aircraft_for_bench_FwFm_with_electric.csv

@@ -114,7 +114,7 @@ aircraft:wing:airfoil_technology,1.92669766647637,unitless
 aircraft:wing:area,1370.0,ft**2
 aircraft:wing:aspect_ratio,11.22091,unitless
 aircraft:wing:bending_material_mass_scaler,1.0,unitless
-aircraft:wing:chord_per_semispan,0.31,0.23,0.084,unitless
+aircraft:wing:chord_per_semispan_dist,0.31,0.23,0.084,unitless
 aircraft:wing:composite_fraction,0.2,unitless
 aircraft:wing:control_surface_area,137,ft**2
 aircraft:wing:control_surface_area_ratio,0.1,unitless

aviary/models/aircraft/test_aircraft/aircraft_for_bench_FwGm.csv

@@ -218,7 +218,7 @@ aircraft:vertical_tail:num_tails,1,unitless
 aircraft:wing:aeroelastic_tailoring_factor,0.0,unitless
 aircraft:wing:airfoil_technology,1.92669766647637,unitless
 aircraft:wing:bending_material_mass_scaler,1.0,unitless
-aircraft:wing:chord_per_semispan,0.31,0.23,0.084,unitless
+aircraft:wing:chord_per_semispan_dist,0.31,0.23,0.084,unitless
 aircraft:wing:composite_fraction,0.2,unitless
 aircraft:wing:control_surface_area,137,ft**2
 aircraft:wing:control_surface_area_ratio,0.1,unitless

aviary/models/aircraft/test_aircraft/aircraft_for_bench_solved2dof.csv

@@ -114,7 +114,7 @@ aircraft:wing:airfoil_technology,1.92669766647637,unitless
 aircraft:wing:area,1370.0,ft**2
 aircraft:wing:aspect_ratio,11.22091,unitless
 aircraft:wing:bending_material_mass_scaler,1.0,unitless
-aircraft:wing:chord_per_semispan,0.31,0.23,0.084,unitless
+aircraft:wing:chord_per_semispan_dist,0.31,0.23,0.084,unitless
 aircraft:wing:composite_fraction,0.2,unitless
 aircraft:wing:control_surface_area,137,ft**2
 aircraft:wing:control_surface_area_ratio,0.1,unitless

aviary/subsystems/aerodynamics/flops_based/test/data/high_wing_single_aisle.csv

@@ -100,7 +100,7 @@ aircraft:wing:airfoil_technology,1.01,unitless   #check
 aircraft:wing:area,1480,ft**2
 aircraft:wing:aspect_ratio_reference,0.01,unitless   #check
 aircraft:wing:bending_material_mass_scaler,1.01,unitless   #check
-aircraft:wing:chord_per_semispan,0.13,0.115,0.06,unitless
+aircraft:wing:chord_per_semispan_dist,0.13,0.115,0.06,unitless
 aircraft:wing:composite_fraction,0.01,unitless   #check
 aircraft:wing:dihedral,-1.0,deg
 aircraft:wing:control_surface_area_ratio,0.2234,unitless

aviary/subsystems/aerodynamics/gasp_based/gaspaero.py

@@ -697,7 +697,7 @@ def compute(self, inputs, outputs):
             ufac = (1 + lift_ratio) ** 2 / (
                 sigstr * (lift_ratio / bbar) ** 2 + 2 * sigma * lift_ratio / bbar + 1
             )
-        else:
+        elif design_type is AircraftTypes.BLENDED_WING_BODY:
             # Modify for tailless "BWB"
             if bbar < 0.01 * wingspan:
                 bbar = 1.0
@@ -2515,7 +2515,7 @@ def setup(self):
                 ),
                 promotes=['*'],
             )
-        else:
+        elif design_type is AircraftTypes.TRANSPORT:
             self.add_subsystem(
                 'aero_setup',
                 AeroSetup(
@@ -2538,7 +2538,7 @@ def setup(self):
                 BWBLiftCoeffClean(output_alpha=self.options['output_alpha'], num_nodes=nn),
                 promotes=['*'],
             )
-        else:
+        elif design_type is AircraftTypes.TRANSPORT:
             self.add_subsystem(
                 'lift_coef',
                 LiftCoeffClean(output_alpha=self.options['output_alpha'], num_nodes=nn),
@@ -2594,7 +2594,7 @@ def setup(self):
                 ),
                 promotes=['*'],
             )
-        else:
+        elif design_type is AircraftTypes.TRANSPORT:
             self.add_subsystem(
                 'aero_setup',
                 AeroSetup(
@@ -2661,7 +2661,7 @@ def setup(self):
                     promotes_inputs=['*'],
                     promotes_outputs=['*'],
                 )
-            else:
+            elif design_type is AircraftTypes.TRANSPORT:
                 self.add_subsystem(
                     'lift_coef',
                     LiftCoeff(num_nodes=nn),

aviary/subsystems/aerodynamics/gasp_based/test/test_common.py

@@ -110,7 +110,7 @@ class TestTanhRampComp(unittest.TestCase):
     def test_tanh_ramp_up(self):
         p = om.Problem()
 
-        nn = 1000
+        nn = 100
 
         c = TanhRampComp(time_units='s', num_nodes=nn)
 
@@ -135,12 +135,12 @@ def test_tanh_ramp_up(self):
 
         thruput = p.get_val('tanh_ramp.thruput')
 
-        assert_near_equal(thruput[250], desired=30, tolerance=0.01)
-        assert_near_equal(thruput[275], desired=35, tolerance=0.01)
-        assert_near_equal(thruput[300], desired=40, tolerance=0.01)
+        assert_near_equal(thruput[25], desired=30, tolerance=0.01)
+        assert_near_equal(thruput[27], desired=33.6, tolerance=0.01)
+        assert_near_equal(thruput[30], desired=40, tolerance=0.01)
 
-        assert_near_equal(thruput[500:], desired=40 * np.ones((500, 1)), tolerance=0.01)
-        assert_near_equal(thruput[:200], desired=30 * np.ones((200, 1)), tolerance=0.01)
+        assert_near_equal(thruput[50:], desired=40 * np.ones((50, 1)), tolerance=0.01)
+        assert_near_equal(thruput[:20], desired=30 * np.ones((20, 1)), tolerance=0.01)
 
         self.assertTrue(np.all(thruput >= 30))
         self.assertTrue(np.all(thruput <= 40))
@@ -150,7 +150,7 @@ def test_tanh_ramp_up(self):
     def test_tanh_ramp_down(self):
         p = om.Problem()
 
-        nn = 1000
+        nn = 100
 
         c = TanhRampComp(time_units='s', num_nodes=nn)
 
@@ -175,12 +175,12 @@ def test_tanh_ramp_down(self):
 
         thruput = p.get_val('tanh_ramp.thruput')[:, 0]
 
-        assert_near_equal(thruput[250], desired=40, tolerance=0.01)
-        assert_near_equal(thruput[275], desired=35, tolerance=0.01)
-        assert_near_equal(thruput[300], desired=30, tolerance=0.01)
+        assert_near_equal(thruput[25], desired=40, tolerance=0.01)
+        assert_near_equal(thruput[27], desired=36.4, tolerance=0.01)
+        assert_near_equal(thruput[30], desired=30, tolerance=0.01)
 
-        assert_near_equal(thruput[500:], desired=30 * np.ones(500), tolerance=0.01)
-        assert_near_equal(thruput[:200], desired=40 * np.ones(200), tolerance=0.01)
+        assert_near_equal(thruput[50:], desired=30 * np.ones(50), tolerance=0.01)
+        assert_near_equal(thruput[:20], desired=40 * np.ones(20), tolerance=0.01)
 
         self.assertTrue(np.all(thruput >= 30))
         self.assertTrue(np.all(thruput <= 40))

aviary/subsystems/geometry/flops_based/test/test_prep_geom.py

@@ -65,7 +65,7 @@ class PrepGeomTest(unittest.TestCase):
     def setUp(self):
         self.prob = om.Problem()
 
-    @parameterized.expand(get_flops_case_names(), name_func=print_case)
+    @parameterized.expand(get_flops_case_names(omit='BWB1aFLOPS'), name_func=print_case)
     def test_case(self, case_name):
         class PreMission(om.Group):
             def initialize(self):

aviary/subsystems/geometry/gasp_based/size_group.py

@@ -27,7 +27,7 @@ def setup(self):
                 promotes_inputs=['*'],
                 promotes_outputs=['*'],
             )
-        else:
+        elif design_type is AircraftTypes.TRANSPORT:
             self.add_subsystem(
                 'fuselage',
                 FuselageGroup(),
@@ -41,7 +41,7 @@ def setup(self):
                 BWBWingGroup(),
                 promotes=['*'],
             )
-        else:
+        elif design_type is AircraftTypes.TRANSPORT:
             self.add_subsystem(
                 'wing',
                 WingGroup(),
@@ -61,7 +61,7 @@ def setup(self):
                 promotes_inputs=['*'],
                 promotes_outputs=['*'],
             )
-        else:
+        elif design_type is AircraftTypes.TRANSPORT:
             self.add_subsystem(
                 'engine',
                 EngineSize(),

aviary/subsystems/geometry/gasp_based/wing.py

@@ -1828,7 +1828,7 @@ def compute(self, inputs, outputs):
         if design_type is AircraftTypes.BLENDED_WING_BODY:
             cabin_height = body_width * inputs[Aircraft.Fuselage.HEIGHT_TO_WIDTH_RATIO]
             b_fus = 0.5 * (body_width - cabin_height) + cabin_height * sqt
-        else:
+        elif design_type is AircraftTypes.TRANSPORT:
             b_fus = body_width * sqt
 
         wingspan = inputs[Aircraft.Wing.SPAN]
@@ -1870,7 +1870,7 @@ def compute_partials(self, inputs, J):
         if design_type is AircraftTypes.BLENDED_WING_BODY:
             cabin_height = body_width * height_to_width
             b_fus = 0.5 * (body_width - cabin_height) + cabin_height * sqt
-        else:
+        elif design_type is AircraftTypes.TRANSPORT:
             b_fus = body_width * sqt
 
         wingspan = inputs[Aircraft.Wing.SPAN]