Merge pull request #1047 from xjjiang/engine_ref_diameter

Removal of Aircraft.Engine.REFERENCE_DIAMETER

Author: jkirk5

aviary/docs/theory_guide/gasp_based_bwb.ipynb

@@ -15,8 +15,8 @@
     "\n",
     "from aviary.api import Aircraft\n",
     "from aviary.subsystems.geometry.gasp_based.engine import (\n",
-    "    BWBEngineSizeGroup,\n",
-    "    EngineSize,\n",
+    "    GASPEngineSizeGroup,\n",
+    "    GASPEngineSize,\n",
     "    PercentNotInFuselage,\n",
     ")\n",
     "from aviary.subsystems.geometry.gasp_based.fuselage import (\n",
@@ -33,8 +33,8 @@
     "glue_variable(get_variable_name(BWBFuselageParameters2), md_code=True)\n",
     "glue_variable(get_variable_name(BWBFuselageSize), md_code=True)\n",
     "glue_variable(get_variable_name(BWBFuselageGroup), md_code=True)\n",
-    "glue_variable(get_variable_name(EngineSize), md_code=True)\n",
-    "glue_variable(get_variable_name(BWBEngineSizeGroup), md_code=True)\n",
+    "glue_variable(get_variable_name(GASPEngineSize), md_code=True)\n",
+    "glue_variable(get_variable_name(GASPEngineSizeGroup), md_code=True)\n",
     "glue_variable(get_variable_name(PercentNotInFuselage), md_code=True)\n",
     "\n",
     "glue_variable(get_variable_name(Aircraft.Wing.VERTICAL_MOUNT_LOCATION), md_code=True)"
@@ -57,8 +57,8 @@
     "- {glue:md}`BWBFuselageParameters2`: This component computes several fuselage geometric parameters based on both the user inputs and cabin layout.\n",
     "- {glue:md}`BWBFuselageSize`: It carries out the computation of fuselage length and wetted area of BWB model.\n",
     "- {glue:md}`BWBFuselageGroup`: {glue:md}`BWBFuselageParameters1` + {glue:md}`BWBCabinLayout` + {glue:md}`BWBFuselageParameters2` + {glue:md}`BWBFuselageSize`\n",
-    "- {glue:md}`PercentNotInFuselage`: For BWB, engines may be partially buried into fuselage. This component computes the percentage of corresponding surface area of nacelles not buried in fuselage. This parameter is passed to {glue:md}`EngineSize` component which computes the wetted area of nacelle. This function has infinity derivatives at the two ends. We use two cubic polynomials to smooth it.\n",
-    "- {glue:md}`BWBEngineSizeGroup`: {glue:md}`PercentNotInFuselage` + {glue:md}`EngineSize`. For Tube+Wing aircraft, we assume that engines are not buried into fuselage and hence {glue:md}`EngineSize` is good enough. But this feature can be extended to conventional aircraft.\n",
+    "- {glue:md}`PercentNotInFuselage`: For BWB, engines may be partially buried into fuselage. This component computes the percentage of corresponding surface area of nacelles not buried in fuselage. This parameter is passed to {glue:md}`GASPEngineSize` component which computes the wetted area of nacelle. This function has infinity derivatives at the two ends. We use two cubic polynomials to smooth it.\n",
+    "- {glue:md}`GASPEngineSizeGroup`: {glue:md}`PercentNotInFuselage` + {glue:md}`GASPEngineSize`. For Tube+Wing aircraft, we assume that engines are not buried into fuselage and hence {glue:md}`GASPEngineSize` is good enough. But this feature can be extended to conventional aircraft.\n",
     "- {glue:md}`ExposedWing`: Computation of exposed wing area. This is useful for BWB, but is available to tube+wing model too. For {glue:md}`Aircraft.Wing.VERTICAL_MOUNT_LOCATION` in the range (0, 1), the function has infinity derivatives at the two ends. We use two cubic polynomials to smooth it."
    ]
   },

