From b52e38b5a51d419e9c95227f5dde683641983d94 Mon Sep 17 00:00:00 2001
From: Adam Kewley <contact@adamkewley.com>
Date: Wed, 27 Nov 2024 10:59:41 +0100
Subject: [PATCH] Remove Moco mentions/dependenices from OpenSim/Simulation

---
 OpenSim/Actuators/DeGrooteFregly2016Muscle.h           |  6 +++---
 OpenSim/Actuators/ModelFactory.cpp                     |  2 +-
 .../Model/Bhargava2004SmoothedMuscleMetabolics.cpp     |  2 +-
 .../Model/Bhargava2004SmoothedMuscleMetabolics.h       | 10 +++++-----
 OpenSim/Simulation/PositionMotion.cpp                  |  3 +--
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/OpenSim/Actuators/DeGrooteFregly2016Muscle.h b/OpenSim/Actuators/DeGrooteFregly2016Muscle.h
index cc856845c4..45380c653e 100644
--- a/OpenSim/Actuators/DeGrooteFregly2016Muscle.h
+++ b/OpenSim/Actuators/DeGrooteFregly2016Muscle.h
@@ -1,5 +1,5 @@
-#ifndef MOCO_DEGROOTEFREGLY2016MUSCLE_H
-#define MOCO_DEGROOTEFREGLY2016MUSCLE_H
+#ifndef DEGROOTEFREGLY2016MUSCLE_H
+#define DEGROOTEFREGLY2016MUSCLE_H
 /* -------------------------------------------------------------------------- *
  *                 OpenSim:  DeGrooteFregly2016Muscle.h                       *
  * -------------------------------------------------------------------------- *
@@ -1002,4 +1002,4 @@ class OSIMACTUATORS_API DeGrooteFregly2016Muscle : public Muscle {
 
 } // namespace OpenSim
 
-#endif // MOCO_DEGROOTEFREGLY2016MUSCLE_H
+#endif // DEGROOTEFREGLY2016MUSCLE_H
diff --git a/OpenSim/Actuators/ModelFactory.cpp b/OpenSim/Actuators/ModelFactory.cpp
index 49387bcc3a..cd8bde3dfa 100644
--- a/OpenSim/Actuators/ModelFactory.cpp
+++ b/OpenSim/Actuators/ModelFactory.cpp
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- *
- * OpenSim Moco: ModelFactory.cpp                                             *
+ *                          ModelFactory.cpp                                  *
  * -------------------------------------------------------------------------- *
  * Copyright (c) 2018 Stanford University and the Authors                     *
  *                                                                            *
diff --git a/OpenSim/Simulation/Model/Bhargava2004SmoothedMuscleMetabolics.cpp b/OpenSim/Simulation/Model/Bhargava2004SmoothedMuscleMetabolics.cpp
index 74c1eb1797..4e9249c29a 100644
--- a/OpenSim/Simulation/Model/Bhargava2004SmoothedMuscleMetabolics.cpp
+++ b/OpenSim/Simulation/Model/Bhargava2004SmoothedMuscleMetabolics.cpp
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- *
- * OpenSim Moco: Bhargava2004Metabolics.cpp                                   *
+ *               Bhargava2004SmoothedMuscleMetabolics.cpp                     *
  * -------------------------------------------------------------------------- *
  * Copyright (c) 2020 Stanford University and the Authors                     *
  *                                                                            *
diff --git a/OpenSim/Simulation/Model/Bhargava2004SmoothedMuscleMetabolics.h b/OpenSim/Simulation/Model/Bhargava2004SmoothedMuscleMetabolics.h
index c8b5c94490..79e380a975 100644
--- a/OpenSim/Simulation/Model/Bhargava2004SmoothedMuscleMetabolics.h
+++ b/OpenSim/Simulation/Model/Bhargava2004SmoothedMuscleMetabolics.h
@@ -1,7 +1,7 @@
-#ifndef MOCO_BHARGAVA2004SMOOTHEDMUSCLEMETABOLICS_H
-#define MOCO_BHARGAVA2004SMOOTHEDMUSCLEMETABOLICS_H
+#ifndef BHARGAVA2004SMOOTHEDMUSCLEMETABOLICS_H
+#define BHARGAVA2004SMOOTHEDMUSCLEMETABOLICS_H
 /* -------------------------------------------------------------------------- *
- * OpenSim Moco: Bhargava2004SmoothedMuscleMetabolics.h                       *
+ *                 Bhargava2004SmoothedMuscleMetabolics.h                     *
  * -------------------------------------------------------------------------- *
  * Copyright (c) 2020 Stanford University and the Authors                     *
  *                                                                            *
@@ -19,7 +19,7 @@
  * limitations under the License.                                             *
  * -------------------------------------------------------------------------- */
 
-#include <OpenSim/Moco/osimMocoDLL.h>
+#include <OpenSim/Simulation/osimSimulationDLL.h>
 #include <unordered_map>
 
 #include <OpenSim/Common/PiecewiseLinearFunction.h>
@@ -380,4 +380,4 @@ class OSIMSIMULATION_API Bhargava2004SmoothedMuscleMetabolics
 
 } // namespace OpenSim
 
-#endif // MOCO_BHARGAVA2004SMOOTHEDMUSCLEMETABOLICS_H
+#endif // BHARGAVA2004SMOOTHEDMUSCLEMETABOLICS_H
diff --git a/OpenSim/Simulation/PositionMotion.cpp b/OpenSim/Simulation/PositionMotion.cpp
index 4894434a2f..584fb73396 100644
--- a/OpenSim/Simulation/PositionMotion.cpp
+++ b/OpenSim/Simulation/PositionMotion.cpp
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- *
- * OpenSim Moco: PositionMotion.cpp                                           *
+ *                           PositionMotion.cpp                               *
  * -------------------------------------------------------------------------- *
  * Copyright (c) 2019 Stanford University and the Authors                     *
  *                                                                            *
@@ -20,7 +20,6 @@
 
 #include <OpenSim/Common/Function.h>
 #include <OpenSim/Common/GCVSplineSet.h>
-#include <OpenSim/Moco/MocoUtilities.h>
 #include <OpenSim/Simulation/Model/Model.h>
 #include <OpenSim/Simulation/SimbodyEngine/Coordinate.h>
 #include <OpenSim/Simulation/StatesTrajectory.h>