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.

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

Polynomial control timeseries bugfix #840

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 14 additions & 1 deletion dymos/transcriptions/explicit_shooting/explicit_shooting.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,19 @@ def setup_polynomial_controls(self, phase):
The phase object to which this transcription instance applies.
"""
phase._check_polynomial_control_options()
if phase.polynomial_control_options:
for name, options in phase.polynomial_control_options.items():
for ts_name, ts_options in phase._timeseries.items():
if f'polynomial_controls:{name}' not in ts_options['outputs']:
phase.add_timeseries_output(name, output_name=f'polynomial_controls:{name}',
timeseries=ts_name)
if f'polynomial_control_rates:{name}_rate' not in ts_options['outputs']:
phase.add_timeseries_output(f'{name}_rate', output_name=f'polynomial_control_rates:{name}_rate',
timeseries=ts_name)
if f'polynomial_control_rates:{name}_rate2' not in ts_options['outputs']:
phase.add_timeseries_output(f'{name}_rate2',
output_name=f'polynomial_control_rates:{name}_rate2',
timeseries=ts_name)

def configure_polynomial_controls(self, phase):
"""
Expand Down Expand Up @@ -654,7 +667,7 @@ def _get_timeseries_var_source(self, var, output_name, phase):
control_name = var[:-6]
path = f'integrator.polynomial_control_rates:{control_name}_rate2'
control = phase.polynomial_control_options[control_name]
src_units = get_rate_units(control['units'], time_units, deriv=1)
src_units = get_rate_units(control['units'], time_units, deriv=2)
src_shape = control['shape']
elif var_type == 'parameter':
path = f'parameter_vals:{var}'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -476,11 +476,13 @@ def test_brachistochrone_explicit_shooting_polynomial_control(self):
y = prob.get_val('phase0.timeseries.states:y')
t = prob.get_val('phase0.timeseries.time')
tp = prob.get_val('phase0.timeseries.time_phase')
theta = prob.get_val('phase0.timeseries.polynomial_controls:theta')

assert_near_equal(x[-1, ...], 10.0, tolerance=1.0E-5)
assert_near_equal(y[-1, ...], 5.0, tolerance=1.0E-5)
assert_near_equal(t[-1, ...], 1.8016, tolerance=5.0E-3)
assert_near_equal(tp[-1, ...], 1.8016, tolerance=5.0E-3)
assert_near_equal(theta[-1, ...], 90.2, tolerance=1e-1)

with np.printoptions(linewidth=1024):
cpd = prob.check_partials(compact_print=False, method='cs', out_stream=None)
Expand Down