Skip to content
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.

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

Add NMSM Pipeline muscle model for use in Moco #3908

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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_actuators.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <OpenSim/Actuators/Millard2012AccelerationMuscle.h>
#include <OpenSim/Actuators/McKibbenActuator.h>
#include <OpenSim/Actuators/DeGrooteFregly2016Muscle.h>
#include <OpenSim/Actuators/MeyerFregly2016Muscle.h>

#include <OpenSim/Actuators/ModelFactory.h>
#include <OpenSim/Actuators/ModelProcessor.h>
Expand Down
1 change: 1 addition & 0 deletions Bindings/actuators.i
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
%include <OpenSim/Actuators/Millard2012AccelerationMuscle.h>
%include <OpenSim/Actuators/McKibbenActuator.h>
%include <OpenSim/Actuators/DeGrooteFregly2016Muscle.h>
%include <OpenSim/Actuators/MeyerFregly2016Muscle.h>
%template (SetFunctionBasedPaths) OpenSim::Set<OpenSim::FunctionBasedPath>;

%include <OpenSim/Actuators/ModelFactory.h>
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ v4.6
components. The `ForceProducer` API was also rolled out to a variety of existing `Force` components, which
means that API users can now now ask many `Force` components what forces they produce (see #3891 for a
comprehensive overview).
- Added `MeyerFregly2016Muscle` class to support NMSM Pipeline-equivalent muscle models in Moco. (#3908)

v4.5.1
======
Expand Down Expand Up @@ -88,6 +89,7 @@ pointer to avoid crashes in scripting due to invalid pointer ownership (#3781).
- Improved exception handling for internal errors in `MocoCasADiSolver`. Problems will now abort and print a descriptive error message (rather than fail due to an empty trajectory). (#3834)
- Upgraded the Ipopt dependency Metis to version 5.1.0 on Unix and macOS to enable building on `osx-arm64` (#3874).


v4.5
====
- Added `AbstractGeometryPath` which is a base class for `GeometryPath` and other path types (#3388). All path-based
Expand Down
1,053 changes: 1,053 additions & 0 deletions OpenSim/Actuators/MeyerFregly2016Muscle.cpp

Large diffs are not rendered by default.

936 changes: 936 additions & 0 deletions OpenSim/Actuators/MeyerFregly2016Muscle.h

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions OpenSim/Actuators/RegisterTypes_osimActuators.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ OSIMACTUATORS_API void RegisterTypes_osimActuators()
Object::RegisterType(Millard2012EquilibriumMuscle());
Object::RegisterType(Millard2012AccelerationMuscle());
Object::RegisterType(DeGrooteFregly2016Muscle());
Object::RegisterType(MeyerFregly2016Muscle());

Object::registerType(ModelProcessor());
Object::registerType(ModOpIgnoreActivationDynamics());
Expand Down
1 change: 1 addition & 0 deletions OpenSim/Actuators/osimActuators.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include "Millard2012EquilibriumMuscle.h"
#include "Millard2012AccelerationMuscle.h"
#include "DeGrooteFregly2016Muscle.h"
#include "MeyerFregly2016Muscle.h"

#include "McKibbenActuator.h"

Expand Down
3 changes: 1 addition & 2 deletions OpenSim/Moco/Components/StationPlaneContactForce.h
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,7 @@ Meyer A. J., Eskinazi, I., Jackson, J. N., Rao, A. V., Patten, C., & Fregly,
B. J. (2016). Muscle Synergies Facilitate Computational Prediction of
Subject-Specific Walking Motions. Frontiers in Bioengineering and
Biotechnology, 4, 1055–27. http://doi.org/10.3389/fbioe.2016.00077

@underdevelopment */
*/
class OSIMMOCO_API MeyerFregly2016Force
: public StationPlaneContactForce {
OpenSim_DECLARE_CONCRETE_OBJECT(MeyerFregly2016Force,
Expand Down