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/geometry/flops_based/bwb_wing_detailed.py

@@ -18,14 +18,16 @@ def initialize(self):
         add_aviary_option(self, Settings.VERBOSITY)
 
     def setup(self):
-        num_stations = len(self.options[Aircraft.Wing.INPUT_STATION_DIST])
+        num_inp_stations = len(self.options[Aircraft.Wing.INPUT_STATION_DIST])
+        add_aviary_input(
+            self, Aircraft.Wing.CHORD_PER_SEMISPAN_DIST, shape=num_inp_stations, units='unitless'
+        )
         add_aviary_input(
-            self, Aircraft.Wing.CHORD_PER_SEMISPAN_DIST, shape=num_stations, units='unitless'
+            self, Aircraft.Wing.THICKNESS_TO_CHORD_DIST, shape=num_inp_stations, units='unitless'
         )
         add_aviary_input(
-            self, Aircraft.Wing.THICKNESS_TO_CHORD_DIST, shape=num_stations, units='unitless'
+            self, Aircraft.Wing.LOAD_PATH_SWEEP_DIST, shape=num_inp_stations, units='deg'
         )
-        add_aviary_input(self, Aircraft.Wing.LOAD_PATH_SWEEP_DIST, shape=num_stations, units='deg')
         add_aviary_input(self, Aircraft.Fuselage.LENGTH, units='ft')
         add_aviary_input(self, Aircraft.Fuselage.MAX_WIDTH, units='ft')
         add_aviary_input(self, Aircraft.Wing.SPAN, units='ft')
@@ -38,14 +40,11 @@ def setup(self):
             desc='RSPSOB: Rear spar percent chord for BWB at side of body',
         )
 
-        self.add_output('BWB_INPUT_STATION_DIST', shape=num_stations, units='unitless')
-        self.add_output('BWB_CHORD_PER_SEMISPAN_DIST', shape=num_stations, units='unitless')
-        self.add_output('BWB_THICKNESS_TO_CHORD_DIST', shape=num_stations, units='unitless')
-        self.add_output('BWB_LOAD_PATH_SWEEP_DIST', shape=num_stations, units='deg')
+        self.add_output('BWB_CHORD_PER_SEMISPAN_DIST', shape=num_inp_stations, units='unitless')
+        self.add_output('BWB_THICKNESS_TO_CHORD_DIST', shape=num_inp_stations, units='unitless')
+        self.add_output('BWB_LOAD_PATH_SWEEP_DIST', shape=num_inp_stations, units='deg')
 
     def setup_partials(self):
-        self.declare_partials('BWB_INPUT_STATION_DIST', '*', method='fd', form='forward')
-
         self.declare_partials('BWB_CHORD_PER_SEMISPAN_DIST', '*', method='fd', form='forward')
 
         self.declare_partials(
@@ -76,18 +75,6 @@ def compute(self, inputs, outputs):
                 print('Rear_spar_percent_chord must be positive.')
         xl_out = root_chord / rear_spar_percent_chord
 
-        bwb_input_station_dist = np.array(
-            self.options[Aircraft.Wing.INPUT_STATION_DIST], dtype=float
-        )
-        bwb_input_station_dist = np.where(
-            bwb_input_station_dist <= 1.0,
-            bwb_input_station_dist * rate_span + width / wingspan,  # if x <= 1.0
-            bwb_input_station_dist + width / 2.0,  # else
-        )
-        bwb_input_station_dist[0] = 0.0
-        bwb_input_station_dist[1] = width / 2.0
-        outputs['BWB_INPUT_STATION_DIST'] = bwb_input_station_dist
-
         outputs['BWB_CHORD_PER_SEMISPAN_DIST'] = inputs[Aircraft.Wing.CHORD_PER_SEMISPAN_DIST]
         idx = np.where(inputs[Aircraft.Wing.CHORD_PER_SEMISPAN_DIST] < 5.0)
         outputs['BWB_CHORD_PER_SEMISPAN_DIST'][idx] *= rate_span
@@ -149,18 +136,11 @@ def setup(self):
             desc='RSPSOB: Rear spar percent chord for BWB at side of body',
         )
 
