From 03c913d34f9e160ac8a3c01610a6aab78b7c04b6 Mon Sep 17 00:00:00 2001 From: Xun Jiang Date: Wed, 22 Jan 2025 21:00:32 -0800 Subject: [PATCH] rename Aircraft.Wing.MOUNT_LOCATION to Aircraft.Wing.VERTICAL_MOUNT_LOCATION --- aviary/mission/gasp_based/ode/params.py | 2 +- .../aerodynamics/aerodynamics_builder.py | 2 +- .../aerodynamics/gasp_based/gaspaero.py | 4 ++-- .../aerodynamics/gasp_based/interference.py | 4 ++-- .../gasp_based/test/test_gaspaero.py | 2 +- .../gasp_based/test/test_interference.py | 4 ++-- aviary/subsystems/mass/gasp_based/fixed.py | 6 +++--- .../mass/gasp_based/test/test_fixed.py | 8 ++++---- .../gasp_based/test/test_mass_summation.py | 4 ++-- aviary/variable_info/variable_meta_data.py | 18 +++++++++--------- aviary/variable_info/variables.py | 2 +- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/aviary/mission/gasp_based/ode/params.py b/aviary/mission/gasp_based/ode/params.py index 97b39d556..d54245a51 100644 --- a/aviary/mission/gasp_based/ode/params.py +++ b/aviary/mission/gasp_based/ode/params.py @@ -123,7 +123,7 @@ def promote_params(sys, trajs=None, phases=None): Aircraft.Wing.SWEEP: dict(units="deg", val=25), Aircraft.HorizontalTail.SWEEP: dict(units="deg", val=25), Aircraft.HorizontalTail.MOMENT_RATIO: dict(units="unitless", val=0.2307), - Aircraft.Wing.MOUNT_LOCATION: dict(units="unitless", val=0), + Aircraft.Wing.VERTICAL_MOUNT_LOCATION: dict(units="unitless", val=0), Aircraft.Design.STATIC_MARGIN: dict(units="unitless", val=0.03), Aircraft.Design.CG_DELTA: dict(units="unitless", val=0.25), Aircraft.Fuselage.FORM_FACTOR: dict(units="unitless", val=1.25), diff --git a/aviary/subsystems/aerodynamics/aerodynamics_builder.py b/aviary/subsystems/aerodynamics/aerodynamics_builder.py index be16adc72..7db299bbd 100644 --- a/aviary/subsystems/aerodynamics/aerodynamics_builder.py +++ b/aviary/subsystems/aerodynamics/aerodynamics_builder.py @@ -602,11 +602,11 @@ def report(self, prob, reports_folder, **kwargs): Aircraft.Wing.FUSELAGE_INTERFERENCE_FACTOR, Aircraft.Wing.MAX_THICKNESS_LOCATION, Aircraft.Wing.MIN_PRESSURE_LOCATION, - Aircraft.Wing.MOUNT_LOCATION, Aircraft.Wing.SPAN, Aircraft.Wing.SWEEP, Aircraft.Wing.TAPER_RATIO, Aircraft.Wing.THICKNESS_TO_CHORD_UNWEIGHTED, + Aircraft.Wing.VERTICAL_MOUNT_LOCATION, Aircraft.Wing.ZERO_LIFT_ANGLE, ] diff --git a/aviary/subsystems/aerodynamics/gasp_based/gaspaero.py b/aviary/subsystems/aerodynamics/gasp_based/gaspaero.py index 664a87363..724ff7506 100644 --- a/aviary/subsystems/aerodynamics/gasp_based/gaspaero.py +++ b/aviary/subsystems/aerodynamics/gasp_based/gaspaero.py @@ -165,7 +165,7 @@ def setup(self): add_aviary_input(self, Aircraft.Wing.THICKNESS_TO_CHORD_ROOT, val=0.15) - add_aviary_input(self, Aircraft.Wing.MOUNT_LOCATION, val=0.0) + add_aviary_input(self, Aircraft.Wing.VERTICAL_MOUNT_LOCATION, val=0.0) add_aviary_input(self, Aircraft.HorizontalTail.VERTICAL_TAIL_FRACTION, val=0.0) @@ -202,7 +202,7 @@ def setup_partials(self): Aircraft.HorizontalTail.VERTICAL_TAIL_FRACTION, Aircraft.VerticalTail.SPAN, Aircraft.Fuselage.AVG_DIAMETER, - Aircraft.Wing.MOUNT_LOCATION, + Aircraft.Wing.VERTICAL_MOUNT_LOCATION, Aircraft.Wing.THICKNESS_TO_CHORD_ROOT, Aircraft.Wing.AREA, Aircraft.Wing.SPAN, diff --git a/aviary/subsystems/aerodynamics/gasp_based/interference.py b/aviary/subsystems/aerodynamics/gasp_based/interference.py index 268a0407e..892e6acdb 100644 --- a/aviary/subsystems/aerodynamics/gasp_based/interference.py +++ b/aviary/subsystems/aerodynamics/gasp_based/interference.py @@ -51,7 +51,7 @@ class CommonVariables(om.ExplicitComponent): def setup(self): self.add_input('CROOT') - add_aviary_input(self, Aircraft.Wing.MOUNT_LOCATION) + add_aviary_input(self, Aircraft.Wing.VERTICAL_MOUNT_LOCATION) add_aviary_input(self, Aircraft.Wing.THICKNESS_TO_CHORD_ROOT) add_aviary_input(self, Aircraft.Fuselage.AVG_DIAMETER) @@ -65,7 +65,7 @@ def compute(self, inputs, outputs): outputs['wtofd'] = TCR*CROOT/SWF # wing_thickness_over_fuselage_diameter def setup_partials(self): - self.declare_partials('ZW_RF', [Aircraft.Wing.MOUNT_LOCATION], val=2) + self.declare_partials('ZW_RF', [Aircraft.Wing.VERTICAL_MOUNT_LOCATION], val=2) self.declare_partials( 'wtofd', [ Aircraft.Wing.THICKNESS_TO_CHORD_ROOT, diff --git a/aviary/subsystems/aerodynamics/gasp_based/test/test_gaspaero.py b/aviary/subsystems/aerodynamics/gasp_based/test/test_gaspaero.py index 9be6b7c15..9f8ccbbbc 100644 --- a/aviary/subsystems/aerodynamics/gasp_based/test/test_gaspaero.py +++ b/aviary/subsystems/aerodynamics/gasp_based/test/test_gaspaero.py @@ -172,7 +172,7 @@ def _init_geom(prob): prob.set_val(Aircraft.Wing.AVERAGE_CHORD, setup_data["cbarw"]) prob.set_val(Aircraft.Wing.TAPER_RATIO, setup_data["slm"]) prob.set_val(Aircraft.Wing.THICKNESS_TO_CHORD_ROOT, setup_data["tcr"]) - prob.set_val(Aircraft.Wing.MOUNT_LOCATION, setup_data["hwing"]) + prob.set_val(Aircraft.Wing.VERTICAL_MOUNT_LOCATION, setup_data["hwing"]) prob.set_val(Aircraft.HorizontalTail.VERTICAL_TAIL_FRACTION, setup_data["sah"]) prob.set_val(Aircraft.HorizontalTail.SPAN, setup_data["bht"]) prob.set_val(Aircraft.VerticalTail.SPAN, setup_data["bvt"]) diff --git a/aviary/subsystems/aerodynamics/gasp_based/test/test_interference.py b/aviary/subsystems/aerodynamics/gasp_based/test/test_interference.py index b67a9a23a..3219d3c56 100644 --- a/aviary/subsystems/aerodynamics/gasp_based/test/test_interference.py +++ b/aviary/subsystems/aerodynamics/gasp_based/test/test_interference.py @@ -36,7 +36,7 @@ def test_common_vars(self): prob.setup(force_alloc_complex=True) prob.set_val('CROOT', 12) - prob.set_val(Aircraft.Wing.MOUNT_LOCATION, .1) + prob.set_val(Aircraft.Wing.VERTICAL_MOUNT_LOCATION, .1) prob.set_val(Aircraft.Wing.THICKNESS_TO_CHORD_ROOT, .12) prob.set_val(Aircraft.Fuselage.AVG_DIAMETER, 10) @@ -121,7 +121,7 @@ def test_complete_group(self): prob.set_val(Aircraft.Wing.AREA, 1400) prob.set_val(Aircraft.Wing.SPAN, 118) prob.set_val(Aircraft.Wing.TAPER_RATIO, .9) - prob.set_val(Aircraft.Wing.MOUNT_LOCATION, .1) + prob.set_val(Aircraft.Wing.VERTICAL_MOUNT_LOCATION, .1) prob.set_val(Aircraft.Wing.THICKNESS_TO_CHORD_ROOT, .12) prob.set_val(Aircraft.Wing.THICKNESS_TO_CHORD_TIP, .1) prob.set_val(Aircraft.Fuselage.AVG_DIAMETER, 12) diff --git a/aviary/subsystems/mass/gasp_based/fixed.py b/aviary/subsystems/mass/gasp_based/fixed.py index 9cd49478b..bccace062 100644 --- a/aviary/subsystems/mass/gasp_based/fixed.py +++ b/aviary/subsystems/mass/gasp_based/fixed.py @@ -2270,7 +2270,7 @@ def initialize(self): def setup(self): num_engine_type = len(self.options[Aircraft.Engine.NUM_ENGINES]) - add_aviary_input(self, Aircraft.Wing.MOUNT_LOCATION, val=0) + add_aviary_input(self, Aircraft.Wing.VERTICAL_MOUNT_LOCATION, val=0) add_aviary_input(self, Aircraft.LandingGear.MASS_COEFFICIENT, val=0.04) add_aviary_input(self, Mission.Design.GROSS_MASS, val=152000) add_aviary_input(self, Aircraft.LandingGear.MAIN_GEAR_MASS_COEFFICIENT, val=0.85) @@ -2291,7 +2291,7 @@ def setup(self): self.declare_partials(Aircraft.LandingGear.MAIN_GEAR_MASS, "*") def compute(self, inputs, outputs): - wing_loc = inputs[Aircraft.Wing.MOUNT_LOCATION] + wing_loc = inputs[Aircraft.Wing.VERTICAL_MOUNT_LOCATION] c_gear_mass = inputs[Aircraft.LandingGear.MASS_COEFFICIENT] gross_wt_initial = inputs[Mission.Design.GROSS_MASS] * GRAV_ENGLISH_LBM c_main_gear = inputs[Aircraft.LandingGear.MAIN_GEAR_MASS_COEFFICIENT] @@ -2331,7 +2331,7 @@ def compute_partials(self, inputs, J): c_gear_mass = inputs[Aircraft.LandingGear.MASS_COEFFICIENT] gross_wt_initial = inputs[Mission.Design.GROSS_MASS] * GRAV_ENGLISH_LBM c_main_gear = inputs[Aircraft.LandingGear.MAIN_GEAR_MASS_COEFFICIENT] - wing_loc = inputs[Aircraft.Wing.MOUNT_LOCATION] + wing_loc = inputs[Aircraft.Wing.VERTICAL_MOUNT_LOCATION] clearance_ratio = inputs[Aircraft.Nacelle.CLEARANCE_RATIO] nacelle_diam = inputs[Aircraft.Nacelle.AVG_DIAMETER] diff --git a/aviary/subsystems/mass/gasp_based/test/test_fixed.py b/aviary/subsystems/mass/gasp_based/test/test_fixed.py index 1969df4fa..f968378ab 100644 --- a/aviary/subsystems/mass/gasp_based/test/test_fixed.py +++ b/aviary/subsystems/mass/gasp_based/test/test_fixed.py @@ -888,7 +888,7 @@ def setUp(self): Aircraft.Nacelle.AVG_DIAMETER, val=7.35, units="ft" ) # bug fixed value and original value self.prob.model.set_input_defaults( - Aircraft.Wing.MOUNT_LOCATION, val=0, units="unitless") + Aircraft.Wing.VERTICAL_MOUNT_LOCATION, val=0, units="unitless") self.prob.setup(check=False, force_alloc_complex=True) @@ -927,7 +927,7 @@ def setUp(self): Aircraft.LandingGear.MAIN_GEAR_MASS_COEFFICIENT, val=0.85, units="unitless" ) # bug fixed value and original value self.prob.model.set_input_defaults( - Aircraft.Wing.MOUNT_LOCATION, val=0.1, units="unitless") + Aircraft.Wing.VERTICAL_MOUNT_LOCATION, val=0.1, units="unitless") setup_model_options(self.prob, options) @@ -1261,7 +1261,7 @@ def setUp(self): Aircraft.Wing.SPAN, val=117.8, units="ft" ) # original GASP value self.prob.model.set_input_defaults( - Aircraft.Wing.MOUNT_LOCATION, val=.1, units="unitless") + Aircraft.Wing.VERTICAL_MOUNT_LOCATION, val=.1, units="unitless") self.prob.model.set_input_defaults( Mission.Design.GROSS_MASS, val=175400, units="lbm" ) # bug fixed value and original value @@ -1600,7 +1600,7 @@ def test_case1(self): Aircraft.Engine.HAS_PROPELLERS: ([False], 'unitless'), Aircraft.Wing.FLAP_TYPE: ('plain', 'unitless'), Aircraft.Wing.SWEEP: (30.0, 'deg'), - Aircraft.Wing.MOUNT_LOCATION: (0, 'unitless'), + Aircraft.Wing.VERTICAL_MOUNT_LOCATION: (0, 'unitless'), Aircraft.Wing.TAPER_RATIO: (0.25, 'unitless'), Aircraft.Wing.ASPECT_RATIO: (11.0, 'unitless'), Aircraft.Wing.SPAN: (100.0, 'ft'), diff --git a/aviary/subsystems/mass/gasp_based/test/test_mass_summation.py b/aviary/subsystems/mass/gasp_based/test/test_mass_summation.py index 2382b7908..3f2c5702f 100644 --- a/aviary/subsystems/mass/gasp_based/test/test_mass_summation.py +++ b/aviary/subsystems/mass/gasp_based/test/test_mass_summation.py @@ -2601,7 +2601,7 @@ def setUp(self): ) self.prob.model.set_input_defaults(Aircraft.Wing.SWEEP, val=22.47, units="deg") self.prob.model.set_input_defaults( - Aircraft.Wing.MOUNT_LOCATION, val=.1, units="unitless") + Aircraft.Wing.VERTICAL_MOUNT_LOCATION, val=.1, units="unitless") self.prob.model.set_input_defaults( Aircraft.Wing.ASPECT_RATIO, val=19.565, units="unitless" ) @@ -2995,7 +2995,7 @@ def setUp(self): ) self.prob.model.set_input_defaults(Aircraft.Wing.SWEEP, val=22.47, units="deg") self.prob.model.set_input_defaults( - Aircraft.Wing.MOUNT_LOCATION, val=.1, units="unitless") + Aircraft.Wing.VERTICAL_MOUNT_LOCATION, val=.1, units="unitless") self.prob.model.set_input_defaults( Aircraft.Wing.ASPECT_RATIO, val=19.565, units="unitless" ) diff --git a/aviary/variable_info/variable_meta_data.py b/aviary/variable_info/variable_meta_data.py index 9d6e3d415..27b8f183a 100644 --- a/aviary/variable_info/variable_meta_data.py +++ b/aviary/variable_info/variable_meta_data.py @@ -5774,15 +5774,6 @@ default_value=1.0, ) -add_meta_data( - Aircraft.Wing.MOUNT_LOCATION, - meta_data=_MetaData, - historical_name={"GASP": 'INGASP.HWING', "FLOPS": None, "LEAPS1": None}, - units='unitless', - desc='wing mount location on fuselage (0 = low wing, 1 = high wing)', - default_value=0.0, -) - add_meta_data( Aircraft.Wing.NUM_FLAP_SEGMENTS, meta_data=_MetaData, @@ -6163,6 +6154,15 @@ default_value=0.0, ) +add_meta_data( + Aircraft.Wing.VERTICAL_MOUNT_LOCATION, + meta_data=_MetaData, + historical_name={"GASP": 'INGASP.HWING', "FLOPS": None, "LEAPS1": None}, + units='unitless', + desc='wing mount location on fuselage (0 = low wing, 1 = high wing). Values between 0 and 1 are acceptable.', + default_value=0.0, +) + add_meta_data( # Note user override # - see also: Aircraft.Wing.WETTED_AREA_SCALER diff --git a/aviary/variable_info/variables.py b/aviary/variable_info/variables.py index e97803ae3..d8f28d034 100644 --- a/aviary/variable_info/variables.py +++ b/aviary/variable_info/variables.py @@ -572,7 +572,6 @@ class Wing: MIN_PRESSURE_LOCATION = 'aircraft:wing:min_pressure_location' MISC_MASS = 'aircraft:wing:misc_mass' MISC_MASS_SCALER = 'aircraft:wing:misc_mass_scaler' - MOUNT_LOCATION = 'aircraft:wing:mount_location' NUM_FLAP_SEGMENTS = 'aircraft:wing:num_flap_segments' NUM_INTEGRATION_STATIONS = 'aircraft:wing:num_integration_stations' OPTIMUM_FLAP_DEFLECTION = 'aircraft:wing:optimum_flap_deflection' @@ -604,6 +603,7 @@ class Wing: THICKNESS_TO_CHORD_UNWEIGHTED = 'aircraft:wing:thickness_to_chord_unweighted' ULTIMATE_LOAD_FACTOR = 'aircraft:wing:ultimate_load_factor' VAR_SWEEP_MASS_PENALTY = 'aircraft:wing:var_sweep_mass_penalty' + VERTICAL_MOUNT_LOCATION = 'aircraft:wing:vertical_mount_location' WETTED_AREA = 'aircraft:wing:wetted_area' WETTED_AREA_SCALER = 'aircraft:wing:wetted_area_scaler' ZERO_LIFT_ANGLE = 'aircraft:wing:zero_lift_angle'