aviary/models/aircraft/large_single_aisle_1/V3_bug_fixed_IO.py

@@ -72,7 +72,7 @@
 V3_bug_fixed_options.set_val(Aircraft.Fuselage.WETTED_AREA, 4000, units='ft**2')
 V3_bug_fixed_options.set_val(Aircraft.VerticalTail.MOMENT_RATIO, 2.362, units='unitless')
 V3_bug_fixed_options.set_val(Aircraft.HorizontalTail.ASPECT_RATIO, val=4.75, units='unitless')
-V3_bug_fixed_options.set_val(Aircraft.Engine.REFERENCE_DIAMETER, 5.8, units='ft')
+V3_bug_fixed_options.set_val(Aircraft.Engine.INLET_AREA_COEFFICIENT, 0.00030975, units='unitless')
 V3_bug_fixed_options.set_val(Aircraft.Nacelle.CORE_DIAMETER_RATIO, 1.25, units='unitless')
 V3_bug_fixed_options.set_val(Aircraft.Nacelle.FINENESS, 2, units='unitless')
 

aviary/models/aircraft/large_single_aisle_1/large_single_aisle_1_GASP.csv

@@ -29,12 +29,12 @@ aircraft:design:type,transport,unitless
 aircraft:engine:additional_mass_fraction,0.14,unitless
 aircraft:engine:data_file,models/engines/turbofan_23k_1.csv,unitless
 aircraft:engine:global_throttle, True, unitless
+aircraft:engine:inlet_area_coefficient,0.000301265,unitless
 aircraft:engine:mass_scaler,1,unitless
 aircraft:engine:mass_specific,0.21366,lbm/lbf
 aircraft:engine:num_engines,2,unitless
 aircraft:engine:pod_mass_scaler,1,unitless
 aircraft:engine:pylon_factor,1.25,unitless
-aircraft:engine:reference_diameter,5.8,ft
 aircraft:engine:reference_sls_thrust,28690,lbf
 aircraft:engine:scale_factor,1.0,unitless
 aircraft:engine:scaled_sls_thrust,28690,lbf

aviary/models/aircraft/large_turboprop_freighter/large_turboprop_freighter_GASP.csv

@@ -64,7 +64,6 @@ aircraft:engine:propeller:diameter, 13.5, ft
 aircraft:engine:propeller:integrated_lift_coefficient, 0.5, unitless
 aircraft:engine:propeller:tip_speed_max, 720, ft/s
 aircraft:engine:pylon_factor, 0.7, unitless
-aircraft:engine:reference_diameter, 5.8, ft
 aircraft:engine:reference_sls_thrust, 5000, lbf
 aircraft:engine:rpm_design, 13820, rpm
 aircraft:engine:fixed_rpm, 13820, rpm

aviary/models/aircraft/small_single_aisle/small_single_aisle_GASP.csv

@@ -35,7 +35,6 @@ aircraft:engine:mass_specific,0.2153,lbm/lbf
 aircraft:engine:num_engines,2,unitless
 aircraft:engine:pod_mass_scaler,1,unitless
 aircraft:engine:pylon_factor,0.6,unitless
-aircraft:engine:reference_diameter,6.04,ft
 aircraft:engine:reference_sls_thrust,28690,lbf
 aircraft:engine:scale_factor,0.8295573370512374,unitless
 aircraft:engine:scaled_sls_thrust,23800,lbf

aviary/models/aircraft/test_aircraft/aircraft_for_bench_FwGm.csv

@@ -22,6 +22,7 @@ aircraft:engine:fuel_flow_scaler_constant_term,0.,unitless
 aircraft:engine:fuel_flow_scaler_linear_term,0.,unitless
 aircraft:engine:geopotential_alt,False,unitless
 aircraft:engine:ignore_negative_thrust,False,unitless
