Skip to content

Add MeyerFregly2016Force #4234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nickbianco wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add MeyerFregly2016Force #4234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Bindings/OpenSimHeaders_simulation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
#include <OpenSim/Simulation/Model/BushingForce.h>
#include <OpenSim/Simulation/Model/FunctionBasedBushingForce.h>
#include <OpenSim/Simulation/Model/ExpressionBasedBushingForce.h>
#include <OpenSim/Simulation/Model/MeyerFregly2016Force.h>

#include <OpenSim/Simulation/Solver.h>
#include <OpenSim/Simulation/AssemblySolver.h>
Expand Down
1 change: 1 addition & 0 deletions Bindings/simulation.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ OpenSim::ModelComponentSet<OpenSim::Controller>;
%include <OpenSim/Simulation/Model/ElasticFoundationForce.h>
%include <OpenSim/Simulation/Model/HuntCrossleyForce.h>
%include <OpenSim/Simulation/Model/SmoothSphereHalfSpaceForce.h>
%include <OpenSim/Simulation/Model/MeyerFregly2016Force.h>

%include <OpenSim/Simulation/Model/Actuator.h>
%template(SetActuators) OpenSim::Set<OpenSim::Actuator, OpenSim::Object>;
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ performance and stability in wrapping solutions.
- Breaking: removed the `operator==` and `operator<` overloads in `ControlLinearNode` and replaced usages with the equivalent utility functions `isEqual()` and `isLessThan()`. (#4095)
- Made various changes to support builds on Ubuntu 24.04 with GCC 13. (#4186)
- Support building PYPI distribution python wheels on all platforms, upgrade builds to python 3.11 and numpy 2.0. (#4189)
- Completed the implementation of the `MeyerFregly2016Force` class to support NMSM Pipeline-equivalent contact models in Moco. (#4234)
- The experimental classes `AckermannVanDenBogert2010Force` and `EspositoMiller2018Force` have been removed. (#4234)


v4.5.2
Expand Down
3 changes: 3 additions & 0 deletions OpenSim/Actuators/Test/testModelProcessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
#include <OpenSim/Analyses/MuscleAnalysis.h>
#include <OpenSim/Moco/osimMoco.h>
#include <OpenSim/Simulation/SimbodyEngine/PinJoint.h>
#include <OpenSim/Simulation/SimbodyEngine/SliderJoint.h>
#include <OpenSim/Simulation/StatesTrajectoryReporter.h>
#include <OpenSim/Simulation/Manager/Manager.h>

#include <catch2/catch_all.hpp>

Expand Down
1 change: 1 addition & 0 deletions OpenSim/Examples/Moco/example2DWalking/example2DWalkingMetabolics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@

#include <OpenSim/Moco/MocoGoal/MocoOutputGoal.h>
#include <OpenSim/Moco/osimMoco.h>
#include <OpenSim/Simulation/Model/Bhargava2004SmoothedMuscleMetabolics.h>

using namespace OpenSim;

Expand Down
1 change: 1 addition & 0 deletions OpenSim/Examples/Moco/example3DWalking/exampleMocoInverse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

#include <OpenSim/Actuators/ModelOperators.h>
#include <OpenSim/Common/Adapters.h>
#include <OpenSim/Simulation/Control/SynergyController.h>
#include <OpenSim/Moco/osimMoco.h>

using namespace OpenSim;
Expand Down
1 change: 1 addition & 0 deletions ...es/Moco/exampleCustomImplicitAuxiliaryDynamics/exampleCustomImplicitAuxiliaryDynamics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* -------------------------------------------------------------------------- */

#include <OpenSim/Moco/osimMoco.h>
#include <OpenSim/Simulation/Manager/Manager.h>

using namespace OpenSim;

Expand Down
5 changes: 4 additions & 1 deletion OpenSim/Examples/Moco/exampleHangingMuscle/exampleHangingMuscle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,11 @@
#include <OpenSim/Analyses/MuscleAnalysis.h>
#include <OpenSim/Analyses/ProbeReporter.h>
#include <OpenSim/Common/STOFileAdapter.h>
#include <OpenSim/Moco/osimMoco.h>
#include <OpenSim/Simulation/SimbodyEngine/PinJoint.h>
#include <OpenSim/Simulation/SimbodyEngine/SliderJoint.h>
#include <OpenSim/Simulation/Model/Umberger2010MuscleMetabolicsProbe.h>
#include <OpenSim/Simulation/Control/PrescribedController.h>
#include <OpenSim/Moco/osimMoco.h>
#include <OpenSim/Tools/AnalyzeTool.h>

using namespace OpenSim;
Expand Down
1 change: 1 addition & 0 deletions OpenSim/Examples/Moco/exampleMocoCustomEffortGoal/exampleMocoCustomEffortGoal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include "MocoCustomEffortGoal.h"

#include <OpenSim/Simulation/SimbodyEngine/SliderJoint.h>
#include <OpenSim/Actuators/ActivationCoordinateActuator.h>
#include <OpenSim/Moco/osimMoco.h>

Expand Down
2 changes: 0 additions & 2 deletions OpenSim/Moco/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ set(MOCO_SOURCES
MocoFrameDistanceConstraint.cpp
MocoOutputConstraint.h
MocoOutputConstraint.cpp
Components/StationPlaneContactForce.h
Components/StationPlaneContactForce.cpp
Components/DiscreteForces.h
Components/DiscreteForces.cpp
Components/AccelerationMotion.h
Expand Down
55 changes: 0 additions & 55 deletions OpenSim/Moco/Components/StationPlaneContactForce.cpp
View file
Open in desktop

This file was deleted.

Loading
Loading