Merge pull request #4011 from opensim-org/fix_cleanup-old-moco-mentions

Remove Moco mentions/dependenices from OpenSim/Simulation
opensim-org · Feb 7, 2025 · 5166751 · 5166751
2 parents 33298c3 + b52e38b
commit 5166751
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git 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                       *
  * -------------------------------------------------------------------------- *
@@ -1017,4 +1017,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
@@ -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
@@ -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
@@ -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
@@ -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>