-
Notifications
You must be signed in to change notification settings - Fork 62
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.
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
Issue 32 Resolution - Range to Distance switch #73
Conversation
…ench_test_swap_4_FwFm_simple no longer passing locally
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the detail-oriented work here, Eliot! I dig it.
" \"takeoff_vel_con=takeoff_vel-climb_start_vel\",\n", | ||
" \"takeoff_alt_con=takeoff_alt-climb_start_alt\"\n", | ||
" ],\n", | ||
" takeoff_mass_con={'units': 'lbm'}, takeoff_mass={'units': 'lbm'},\n", | ||
" climb_start_mass={'units': 'lbm'},\n", | ||
" takeoff_range_con={'units': 'ft'}, takeoff_range={'units': 'ft'},\n", | ||
" takeoff_distance_con={'units': 'ft'}, takeoff_range={'units': 'ft'},\n", | ||
" climb_start_range={'units': 'ft'},\n", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I noticed there is a "climb_start_range" that should probably also be changed to distance.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
for sure there are a bunch of other references to range
in the code. I hesitate to do a global find/replace as I'm sure that will brick things. There are around 21 instances of climb_start_range
I'll do a quick find/replace on those and see if all the tests are still working afterwards.
from aviary.variable_info.variables import Mission | ||
|
||
Dynamic = _Dynamic.Mission | ||
from aviary.variable_info.variables import Dynamic, Mission |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All of these detailed landing phases have a "max_range" which should become "max_distance".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
John was hoping to name distance_max as range I think.
we should never be using a naming scheme with max
at the start.
from aviary.variable_info.variables import Mission | ||
|
||
Dynamic = _Dynamic.Mission | ||
from aviary.variable_info.variables import Dynamic, Mission |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All of these detailed takeoff phases have a "max_range" which should become "max_distance".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looked pretty good. Just noted a few more variables with "range" in the name that need to be changed over to distance.
Made updates based on Ken's comments, tests passing locally, pushing up. |
Summary
Dynamic.Mission.RANGE
was removed and replaced withDynamic.Mission.DISTANCE
.To implement this, some additional names were replaced:
initial_range
->initial_distance
states:range
->states:distance
_Dynamic.Mission
was removed from all files and longer but easier to find names were introduced.Dynamic
to test_FLOPS_based_sizing_N3CC.py to enable it to pass tests"distance_rate"
,Dynamic.Mission.RANGE_RATE
->Dynamic.Mission.DISTANCE_RATE
.RANGE_RATE
- >.DISTANCE_RATE
"range"
,'range'
,"distance"
,'distance'
,Dynamic.Mission.RANGE
->Dynamic.Mission.DISTANCE
Dynamic.Mission.RANGE
,Dynamic.Mission.RANGE_RATE
,RANGE
, &RANGE_RATE
were removed from variables.pyRelated Issues
Backwards incompatibilities
None
New Dependencies
None