From ba24d528014c80aed8a67360d91686cb1e34541e Mon Sep 17 00:00:00 2001 From: David Hammen Date: Mon, 8 May 2017 09:08:29 -0500 Subject: [PATCH] Fixed a code bug and a comment bug in er7_utils, mostly so I can submit a new pull request against Trick 15.2.3. References #416. --- .../integration/beeman/src/beeman_integrator_constructor.cc | 2 +- .../rkn4/include/rkn4_second_order_ode_integrator.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/trick_source/er7_utils/integration/beeman/src/beeman_integrator_constructor.cc b/trick_source/er7_utils/integration/beeman/src/beeman_integrator_constructor.cc index 02877bf7..72d2bf71 100644 --- a/trick_source/er7_utils/integration/beeman/src/beeman_integrator_constructor.cc +++ b/trick_source/er7_utils/integration/beeman/src/beeman_integrator_constructor.cc @@ -24,7 +24,7 @@ Purpose: () // Integration includes #include "er7_utils/integration/core/include/integrator_constructor_utils.hh" #include "er7_utils/integration/core/include/priming_integration_controls.hh" -#include "er7_utils/integration/rk2_heun/include/rk2_heun_integrator_constructor.hh" +#include "er7_utils/integration/rk2_heun/include/rk2_heun_first_order_ode_integrator.hh" // Model includes #include "../include/beeman_integrator_constructor.hh" diff --git a/trick_source/er7_utils/integration/rkn4/include/rkn4_second_order_ode_integrator.hh b/trick_source/er7_utils/integration/rkn4/include/rkn4_second_order_ode_integrator.hh index 9ca9092e..00eb84f6 100644 --- a/trick_source/er7_utils/integration/rkn4/include/rkn4_second_order_ode_integrator.hh +++ b/trick_source/er7_utils/integration/rkn4/include/rkn4_second_order_ode_integrator.hh @@ -77,7 +77,7 @@ protected: * for a simple second order ODE, one in which generalized velocity * is time derivative of generalized position. * @param[in] size State size - * @param[in,out] controls_in Integration controls + * @param[in,out] controls Integration controls */ RKNystrom4SecondOrderODEIntegrator ( unsigned int size,