From a95e8e086b6ed7068f3c3b86001a98ab2576f493 Mon Sep 17 00:00:00 2001 From: Alex Lin Date: Tue, 17 May 2016 09:01:37 -0500 Subject: [PATCH] Use udunits package for units conversions Copied the units_conv.c from 15 that includes the new units to master. Swept through the code removing includes to Unit.hh and UCF.h where they are no longer needed. Remade makefile dependencies. refs #231 --- include/trick/swig/swig_int_typemap.i | 1 - include/trick/swig/trick_swig.i | 1 - test/SIM_measurement_units/S_define | 38 +- .../DPX/DPC/DPC_UnitConvDataStream.cpp | 1 + .../DPX/DPC/DPC_UnitConvDataStream.hh | 1 - .../data_products/DPX/DPC/DPC_column_info.hh | 1 - .../DPX/DPC/DPC_datastream_supplier.hh | 1 - .../data_products/DPX/DPC/DPC_delta_curve.cpp | 1 - .../data_products/DPX/DPC/DPC_std_curve.cpp | 1 - .../CheckPointAgent/Makefile_deps | 4 +- .../CheckPointRestart/Makefile_deps | 17 +- .../sim_services/EventManager/Makefile_deps | 6 +- .../sim_services/FrameLog/Makefile_deps | 6 +- .../sim_services/Integrator/Makefile_deps | 308 +++++++- .../sim_services/JITInputFile/Makefile_deps | 4 +- .../JSONVariableServer/Makefile_deps | 5 - .../sim_services/MemoryManager/Makefile_deps | 128 ++-- trick_source/sim_services/Sie/Makefile_deps | 4 +- .../sim_services/VariableServer/Makefile_deps | 662 +++++++++++++++--- .../VariableServerThread_commands.cpp | 1 - trick_source/trick_swig/sim_services.i | 1 - .../trick_swig/swig_convert_units.cpp | 1 - trick_source/trick_swig/swig_double.cpp | 2 - trick_source/trick_swig/swig_int.cpp | 2 - .../trick_utils/units/src/units_conv.c | 17 + 25 files changed, 972 insertions(+), 242 deletions(-) diff --git a/include/trick/swig/swig_int_typemap.i b/include/trick/swig/swig_int_typemap.i index 7298fec7..a28cefc4 100644 --- a/include/trick/swig/swig_int_typemap.i +++ b/include/trick/swig/swig_int_typemap.i @@ -11,7 +11,6 @@ #include "trick/swig/swig_ref.hh" #include "trick/swig/PrimitiveAttributesMap.hh" #include "trick/UnitsMap.hh" -#include "trick/Unit.hh" #include "trick/reference.h" #include "trick/memorymanager_c_intf.h" diff --git a/include/trick/swig/trick_swig.i b/include/trick/swig/trick_swig.i index 0ed2bc8f..96746cd4 100644 --- a/include/trick/swig/trick_swig.i +++ b/include/trick/swig/trick_swig.i @@ -25,7 +25,6 @@ #include #include "trick/UnitsMap.hh" -#include "trick/Unit.hh" #include "trick/MemoryManager.hh" #include "trick/reference.h" #include "trick/memorymanager_c_intf.h" diff --git a/test/SIM_measurement_units/S_define b/test/SIM_measurement_units/S_define index 57d506b2..78c5742c 100644 --- a/test/SIM_measurement_units/S_define +++ b/test/SIM_measurement_units/S_define @@ -9,6 +9,7 @@ class unitSimObject : public Trick::SimObject { public: + // test map_trick_units_to_udunits to convert old symbols to udunits double r ; // trick_units((r)) test double r2 ; // trick_units(r2) test double r2pers ; // trick_units(r2/s) test @@ -17,14 +18,8 @@ class unitSimObject : public Trick::SimObject { double cnt ; // trick_units(cnt) test double crazy ; // trick_units(as^2*am3/d2/r*cnt/one*F/C*R/v) test double another_crazy ; // trick_units((m^2*kg3)/(degree2/rad)*(count/1)*(degF/degC*degR/V)) test - double test ; // trick_units(m3/s2) test - - double temp_F ; // trick_units(degF) test - double temp_C ; // trick_units(degC) test - - double fpf ; // trick_units(furlong/fortnight) test - double mps ; // trick_units(m/s ) test + // Time variables and prefixes double s ; // trick_units(s) test double ps ; // trick_units(ps) test double ns ; // trick_units(ns) test @@ -42,6 +37,7 @@ class unitSimObject : public Trick::SimObject { double hr ; // trick_units(hr) test double day ; // trick_units(day) test + // Length double m ; // trick_units(m) test double ft ; // trick_units(ft) test double kft ; // trick_units(kft) test @@ -50,40 +46,50 @@ class unitSimObject : public Trick::SimObject { double mi ; // trick_units(mi) test double nmile ; // trick_units(nmile) test + // Angle double rad ; // trick_units(rad) test double degree ; // trick_units(degree) test double arcsecond ; // trick_units(arcsecond) test double arcminute ; // trick_units(arcminute) test double revolution ; // trick_units(revolution) test + // Mass double g ; // trick_units(g) test + double ug ; // trick_units(μg) test double kg ; // trick_units(kg) test double t ; // trick_units(t) test double slug ; // trick_units(slug) test double lb ; // trick_units(lb) test + // Force double N ; // trick_units(N) test double ozf ; // trick_units(ozf) test double lbf ; // trick_units(lbf) test + // Electrical double V ; // trick_units(V) test double A ; // trick_units(A) test double ohm ; // trick_units(ohm) test + double omega ; // trick_units(Ω) test - double degC ; // trick_units(degC) test - double degF ; // trick_units(degF) test + // Temperature + double degC ; // trick_units(℃) test + double degF ; // trick_units(°F) test double K ; // trick_units(K) test double degR ; // trick_units(degR) test + // Energy double J ; // trick_units(J) test double BTU ; // trick_units(BTU) test double ton_TNT ; // trick_units(ton_TNT) test double Wh ; // trick_units(W*h) test double kWh ; // trick_units(kW*h) test + // Power double W ; // trick_units(W) test double hp ; // trick_units(hp) test + // Pressure double Pa ; // trick_units(Pa) test double psi ; // trick_units(psi) test double atm ; // trick_units(atm) test @@ -92,23 +98,33 @@ class unitSimObject : public Trick::SimObject { double cmH2O ; // trick_units(cmH2O) test double inch_H2O_39F ; // trick_units(inch_H2O_39F) test + // Volume double l ; // trick_units(l) test double gallon ; // trick_units(gallon) test double floz ; // trick_units(floz) test + // Frequency double Hz ; // trick_units(Hz) test + // Unitless double one ; // trick_units(1) test double count ; // trick_units(count) test - double mol ; // trick_units(mol) test + // furlongs/fortnight double furlong ; // trick_units(furlong) test double fortnight ; // trick_units(fortnight) test + double fpf ; // trick_units(furlong/fortnight) test + double mps ; // trick_units(m/s) test - double m3 ; // trick_units(m^3) test + // Exponentiation testing + double accel ; // trick_units(m/s²) test + double m3 ; // trick_units(m³) test double dashdash ; // trick_units(--) test + // Using dot as multiplication symbol + double torque ; // trick_units(N·m) test + unitSimObject() { } } ; diff --git a/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.cpp b/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.cpp index 90089462..f327900b 100644 --- a/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.cpp +++ b/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.cpp @@ -1,4 +1,5 @@ +#include #include #include "DPC/DPC_UnitConvDataStream.hh" diff --git a/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.hh b/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.hh index e4e202f9..c57321e4 100644 --- a/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.hh +++ b/trick_source/data_products/DPX/DPC/DPC_UnitConvDataStream.hh @@ -4,7 +4,6 @@ #include #include -#include "trick/Unit.hh" #include "../../Log/DataStream.hh" /** diff --git a/trick_source/data_products/DPX/DPC/DPC_column_info.hh b/trick_source/data_products/DPX/DPC/DPC_column_info.hh index 920e5fab..bcd0a09b 100644 --- a/trick_source/data_products/DPX/DPC/DPC_column_info.hh +++ b/trick_source/data_products/DPX/DPC/DPC_column_info.hh @@ -4,7 +4,6 @@ #include #include #include -#include "trick/Unit.hh" class DPC_column_info { public: diff --git a/trick_source/data_products/DPX/DPC/DPC_datastream_supplier.hh b/trick_source/data_products/DPX/DPC/DPC_datastream_supplier.hh index e60dd711..fcb33b8b 100644 --- a/trick_source/data_products/DPX/DPC/DPC_datastream_supplier.hh +++ b/trick_source/data_products/DPX/DPC/DPC_datastream_supplier.hh @@ -2,7 +2,6 @@ #ifndef DPC_DATASTREAM_SUPPLIER_HH #define DPC_DATASTREAM_SUPPLIER_HH -#include "trick/Unit.hh" #include "../../Log/DataStream.hh" #include "../../Log/DataStreamFactory.hh" diff --git a/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp b/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp index 7a9cc889..2e16ca65 100644 --- a/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp +++ b/trick_source/data_products/DPX/DPC/DPC_delta_curve.cpp @@ -2,7 +2,6 @@ #include "DPC/DPC_delta_curve.hh" #include "math.h" #include "string.h" -#include "trick/Unit.hh" #include // CONSTRUCTOR diff --git a/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp b/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp index 3f93700a..49cda9de 100644 --- a/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp +++ b/trick_source/data_products/DPX/DPC/DPC_std_curve.cpp @@ -3,7 +3,6 @@ #include "DPC/DPC_std_curve.hh" #include "math.h" -#include "trick/Unit.hh" extern ut_system * u_system ; diff --git a/trick_source/sim_services/CheckPointAgent/Makefile_deps b/trick_source/sim_services/CheckPointAgent/Makefile_deps index 3aae3762..32bde2af 100644 --- a/trick_source/sim_services/CheckPointAgent/Makefile_deps +++ b/trick_source/sim_services/CheckPointAgent/Makefile_deps @@ -28,7 +28,6 @@ object_${TRICK_HOST_CPU}/ClassicCheckPointerAgent.o: ClassicCheckPointerAgent.cp ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/wcs_ext.h \ ${TRICK_HOME}/include/trick/bitfield_proto.h \ ${TRICK_HOME}/include/trick/message_proto.h \ @@ -46,5 +45,4 @@ object_${TRICK_HOST_CPU}/ChkPtParseContext.o: ChkPtParseContext.cpp \ ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh diff --git a/trick_source/sim_services/CheckPointRestart/Makefile_deps b/trick_source/sim_services/CheckPointRestart/Makefile_deps index 7d60ca41..52706a32 100644 --- a/trick_source/sim_services/CheckPointRestart/Makefile_deps +++ b/trick_source/sim_services/CheckPointRestart/Makefile_deps @@ -18,6 +18,7 @@ object_${TRICK_HOST_CPU}/CheckPointRestart_c_intf.o: CheckPointRestart_c_intf.cp ${TRICK_HOME}/include/trick/message_type.h object_${TRICK_HOST_CPU}/next_attr_name.o: next_attr_name.cpp \ ${TRICK_HOME}/include/trick/CheckPointRestart_c_intf.hh +object_${TRICK_HOST_CPU}/stl_type_name_convert.o: stl_type_name_convert.cpp object_${TRICK_HOST_CPU}/CheckPointRestart.o: CheckPointRestart.cpp \ ${TRICK_HOME}/include/trick/DMTCP.hh \ ${TRICK_HOME}/include/trick/dmtcp_checkpoint_c_intf.hh \ @@ -37,24 +38,18 @@ object_${TRICK_HOST_CPU}/CheckPointRestart.o: CheckPointRestart.cpp \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ ${TRICK_HOME}/include/trick/Threads.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/ThreadTrigger.hh \ ${TRICK_HOME}/include/trick/sim_mode.h \ ${TRICK_HOME}/include/trick/exec_proto.hh \ ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ ${TRICK_HOME}/include/trick/command_line_protos.h \ ${TRICK_HOME}/include/trick/message_proto.h \ ${TRICK_HOME}/include/trick/message_type.h \ - ${TRICK_HOME}/include/trick/TrickConstant.hh \ - ${TRICK_HOME}/include/trick/checkpoint_stl.hh \ - ${TRICK_HOME}/include/trick/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/include/trick/checkpoint_is_stl_container.hh \ - ${TRICK_HOME}/include/trick/checkpoint_fwd_declare.hh \ - ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ - ${TRICK_HOME}/include/trick/checkpoint_map.hh \ - ${TRICK_HOME}/include/trick/checkpoint_stack.hh \ - ${TRICK_HOME}/include/trick/checkpoint_queue.hh \ - ${TRICK_HOME}/include/trick/checkpoint_pair.hh + ${TRICK_HOME}/include/trick/TrickConstant.hh diff --git a/trick_source/sim_services/EventManager/Makefile_deps b/trick_source/sim_services/EventManager/Makefile_deps index fd31ccd0..66bf607a 100644 --- a/trick_source/sim_services/EventManager/Makefile_deps +++ b/trick_source/sim_services/EventManager/Makefile_deps @@ -13,7 +13,6 @@ object_${TRICK_HOST_CPU}/EventManager.o: EventManager.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/exec_proto.h \ ${TRICK_HOME}/include/trick/sim_mode.h \ ${TRICK_HOME}/include/trick/EventInstrument.hh \ @@ -29,6 +28,7 @@ object_${TRICK_HOST_CPU}/EventManager.o: EventManager.cpp \ ${TRICK_HOME}/include/trick/SimObject.hh \ ${TRICK_HOME}/include/trick/Threads.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/ThreadTrigger.hh \ ${TRICK_HOME}/include/trick/sim_mode.h \ ${TRICK_HOME}/include/trick/message_proto.h \ ${TRICK_HOME}/include/trick/message_type.h @@ -46,7 +46,6 @@ object_${TRICK_HOST_CPU}/EventManager_c_intf.o: EventManager_c_intf.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/exec_proto.h \ ${TRICK_HOME}/include/trick/sim_mode.h \ ${TRICK_HOME}/include/trick/EventManager.hh \ @@ -70,7 +69,6 @@ object_${TRICK_HOST_CPU}/EventInstrument.o: EventInstrument.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/exec_proto.h \ ${TRICK_HOME}/include/trick/sim_mode.h \ ${TRICK_HOME}/include/trick/InstrumentBase.hh \ @@ -84,6 +82,7 @@ object_${TRICK_HOST_CPU}/EventInstrument.o: EventInstrument.cpp \ ${TRICK_HOME}/include/trick/SimObject.hh \ ${TRICK_HOME}/include/trick/Threads.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/ThreadTrigger.hh \ ${TRICK_HOME}/include/trick/sim_mode.h object_${TRICK_HOST_CPU}/EventProcessor.o: EventProcessor.cpp \ ${TRICK_HOME}/include/trick/EventProcessor.hh \ @@ -100,7 +99,6 @@ object_${TRICK_HOST_CPU}/EventProcessor.o: EventProcessor.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/exec_proto.h \ ${TRICK_HOME}/include/trick/sim_mode.h \ ${TRICK_HOME}/include/trick/JobData.hh \ diff --git a/trick_source/sim_services/FrameLog/Makefile_deps b/trick_source/sim_services/FrameLog/Makefile_deps index 07488081..1f666732 100644 --- a/trick_source/sim_services/FrameLog/Makefile_deps +++ b/trick_source/sim_services/FrameLog/Makefile_deps @@ -17,7 +17,6 @@ object_${TRICK_HOST_CPU}/FrameDataRecordGroup.o: FrameDataRecordGroup.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/clock_proto.h \ ${TRICK_HOME}/include/trick/exec_proto.h \ ${TRICK_HOME}/include/trick/sim_mode.h @@ -40,7 +39,6 @@ object_${TRICK_HOST_CPU}/FrameLog.o: FrameLog.cpp ${TRICK_HOME}/include/trick/Fr ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/exec_proto.hh \ ${TRICK_HOME}/include/trick/Executive.hh \ ${TRICK_HOME}/include/trick/Scheduler.hh \ @@ -49,6 +47,7 @@ object_${TRICK_HOST_CPU}/FrameLog.o: FrameLog.cpp ${TRICK_HOME}/include/trick/Fr ${TRICK_HOME}/include/trick/SimObject.hh \ ${TRICK_HOME}/include/trick/Threads.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/ThreadTrigger.hh \ ${TRICK_HOME}/include/trick/sim_mode.h \ ${TRICK_HOME}/include/trick/exec_proto.h \ ${TRICK_HOME}/include/trick/sim_mode.h \ @@ -76,5 +75,4 @@ object_${TRICK_HOST_CPU}/FrameLog_c_intf.o: FrameLog_c_intf.cpp \ ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/mm_error.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh diff --git a/trick_source/sim_services/Integrator/Makefile_deps b/trick_source/sim_services/Integrator/Makefile_deps index 2a062d0b..9f1dfaee 100644 --- a/trick_source/sim_services/Integrator/Makefile_deps +++ b/trick_source/sim_services/Integrator/Makefile_deps @@ -21,17 +21,84 @@ 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}/include/trick/Integrator.hh \ - ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${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/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 \ @@ -57,21 +124,87 @@ 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}/include/trick/Integrator.hh \ - ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${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/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 \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/message_proto.h \ ${TRICK_HOME}/include/trick/message_type.h \ ${TRICK_HOME}/include/trick/exec_proto.hh \ @@ -81,6 +214,7 @@ object_${TRICK_HOST_CPU}/IntegLoopManager.o: src/IntegLoopManager.cpp \ ${TRICK_HOME}/include/trick/SimObject.hh \ ${TRICK_HOME}/include/trick/Threads.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/ThreadTrigger.hh \ ${TRICK_HOME}/include/trick/sim_mode.h \ ${TRICK_HOME}/include/trick/exec_proto.h \ ${TRICK_HOME}/include/trick/sim_mode.h @@ -104,17 +238,84 @@ 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}/include/trick/Integrator.hh \ - ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${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/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 \ @@ -122,15 +323,8 @@ object_${TRICK_HOST_CPU}/IntegLoopSimObject.o: src/IntegLoopSimObject.cpp \ ${TRICK_HOME}/include/trick/SimObject.hh \ ${TRICK_HOME}/include/trick/Threads.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ - ${TRICK_HOME}/include/trick/sim_mode.h \ - ${TRICK_HOME}/include/trick/checkpoint_stl.hh \ - ${TRICK_HOME}/include/trick/checkpoint_sequence_stl.hh \ - ${TRICK_HOME}/include/trick/message_proto.h \ - ${TRICK_HOME}/include/trick/message_type.h \ - ${TRICK_HOME}/include/trick/checkpoint_map.hh \ - ${TRICK_HOME}/include/trick/checkpoint_stack.hh \ - ${TRICK_HOME}/include/trick/checkpoint_queue.hh \ - ${TRICK_HOME}/include/trick/checkpoint_pair.hh + ${TRICK_HOME}/include/trick/ThreadTrigger.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h object_${TRICK_HOST_CPU}/Integrator_C_Intf.o: src/Integrator_C_Intf.cpp \ ${TRICK_HOME}/include/trick/integrator_c_intf.h \ ${TRICK_HOME}/include/trick/Integrator.hh \ @@ -167,12 +361,90 @@ 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}/include/trick/memorymanager_c_intf.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/Integrator.hh \ ${TRICK_HOME}/include/trick/IntegAlgorithms.hh \ ${TRICK_HOME}/include/trick/ABM_Integrator.hh \ - ${TRICK_HOME}/include/trick/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/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/JITInputFile/Makefile_deps b/trick_source/sim_services/JITInputFile/Makefile_deps index 1cb076bb..e350ed07 100644 --- a/trick_source/sim_services/JITInputFile/Makefile_deps +++ b/trick_source/sim_services/JITInputFile/Makefile_deps @@ -11,7 +11,6 @@ object_${TRICK_HOST_CPU}/JITEvent.o: JITEvent.cpp ${TRICK_HOME}/include/trick/JI ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/Event.hh \ ${TRICK_HOME}/include/trick/exec_proto.h \ ${TRICK_HOME}/include/trick/sim_mode.h \ @@ -34,7 +33,6 @@ object_${TRICK_HOST_CPU}/jit_input_file_c_intf.o: jit_input_file_c_intf.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/Event.hh \ ${TRICK_HOME}/include/trick/exec_proto.h \ ${TRICK_HOME}/include/trick/sim_mode.h \ @@ -56,7 +54,6 @@ object_${TRICK_HOST_CPU}/JITInputFile.o: JITInputFile.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/Event.hh \ ${TRICK_HOME}/include/trick/exec_proto.h \ ${TRICK_HOME}/include/trick/sim_mode.h \ @@ -75,5 +72,6 @@ object_${TRICK_HOST_CPU}/JITInputFile.o: JITInputFile.cpp \ ${TRICK_HOME}/include/trick/SimObject.hh \ ${TRICK_HOME}/include/trick/Threads.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/ThreadTrigger.hh \ ${TRICK_HOME}/include/trick/sim_mode.h \ ${TRICK_HOME}/include/trick/TrickConstant.hh diff --git a/trick_source/sim_services/JSONVariableServer/Makefile_deps b/trick_source/sim_services/JSONVariableServer/Makefile_deps index 45fade5d..e91554c1 100644 --- a/trick_source/sim_services/JSONVariableServer/Makefile_deps +++ b/trick_source/sim_services/JSONVariableServer/Makefile_deps @@ -1,12 +1,10 @@ object_${TRICK_HOST_CPU}/JSONVariableServer.o: JSONVariableServer.cpp \ ${TRICK_HOME}/include/trick/JSONVariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/JSONVariableServerThread.hh \ ${TRICK_HOME}/include/trick/tc_proto.h \ - ${TRICK_HOME}/include/trick/tc.h \ ${TRICK_HOME}/include/trick/attributes.h \ ${TRICK_HOME}/include/trick/parameter_types.h \ ${TRICK_HOME}/include/trick/message_proto.h \ @@ -14,7 +12,6 @@ object_${TRICK_HOST_CPU}/JSONVariableServer.o: JSONVariableServer.cpp \ object_${TRICK_HOST_CPU}/JSONVariableServerThread.o: JSONVariableServerThread.cpp \ ${TRICK_HOME}/include/trick/JSONVariableServerThread.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ @@ -27,11 +24,9 @@ object_${TRICK_HOST_CPU}/JSONVariableServerThread.o: JSONVariableServerThread.cp ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ ${TRICK_HOME}/include/trick/exec_proto.h \ ${TRICK_HOME}/include/trick/sim_mode.h \ ${TRICK_HOME}/include/trick/PythonPrint.hh \ ${TRICK_HOME}/include/trick/tc_proto.h \ - ${TRICK_HOME}/include/trick/tc.h \ ${TRICK_HOME}/include/trick/TrickConstant.hh diff --git a/trick_source/sim_services/MemoryManager/Makefile_deps b/trick_source/sim_services/MemoryManager/Makefile_deps index 0fdf11ad..8330a24a 100644 --- a/trick_source/sim_services/MemoryManager/Makefile_deps +++ b/trick_source/sim_services/MemoryManager/Makefile_deps @@ -52,8 +52,7 @@ object_${TRICK_HOST_CPU}/MemoryManager_add_shared_library_symbols.o: \ ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager.o: MemoryManager.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -65,9 +64,8 @@ object_${TRICK_HOST_CPU}/MemoryManager.o: MemoryManager.cpp \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/ClassicCheckPointAgent.hh -object_${TRICK_HOST_CPU}/MemoryManager_realloc.o: MemoryManager_realloc.cpp \ +object_${TRICK_HOST_CPU}/MemoryManager_set_debug_level.o: MemoryManager_set_debug_level.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/attributes.h \ ${TRICK_HOME}/include/trick/parameter_types.h \ @@ -77,8 +75,7 @@ object_${TRICK_HOST_CPU}/MemoryManager_realloc.o: MemoryManager_realloc.cpp \ ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_make_reference_attr.o: \ MemoryManager_make_reference_attr.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ @@ -90,9 +87,9 @@ object_${TRICK_HOST_CPU}/MemoryManager_make_reference_attr.o: \ ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh -object_${TRICK_HOST_CPU}/MemoryManager_set_debug_level.o: MemoryManager_set_debug_level.cpp \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh +object_${TRICK_HOST_CPU}/MemoryManager_add_checkpoint_alloc_dependency.o: \ + MemoryManager_add_checkpoint_alloc_dependency.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/attributes.h \ ${TRICK_HOME}/include/trick/parameter_types.h \ @@ -102,8 +99,7 @@ object_${TRICK_HOST_CPU}/MemoryManager_set_debug_level.o: MemoryManager_set_debu ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_add_attr_info.o: MemoryManager_add_attr_info.cpp \ ${TRICK_HOME}/include/trick/SimObject.hh \ ${TRICK_HOME}/include/trick/JobData.hh \ @@ -117,8 +113,7 @@ object_${TRICK_HOST_CPU}/MemoryManager_add_attr_info.o: MemoryManager_add_attr_i ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/ref_free.o: ref_free.cpp ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ ${TRICK_HOME}/include/trick/parameter_types.h \ @@ -134,8 +129,7 @@ object_${TRICK_HOST_CPU}/MemoryManager_alloc_info_map.o: MemoryManager_alloc_inf ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_delete_var.o: MemoryManager_delete_var.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -146,8 +140,7 @@ object_${TRICK_HOST_CPU}/MemoryManager_delete_var.o: MemoryManager_delete_var.cp ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_ref_name_from_address.o: \ MemoryManager_ref_name_from_address.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ @@ -160,7 +153,6 @@ object_${TRICK_HOST_CPU}/MemoryManager_ref_name_from_address.o: \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/ClassicCheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_ref_name.o: MemoryManager_ref_name.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ @@ -172,8 +164,7 @@ object_${TRICK_HOST_CPU}/MemoryManager_ref_name.o: MemoryManager_ref_name.cpp \ ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_ref_dim.o: MemoryManager_ref_dim.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -185,8 +176,18 @@ object_${TRICK_HOST_CPU}/MemoryManager_ref_dim.o: MemoryManager_ref_dim.cpp \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/vval.h +object_${TRICK_HOST_CPU}/MemoryManager_realloc.o: MemoryManager_realloc.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_get_size.o: MemoryManager_get_size.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -197,8 +198,7 @@ object_${TRICK_HOST_CPU}/MemoryManager_get_size.o: MemoryManager_get_size.cpp \ ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_declare_var.o: MemoryManager_declare_var.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -210,7 +210,6 @@ object_${TRICK_HOST_CPU}/MemoryManager_declare_var.o: MemoryManager_declare_var. ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/ADefParseContext.hh object_${TRICK_HOST_CPU}/MemoryManager_add_template_name_trans.o: \ MemoryManager_add_template_name_trans.cpp \ @@ -223,8 +222,7 @@ object_${TRICK_HOST_CPU}/MemoryManager_add_template_name_trans.o: \ ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_make_declaration.o: MemoryManager_make_declaration.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -235,8 +233,7 @@ object_${TRICK_HOST_CPU}/MemoryManager_make_declaration.o: MemoryManager_make_de ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_map_external_object.o: \ MemoryManager_map_external_object.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ @@ -249,7 +246,6 @@ object_${TRICK_HOST_CPU}/MemoryManager_map_external_object.o: \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/ADefParseContext.hh object_${TRICK_HOST_CPU}/MemoryManager_ref_assignment.o: MemoryManager_ref_assignment.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ @@ -262,12 +258,11 @@ object_${TRICK_HOST_CPU}/MemoryManager_ref_assignment.o: MemoryManager_ref_assig ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/bitfield_proto.h \ ${TRICK_HOME}/include/trick/vval.h \ ${TRICK_HOME}/include/trick/wcs_ext.h \ - ${TRICK_HOME}/include/trick/Unit.hh \ - ${TRICK_HOME}/include/trick/units_conv.h + /usr/include/udunits2/udunits2.h /usr/include/udunits2/converter.h \ + ${TRICK_HOME}/include/trick/UdUnits.hh object_${TRICK_HOST_CPU}/MemoryManager_C_Intf.o: MemoryManager_C_Intf.cpp \ ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ ${TRICK_HOME}/include/trick/parameter_types.h \ @@ -279,8 +274,7 @@ object_${TRICK_HOST_CPU}/MemoryManager_C_Intf.o: MemoryManager_C_Intf.cpp \ ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/mm_error.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_write_checkpoint.o: MemoryManager_write_checkpoint.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -291,8 +285,7 @@ object_${TRICK_HOST_CPU}/MemoryManager_write_checkpoint.o: MemoryManager_write_c ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_get_type_attributes.o: \ MemoryManager_get_type_attributes.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ @@ -304,8 +297,7 @@ object_${TRICK_HOST_CPU}/MemoryManager_get_type_attributes.o: \ ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_get_enumerated.o: MemoryManager_get_enumerated.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -316,8 +308,19 @@ object_${TRICK_HOST_CPU}/MemoryManager_get_enumerated.o: MemoryManager_get_enume ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh +object_${TRICK_HOST_CPU}/MemoryManager_get_stl_dependencies.o: \ + MemoryManager_get_stl_dependencies.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_add_var.o: MemoryManager_add_var.cpp \ ${TRICK_HOME}/include/trick/value.h \ ${TRICK_HOME}/include/trick/parameter_types.h \ @@ -329,8 +332,7 @@ object_${TRICK_HOST_CPU}/MemoryManager_add_var.o: MemoryManager_add_var.cpp \ ${TRICK_HOME}/include/trick/dllist.h \ ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/RefParseContext.o: RefParseContext.cpp \ ${TRICK_HOME}/include/trick/RefParseContext.hh \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ @@ -342,8 +344,7 @@ object_${TRICK_HOST_CPU}/RefParseContext.o: RefParseContext.cpp \ ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_set_checkpointagent.o: \ MemoryManager_set_checkpointagent.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ @@ -355,8 +356,7 @@ object_${TRICK_HOST_CPU}/MemoryManager_set_checkpointagent.o: \ ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_ref_attributes.o: MemoryManager_ref_attributes.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -368,7 +368,6 @@ object_${TRICK_HOST_CPU}/MemoryManager_ref_attributes.o: MemoryManager_ref_attri ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/RefParseContext.hh object_${TRICK_HOST_CPU}/MemoryManager_io_src_intf.o: MemoryManager_io_src_intf.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ @@ -380,8 +379,7 @@ object_${TRICK_HOST_CPU}/MemoryManager_io_src_intf.o: MemoryManager_io_src_intf. ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_is_alloced.o: MemoryManager_is_alloced.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -392,8 +390,7 @@ object_${TRICK_HOST_CPU}/MemoryManager_is_alloced.o: MemoryManager_is_alloced.cp ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_ref_var.o: MemoryManager_ref_var.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -405,7 +402,6 @@ object_${TRICK_HOST_CPU}/MemoryManager_ref_var.o: MemoryManager_ref_var.cpp \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/vval.h object_${TRICK_HOST_CPU}/MemoryManager_clear_memory.o: MemoryManager_clear_memory.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ @@ -418,7 +414,6 @@ object_${TRICK_HOST_CPU}/MemoryManager_clear_memory.o: MemoryManager_clear_memor ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/bitfield_proto.h object_${TRICK_HOST_CPU}/MemoryManager_write_var.o: MemoryManager_write_var.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ @@ -430,8 +425,18 @@ object_${TRICK_HOST_CPU}/MemoryManager_write_var.o: MemoryManager_write_var.cpp ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh +object_${TRICK_HOST_CPU}/MemoryManager_restore_stls.o: MemoryManager_restore_stls.cpp \ + ${TRICK_HOME}/include/trick/MemoryManager.hh \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/mm_error.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_restore.o: MemoryManager_restore.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -443,7 +448,6 @@ object_${TRICK_HOST_CPU}/MemoryManager_restore.o: MemoryManager_restore.cpp \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/ClassicCheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_strdup.o: MemoryManager_strdup.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ @@ -455,8 +459,7 @@ object_${TRICK_HOST_CPU}/MemoryManager_strdup.o: MemoryManager_strdup.cpp \ ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/ADefParseContext.o: ADefParseContext.cpp \ ${TRICK_HOME}/include/trick/ADefParseContext.hh \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ @@ -468,8 +471,7 @@ object_${TRICK_HOST_CPU}/ADefParseContext.o: ADefParseContext.cpp \ ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_alloc_depends.o: MemoryManager_alloc_depends.cpp \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -480,8 +482,7 @@ object_${TRICK_HOST_CPU}/MemoryManager_alloc_depends.o: MemoryManager_alloc_depe ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/MemoryManager_ref_allocate.o: MemoryManager_ref_allocate.cpp \ ${TRICK_HOME}/include/trick/attributes.h \ ${TRICK_HOME}/include/trick/parameter_types.h \ @@ -492,5 +493,4 @@ object_${TRICK_HOST_CPU}/MemoryManager_ref_allocate.o: MemoryManager_ref_allocat ${TRICK_HOME}/include/trick/io_alloc.h \ ${TRICK_HOME}/include/trick/mm_error.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh diff --git a/trick_source/sim_services/Sie/Makefile_deps b/trick_source/sim_services/Sie/Makefile_deps index a85662f5..42ae6367 100644 --- a/trick_source/sim_services/Sie/Makefile_deps +++ b/trick_source/sim_services/Sie/Makefile_deps @@ -20,12 +20,12 @@ object_${TRICK_HOST_CPU}/Sie.o: Sie.cpp ${TRICK_HOME}/include/trick/Sie.hh \ ${TRICK_HOME}/include/trick/SimObject.hh \ ${TRICK_HOME}/include/trick/Threads.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/ThreadTrigger.hh \ ${TRICK_HOME}/include/trick/sim_mode.h \ ${TRICK_HOME}/include/trick/command_line_protos.h \ ${TRICK_HOME}/include/trick/MemoryManager.hh \ ${TRICK_HOME}/include/trick/mm_error.h \ - ${TRICK_HOME}/include/trick/CheckPointAgent.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh + ${TRICK_HOME}/include/trick/CheckPointAgent.hh object_${TRICK_HOST_CPU}/EnumAttributesMap.o: EnumAttributesMap.cpp \ ${TRICK_HOME}/include/trick/EnumAttributesMap.hh \ ${TRICK_HOME}/include/trick/attributes.h \ diff --git a/trick_source/sim_services/VariableServer/Makefile_deps b/trick_source/sim_services/VariableServer/Makefile_deps index 2bafcec5..b3068b5e 100644 --- a/trick_source/sim_services/VariableServer/Makefile_deps +++ b/trick_source/sim_services/VariableServer/Makefile_deps @@ -1,7 +1,6 @@ object_${TRICK_HOST_CPU}/VariableServerThread_loop.o: VariableServerThread_loop.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -14,11 +13,9 @@ object_${TRICK_HOST_CPU}/VariableServerThread_loop.o: VariableServerThread_loop. ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ ${TRICK_HOME}/include/trick/input_processor_proto.h \ ${TRICK_HOME}/include/trick/tc_proto.h \ - ${TRICK_HOME}/include/trick/tc.h \ ${TRICK_HOME}/include/trick/message_proto.h \ ${TRICK_HOME}/include/trick/message_type.h \ ${TRICK_HOME}/include/trick/realtimesync_proto.h \ @@ -31,7 +28,6 @@ object_${TRICK_HOST_CPU}/VariableServer_copy_data_scheduled.o: \ VariableServer_copy_data_scheduled.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -44,13 +40,11 @@ object_${TRICK_HOST_CPU}/VariableServer_copy_data_scheduled.o: \ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ ${TRICK_HOME}/include/trick/TrickConstant.hh object_${TRICK_HOST_CPU}/VariableServer_shutdown.o: VariableServer_shutdown.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -63,13 +57,11 @@ object_${TRICK_HOST_CPU}/VariableServer_shutdown.o: VariableServer_shutdown.cpp ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh object_${TRICK_HOST_CPU}/VariableServer_copy_data_freeze_scheduled.o: \ VariableServer_copy_data_freeze_scheduled.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -82,13 +74,12 @@ object_${TRICK_HOST_CPU}/VariableServer_copy_data_freeze_scheduled.o: \ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ ${TRICK_HOME}/include/trick/TrickConstant.hh object_${TRICK_HOST_CPU}/VariableReference.o: VariableReference.cpp \ + /usr/include/udunits2/udunits2.h /usr/include/udunits2/converter.h \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -101,7 +92,6 @@ object_${TRICK_HOST_CPU}/VariableReference.o: VariableReference.cpp \ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ ${TRICK_HOME}/include/trick/var.h \ @@ -113,7 +103,6 @@ object_${TRICK_HOST_CPU}/VariableServer_get_next_freeze_call_time.o: \ VariableServer_get_next_freeze_call_time.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -126,13 +115,11 @@ object_${TRICK_HOST_CPU}/VariableServer_get_next_freeze_call_time.o: \ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ ${TRICK_HOME}/include/trick/TrickConstant.hh object_${TRICK_HOST_CPU}/VariableServerThread_write_stdio.o: VariableServerThread_write_stdio.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -145,49 +132,13 @@ object_${TRICK_HOST_CPU}/VariableServerThread_write_stdio.o: VariableServerThrea ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ ${TRICK_HOME}/include/trick/variable_server_message_types.h \ - ${TRICK_HOME}/include/trick/tc_proto.h \ - ${TRICK_HOME}/include/trick/tc.h -object_${TRICK_HOST_CPU}/VariableServerThread_commands.o: VariableServerThread_commands.cpp \ - ${TRICK_HOME}/include/trick/VariableServer.hh \ - ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ - ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ - ${TRICK_HOME}/include/trick/reference.h \ - ${TRICK_HOME}/include/trick/attributes.h \ - ${TRICK_HOME}/include/trick/parameter_types.h \ - ${TRICK_HOME}/include/trick/value.h \ - ${TRICK_HOME}/include/trick/dllist.h \ - ${TRICK_HOME}/include/trick/JobData.hh \ - ${TRICK_HOME}/include/trick/InstrumentBase.hh \ - ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ - ${TRICK_HOME}/include/trick/VariableServerThread.hh \ - ${TRICK_HOME}/include/trick/ThreadBase.hh \ - ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ - ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ - ${TRICK_HOME}/include/trick/variable_server_message_types.h \ - ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ - ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/io_alloc.h \ - ${TRICK_HOME}/include/trick/tc_proto.h \ - ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/exec_proto.h \ - ${TRICK_HOME}/include/trick/sim_mode.h \ - ${TRICK_HOME}/include/trick/command_line_protos.h \ - ${TRICK_HOME}/include/trick/Unit.hh \ - ${TRICK_HOME}/include/trick/units_conv.h \ - ${TRICK_HOME}/include/trick/message_proto.h \ - ${TRICK_HOME}/include/trick/message_type.h \ - ${TRICK_HOME}/include/trick/TrickConstant.hh \ - ${TRICK_HOME}/include/trick/sie_c_intf.h + ${TRICK_HOME}/include/trick/tc_proto.h object_${TRICK_HOST_CPU}/VariableServer_get_next_sync_call_time.o: \ VariableServer_get_next_sync_call_time.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -200,13 +151,11 @@ object_${TRICK_HOST_CPU}/VariableServer_get_next_sync_call_time.o: \ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ ${TRICK_HOME}/include/trick/TrickConstant.hh object_${TRICK_HOST_CPU}/VariableServer_restart.o: VariableServer_restart.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -219,16 +168,13 @@ object_${TRICK_HOST_CPU}/VariableServer_restart.o: VariableServer_restart.cpp \ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ ${TRICK_HOME}/include/trick/message_proto.h \ ${TRICK_HOME}/include/trick/message_type.h \ - ${TRICK_HOME}/include/trick/tc_proto.h \ - ${TRICK_HOME}/include/trick/tc.h + ${TRICK_HOME}/include/trick/tc_proto.h object_${TRICK_HOST_CPU}/var_server_ext.o: var_server_ext.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -241,7 +187,6 @@ object_${TRICK_HOST_CPU}/var_server_ext.o: var_server_ext.cpp \ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ ${TRICK_HOME}/include/trick/exec_proto.h \ ${TRICK_HOME}/include/trick/sim_mode.h \ @@ -254,7 +199,6 @@ object_${TRICK_HOST_CPU}/VariableServerThread_create_socket.o: \ VariableServerThread_create_socket.cpp \ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ @@ -263,16 +207,13 @@ object_${TRICK_HOST_CPU}/VariableServerThread_create_socket.o: \ ${TRICK_HOME}/include/trick/parameter_types.h \ ${TRICK_HOME}/include/trick/value.h \ ${TRICK_HOME}/include/trick/dllist.h \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ ${TRICK_HOME}/include/trick/tc_proto.h \ - ${TRICK_HOME}/include/trick/tc.h \ ${TRICK_HOME}/include/trick/message_proto.h \ ${TRICK_HOME}/include/trick/message_type.h object_${TRICK_HOST_CPU}/VariableServerListenThread.o: VariableServerListenThread.cpp \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ @@ -282,10 +223,8 @@ object_${TRICK_HOST_CPU}/VariableServerListenThread.o: VariableServerListenThrea ${TRICK_HOME}/include/trick/parameter_types.h \ ${TRICK_HOME}/include/trick/value.h \ ${TRICK_HOME}/include/trick/dllist.h \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ ${TRICK_HOME}/include/trick/tc_proto.h \ - ${TRICK_HOME}/include/trick/tc.h \ ${TRICK_HOME}/include/trick/exec_proto.h \ ${TRICK_HOME}/include/trick/sim_mode.h \ ${TRICK_HOME}/include/trick/command_line_protos.h \ @@ -294,7 +233,6 @@ object_${TRICK_HOST_CPU}/VariableServerListenThread.o: VariableServerListenThrea object_${TRICK_HOST_CPU}/VariableServerThread_write_data.o: VariableServerThread_write_data.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -307,19 +245,16 @@ object_${TRICK_HOST_CPU}/VariableServerThread_write_data.o: VariableServerThread ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ ${TRICK_HOME}/include/trick/variable_server_message_types.h \ ${TRICK_HOME}/include/trick/bitfield_proto.h \ ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/tc_proto.h \ - ${TRICK_HOME}/include/trick/tc.h \ ${TRICK_HOME}/include/trick/message_proto.h \ ${TRICK_HOME}/include/trick/message_type.h object_${TRICK_HOST_CPU}/VariableServer_init.o: VariableServer_init.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -332,7 +267,6 @@ object_${TRICK_HOST_CPU}/VariableServer_init.o: VariableServer_init.cpp \ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ ${TRICK_HOME}/include/trick/exec_proto.hh \ ${TRICK_HOME}/include/trick/Executive.hh \ @@ -342,11 +276,11 @@ object_${TRICK_HOST_CPU}/VariableServer_init.o: VariableServer_init.cpp \ ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ ${TRICK_HOME}/include/trick/SimObject.hh \ ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadTrigger.hh \ ${TRICK_HOME}/include/trick/sim_mode.h object_${TRICK_HOST_CPU}/VariableServer_copy_data_freeze.o: VariableServer_copy_data_freeze.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -359,12 +293,10 @@ object_${TRICK_HOST_CPU}/VariableServer_copy_data_freeze.o: VariableServer_copy_ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh object_${TRICK_HOST_CPU}/VariableServer_default_data.o: VariableServer_default_data.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -377,12 +309,10 @@ object_${TRICK_HOST_CPU}/VariableServer_default_data.o: VariableServer_default_d ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh object_${TRICK_HOST_CPU}/VariableServer_freeze_init.o: VariableServer_freeze_init.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -395,14 +325,12 @@ object_${TRICK_HOST_CPU}/VariableServer_freeze_init.o: VariableServer_freeze_ini ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ ${TRICK_HOME}/include/trick/variable_server_proto.h \ ${TRICK_HOME}/include/trick/TrickConstant.hh object_${TRICK_HOST_CPU}/VariableServer.o: VariableServer.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -415,18 +343,16 @@ object_${TRICK_HOST_CPU}/VariableServer.o: VariableServer.cpp \ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ - ${TRICK_HOME}/include/trick/tc_proto.h \ - ${TRICK_HOME}/include/trick/tc.h -object_${TRICK_HOST_CPU}/vs_format_ascii.o: vs_format_ascii.cpp \ + ${TRICK_HOME}/include/trick/tc_proto.h +object_${TRICK_HOST_CPU}/vs_format_ascii.o: vs_format_ascii.cpp /usr/include/udunits2/udunits2.h \ + /usr/include/udunits2/converter.h \ ${TRICK_HOME}/include/trick/parameter_types.h \ ${TRICK_HOME}/include/trick/attributes.h \ ${TRICK_HOME}/include/trick/bitfield_proto.h \ ${TRICK_HOME}/include/trick/wcs_ext.h \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/value.h \ @@ -437,13 +363,11 @@ object_${TRICK_HOST_CPU}/vs_format_ascii.o: vs_format_ascii.cpp \ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ ${TRICK_HOME}/include/trick/TrickConstant.hh object_${TRICK_HOST_CPU}/VariableServerThread_restart.o: VariableServerThread_restart.cpp \ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ @@ -452,12 +376,10 @@ object_${TRICK_HOST_CPU}/VariableServerThread_restart.o: VariableServerThread_re ${TRICK_HOME}/include/trick/parameter_types.h \ ${TRICK_HOME}/include/trick/value.h \ ${TRICK_HOME}/include/trick/dllist.h \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/variable_server_sync_types.h object_${TRICK_HOST_CPU}/VariableServer_copy_data_top.o: VariableServer_copy_data_top.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -470,12 +392,10 @@ object_${TRICK_HOST_CPU}/VariableServer_copy_data_top.o: VariableServer_copy_dat ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh object_${TRICK_HOST_CPU}/exit_var_thread.o: exit_var_thread.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -488,14 +408,11 @@ object_${TRICK_HOST_CPU}/exit_var_thread.o: exit_var_thread.cpp \ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ - ${TRICK_HOME}/include/trick/tc_proto.h \ - ${TRICK_HOME}/include/trick/tc.h + ${TRICK_HOME}/include/trick/tc_proto.h object_${TRICK_HOST_CPU}/VariableServerThread_copy_data.o: VariableServerThread_copy_data.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -508,7 +425,6 @@ object_${TRICK_HOST_CPU}/VariableServerThread_copy_data.o: VariableServerThread_ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ ${TRICK_HOME}/include/trick/exec_proto.h \ ${TRICK_HOME}/include/trick/sim_mode.h \ @@ -518,7 +434,6 @@ object_${TRICK_HOST_CPU}/VariableServerThread_copy_data.o: VariableServerThread_ object_${TRICK_HOST_CPU}/VariableServerThread_connect.o: VariableServerThread_connect.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -531,14 +446,12 @@ object_${TRICK_HOST_CPU}/VariableServerThread_connect.o: VariableServerThread_co ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ ${TRICK_HOME}/include/trick/release.h object_${TRICK_HOST_CPU}/VariableServerThread_copy_sim_data.o: \ VariableServerThread_copy_sim_data.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -551,15 +464,563 @@ object_${TRICK_HOST_CPU}/VariableServerThread_copy_sim_data.o: \ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ ${TRICK_HOME}/include/trick/var.h \ - ${TRICK_HOME}/include/trick/io_alloc.h + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/VariableServerThread_freeze_init.o: VariableServerThread_freeze_init.cpp \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/VariableServer_get_var_server_port.o: \ + VariableServer_get_var_server_port.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh +object_${TRICK_HOST_CPU}/VariableServerThread.o: VariableServerThread.cpp \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/VariableServerThread_loop.o: VariableServerThread_loop.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/input_processor_proto.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/realtimesync_proto.h \ + ${TRICK_HOME}/include/trick/Clock.hh \ + ${TRICK_HOME}/include/trick/Timer.hh \ + ${TRICK_HOME}/include/trick/ExecutiveException.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/VariableServer_copy_data_scheduled.o: \ + VariableServer_copy_data_scheduled.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/VariableServer_shutdown.o: VariableServer_shutdown.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh +object_${TRICK_HOST_CPU}/VariableServer_copy_data_freeze_scheduled.o: \ + VariableServer_copy_data_freeze_scheduled.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/VariableReference.o: VariableReference.cpp \ + /usr/include/udunits2/udunits2.h /usr/include/udunits2/converter.h \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/wcs_ext.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/VariableServerThread_write_stdio.o: VariableServerThread_write_stdio.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/variable_server_message_types.h \ + ${TRICK_HOME}/include/trick/tc_proto.h +object_${TRICK_HOST_CPU}/VariableServerThread_commands.o: VariableServerThread_commands.cpp \ + /usr/include/udunits2/udunits2.h /usr/include/udunits2/converter.h \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/variable_server_message_types.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh \ + ${TRICK_HOME}/include/trick/sie_c_intf.h \ + ${TRICK_HOME}/include/trick/UdUnits.hh \ + ${TRICK_HOME}/include/trick/map_trick_units_to_udunits.hh +object_${TRICK_HOST_CPU}/VariableServer_get_next_sync_call_time.o: \ + VariableServer_get_next_sync_call_time.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/VariableServer_restart.o: VariableServer_restart.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/tc_proto.h +object_${TRICK_HOST_CPU}/var_server_ext.o: var_server_ext.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h +object_${TRICK_HOST_CPU}/VariableServerThread_create_socket.o: \ + VariableServerThread_create_socket.cpp \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/VariableServerListenThread.o: VariableServerListenThread.cpp \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/command_line_protos.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/VariableServerThread_write_data.o: VariableServerThread_write_data.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/variable_server_message_types.h \ + ${TRICK_HOME}/include/trick/bitfield_proto.h \ + ${TRICK_HOME}/include/trick/trick_byteswap.h \ + ${TRICK_HOME}/include/trick/tc_proto.h \ + ${TRICK_HOME}/include/trick/message_proto.h \ + ${TRICK_HOME}/include/trick/message_type.h +object_${TRICK_HOST_CPU}/VariableServer_init.o: VariableServer_init.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/exec_proto.hh \ + ${TRICK_HOME}/include/trick/Executive.hh \ + ${TRICK_HOME}/include/trick/Scheduler.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/ScheduledJobQueue.hh \ + ${TRICK_HOME}/include/trick/SimObject.hh \ + ${TRICK_HOME}/include/trick/Threads.hh \ + ${TRICK_HOME}/include/trick/ThreadTrigger.hh \ + ${TRICK_HOME}/include/trick/sim_mode.h +object_${TRICK_HOST_CPU}/VariableServer_copy_data_freeze.o: VariableServer_copy_data_freeze.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh +object_${TRICK_HOST_CPU}/VariableServer_default_data.o: VariableServer_default_data.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh +object_${TRICK_HOST_CPU}/VariableServer_freeze_init.o: VariableServer_freeze_init.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/variable_server_proto.h \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/VariableServer.o: VariableServer.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/tc_proto.h +object_${TRICK_HOST_CPU}/vs_format_ascii.o: vs_format_ascii.cpp /usr/include/udunits2/udunits2.h \ + /usr/include/udunits2/converter.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/bitfield_proto.h \ + ${TRICK_HOME}/include/trick/wcs_ext.h \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/VariableServerThread_restart.o: VariableServerThread_restart.cpp \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h +object_${TRICK_HOST_CPU}/VariableServer_copy_data_top.o: VariableServer_copy_data_top.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh +object_${TRICK_HOST_CPU}/exit_var_thread.o: exit_var_thread.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/tc_proto.h +object_${TRICK_HOST_CPU}/VariableServerThread_copy_data.o: VariableServerThread_copy_data.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h \ + ${TRICK_HOME}/include/trick/realtimesync_proto.h \ + ${TRICK_HOME}/include/trick/Clock.hh \ + ${TRICK_HOME}/include/trick/Timer.hh +object_${TRICK_HOST_CPU}/VariableServer_get_next_freeze_call_time.o: \ + VariableServer_get_next_freeze_call_time.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/TrickConstant.hh +object_${TRICK_HOST_CPU}/VariableServerThread_connect.o: VariableServerThread_connect.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/release.h +object_${TRICK_HOST_CPU}/VariableServerThread_copy_sim_data.o: \ + VariableServerThread_copy_sim_data.cpp \ + ${TRICK_HOME}/include/trick/VariableServer.hh \ + ${TRICK_HOME}/include/trick/tc.h \ + ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ + ${TRICK_HOME}/include/trick/reference.h \ + ${TRICK_HOME}/include/trick/attributes.h \ + ${TRICK_HOME}/include/trick/parameter_types.h \ + ${TRICK_HOME}/include/trick/value.h \ + ${TRICK_HOME}/include/trick/dllist.h \ + ${TRICK_HOME}/include/trick/JobData.hh \ + ${TRICK_HOME}/include/trick/InstrumentBase.hh \ + ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ + ${TRICK_HOME}/include/trick/VariableServerThread.hh \ + ${TRICK_HOME}/include/trick/ThreadBase.hh \ + ${TRICK_HOME}/include/trick/VariableServerReference.hh \ + ${TRICK_HOME}/include/trick/VariableServerListenThread.hh \ + ${TRICK_HOME}/include/trick/memorymanager_c_intf.h \ + ${TRICK_HOME}/include/trick/var.h \ + ${TRICK_HOME}/include/trick/io_alloc.h \ + ${TRICK_HOME}/include/trick/exec_proto.h \ + ${TRICK_HOME}/include/trick/sim_mode.h object_${TRICK_HOST_CPU}/VariableServerThread_freeze_init.o: VariableServerThread_freeze_init.cpp \ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ @@ -568,14 +1029,12 @@ object_${TRICK_HOST_CPU}/VariableServerThread_freeze_init.o: VariableServerThrea ${TRICK_HOME}/include/trick/parameter_types.h \ ${TRICK_HOME}/include/trick/value.h \ ${TRICK_HOME}/include/trick/dllist.h \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ ${TRICK_HOME}/include/trick/TrickConstant.hh object_${TRICK_HOST_CPU}/VariableServer_get_var_server_port.o: \ VariableServer_get_var_server_port.cpp \ ${TRICK_HOME}/include/trick/VariableServer.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/reference.h \ ${TRICK_HOME}/include/trick/attributes.h \ @@ -588,12 +1047,10 @@ object_${TRICK_HOST_CPU}/VariableServer_get_var_server_port.o: \ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/VariableServerListenThread.hh object_${TRICK_HOST_CPU}/VariableServerThread.o: VariableServerThread.cpp \ ${TRICK_HOME}/include/trick/VariableServerThread.hh \ ${TRICK_HOME}/include/trick/tc.h \ - ${TRICK_HOME}/include/trick/trick_byteswap.h \ ${TRICK_HOME}/include/trick/trick_error_hndlr.h \ ${TRICK_HOME}/include/trick/ThreadBase.hh \ ${TRICK_HOME}/include/trick/VariableServerReference.hh \ @@ -602,7 +1059,6 @@ object_${TRICK_HOST_CPU}/VariableServerThread.o: VariableServerThread.cpp \ ${TRICK_HOME}/include/trick/parameter_types.h \ ${TRICK_HOME}/include/trick/value.h \ ${TRICK_HOME}/include/trick/dllist.h \ - ${TRICK_HOME}/include/trick/UCFn.hh \ ${TRICK_HOME}/include/trick/variable_server_sync_types.h \ ${TRICK_HOME}/include/trick/exec_proto.h \ ${TRICK_HOME}/include/trick/sim_mode.h \ diff --git a/trick_source/sim_services/VariableServer/VariableServerThread_commands.cpp b/trick_source/sim_services/VariableServer/VariableServerThread_commands.cpp index e92e13d6..b7314c1f 100644 --- a/trick_source/sim_services/VariableServer/VariableServerThread_commands.cpp +++ b/trick_source/sim_services/VariableServer/VariableServerThread_commands.cpp @@ -9,7 +9,6 @@ #include "trick/tc_proto.h" #include "trick/exec_proto.h" #include "trick/command_line_protos.h" -#include "trick/Unit.hh" #include "trick/message_proto.h" #include "trick/message_type.h" #include "trick/TrickConstant.hh" diff --git a/trick_source/trick_swig/sim_services.i b/trick_source/trick_swig/sim_services.i index 88d4c08d..4bb17c26 100644 --- a/trick_source/trick_swig/sim_services.i +++ b/trick_source/trick_swig/sim_services.i @@ -135,7 +135,6 @@ #include "trick/variable_server_proto.h" #include "trick/vval.h" #include "trick/Flag.h" -#include "trick/Unit.hh" #include "trick/UdUnits.hh" #ifdef USE_ER7_UTILS_INTEGRATORS diff --git a/trick_source/trick_swig/swig_convert_units.cpp b/trick_source/trick_swig/swig_convert_units.cpp index 213d7ba5..85622e07 100644 --- a/trick_source/trick_swig/swig_convert_units.cpp +++ b/trick_source/trick_swig/swig_convert_units.cpp @@ -3,7 +3,6 @@ #include #include -#include "trick/Unit.hh" #include "trick/UdUnits.hh" int convert_united_value( std::string & to_units , std::string & from_units , long long * val ) { diff --git a/trick_source/trick_swig/swig_double.cpp b/trick_source/trick_swig/swig_double.cpp index e37fd725..3149a04e 100644 --- a/trick_source/trick_swig/swig_double.cpp +++ b/trick_source/trick_swig/swig_double.cpp @@ -5,8 +5,6 @@ #include "trick/swig/swig_int.hh" #include "trick/swig/swig_convert_units.hh" -#include "trick/Unit.hh" - char swig_double::str_output[32] ; swig_double::swig_double() { diff --git a/trick_source/trick_swig/swig_int.cpp b/trick_source/trick_swig/swig_int.cpp index 9fb664fc..112a5631 100644 --- a/trick_source/trick_swig/swig_int.cpp +++ b/trick_source/trick_swig/swig_int.cpp @@ -5,8 +5,6 @@ #include "trick/swig/swig_double.hh" #include "trick/swig/swig_convert_units.hh" -#include "trick/Unit.hh" - char swig_int::str_output[32] ; swig_int::swig_int() { diff --git a/trick_source/trick_utils/units/src/units_conv.c b/trick_source/trick_utils/units/src/units_conv.c index f7b5fe9e..ec8612b6 100644 --- a/trick_source/trick_utils/units/src/units_conv.c +++ b/trick_source/trick_utils/units/src/units_conv.c @@ -423,8 +423,10 @@ struct { { Length , "yd", "m", "yards", 1,English, {{ 0.0 , 0.9144 }} }, { Length , "mi", "m", "miles", 1,English, {{ 0.0 , 1609.344 }} }, { Length , "n.m.", "m", "nautical-miles", 7,English, {{ 0.0 , 1852.0 }} }, + { Length , "nmile", "m", "nautical-miles", 7,English, {{ 0.0 , 1852.0 }} }, { Angle , "r", "r", "radians", 1,Standard, {{ 0.0 , 1.0 }} }, + { Angle , "rad", "r", "radians", 1,Standard, {{ 0.0 , 1.0 }} }, { Angle , "pr", "r", "pico-radians", 7,Standard, {{ 0.0 , 1.0 * PICO }} }, { Angle , "nr", "r", "nano-radians", 7,Standard, {{ 0.0 , 1.0 * NANO }} }, { Angle , "ur", "r", "micro-radians", 7,Standard, {{ 0.0 , 1.0 * MICRO }} }, @@ -437,9 +439,13 @@ struct { { Angle , "Gr", "r", "giga-radians", 7,Standard, {{ 0.0 , 1.0 * GIGA }} }, { Angle , "Tr", "r", "tera-radians", 7,Standard, {{ 0.0 , 1.0 * TERA }} }, { Angle , "d", "r", "degrees", 1,Standard, {{ 0.0 , 0.0174532925199433 }} }, + { Angle , "degree", "r", "degrees", 1,Standard, {{ 0.0 , 0.0174532925199433 }} }, { Angle , "as", "r", "arc-seconds", 1,Standard, {{ 0.0 , 4.848136811095362e-06 }} }, + { Angle , "arcsecond", "r", "arc-seconds", 1,Standard, {{ 0.0 , 4.848136811095362e-06 }} }, { Angle , "am", "r", "arc-minutes", 1,Standard, {{ 0.0 , 0.0002908882086657216 }} }, + { Angle , "arcminute", "r", "arc-minutes", 1,Standard, {{ 0.0 , 0.0002908882086657216 }} }, { Angle , "rev", "r", "revolutions", 1,Standard, {{ 0.0 , 6.28318530717958647 }} }, + { Angle , "revolution", "r","revolutions", 1,Standard, {{ 0.0 , 6.28318530717958647 }} }, { Mass , "g", "kg", "grams", 1,Metric, {{ 0.0 , MILLI }} }, { Mass , "pg", "kg", "pico-grams", 1,Metric, {{ 0.0 , MILLI * PICO }} }, @@ -455,8 +461,11 @@ struct { { Mass , "Gg", "kg", "giga-grams", 7,Metric, {{ 0.0 , MILLI * GIGA }} }, { Mass , "Tg", "kg", "tera-grams", 7,Metric, {{ 0.0 , MILLI * TERA }} }, { Mass , "mt", "kg", "metric-tons", 1,Metric, {{ 0.0 , 1000.0 }} }, + { Mass , "t", "kg", "metric-tons", 1,Metric, {{ 0.0 , 1000.0 }} }, { Mass , "sl", "kg", "slugs", 1,English, {{ 0.0 , 14.5939029372064 }} }, + { Mass , "slug", "kg", "slugs", 1,English, {{ 0.0 , 14.5939029372064 }} }, { Mass , "lbm", "kg", "pound(mass)", 1,English, {{ 0.0 , 0.4535923697760192 }} }, + { Mass , "lb", "kg", "pound(mass)", 1,English, {{ 0.0 , 0.4535923697760192 }} }, { Force , "N", "N", "newtons", 1,Metric, {{ 0.0 , 1.0 }} }, { Force , "pN", "N", "pico-newtons", 7,Metric, {{ 0.0 , PICO }} }, @@ -472,9 +481,11 @@ struct { { Force , "GN", "N", "giga-newtons", 7,Metric, {{ 0.0 , GIGA }} }, { Force , "TN", "N", "tera-newtons", 7,Metric, {{ 0.0 , TERA }} }, { Force , "oz", "N", "ounces", 1,English, {{ 0.0 , 0.27801385 }} }, + { Force , "ozf", "N", "ounces", 1,English, {{ 0.0 , 0.27801385 }} }, { Force , "lbf", "N", "pound(force)", 1,English, {{ 0.0 , 4.4482216152605 }} }, { Voltage , "v", "v", "volts", 1,Standard, {{ 0.0 , 1.0 }} }, + { Voltage , "V", "v", "volts", 1,Standard, {{ 0.0 , 1.0 }} }, { Voltage , "pv", "v", "pico-volts", 7,Standard, {{ 0.0 , PICO }} }, { Voltage , "nv", "v", "nano-volts", 7,Standard, {{ 0.0 , NANO }} }, { Voltage , "uv", "v", "micro-volts", 7,Standard, {{ 0.0 , MICRO }} }, @@ -517,9 +528,12 @@ struct { { Resistance , "Tohm", "ohm", "tera-ohms", 7,Standard, {{ 0.0 , TERA }} }, { Temperature, "C", "C", "degrees-celsius", 1,Metric, {{ 0.0 , 1.0 }} }, + { Temperature, "degC","C", "degrees-celsius", 1,Metric, {{ 0.0 , 1.0 }} }, { Temperature, "K", "C", "degrees-kelvin", 1,Metric, {{ -273.15 , 1.0 }} }, { Temperature, "F", "C", "degrees-fahrenheit",1,English, {{ -17.777777777777778, 0.55555555555555556 }} }, + { Temperature, "degF","C", "degrees-fahrenheit",1,English, {{ -17.777777777777778, 0.55555555555555556 }} }, { Temperature, "R", "C", "degrees-rankine", 1,English, {{ -273.15 , 0.55555555555555556 }} }, + { Temperature, "degR","C", "degrees-rankine", 1,English, {{ -273.15 , 0.55555555555555556 }} }, { Sound, "dB", "dB", "decibels", 1,Standard, {{ 0.0 , 1.0 }} }, @@ -538,6 +552,7 @@ struct { {Energy, "TJ", "J", "tera-joule", 9,Metric, {{ 0.0 , TERA }} }, {Energy, "BTU", "J", "british-thermal", 9,English, {{ 0.0 , 1055.056 }} }, {Energy, "TNT", "J", "ton-tnt", 9,Metric, {{ 0.0 , 4.184 * GIGA }} }, + {Energy, "ton_TNT", "J","ton-tnt", 9,Metric, {{ 0.0 , 4.184 * GIGA }} }, {Energy, "Wh", "J", "watt-hour", 9,Metric, {{ 0.0 , 3600 }} }, {Energy, "kWh", "J", "kilo-watt-hour", 9,Metric, {{ 0.0 , 3600000 }} }, @@ -590,11 +605,13 @@ struct { {Volume, "Gl", "l", "giga-liter", 10,Metric, {{ 0.0 , GIGA }} }, {Volume, "Tl", "l", "tera-liter", 10,Metric, {{ 0.0 , TERA }} }, {Volume, "gal", "l", "gallon", 10,English, {{ 0.0 , 3.785412 }} }, + {Volume, "gallon", "l", "gallon", 10,English, {{ 0.0 , 3.785412 }} }, {Volume, "floz","l", "fluid ounce", 10,English, {{ 0.0 , 0.02957353 }} }, { Unitless, "1", "--", "", 1,Standard, {{ 0.0 , 1.0 }} }, { Unitless, "--", "--", "", 1,Standard, {{ 0.0 , 1.0 }} }, { Unitless, "cnt", "--", "", 1,Standard, {{ 0.0 , 1.0 }} }, + { Unitless, "count", "--", "", 1,Standard, {{ 0.0 , 1.0 }} }, { Unitless, "mol", "--", "", 7,Standard, {{ 0.0 , 6.02214179e+23 }} }, { Unitless, "one", "--", "", 1,Standard, {{ 0.0 , 1.0 }} },