Mission Report #126
Merged
Mission Report #126
Conversation
This file contains 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
johnjasa
requested changes
Feb 7, 2024
aviary/interface/reports.py
Outdated
Comment on lines
68
to
93
| vals = prob.get_val(f"{traj}.{phase}.timeseries.{var_name}", | ||
| units=units, | ||
| indices=indices,) | ||
|
|
||
| except KeyError: | ||
| try: | ||
| vals = prob.get_val(f"{traj}.{phase}.states:{var_name}", | ||
| units=units, | ||
| indices=indices,) | ||
| except KeyError: | ||
| try: | ||
| vals = prob.get_val(f"{traj}.{phase}.timeseries.states:{var_name}", | ||
| units=units, | ||
| indices=indices,) | ||
| except KeyError: | ||
| try: | ||
| vals = prob.get_val(f"{traj}.{phase}.{var_name}", | ||
| units=units, | ||
| indices=indices,) | ||
| # 2DOF breguet range cruise uses time integration to track mass | ||
| except TypeError: | ||
| vals = prob.get_val(f"{traj}.{phase}.timeseries.time", | ||
| units=units, | ||
| indices=indices,) | ||
| except KeyError: | ||
| vals = None |
There was a problem hiding this comment.
Do all of these try/except blocks strictly need to be here? I'm thinking that most of the values we care about from the mission should be added to the timeseries (so they'd be accessible in the first try block).
There was a problem hiding this comment.
Good point. I did some experimenting and some of these aren't required. I've removed the unneeded try/except blocks
crecine
approved these changes
Feb 7, 2024
aviary/interface/reports.py
Outdated
Comment on lines
67
to
93
| try: | ||
| vals = prob.get_val(f"{traj}.{phase}.timeseries.{var_name}", | ||
| units=units, | ||
| indices=indices,) | ||
|
|
||
| except KeyError: | ||
| try: | ||
| vals = prob.get_val(f"{traj}.{phase}.states:{var_name}", | ||
| units=units, | ||
| indices=indices,) | ||
| except KeyError: | ||
| try: | ||
| vals = prob.get_val(f"{traj}.{phase}.timeseries.states:{var_name}", | ||
| units=units, | ||
| indices=indices,) | ||
| except KeyError: | ||
| try: | ||
| vals = prob.get_val(f"{traj}.{phase}.{var_name}", | ||
| units=units, | ||
| indices=indices,) | ||
| # 2DOF breguet range cruise uses time integration to track mass | ||
| except TypeError: | ||
| vals = prob.get_val(f"{traj}.{phase}.timeseries.time", | ||
| units=units, | ||
| indices=indices,) | ||
| except KeyError: | ||
| vals = None |
There was a problem hiding this comment.
could this be changed to something like:
key_paths = [f"timeseries.{var_name}", f"states:{var_name}", f"timeseries.states:{var_name}", f"{var_name}", "timeseries.time"]
vals = None
for key_path in key_paths:
try:
vals = prob.get_val(f"{traj}.{phase}.{key_path}", units=units, indices=indices,)
return vals
except KeyError:
pass
There was a problem hiding this comment.
That will work for everything except catching the TypeError that only shows up for the timeseries.time check. I'll play around a little with this idea
fixed reports generating before optimization
updated docs to ignore new reports
johnjasa
approved these changes
Feb 15, 2024
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
Addition of mission summary report as well as minor reworks to subsystem reports
Related Issues
None
Backwards incompatibilities
None
New Dependencies
None