variable name fixes for turboprop freighter

OpenMDAO · Jan 27, 2025 · 95b57c9 · 95b57c9
1 parent 169c66a
commit 95b57c9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/aviary/models/large_turboprop_freighter/large_turboprop_freighter.csv b/aviary/models/large_turboprop_freighter/large_turboprop_freighter.csv
@@ -51,12 +51,12 @@ aircraft:engine:data_file, models/engines/turboshaft_4465hp.deck
 aircraft:engine:mass_scaler, 1, unitless
 aircraft:engine:mass_specific, 0.37026, lbm/lbf
 aircraft:engine:num_engines, 4, unitless
-aircraft:engine:num_propeller_blades, 4, unitless
+aircraft:engine:propeller:num_blades, 4, unitless
 aircraft:engine:pod_mass_scaler, 1, unitless
-aircraft:engine:propeller_activity_factor, 167, unitless
-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:propeller:activity_factor, 167, unitless
+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

diff --git a/aviary/subsystems/propulsion/propeller/propeller_builder.py b/aviary/subsystems/propulsion/propeller/propeller_builder.py
@@ -43,19 +43,19 @@ def get_design_vars(self):
 
         # TODO bounds are rough placeholders
         DVs = {
-            Aircraft.Engine.PROPELLER_ACTIVITY_FACTOR: {
+            Aircraft.Engine.Propeller.ACTIVITY_FACTOR: {
                 'units': 'unitless',
                 'lower': 100,
                 'upper': 200,
                 # 'val': 100,  # initial value
             },
-            Aircraft.Engine.PROPELLER_DIAMETER: {
+            Aircraft.Engine.Propeller.DIAMETER: {
                 'units': 'ft',
                 'lower': 0.0,
                 'upper': None,
                 # 'val': 8,  # initial value
             },
-            Aircraft.Engine.PROPELLER_INTEGRATED_LIFT_COEFFICIENT: {
+            Aircraft.Engine.Propeller.INTEGRATED_LIFT_COEFFICIENT: {
                 'units': 'unitless',
                 'lower': 0.0,
                 'upper': 0.5,
@@ -79,27 +79,27 @@ def get_parameters(self, aviary_inputs=None, phase_info=None):
         A dict of names for the propeller subsystem.
         """
         parameters = {
-            Aircraft.Engine.PROPELLER_TIP_MACH_MAX: {
+            Aircraft.Engine.Propeller.TIP_MACH_MAX: {
                 'val': 1.0,
                 'units': 'unitless',
             },
-            Aircraft.Engine.PROPELLER_TIP_SPEED_MAX: {
+            Aircraft.Engine.Propeller.TIP_SPEED_MAX: {
                 'val': 0.0,
                 'units': 'unitless',
             },
-            Aircraft.Engine.PROPELLER_TIP_SPEED_MAX: {
+            Aircraft.Engine.Propeller.TIP_SPEED_MAX: {
                 'val': 0.0,
                 'units': 'ft/s',
             },
-            Aircraft.Engine.PROPELLER_INTEGRATED_LIFT_COEFFICIENT: {
+            Aircraft.Engine.Propeller.INTEGRATED_LIFT_COEFFICIENT: {
                 'val': 0.0,
                 'units': 'unitless',
             },
-            Aircraft.Engine.PROPELLER_ACTIVITY_FACTOR: {
+            Aircraft.Engine.Propeller.ACTIVITY_FACTOR: {
                 'val': 0.0,
                 'units': 'unitless',
             },
-            Aircraft.Engine.PROPELLER_DIAMETER: {
+            Aircraft.Engine.Propeller.DIAMETER: {
                 'val': 0.0,
                 'units': 'ft',
             },
@@ -116,9 +116,9 @@ def get_mass_names(self):
 
     def get_outputs(self):
         return [
-            Dynamic.Mission.SHAFT_POWER + '_out',
-            Dynamic.Mission.SHAFT_POWER_MAX + '_out',
-            Dynamic.Mission.RPM + '_out',
-            Dynamic.Mission.TORQUE + '_out',
+            Dynamic.Vehicle.Propulsion.SHAFT_POWER + '_out',
+            Dynamic.Vehicle.Propulsion.SHAFT_POWER_MAX + '_out',
+            Dynamic.Vehicle.Propulsion.RPM + '_out',
+            Dynamic.Vehicle.Propulsion.TORQUE + '_out',
             Mission.Constraints.GEARBOX_SHAFT_POWER_RESIDUAL,
         ]