Split test sims and fun sims into separate directories.

I created an ODE directory and moved the ODE sims into it.  I moved
the Ball++ models into SIM_Ball++_L1 and flattened the directory
structure.

refs #191

trick_sims/ODE/SIM_ode_ball/S_define

@@ -10,8 +10,8 @@ LIBRARY DEPENDENCIES:
 
 #include "sim_objects/default_trick_sys.sm"
 
-##include "ODE/Ball/Ball.hh"
+##include "Ball/Ball.hh"
-##include "ODE/DrawStuff/DrawStuff.hh"
+##include "DrawStuff/DrawStuff.hh"
 
 %{
 const double OdeBallSimObject::time_step = 0.01 ;

trick_sims/ODE/SIM_ode_ball/S_overrides.mk

@@ -5,7 +5,7 @@ TRICK_ICG_EXCLUDE = ${ODE_HOME}
 TRICK_ICG_NOCOMMENT = ${ODE_HOME}
 TRICK_SWIG_EXCLUDE = ${ODE_HOME}
 
-TRICK_CFLAGS += -I${TRICK_HOME}/trick_models -I${ODE_HOME}/include -I${ODE_HOME}
+TRICK_CFLAGS += -I./models -I../models -I${ODE_HOME}/include -I${ODE_HOME}
-TRICK_CXXFLAGS += -I${TRICK_HOME}/trick_models -I${ODE_HOME}/include -I${ODE_HOME}
+TRICK_CXXFLAGS += -I./models -I../models -I${ODE_HOME}/include -I${ODE_HOME}
 
 TRICK_EXEC_LINK_LIBS += -L${ODE_HOME}/drawstuff/src/.libs -ldrawstuff -L${ODE_HOME}/ode/src/.libs -lode -lGLU -lGL -L/usr/X11R6/lib -lXext -lX11

trick_sims/ODE/SIM_ode_ball/models/Ball/Ball.hh

@@ -11,7 +11,7 @@ LIBRARY DEPENDENCY:
 
 #include <ode/common.h>
 #include <ode/src/objects.h>
-#include "ODE/DrawStuff/DrawStuffObject.hh"
+#include "DrawStuff/DrawStuffObject.hh"
 
 class Ball : public DrawStuffObject {
     public:

trick_sims/ODE/SIM_ode_buggy/S_define

@@ -10,8 +10,8 @@ LIBRARY DEPENDENCIES:
 
 #include "sim_objects/default_trick_sys.sm"
 
-##include "ODE/Buggy/Buggy.hh"
+##include "Buggy/Buggy.hh"
-##include "ODE/DrawStuff/DrawStuff.hh"
+##include "DrawStuff/DrawStuff.hh"
 
 %{
 const double BuggySimObject::time_step = 0.05 ;

trick_sims/ODE/SIM_ode_buggy/S_overrides.mk

@@ -5,7 +5,7 @@ TRICK_ICG_EXCLUDE = ${ODE_HOME}
 TRICK_ICG_NOCOMMENT = ${ODE_HOME}
 TRICK_SWIG_EXCLUDE = ${ODE_HOME}
 
-TRICK_CFLAGS += -I${TRICK_HOME}/trick_models -I${ODE_HOME}/include -I${ODE_HOME}
+TRICK_CFLAGS += -I./models -I../models -I${ODE_HOME}/include -I${ODE_HOME}
-TRICK_CXXFLAGS += -I${TRICK_HOME}/trick_models -I${ODE_HOME}/include -I${ODE_HOME}
+TRICK_CXXFLAGS += -I./models -I../models -I${ODE_HOME}/include -I${ODE_HOME}
 
 TRICK_EXEC_LINK_LIBS += -L${ODE_HOME}/drawstuff/src/.libs -ldrawstuff -L${ODE_HOME}/ode/src/.libs -lode -lGLU -lGL -L/usr/X11R6/lib -lXext -lX11

trick_sims/ODE/SIM_ode_buggy/models/Buggy/Buggy.hh

@@ -11,7 +11,7 @@ LIBRARY DEPENDENCY:
 
 #include <ode/common.h>
 #include <ode/src/objects.h>
-#include "ODE/DrawStuff/DrawStuffObject.hh"
+#include "DrawStuff/DrawStuffObject.hh"
 
 #if SWIG
 %apply float { dReal }

trick_sims/SIM_Ball++_L1/S_define

@@ -9,7 +9,7 @@ LIBRARY DEPENDENCIES:
 #define TRICK_JSON_VARIABLE_SERVER
 #include "sim_objects/default_trick_sys.sm"
 
-##include "Ball++/L1/include/Ball.hh"
+##include "Ball.hh"
 
 /**
   This class is the base ball class

trick_sims/SIM_Ball++_L1/S_overrides.mk

@@ -2,6 +2,6 @@
 # Uncomment this to compile the simulation without a python input processor.
 #TRICK_CPFLAGS = --no_python
 
-TRICK_CFLAGS += -I${TRICK_HOME}/trick_models
+TRICK_CFLAGS += -I./models
-TRICK_CXXFLAGS += -I${TRICK_HOME}/trick_models
+TRICK_CXXFLAGS += -I./models
 

trick_sims/SIM_Ball++_L1/models/Ball.cpp

@@ -24,7 +24,7 @@ PROGRAMMERS:
 #include <iostream>
 
 /* Model include files. */
-#include "../include/Ball.hh"
+#include "Ball.hh"
 
 // Default consructor.
 Ball::Ball() /* RETURN: -- None. */

trick_sims/SIM_Ball++_L1/models/Ball.hh

@@ -15,13 +15,13 @@ ASSUMPTIONS AND LIMITATIONS:
     ((2 dimensional space)
      (Translational EOM only))
 LIBRARY DEPENDENCY:
-    ((../src/Ball.cpp)
+    ((Ball.cpp)
-     (../src/BallStateDeriv.cpp)
+     (BallStateDeriv.cpp)
-     (../src/BallStateInit.cpp)
+     (BallStateInit.cpp)
-     (../src/BallStateInteg.cpp)
+     (BallStateInteg.cpp)
-     (../src/BallStatePrint.cpp)
+     (BallStatePrint.cpp)
-     (../src/BallForceField.cpp)
+     (BallForceField.cpp)
-     (../src/BallShutdown.cpp))
+     (BallShutdown.cpp))
 PROGRAMMERS:
     (((Robert W. Bailey) (Sweet Systems Inc) (March 1997) (Tutorial Lesson 1))
      ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
@@ -43,7 +43,7 @@ PROGRAMMERS:
     @brief ball in C++
  */
 
-#include "sim_services/include/mm_macros.hh"
+#include "trick/mm_macros.hh"
 
 class Ball {
 

trick_sims/SIM_Ball++_L1/models/BallForce.cpp

@@ -1,5 +1,5 @@
 
-#include "Ball++/L1/include/BallForce.hh"
+#include "BallForce.hh"
 
 BallForceInput::BallForceInput() {
 

trick_sims/SIM_Ball++_L1/models/BallForceField.cpp

@@ -27,7 +27,7 @@ PROGRAMMERS:
 #include <math.h>
 
 /* Model include files. */
-#include "../include/Ball.hh"
+#include "Ball.hh"
 
 /* ENTRY POINT */
 int Ball::force_field() /* RETURN: -- Always return zero. */

trick_sims/SIM_Ball++_L1/models/BallForce_default_data.cpp

@@ -28,7 +28,7 @@ PROGRAMMERS:
 #include <math.h>
 
 /* Model include files. */
-#include "../include/BallForce.hh"
+#include "BallForce.hh"
 
 /* ENTRY POINT */
 int BallForce::default_data() {

trick_sims/SIM_Ball++_L1/models/BallShutdown.cpp

@@ -22,10 +22,10 @@ PROGRAMMERS:
      ((Edwin Z. Crues)(Titan Systems Corp.)(Jan 2002)(Crude C++ translation)))
 *******************************************************************************/
 
-#include "sim_services/UnitTest/include/trick_tests.h"
+#include "trick/trick_tests.h"
 
 /* Model include files. */
-#include "../include/Ball.hh"
+#include "Ball.hh"
 
      /* ENTRY POINT */
 int Ball::shutdown() {

trick_sims/SIM_Ball++_L1/models/BallState.cpp

@@ -1,9 +1,9 @@
 
 #include <stdio.h>
 
-#include "Ball++/L1/include/BallState.hh"
+#include "BallState.hh"
-#include "trick_utils/units/include/constant.h"
+#include "trick/constant.h"
-#include "sim_services/MemoryManager/include/memorymanager_c_intf.h"
+#include "trick/memorymanager_c_intf.h"
 
 BallStateInput::BallStateInput() {
 

trick_sims/SIM_Ball++_L1/models/BallStateDeriv.cpp

@@ -28,10 +28,10 @@ PROGRAMMERS:
 #include <iostream>
 
 /* Trick include files. */
-#include "sim_services/include/collect_macros.h"
+#include "trick/collect_macros.h"
 
 /* Model include files. */
-#include "../include/Ball.hh"
+#include "Ball.hh"
 
 /* ENTRY POINT */
 int Ball::state_deriv() /* RETURN: -- Always return zero. */

trick_sims/SIM_Ball++_L1/models/BallStateInit.cpp

@@ -26,7 +26,7 @@ PROGRAMMERS:
 #include <math.h>
 
 /* Model include files. */
-#include "../include/Ball.hh"
+#include "Ball.hh"
 
      /* ENTRY POINT */
 int Ball::state_init() /* RETURN: -- Always return zero. */

trick_sims/SIM_Ball++_L1/models/BallStateInteg.cpp

@@ -27,8 +27,8 @@ PROGRAMMERS:
 /* Model include files. */
 #include <stdio.h>
 
-#include "sim_services/Integrator/include/integrator_c_intf.h"
+#include "trick/integrator_c_intf.h"
-#include "../include/Ball.hh"
+#include "Ball.hh"
 #include <iostream>
 
 /* ENTRY POINT */

trick_sims/SIM_Ball++_L1/models/BallStatePrint.cpp

@@ -28,10 +28,10 @@ PROGRAMMERS:
 #include <unistd.h>
 
 /* Model include files. */
-#include "../include/Ball.hh"
+#include "Ball.hh"
-#include "sim_services/Executive/include/exec_proto.hh"
+#include "trick/exec_proto.hh"
-#include "sim_services/Executive/include/exec_proto.h"
+#include "trick/exec_proto.h"
-#include "sim_services/Message/include/message_proto.h"
+#include "trick/message_proto.h"
 
      /* ENTRY POINT */
 int Ball::state_print() {

trick_sims/SIM_Ball++_L1/models/BallState_default_data.cpp

@@ -27,9 +27,9 @@ PROGRAMMERS:
 #include <stdlib.h>
 
 /* Model include files. */
-#include "trick_utils/units/include/constant.h"
+#include "BallState.hh"
-#include "../include/BallState.hh"
+#include "trick/constant.h"
-#include "sim_services/MemoryManager/include/memorymanager_c_intf.h"
+#include "trick/memorymanager_c_intf.h"
 
 /* ENTRY POINT */
 int BallState::default_data() {