+aircraft:engine:inlet_area_coefficient,0.00030975,unitless
 aircraft:engine:interpolation_method,slinear,unitless
 aircraft:engine:mass_scaler,1.15,unitless
 aircraft:engine:mass,7400,lbm
@@ -31,7 +32,6 @@ aircraft:engine:num_fuselage_engines,0,unitless
 aircraft:engine:num_wing_engines,2,unitless
 aircraft:engine:pod_mass_scaler,1,unitless
 aircraft:engine:pylon_factor,1.25,unitless
-aircraft:engine:reference_diameter,5.8,ft
 aircraft:engine:reference_mass,7400,lbm
 aircraft:engine:reference_sls_thrust,28928.1,lbf
 aircraft:engine:scale_factor,1.0,unitless

aviary/models/aircraft/test_aircraft/aircraft_for_bench_GwFm.csv

@@ -38,7 +38,6 @@ aircraft:engine:mass_scaler,1,unitless
 aircraft:engine:num_engines,2,unitless
 aircraft:engine:pod_mass_scaler,1,unitless
 aircraft:engine:pylon_factor,1.25,unitless
-aircraft:engine:reference_diameter,5.8,ft
 aircraft:engine:reference_sls_thrust,28690,lbf
 aircraft:engine:scale_factor,1.0,unitless
 aircraft:engine:scaled_sls_thrust,28690,lbf

aviary/models/aircraft/test_aircraft/aircraft_for_bench_GwGm.csv

@@ -31,14 +31,14 @@ aircraft:electrical:system_mass_per_passenger,16.0,lbm
 aircraft:engine:additional_mass_fraction,0.135,unitless
 aircraft:engine:data_file,models/engines/turbofan_23k_1.csv,unitless
 aircraft:engine:global_throttle, True, unitless
+aircraft:engine:inlet_area_coefficient,0.000301265,unitless
 aircraft:engine:mass_scaler,1,unitless
 aircraft:engine:mass_specific,0.21366,lbm/lbf
 aircraft:engine:mass_scaler,1,unitless
 aircraft:engine:num_engines,2,unitless
 aircraft:engine:num_wing_engines,2,unitless
 aircraft:engine:pod_mass_scaler,1,unitless
 aircraft:engine:pylon_factor,1.25,unitless
-aircraft:engine:reference_diameter,5.8,ft
 aircraft:engine:reference_sls_thrust,28690,lbf
 aircraft:engine:scale_factor,1.0,unitless
 aircraft:engine:scaled_sls_thrust,28690,lbf

aviary/models/aircraft/test_aircraft/configuration_test_GASP.csv

@@ -35,7 +35,6 @@ aircraft:engine:mass_specific,0.21366,lbm/lbf
 aircraft:engine:num_engines,2,unitless
 aircraft:engine:pod_mass_scaler,1,unitless
 aircraft:engine:pylon_factor,1.25,unitless
-aircraft:engine:reference_diameter,6.15,ft
 aircraft:engine:reference_sls_thrust,28690,lbf
 aircraft:engine:scale_factor,0.7376089229696758,unitless
 aircraft:engine:scaled_sls_thrust,21162,lbf

aviary/subsystems/geometry/gasp_based/empennage.py

@@ -244,12 +244,7 @@ def initialize(self):
         add_aviary_option(self, Aircraft.Design.COMPUTE_VTAIL_VOLUME_COEFF)
 
     def setup(self):
-        # TODO: For cruciform/T-tail configurations, GASP checks to make sure the V tail
-        # chord at the H tail location is greater than the H tail root chord. If not, it
-        # overrides the H tail taper ratio so they match. If that leads to a H tail root
-        # chord greater than the H tail tip chord, it sets the taper ratio to 1 and
-        # overrides the H tail aspect ratio. H tail taper ratio is used in landing gear
-        # mass calculation.
+        # For cruciform/T-tail configurations, see issue #1089
 
         if self.options[Aircraft.Design.COMPUTE_HTAIL_VOLUME_COEFF]:
             self.add_subsystem(