Skip to content
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

Trajectory timeseries reports now work with multiple trajectories in a single problem. #1123

Merged
merged 4 commits into from
Nov 6, 2024
Merged

Trajectory timeseries reports now work with multiple trajectories in a single problem. #1123

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0daa2c
possible fix for timeseries plots when there are multiple trajectorie…
robfalck Oct 30, 2024
e19d474
Merge branch 'master' of https://github.com/OpenMDAO/dymos into times…
robfalck Nov 1, 2024
d3cf9c8
pycodestyle
robfalck Nov 1, 2024
1ba551c
Merge branch 'master' of https://github.com/OpenMDAO/dymos into times…
robfalck Nov 4, 2024
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
26 changes: 12 additions & 14 deletions dymos/visualization/timeseries/bokeh_timeseries_report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,20 +290,19 @@ def _load_data_sources(traj_and_phase_meta=None, solution_record_file=None, simu
sim_case = None

for traj_path, traj_data in traj_and_phase_meta.items():
traj_name = traj_data['name']
data_dict[traj_data['name']] = {'param_data_by_phase': {},
'sol_data_by_phase': {},
'sim_data_by_phase': {},
'timeseries_units': {}}
data_dict[traj_path] = {'param_data_by_phase': {},
'sol_data_by_phase': {},
'sim_data_by_phase': {},
'timeseries_units': {}}

for phase_path, phase_data in traj_data['phases'].items():
phase_name = phase_data['name']
phase_param_data = \
data_dict[traj_name]['param_data_by_phase'][phase_name] = \
data_dict[traj_path]['param_data_by_phase'][phase_name] = \
{'param': [], 'val': [], 'units': []}

phase_sol_data = data_dict[traj_data['name']]['sol_data_by_phase'][phase_name] = {}
phase_sim_data = data_dict[traj_data['name']]['sim_data_by_phase'][phase_name] = {}
phase_sol_data = data_dict[traj_path]['sol_data_by_phase'][phase_name] = {}
phase_sim_data = data_dict[traj_path]['sim_data_by_phase'][phase_name] = {}

# param_outputs = {op: meta for op, meta in outputs.items()
# if op.startswith(f'{phase_path}.param_comp.parameter_vals:')}
Expand All @@ -320,7 +319,7 @@ def _load_data_sources(traj_and_phase_meta=None, solution_record_file=None, simu
phase_param_data['val'].append(source_case.get_val(param_path, units=units))

# Find the "largest" unit used for any timeseries output across all phases
ts_units_dict = data_dict[traj_data['name']]['timeseries_units']
ts_units_dict = data_dict[traj_path]['timeseries_units']
for abs_name in sorted(ts_outputs.keys(), key=str.casefold):
meta = ts_outputs[abs_name]
prom_name = meta['prom_name']
Expand Down Expand Up @@ -426,7 +425,6 @@ def make_timeseries_report(prob, solution_record_file=None, simulation_record_fi
curdoc().theme = theme

for traj_path, traj_data in source_data.items():
traj_name = traj_path.split('.')[-1]
report_filename = f'{traj_path}_results_report.html'
report_path = report_dir / report_filename
if _NO_BOKEH:
Expand All @@ -452,7 +450,7 @@ def make_timeseries_report(prob, solution_record_file=None, simulation_record_fi
sizing_mode='stretch_both'))

# Plot the timeseries
ts_units_dict = source_data[traj_name]['timeseries_units']
ts_units_dict = source_data[traj_path]['timeseries_units']

figures = []
x_range = None
Expand All @@ -479,8 +477,8 @@ def make_timeseries_report(prob, solution_record_file=None, simulation_record_fi
x_range = fig.x_range
for i, phase_name in enumerate(phase_names):
color = colors[i % 20]
sol_data = source_data[traj_name]['sol_data_by_phase'][phase_name]
sim_data = source_data[traj_name]['sim_data_by_phase'][phase_name]
sol_data = source_data[traj_path]['sol_data_by_phase'][phase_name]
sim_data = source_data[traj_path]['sim_data_by_phase'][phase_name]
sol_source = ColumnDataSource(sol_data)
sim_source = ColumnDataSource(sim_data)
if x_name in sol_data and var_name in sol_data:
Expand Down Expand Up @@ -551,5 +549,5 @@ def make_timeseries_report(prob, solution_record_file=None, simulation_record_fi

# Save

save(report_layout, filename=report_path, title=f'trajectory results for {traj_name}',
save(report_layout, filename=report_path, title=f'trajectory results for {traj_path}',
resources=bokeh_resources.INLINE)
Loading