Update SIM_cannon_numeric

This commit is contained in:
John M. Penn 2016-10-20 19:12:31 -05:00
parent 8b89bac5ad
commit 37a75bc34e
3 changed files with 5 additions and 6 deletions

View File

@ -1,6 +1,5 @@
#execfile("Modified_data/realtime.py") execfile("Modified_data/realtime.py")
execfile("Modified_data/cannon.dr") execfile("Modified_data/cannon.dr")
dyn_integloop.getIntegrator(trick.Runge_Kutta_4, 4) dyn_integloop.getIntegrator(trick.Runge_Kutta_4, 5)
trick.exec_set_terminate_time(5.2)

View File

@ -1,3 +1,3 @@
dyn_integloop.getIntegrator(trick.Runge_Kutta_4, 4) dyn_integloop.getIntegrator(trick.Runge_Kutta_4, 5)
trick.exec_set_terminate_time(5.2) trick.exec_set_terminate_time(5.2)

View File

@ -5,7 +5,7 @@ LIBRARY DEPENDENCIES:
( (
(cannon/gravity/src/cannon_default_data.c) (cannon/gravity/src/cannon_default_data.c)
(cannon/gravity/src/cannon_init.c) (cannon/gravity/src/cannon_init.c)
(cannon/gravity/src/cannon_deriv_impact.c) (cannon/gravity/src/cannon_deriv.c)
(cannon/gravity/src/cannon_integ.c) (cannon/gravity/src/cannon_integ.c)
(cannon/gravity/src/cannon_impact.c) (cannon/gravity/src/cannon_impact.c)
) )
@ -26,7 +26,7 @@ class CannonSimObject : public Trick::SimObject {
("initialization") cannon_init( &cannon ) ; ("initialization") cannon_init( &cannon ) ;
("derivative") cannon_deriv_impact( &cannon ) ; ("derivative") cannon_deriv( &cannon ) ;
("integration") trick_ret = cannon_integ( &cannon ) ; ("integration") trick_ret = cannon_integ( &cannon ) ;
("dynamic_event") cannon_impact( &cannon) ; ("dynamic_event") cannon_impact( &cannon) ;