diff --git a/trick_source/sim_services/Integrator/Makefile_deps b/trick_source/sim_services/Integrator/Makefile_deps index 16e827a8..2a062d0b 100644 --- a/trick_source/sim_services/Integrator/Makefile_deps +++ b/trick_source/sim_services/Integrator/Makefile_deps @@ -21,84 +21,17 @@ object_${TRICK_HOST_CPU}/IntegLoopScheduler.o: src/IntegLoopScheduler.cpp \ ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/IntegAlgorithms.hh \ ${TRICK_HOME}/include/trick/ABM_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/er7_class.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/config.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/config_trick10.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/deletable.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/generalized_position_derivative.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/config.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_technique.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/single_cycle_integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_interface.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/state_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_result.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator_base.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/standard_integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/trick_integrator.hh \ - ${TRICK_HOME}/include/trick/compat/sim_services/Integrator/include/Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/base_integration_group.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/time_interface.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/bogus_integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/alloc.hh \ - ${TRICK_HOME}/include/trick/compat/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/type_traits.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/message_handler.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_messages.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_interface.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/time_interface.hh \ + ${TRICK_HOME}/include/trick/Integrator.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ ${TRICK_HOME}/include/trick/Euler_Cromer_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/symplectic_euler/include/symplectic_euler_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/symplectic_euler/include/symplectic_euler_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/Euler_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/MM4_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/mm4/include/mm4_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_midpoint/include/rk2_midpoint_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/mm4/include/mm4_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/NL2_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/nl2/include/nl2_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/nl2/include/nl2_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/RK2_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/RK4_Integrator.hh \ ${TRICK_HOME}/include/trick/RKF45_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/RKF78_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/RKG4_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator_base.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/IntegJobClassId.hh \ ${TRICK_HOME}/include/trick/exec_proto.h \ ${TRICK_HOME}/include/trick/sim_mode.h \ @@ -124,84 +57,17 @@ object_${TRICK_HOST_CPU}/IntegLoopManager.o: src/IntegLoopManager.cpp \ ${TRICK_HOME}/include/trick/IntegLoopScheduler.hh \ ${TRICK_HOME}/include/trick/IntegAlgorithms.hh \ ${TRICK_HOME}/include/trick/ABM_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/er7_class.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/config.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/config_trick10.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/deletable.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/generalized_position_derivative.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/config.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_technique.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/single_cycle_integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_interface.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/state_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_result.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator_base.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/standard_integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/trick_integrator.hh \ - ${TRICK_HOME}/include/trick/compat/sim_services/Integrator/include/Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/base_integration_group.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/time_interface.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/bogus_integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/alloc.hh \ - ${TRICK_HOME}/include/trick/compat/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/type_traits.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/message_handler.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_messages.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_interface.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/time_interface.hh \ + ${TRICK_HOME}/include/trick/Integrator.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ ${TRICK_HOME}/include/trick/Euler_Cromer_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/symplectic_euler/include/symplectic_euler_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/symplectic_euler/include/symplectic_euler_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/Euler_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/MM4_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/mm4/include/mm4_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_midpoint/include/rk2_midpoint_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/mm4/include/mm4_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/NL2_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/nl2/include/nl2_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/nl2/include/nl2_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/RK2_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/RK4_Integrator.hh \ ${TRICK_HOME}/include/trick/RKF45_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/RKF78_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/RKG4_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator_base.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ @@ -238,84 +104,17 @@ object_${TRICK_HOST_CPU}/IntegLoopSimObject.o: src/IntegLoopSimObject.cpp \ ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/IntegAlgorithms.hh \ ${TRICK_HOME}/include/trick/ABM_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/er7_class.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/config.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/config_trick10.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/deletable.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/generalized_position_derivative.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/config.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_technique.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/single_cycle_integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_interface.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/state_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_result.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator_base.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/standard_integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/trick_integrator.hh \ - ${TRICK_HOME}/include/trick/compat/sim_services/Integrator/include/Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/base_integration_group.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/time_interface.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/bogus_integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/alloc.hh \ - ${TRICK_HOME}/include/trick/compat/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/type_traits.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/message_handler.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_messages.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_interface.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/time_interface.hh \ + ${TRICK_HOME}/include/trick/Integrator.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ ${TRICK_HOME}/include/trick/Euler_Cromer_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/symplectic_euler/include/symplectic_euler_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/symplectic_euler/include/symplectic_euler_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/Euler_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/MM4_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/mm4/include/mm4_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_midpoint/include/rk2_midpoint_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/mm4/include/mm4_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/NL2_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/nl2/include/nl2_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/nl2/include/nl2_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/RK2_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/RK4_Integrator.hh \ ${TRICK_HOME}/include/trick/RKF45_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/RKF78_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/RKG4_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator_base.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/exec_proto.hh \ ${TRICK_HOME}/include/trick/Executive.hh \ ${TRICK_HOME}/include/trick/Scheduler.hh \ @@ -368,90 +167,12 @@ object_${TRICK_HOST_CPU}/getIntegrator.o: src/getIntegrator.cpp \ ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/message_proto.h \ ${TRICK_HOME}/include/trick/message_type.h \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/alloc.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/config.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/config_trick10.hh \ - ${TRICK_HOME}/include/trick/compat/sim_services/MemoryManager/include/memorymanager_c_intf.h \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/type_traits.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_constructor_factory.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/er7_class.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_technique.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/deletable.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/generalized_position_derivative.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/config.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/single_cycle_integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_interface.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/state_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_result.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator_base.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/standard_integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/abm4/include/abm4_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/priming_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/beeman/include/beeman_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_heun/include/rk2_heun_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/beeman/include/beeman_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/mm4/include/mm4_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_midpoint/include/rk2_midpoint_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/mm4/include/mm4_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/nl2/include/nl2_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/nl2/include/nl2_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/position_verlet/include/position_verlet_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/position_verlet/include/position_verlet_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_midpoint/include/rk2_midpoint_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_midpoint/include/rk2_midpoint_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk2_midpoint/include/rk2_midpoint_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf45/include/rkf45_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkf78/include/rkf78_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rkg4/include/rkg4_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator_base.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/rk4/include/rk4_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/symplectic_euler/include/symplectic_euler_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/euler/include/euler_first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/symplectic_euler/include/symplectic_euler_second_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/velocity_verlet/include/velocity_verlet_integrator_constructor.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/velocity_verlet/include/velocity_verlet_second_order_ode_integrator.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ ${TRICK_HOME}/include/trick/Integrator.hh \ ${TRICK_HOME}/include/trick/IntegAlgorithms.hh \ ${TRICK_HOME}/include/trick/ABM_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/first_order_ode_integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/trick_integrator.hh \ - ${TRICK_HOME}/include/trick/compat/sim_services/Integrator/include/Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/base_integration_group.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/time_interface.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/bogus_integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/interface/include/message_handler.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_controls.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integration_messages.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/integrator_interface.hh \ - ${TRICK_HOME}/trick_source/er7_utils/integration/core/include/time_interface.hh \ + ${TRICK_HOME}/include/trick/Integrator.hh \ ${TRICK_HOME}/include/trick/Euler_Cromer_Integrator.hh \ - ${TRICK_HOME}/trick_source/er7_utils/trick/integration/include/second_order_ode_integrator.hh \ ${TRICK_HOME}/include/trick/Euler_Integrator.hh \ ${TRICK_HOME}/include/trick/MM4_Integrator.hh \ ${TRICK_HOME}/include/trick/NL2_Integrator.hh \ diff --git a/trick_source/sim_services/Integrator/trick_algorithms/ABM_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/ABM_Integrator.cpp index 2194682b..90328819 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/ABM_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/ABM_Integrator.cpp @@ -1,4 +1,4 @@ -#include "trick/trick_algorithms/ABM_Integrator.hh" +#include "trick/ABM_Integrator.hh" #include "trick/message_proto.h" /** diff --git a/trick_source/sim_services/Integrator/trick_algorithms/Euler_Cromer_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/Euler_Cromer_Integrator.cpp index 39432582..9d4f9fda 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/Euler_Cromer_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/Euler_Cromer_Integrator.cpp @@ -1,4 +1,4 @@ -#include "trick/trick_algorithms/Euler_Cromer_Integrator.hh" +#include "trick/Euler_Cromer_Integrator.hh" #include "trick/message_proto.h" #include diff --git a/trick_source/sim_services/Integrator/trick_algorithms/Euler_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/Euler_Integrator.cpp index cbe07ab8..13b15f55 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/Euler_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/Euler_Integrator.cpp @@ -1,4 +1,4 @@ -#include "trick/trick_algorithms/Euler_Integrator.hh" +#include "trick/Euler_Integrator.hh" #include "trick/message_proto.h" #include #include diff --git a/trick_source/sim_services/Integrator/trick_algorithms/MM4_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/MM4_Integrator.cpp index e5ffad06..bf511c33 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/MM4_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/MM4_Integrator.cpp @@ -1,4 +1,4 @@ -#include "trick/trick_algorithms/MM4_Integrator.hh" +#include "trick/MM4_Integrator.hh" #include "trick/message_proto.h" /** diff --git a/trick_source/sim_services/Integrator/trick_algorithms/NL2_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/NL2_Integrator.cpp index 97e3c740..ef1d0e0f 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/NL2_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/NL2_Integrator.cpp @@ -1,4 +1,4 @@ -#include "trick/trick_algorithms/NL2_Integrator.hh" +#include "trick/NL2_Integrator.hh" #include "trick/message_proto.h" /** diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RK2_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/RK2_Integrator.cpp index c491800b..40e8f745 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/RK2_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/RK2_Integrator.cpp @@ -1,5 +1,5 @@ -#include "trick/trick_algorithms/RK2_Integrator.hh" +#include "trick/RK2_Integrator.hh" #include #include "trick/message_proto.h" diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RK4_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/RK4_Integrator.cpp index 2bb1d83e..269dff51 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/RK4_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/RK4_Integrator.cpp @@ -1,4 +1,4 @@ -#include "trick/trick_algorithms/RK4_Integrator.hh" +#include "trick/RK4_Integrator.hh" #include "trick/message_proto.h" /** diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RKF45_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/RKF45_Integrator.cpp index 93e079f6..a6d8e467 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/RKF45_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/RKF45_Integrator.cpp @@ -1,4 +1,4 @@ -#include "trick/trick_algorithms/RKF45_Integrator.hh" +#include "trick/RKF45_Integrator.hh" #include "trick/message_proto.h" /** diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RKF78_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/RKF78_Integrator.cpp index a804b8fb..737bdd65 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/RKF78_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/RKF78_Integrator.cpp @@ -1,4 +1,4 @@ -#include "trick/trick_algorithms/RKF78_Integrator.hh" +#include "trick/RKF78_Integrator.hh" #include "trick/message_proto.h" /** diff --git a/trick_source/sim_services/Integrator/trick_algorithms/RKG4_Integrator.cpp b/trick_source/sim_services/Integrator/trick_algorithms/RKG4_Integrator.cpp index 7138ed7a..498eba40 100644 --- a/trick_source/sim_services/Integrator/trick_algorithms/RKG4_Integrator.cpp +++ b/trick_source/sim_services/Integrator/trick_algorithms/RKG4_Integrator.cpp @@ -1,4 +1,4 @@ -#include "trick/trick_algorithms/RKG4_Integrator.hh" +#include "trick/RKG4_Integrator.hh" #include "trick/message_proto.h" /**