Repository navigation
Conversation
jkirk5
marked this pull request as ready for review
October 13, 2026 17:25
| val=np.zeros((nn, num_engine_type)), | ||
| units='lbf', | ||
| ) | ||
| # self.add_input( |
| from aviary.variable_info.variables import Mission | ||
|
|
||
|
|
||
| # @use_tempdirs |
Member
There was a problem hiding this comment.
If you can do a quick search for all the commented out use_tempdirs and restore them, that would probably be best.
Kenneth-T-Moore
approved these changes
Oct 16, 2026
Kenneth-T-Moore
left a comment
Member
There was a problem hiding this comment.
A little cleanup to do, but ready.
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This completely overhauls how fuel is calculated by Aviary and rips out many undesirable assumptions.
Dynamic.Vehicle.Propulsion.FUEL_FLOW_MASS_RATEis now the main output from engines from which all other values are derived (Dynamic.Aircraft.Propulsion.FUEL_FLOW_MASS_RATE_TOTAL, andDynamic.Aircraft.Propulsion.FUEL_FLOW_MASS_RATE_NEGATIVE_TOTAL).Dynamic.Vehicle.Propulsion.FUEL_FLOW_MASS_RATE_NEGATIVEhas been removed as it is not necessary to track the inverse of per-engine fuel flow, and having essentially duplicate variables is unnecessary and confusing.While updating tests and checking this conversion worked, I found several issues in the tests and updated them:
get_default_premission_subsystems,get_default_mission_subsystems, andget_geom_and_mass_subsystemsinto a single util function - this makes keeping tests on top of any additions/removals/changes to the core subsystem lineup much easierBackwards-incompatible changes
Mission.RESERVE_FUEL_MARGIN was changed to be specified as a direct multiplicative value to be applied, rather than as percentage points (e.g. 0.2 rather than 20). This was done for consistency, as every other Aviary variable that deals with fractions/percentages works this way. A deprecation check was added to the preprocessor to alert the user of this.
Removed
Dynamic.Vehicle.Propulsion.FUEL_FLOW_MASS_RATE_NEGATIVE