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_results_for_test.json

@@ -806,7 +806,7 @@
         "<class 'float'>"
     ],
     [
-        "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

@@ -217,7 +217,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

@@ -662,7 +662,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
@@ -2480,7 +2480,7 @@ def setup(self):
                 ),
                 promotes=['*'],
             )
-        else:
+        elif design_type is AircraftTypes.TRANSPORT:
             self.add_subsystem(
                 'aero_setup',
                 AeroSetup(
@@ -2503,7 +2503,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),
@@ -2559,7 +2559,7 @@ def setup(self):
                 ),
                 promotes=['*'],
             )
-        else:
+        elif design_type is AircraftTypes.TRANSPORT:
             self.add_subsystem(
                 'aero_setup',
                 AeroSetup(
@@ -2626,7 +2626,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/fuselage.py

@@ -16,9 +16,6 @@ class FuselagePrelim(om.ExplicitComponent):
     Aircraft.Fuselage.PLANFORM_AREA = length * max_width.
     """
 
-    def initialize(self):
-        add_aviary_option(self, Settings.VERBOSITY)
-
     def setup(self):
         add_aviary_input(self, Aircraft.Fuselage.LENGTH, units='ft')
         add_aviary_input(self, Aircraft.Fuselage.MAX_HEIGHT, units='ft')
@@ -39,16 +36,16 @@ def setup_partials(self):
         )
 
     def compute(self, inputs, outputs):
-        verbosity = self.options[Settings.VERBOSITY]
         max_height = inputs[Aircraft.Fuselage.MAX_HEIGHT]
         max_width = inputs[Aircraft.Fuselage.MAX_WIDTH]
         length = inputs[Aircraft.Fuselage.LENGTH]
         if length <= 0.0:
-            if verbosity > Verbosity.BRIEF:
-                print('Aircraft.Fuselage.LENGTH must be positive.')
+            raise ValueError(
+                f'Aircraft.Fuselage.LENGTH must be positive, however {length} is provided.'
+            )
 
-        avg_diameter = 0.5 * (max_height + max_width)
-        outputs[Aircraft.Fuselage.REF_DIAMETER] = avg_diameter
+        ref_diameter = 0.5 * (max_height + max_width)
+        outputs[Aircraft.Fuselage.REF_DIAMETER] = ref_diameter
 
         outputs[Aircraft.Fuselage.PLANFORM_AREA] = length * max_width
 
@@ -64,9 +61,6 @@ def compute_partials(self, inputs, partials, discrete_inputs=None):
 class BWBFuselagePrelim(om.ExplicitComponent):
     """Calculate fuselage average diameter and planform area for BWB"""
 
-    def initialize(self):
-        add_aviary_option(self, Settings.VERBOSITY)
-
     def setup(self):
         add_aviary_input(self, Aircraft.Fuselage.LENGTH, units='ft')
         add_aviary_input(self, Aircraft.Fuselage.MAX_WIDTH, units='ft')
@@ -99,25 +93,26 @@ def setup_partials(self):
         )
 
     def compute(self, inputs, outputs):
-        verbosity = self.options[Settings.VERBOSITY]
         max_width = inputs[Aircraft.Fuselage.MAX_WIDTH]
         length = inputs[Aircraft.Fuselage.LENGTH]
         max_height = inputs[Aircraft.Fuselage.MAX_HEIGHT]
         root_chord = inputs[Aircraft.Wing.ROOT_CHORD]
         rear_spar_percent_chord = inputs['Rear_spar_percent_chord']
 
         if length <= 0.0:
-            if verbosity > Verbosity.BRIEF:
-                print('Aircraft.Fuselage.LENGTH must be positive.')
+            raise ValueError(
+                f'Aircraft.Fuselage.LENGTH must be positive, however {length} is provided.'
+            )
         if rear_spar_percent_chord <= 0.0:
-            if verbosity > Verbosity.BRIEF:
-                print('Rear_spar_percent_chord must be positive. It is default to 0.7')
+            raise ValueError(
+                'Rear_spar_percent_chord must be positive, '
+                f'however {rear_spar_percent_chord} is provided.'
+            )
 
-        # not sure if this is right definition and not sure if it is used for BWB.
-        avg_diameter = 0.5 * (max_height + max_width)
+        ref_diameter = 0.5 * (max_height + max_width)
         planform_area = max_width * (length + root_chord / rear_spar_percent_chord) / 2.0
 
-        outputs[Aircraft.Fuselage.REF_DIAMETER] = avg_diameter
+        outputs[Aircraft.Fuselage.REF_DIAMETER] = ref_diameter
         outputs[Aircraft.Fuselage.PLANFORM_AREA] = planform_area
 
     def compute_partials(self, inputs, partials):
@@ -139,15 +134,16 @@ def compute_partials(self, inputs, partials):
 
 
 class SimpleCabinLayout(om.ExplicitComponent):
-    """Given fuselage length, height and width, compute passenger compartment length."""
+    """
+    Given fuselage length, height and width, compute passenger compartment length.
+    This is for transporter aircraft, not BWB.
+    """
 
     def initialize(self):
         add_aviary_option(self, Settings.VERBOSITY)
 
     def setup(self):
         add_aviary_input(self, Aircraft.Fuselage.LENGTH, units='ft')
-        add_aviary_input(self, Aircraft.Fuselage.MAX_HEIGHT, units='ft')
-        add_aviary_input(self, Aircraft.Fuselage.MAX_WIDTH, units='ft')
 
         add_aviary_output(self, Aircraft.Fuselage.PASSENGER_COMPARTMENT_LENGTH, units='ft')
 
@@ -161,24 +157,19 @@ def compute(self, inputs, outputs):
         verbosity = self.options[Settings.VERBOSITY]
 
         length = inputs[Aircraft.Fuselage.LENGTH]
-        max_height = inputs[Aircraft.Fuselage.MAX_HEIGHT]
-        max_width = inputs[Aircraft.Fuselage.MAX_WIDTH]
         if length <= 0.0:
-            if verbosity > Verbosity.BRIEF:
-                print('Aircraft.Fuselage.LENGTH must be positive to use simple cabin layout.')
-        if max_height <= 0.0 or max_width <= 0.0:
-            if verbosity > Verbosity.BRIEF:
-                print(
-                    'Aircraft.Fuselage.MAX_HEIGHT & Aircraft.Fuselage.MAX_WIDTH must be positive.'
-                )
+            raise ValueError(
+                f'Aircraft.Fuselage.LENGTH must be positive, however {length} is provided.'
+            )
 
         pax_compart_length = 0.6085 * length * (np.arctan(length / 59.0)) ** 1.1
         if pax_compart_length > 190.0:
             if verbosity > Verbosity.BRIEF:
-                print(
-                    'Passenger compartiment lenght is longer than recommended maximum length. '
-                    'Suggest use detailed laylout algorithm.'
+                raise UserWarning(
+                    'Passenger compartment length is longer than recommended maximum'
+                    ' length. Suggest using detailed laylout algorithm.'
                 )
+
         outputs[Aircraft.Fuselage.PASSENGER_COMPARTMENT_LENGTH] = pax_compart_length
 
     def compute_partials(self, inputs, J):
@@ -191,11 +182,12 @@ def compute_partials(self, inputs, J):
 
 
 class DetailedCabinLayout(om.ExplicitComponent):
-    """Compute fuselage dimensions using cabin seat information."""
+    """
+    Compute fuselage dimensions using cabin seat information.
+    This is for transporter aircraft, not BWB.
+    """
 
     def initialize(self):
-        add_aviary_option(self, Settings.VERBOSITY)
-        add_aviary_option(self, Aircraft.Fuselage.NUM_FUSELAGES)
         add_aviary_option(self, Aircraft.CrewPayload.Design.NUM_FIRST_CLASS)
         add_aviary_option(self, Aircraft.CrewPayload.Design.NUM_TOURIST_CLASS)
         add_aviary_option(self, Aircraft.CrewPayload.Design.NUM_SEATS_ABREAST_FIRST)
@@ -215,14 +207,9 @@ def setup(self):
         self.declare_partials('*', '*', method='fd', form='forward')
 
     def compute(self, inputs, outputs):
-        verbosity = self.options[Settings.VERBOSITY]
         num_first_class_pax = self.options[Aircraft.CrewPayload.Design.NUM_FIRST_CLASS]
         num_tourist_class_pax = self.options[Aircraft.CrewPayload.Design.NUM_TOURIST_CLASS]
         fuselage_multiplier = 1.0
-        num_fuselage = self.options[Aircraft.Fuselage.NUM_FUSELAGES]
-        if num_fuselage > 1:
-            if verbosity > Verbosity.BRIEF:
-                print('Multiple fuselage configuration is not implemented yet.')
 
         num_seat_abreast_first = self.options[Aircraft.CrewPayload.Design.NUM_SEATS_ABREAST_FIRST]
         num_seat_abreast_tourist = self.options[
@@ -466,20 +453,20 @@ def compute(self, inputs, outputs):
         bay_width_max = 12.0  # ft
 
         if length <= 0.0:
-            if verbosity > Verbosity.BRIEF:
-                print('Aircraft.Fuselage.LENGTH must be positive to use simple cabin layout.')
+            raise ValueError(
+                f'Aircraft.Fuselage.LENGTH must be positive to use simple cabin layout.'
+            )
         if max_width <= 0.0:
-            if verbosity > Verbosity.BRIEF:
-                print(
-                    'Aircraft.Fuselage.MAX_HEIGHT & Aircraft.Fuselage.MAX_WIDTH must be positive.'
-                )
+            raise ValueError(
+                f'Aircraft.Fuselage.MAX_HEIGHT must be positive, however {max_width} is provided.'
+            )
 
         pax_compart_length = rear_spar_percent_chord * length
         if pax_compart_length > 190.0:
             if verbosity > Verbosity.BRIEF:
-                print(
-                    'Passenger compartiment lenght is longer than recommended maximum length. '
-                    'Suggest use detailed laylout algorithm.'
+                raise UserWarning(
+                    'Passenger compartment lenght is longer than recommended maximum'
+                    ' length. Suggest using detailed laylout algorithm.'
                 )
 
         sweep = inputs[Aircraft.BWB.PASSENGER_LEADING_EDGE_SWEEP]
@@ -540,8 +527,6 @@ class BWBDetailedCabinLayout(om.ExplicitComponent):
     """Compute BWB fuselage dimensions using cabin seat information."""
 
     def initialize(self):
-        add_aviary_option(self, Settings.VERBOSITY)
-        add_aviary_option(self, Aircraft.Fuselage.NUM_FUSELAGES)
         add_aviary_option(self, Aircraft.CrewPayload.Design.NUM_BUSINESS_CLASS)
         add_aviary_option(self, Aircraft.CrewPayload.Design.NUM_FIRST_CLASS)
         add_aviary_option(self, Aircraft.CrewPayload.Design.NUM_TOURIST_CLASS)