Skip to content

Engine scaling #1073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jkirk5 wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Engine scaling #1073

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5154677
enginedeck cleanup
jkirk5 Apr 2, 2026
d66a73d
remove SCALE_PERFORMANCE
jkirk5 Apr 2, 2026
bfa9580
fixed derivatives error
jkirk5 Apr 3, 2026
1b35972
Merge branch 'main' into engine_scaling
jkirk5 Apr 3, 2026
4af9c7f
PR feedback
jkirk5 Apr 13, 2026
87f9de4
added deprecationwarning to enginedeck
jkirk5 Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion aviary/docs/examples_unreviewed/modified_aircraft.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ aircraft:engine:reference_mass,7400,lbm
aircraft:engine:reference_sls_thrust,28928.1,lbf
aircraft:engine:scale_factor,1.0,unitless
aircraft:engine:scale_mass,True,unitless
aircraft:engine:scale_performance,True,unitless
aircraft:engine:scaled_sls_thrust,28928.1,lbf
aircraft:engine:subsonic_fuel_flow_scaler,1.,unitless
aircraft:engine:supersonic_fuel_flow_scaler,1.,unitless
Expand Down
3 changes: 1 addition & 2 deletions aviary/docs/user_guide_unreviewed/subsystems/propulsion.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@
"Aircraft.Engine = Aircraft.Engine\n",
"check_contains(required_options, CoreMetaData)\n",
"required = ( # f'{Aircraft.Engine.DATA_FILE=}'.split('=')[0],\n",
" get_variable_name(Aircraft.Engine.SCALE_PERFORMANCE),\n",
" get_variable_name(Aircraft.Engine.IGNORE_NEGATIVE_THRUST),\n",
" get_variable_name(Aircraft.Engine.GEOPOTENTIAL_ALT),\n",
" get_variable_name(Aircraft.Engine.GENERATE_FLIGHT_IDLE),\n",
Expand Down Expand Up @@ -213,7 +212,7 @@
"If you are missing any required variables, you may see a warning at runtime, depending on verbosity level. Aviary will try using the default value for the missing variable, which may affect analysis results.\n",
"\n",
"```\n",
"UserWarning: <aircraft:engine:scale_performance> is a required option for EngineDecks, but has not been specified for EngineDeck <example>. The default value will be used.\n",
"UserWarning: <aircraft:engine:generate_flight_idle> is a required option for EngineDecks, but has not been specified for EngineDeck <example>. The default value will be used.\n",
"```\n",
"\n",
"<!-- See !!!LINK HERE!!! for a complete list of all available options to define engine behavior -->\n",
Expand Down
8 changes: 0 additions & 8 deletions aviary/interface/test/sizing_results_for_test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,14 +407,6 @@
"unitless",
"<class 'list'>"
],
[
"aircraft:engine:scale_performance",
[
true
],
"unitless",
"<class 'list'>"
],
[
"aircraft:engine:scaled_sls_thrust",
[
Expand Down
1 change: 0 additions & 1 deletion aviary/models/aircraft/advanced_single_aisle/advanced_single_aisle_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@
inputs.set_val(Aircraft.Engine.WING_LOCATIONS, 0.289682918)
inputs.set_val(Aircraft.Engine.SCALE_MASS, True)
inputs.set_val(Aircraft.Engine.MASS_SCALER, 1.15)
inputs.set_val(Aircraft.Engine.SCALE_PERFORMANCE, True)
inputs.set_val(Aircraft.Engine.SUBSONIC_FUEL_FLOW_SCALER, 1.0)
inputs.set_val(Aircraft.Engine.SUPERSONIC_FUEL_FLOW_SCALER, 1.0)
inputs.set_val(Aircraft.Engine.FUEL_FLOW_SCALER_CONSTANT_TERM, 0.0)
Expand Down
1 change: 0 additions & 1 deletion aviary/models/aircraft/blended_wing_body/bwb_detailed_FLOPS.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ aircraft:engine:reference_mass,22017.0,lbm
aircraft:engine:reference_sls_thrust,86459.2,lbf
aircraft:engine:scale_factor,0.8096304384,unitless
aircraft:engine:scale_mass,True,unitless
aircraft:engine:scale_performance,True,unitless
aircraft:engine:scaled_sls_thrust,70000,lbf
aircraft:engine:subsonic_fuel_flow_scaler,1.0,unitless
aircraft:engine:supersonic_fuel_flow_scaler,1.0,unitless
Expand Down
1 change: 0 additions & 1 deletion aviary/models/aircraft/blended_wing_body/bwb_detailed_FLOPS_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@
inputs.set_val(Aircraft.Engine.SCALE_FACTOR, 0.8096304384) # THRUST/THRSO
inputs.set_val(Aircraft.Engine.SCALE_MASS, True)
inputs.set_val(Aircraft.Engine.MASS_SCALER, 1.0) # EEXP
inputs.set_val(Aircraft.Engine.SCALE_PERFORMANCE, True)
inputs.set_val(Aircraft.Engine.SUBSONIC_FUEL_FLOW_SCALER, 1.0) # FFFSUB
inputs.set_val(Aircraft.Engine.SUPERSONIC_FUEL_FLOW_SCALER, 1.0) # FFFSUP
inputs.set_val(Aircraft.Engine.FUEL_FLOW_SCALER_CONSTANT_TERM, 0.0) # DFFAC
Expand Down
1 change: 0 additions & 1 deletion aviary/models/aircraft/blended_wing_body/bwb_simple_FLOPS.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ aircraft:engine:reference_mass,22017.0,lbm
aircraft:engine:reference_sls_thrust,86459.2,lbf
aircraft:engine:scale_factor,0.8096304384,unitless
aircraft:engine:scale_mass,True,unitless
aircraft:engine:scale_performance,True,unitless
aircraft:engine:scaled_sls_thrust,70000,lbf
aircraft:engine:subsonic_fuel_flow_scaler,1.0,unitless
aircraft:engine:supersonic_fuel_flow_scaler,1.0,unitless
Expand Down
1 change: 0 additions & 1 deletion aviary/models/aircraft/blended_wing_body/bwb_simple_FLOPS_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@
inputs.set_val(Aircraft.Engine.SCALE_FACTOR, 0.8096304384) # THRUST/THRSO
inputs.set_val(Aircraft.Engine.SCALE_MASS, True)
inputs.set_val(Aircraft.Engine.MASS_SCALER, 1.0) # EEXP
inputs.set_val(Aircraft.Engine.SCALE_PERFORMANCE, True)
inputs.set_val(Aircraft.Engine.SUBSONIC_FUEL_FLOW_SCALER, 1.0) # FFFSUB
inputs.set_val(Aircraft.Engine.SUPERSONIC_FUEL_FLOW_SCALER, 1.0) # FFFSUP
inputs.set_val(Aircraft.Engine.FUEL_FLOW_SCALER_CONSTANT_TERM, 0.0) # DFFAC
Expand Down
1 change: 0 additions & 1 deletion aviary/models/aircraft/large_single_aisle_1/large_single_aisle_1_FLOPS_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@
inputs.set_val(Aircraft.Engine.SCALE_FACTOR, 1.0)
inputs.set_val(Aircraft.Engine.SCALE_MASS, True)
inputs.set_val(Aircraft.Engine.MASS_SCALER, 1.15)
inputs.set_val(Aircraft.Engine.SCALE_PERFORMANCE, True)
inputs.set_val(Aircraft.Engine.SUBSONIC_FUEL_FLOW_SCALER, 1.0)
inputs.set_val(Aircraft.Engine.SUPERSONIC_FUEL_FLOW_SCALER, 1.0)
inputs.set_val(Aircraft.Engine.FUEL_FLOW_SCALER_CONSTANT_TERM, 0.0)
Expand Down
1 change: 0 additions & 1 deletion aviary/models/aircraft/large_single_aisle_2/large_single_aisle_2_FLOPS_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@
inputs.set_val(Aircraft.Engine.THRUST_REVERSERS_MASS_SCALER, 1.0)
inputs.set_val(Aircraft.Engine.SCALE_MASS, True)
inputs.set_val(Aircraft.Engine.MASS_SCALER, 1.15)
inputs.set_val(Aircraft.Engine.SCALE_PERFORMANCE, True)
inputs.set_val(Aircraft.Engine.SCALE_FACTOR, 1.0)
inputs.set_val(Aircraft.Engine.SUBSONIC_FUEL_FLOW_SCALER, 1.0)
inputs.set_val(Aircraft.Engine.SUPERSONIC_FUEL_FLOW_SCALER, 1.0)
Expand Down
1 change: 0 additions & 1 deletion aviary/models/aircraft/large_single_aisle_2/large_single_aisle_2_altwt_FLOPS_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@
inputs.set_val(Aircraft.Engine.THRUST_REVERSERS_MASS_SCALER, 1.0)
inputs.set_val(Aircraft.Engine.SCALE_MASS, True)
inputs.set_val(Aircraft.Engine.MASS_SCALER, 1.15)
inputs.set_val(Aircraft.Engine.SCALE_PERFORMANCE, True)

inputs.set_val(Aircraft.Engine.SUBSONIC_FUEL_FLOW_SCALER, 1.0)
inputs.set_val(Aircraft.Engine.SUPERSONIC_FUEL_FLOW_SCALER, 1.0)
Expand Down
1 change: 0 additions & 1 deletion aviary/models/aircraft/large_single_aisle_2/large_single_aisle_2_detailwing_FLOPS_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@
inputs.set_val(Aircraft.Engine.THRUST_REVERSERS_MASS_SCALER, 1.0)
inputs.set_val(Aircraft.Engine.SCALE_MASS, True)
inputs.set_val(Aircraft.Engine.MASS_SCALER, 1.15)
inputs.set_val(Aircraft.Engine.SCALE_PERFORMANCE, True)
inputs.set_val(Aircraft.Engine.SUBSONIC_FUEL_FLOW_SCALER, 1.0)
inputs.set_val(Aircraft.Engine.SUPERSONIC_FUEL_FLOW_SCALER, 1.0)
inputs.set_val(Aircraft.Engine.FUEL_FLOW_SCALER_CONSTANT_TERM, 0.0)
Expand Down
2 changes: 0 additions & 2 deletions aviary/models/aircraft/multi_engine_single_aisle/multi_engine_single_aisle_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@
engine_1_inputs.set_val(Aircraft.Engine.WING_LOCATIONS, 15.8300 / (117.83 / 2))
engine_1_inputs.set_val(Aircraft.Engine.SCALE_MASS, True)
engine_1_inputs.set_val(Aircraft.Engine.MASS_SCALER, 1.15)
engine_1_inputs.set_val(Aircraft.Engine.SCALE_PERFORMANCE, True)
engine_1_inputs.set_val(Aircraft.Engine.SUBSONIC_FUEL_FLOW_SCALER, 1.0)
engine_1_inputs.set_val(Aircraft.Engine.SUPERSONIC_FUEL_FLOW_SCALER, 1.0)
engine_1_inputs.set_val(Aircraft.Engine.FUEL_FLOW_SCALER_CONSTANT_TERM, 0.0)
Expand Down Expand Up @@ -197,7 +196,6 @@
engine_2_inputs.set_val(Aircraft.Engine.WING_LOCATIONS, 0.289682918)
engine_2_inputs.set_val(Aircraft.Engine.SCALE_MASS, True)
engine_2_inputs.set_val(Aircraft.Engine.MASS_SCALER, 1.15)
engine_2_inputs.set_val(Aircraft.Engine.SCALE_PERFORMANCE, True)
engine_2_inputs.set_val(Aircraft.Engine.SUBSONIC_FUEL_FLOW_SCALER, 1.0)
engine_2_inputs.set_val(Aircraft.Engine.SUPERSONIC_FUEL_FLOW_SCALER, 1.0)
engine_2_inputs.set_val(Aircraft.Engine.FUEL_FLOW_SCALER_CONSTANT_TERM, 0.0)
Expand Down
1 change: 0 additions & 1 deletion aviary/models/aircraft/test_aircraft/aircraft_for_bench_FwFm.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ aircraft:engine:reference_mass,7400,lbm
aircraft:engine:reference_sls_thrust,28928.1,lbf
aircraft:engine:scale_factor,1.0,unitless
aircraft:engine:scale_mass,True,unitless
aircraft:engine:scale_performance,True,unitless
aircraft:engine:scaled_sls_thrust,28928.1,lbf
aircraft:engine:subsonic_fuel_flow_scaler,1.,unitless
aircraft:engine:supersonic_fuel_flow_scaler,1.,unitless
Expand Down
1 change: 0 additions & 1 deletion aviary/models/aircraft/test_aircraft/aircraft_for_bench_FwFm_with_electric.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ aircraft:engine:reference_mass,7400,lbm
aircraft:engine:reference_sls_thrust,28928.1,lbf
aircraft:engine:scale_factor,1.0,unitless
aircraft:engine:scale_mass,True,unitless
aircraft:engine:scale_performance,True,unitless
aircraft:engine:scaled_sls_thrust,28928.1,lbf
aircraft:engine:subsonic_fuel_flow_scaler,1.,unitless
aircraft:engine:supersonic_fuel_flow_scaler,1.,unitless
Expand Down
2 changes: 0 additions & 2 deletions aviary/models/aircraft/test_aircraft/aircraft_for_bench_FwGm.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ aircraft:design:drag_divergence_shift,0.033,unitless
aircraft:engine:constant_fuel_consumption,0.,lbm/h
aircraft:engine:data_file,models/engines/turbofan_23k_1.csv,unitless
aircraft:engine:global_throttle, True, unitless
aircraft:engine:scale_performance,False,unitless
aircraft:engine:mass_specific,0.21366,lbm/lbf
aircraft:engine:fuel_flow_scaler_constant_term,0.,unitless
aircraft:engine:fuel_flow_scaler_linear_term,0.,unitless
Expand All @@ -37,7 +36,6 @@ aircraft:engine:reference_mass,7400,lbm
aircraft:engine:reference_sls_thrust,28928.1,lbf
aircraft:engine:scale_factor,1.0,unitless
aircraft:engine:scale_mass,True,unitless
aircraft:engine:scale_performance,True,unitless
aircraft:engine:scaled_sls_thrust,28928.1,lbf
aircraft:engine:subsonic_fuel_flow_scaler,1.,unitless
aircraft:engine:supersonic_fuel_flow_scaler,1.,unitless
Expand Down
1 change: 0 additions & 1 deletion aviary/models/aircraft/test_aircraft/aircraft_for_bench_solved2dof.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ aircraft:engine:reference_mass,7400,lbm
aircraft:engine:reference_sls_thrust,28928.1,lbf
aircraft:engine:scale_factor,1.0,unitless
aircraft:engine:scale_mass,True,unitless
aircraft:engine:scale_performance,True,unitless
aircraft:engine:scaled_sls_thrust,28928.1,lbf
aircraft:engine:subsonic_fuel_flow_scaler,1.,unitless
aircraft:engine:supersonic_fuel_flow_scaler,1.,unitless
Expand Down
1 change: 0 additions & 1 deletion aviary/subsystems/aerodynamics/flops_based/test/data/high_wing_single_aisle.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ aircraft:engine:num_wing_engines,2,unitless
aircraft:engine:reference_mass,4600.0,lbm
aircraft:engine:reference_sls_thrust,23000.0,lbf
aircraft:engine:scale_mass,True,unitless
aircraft:engine:scale_performance,True,unitless
aircraft:engine:scaled_sls_thrust,23000.0,lbf
aircraft:engine:subsonic_fuel_flow_scaler,1.,unitless
aircraft:engine:supersonic_fuel_flow_scaler,1.,unitless
Expand Down
Loading
Loading