-        self.add_output('BWB_INPUT_STATION_DIST', shape=3, units='unitless')
         self.add_output('BWB_CHORD_PER_SEMISPAN_DIST', shape=3, units='unitless')
         self.add_output('BWB_THICKNESS_TO_CHORD_DIST', shape=3, units='unitless')
         self.add_output('BWB_LOAD_PATH_SWEEP_DIST', shape=3, units='deg')
 
     def setup_partials(self):
-        self.declare_partials(
-            'BWB_INPUT_STATION_DIST',
-            [
-                Aircraft.Fuselage.MAX_WIDTH,
-            ],
-        )
         self.declare_partials(
             'BWB_CHORD_PER_SEMISPAN_DIST',
             [
@@ -184,6 +164,12 @@ def setup_partials(self):
 
     def compute(self, inputs, outputs):
         verbosity = self.options[Settings.VERBOSITY]
+
+        num_inp_stations = len(self.options[Aircraft.Wing.INPUT_STATION_DIST])
+        if num_inp_stations != 3:
+            if verbosity > Verbosity.BRIEF:
+                print('Aircraft.Wing.INPUT_STATION_DIST must be 3.')
+
         width = inputs[Aircraft.Fuselage.MAX_WIDTH][0]
         wingspan = inputs[Aircraft.Wing.SPAN][0]
         length = inputs[Aircraft.Fuselage.LENGTH][0]
@@ -202,10 +188,6 @@ def compute(self, inputs, outputs):
         angle = np.tan(sweep / 57.2958) - 2.0 * (1 - tr_out) / (1 + tr_out) / ar_out
         swp_ld_path = 57.2958 * np.arctan(angle)
 
-        outputs['BWB_INPUT_STATION_DIST'][0] = 0.0
-        outputs['BWB_INPUT_STATION_DIST'][1] = width / 2.0
-        outputs['BWB_INPUT_STATION_DIST'][2] = 1.0
-
         outputs['BWB_CHORD_PER_SEMISPAN_DIST'][0] = length
         outputs['BWB_CHORD_PER_SEMISPAN_DIST'][1] = xl_out
         outputs['BWB_CHORD_PER_SEMISPAN_DIST'][2] = wing_tip_chord
@@ -221,19 +203,14 @@ def compute(self, inputs, outputs):
     def compute_partials(self, inputs, J):
         width = inputs[Aircraft.Fuselage.MAX_WIDTH][0]
         wingspan = inputs[Aircraft.Wing.SPAN][0]
-        length = inputs[Aircraft.Fuselage.LENGTH][0]
         root_chord = inputs[Aircraft.Wing.ROOT_CHORD][0]
         rear_spar_percent_chord = inputs['Rear_spar_percent_chord'][0]
         xl_out = root_chord / rear_spar_percent_chord
         wing_tip_chord = 0.06 * wingspan
-        tc = inputs[Aircraft.Wing.THICKNESS_TO_CHORD][0]
         sweep = inputs[Aircraft.Wing.SWEEP][0]
         tr_out = wing_tip_chord / xl_out
         ar_out = 2.0 * (wingspan - width) / (wing_tip_chord + xl_out)
         angle = np.tan(sweep / 57.2958) - 2.0 * (1 - tr_out) / (1 + tr_out) / ar_out
-        swp_ld_path = 57.2958 * np.arctan(angle)
-
-        J['BWB_INPUT_STATION_DIST', Aircraft.Fuselage.MAX_WIDTH] = [0.0, 0.5, 0.0]
 
         J['BWB_CHORD_PER_SEMISPAN_DIST', Aircraft.Fuselage.LENGTH] = [1.0, 0.0, 0.0]
         J['BWB_CHORD_PER_SEMISPAN_DIST', Aircraft.Wing.ROOT_CHORD] = [
@@ -338,16 +315,16 @@ class BWBWingPrelim(om.ExplicitComponent):
     """preliminary calculations of wing aspect ratio for BWB using detailed wing information"""
 
     def initialize(self):
-        add_aviary_option(self, Aircraft.Wing.NUM_INTEGRATION_STATIONS)
+        add_aviary_option(self, Aircraft.Wing.INPUT_STATION_DIST)
+        add_aviary_option(self, Settings.VERBOSITY)
 
     def setup(self):
-        num_stations = self.options[Aircraft.Wing.NUM_INTEGRATION_STATIONS]
+        num_inp_stations = len(self.options[Aircraft.Wing.INPUT_STATION_DIST])
 
         add_aviary_input(self, Aircraft.Fuselage.MAX_WIDTH, units='ft')
         add_aviary_input(self, Aircraft.Wing.GLOVE_AND_BAT, units='ft**2')
         add_aviary_input(self, Aircraft.Wing.SPAN, units='ft')
-        self.add_input('BWB_INPUT_STATION_DIST', shape=num_stations, units='unitless')
-        self.add_input('BWB_CHORD_PER_SEMISPAN_DIST', shape=num_stations, units='unitless')
+        self.add_input('BWB_CHORD_PER_SEMISPAN_DIST', shape=num_inp_stations, units='unitless')
 
         add_aviary_output(self, Aircraft.Wing.AREA, units='ft**2')
         add_aviary_output(self, Aircraft.Wing.ASPECT_RATIO, units='unitless')
@@ -356,8 +333,26 @@ def setup(self):
         self.declare_partials('*', '*', method='fd', form='forward')
 
     def compute(self, inputs, outputs):
-        input_station_dist = inputs['BWB_INPUT_STATION_DIST']
-        num_stations = len(inputs['BWB_INPUT_STATION_DIST'])
+        verbosity = self.options[Settings.VERBOSITY]
+        width = inputs[Aircraft.Fuselage.MAX_WIDTH][0]
+        wingspan = inputs[Aircraft.Wing.SPAN][0]
+        if wingspan <= 0.0:
+            if verbosity > Verbosity.BRIEF:
+                print('Aircraft.Wing.SPAN must be positive.')
+        rate_span = (wingspan - width) / wingspan
+
+        # This part is repeated in _BWBWing()
+        num_inp_stations = len(self.options[Aircraft.Wing.INPUT_STATION_DIST])
+        bwb_input_station_dist = np.array(
+            self.options[Aircraft.Wing.INPUT_STATION_DIST], dtype=float
+        )
+        bwb_input_station_dist = np.where(
+            bwb_input_station_dist <= 1.0,
+            bwb_input_station_dist * rate_span + width / wingspan,  # if x <= 1.0
+            bwb_input_station_dist + width / 2.0,  # else
+        )
+        bwb_input_station_dist[0] = 0.0
+        bwb_input_station_dist[1] = width / 2.0
 
         glove_and_bat = inputs[Aircraft.Wing.GLOVE_AND_BAT]
         width = inputs[Aircraft.Fuselage.MAX_WIDTH]
@@ -371,19 +366,19 @@ def compute(self, inputs, outputs):
             C1 = bwb_chord_per_semispan_dist[0] * span / 2.0
         else:
             C1 = bwb_chord_per_semispan_dist[0]
-        if input_station_dist[0] <= 1.1:
-            Y1 = input_station_dist[0] * span / 2.0
+        if bwb_input_station_dist[0] <= 1.1:
+            Y1 = bwb_input_station_dist[0] * span / 2.0
         else:
-            Y1 = input_station_dist[0]
-        for n in range(1, num_stations):
+            Y1 = bwb_input_station_dist[0]
+        for n in range(1, num_inp_stations):
             if bwb_chord_per_semispan_dist[n] <= 5.0:
                 C2 = bwb_chord_per_semispan_dist[n] * span / 2.0
             else:
                 C2 = bwb_chord_per_semispan_dist[n]
-            if input_station_dist[n] <= 1.1:
-                Y2 = input_station_dist[n] * span / 2.0
+            if bwb_input_station_dist[n] <= 1.1:
+                Y2 = bwb_input_station_dist[n] * span / 2.0
             else:
-                Y2 = input_station_dist[n]
+                Y2 = bwb_input_station_dist[n]
             axp = (Y2 - Y1) * (C1 + C2)
             C1 = C2
             Y1 = Y2