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.

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

initial commit of Smith2018ContactMesh and Smith2018ArticularContactForce #2658

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

initial commit of Smith2018ContactMesh and Smith2018ArticularContactForce #2658

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0ac0e05
initial commit of Smith2018ContactMesh and Smith2018ArticularContactF…
clnsmith Dec 29, 2019
712a2f4
removed accidental commented section in Test/testForces.cpp
clnsmith Dec 29, 2019
cbda1fa
removed tab symbols
clnsmith Dec 29, 2019
b284515
Merge branch 'master' into Smith2018Contact
chrisdembia Dec 30, 2019
7e34ada
Add headings to doxygen docs.
chrisdembia Jan 2, 2020
446e6a4
Merge pull request #3 from opensim-org/Smith2018Contact_chrisdembia
clnsmith Jan 8, 2020
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
3 changes: 3 additions & 0 deletions Bindings/OpenSimHeaders_simulation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
#include <OpenSim/Simulation/Model/ElasticFoundationForce.h>
#include <OpenSim/Simulation/Model/HuntCrossleyForce.h>

#include <OpenSim/Simulation/Model/Smith2018ContactMesh.h>
#include <OpenSim/Simulation/Model/Smith2018ArticularContactForce.h>

#include <OpenSim/Simulation/Model/ContactGeometrySet.h>
#include <OpenSim/Simulation/Model/Probe.h>
#include <OpenSim/Simulation/Model/ProbeSet.h>
Expand Down
2 changes: 2 additions & 0 deletions Bindings/simulation.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ OpenSim::ModelComponentSet<OpenSim::Controller>;
%include <OpenSim/Simulation/Model/ContactSphere.h>
%include <OpenSim/Simulation/Model/ElasticFoundationForce.h>
%include <OpenSim/Simulation/Model/HuntCrossleyForce.h>
%include <OpenSim/Simulation/Model/Smith2018ContactMesh.h>
%include <OpenSim/Simulation/Model/Smith2018ArticularContactForce.h>

%include <OpenSim/Simulation/Model/Actuator.h>
%template(SetActuators) OpenSim::Set<OpenSim::Actuator, OpenSim::Object>;
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ v4.1
- If finalizeConnections() method was not called on a model after making changes and before printing, an exception is thrown to avoid creating corrupt model files quietly (PR #2529)
- Updated the docopt.cpp dependency so that OpenSim can be compiled with Visual C++ from Visual Studio 2019.
- Updated Simbody to 3.7 to fix an issue with the simbody-visualizer on macOS 10.15 Catalina.
- Added `Smith2018ContactMesh` and `Smith2018ArticularContactForce` components to represent the contact forces between triangulated meshes representing articular surfaces. (PR #2658).
- On Mac and Linux, we include a shell script opensim-install-command-line.sh to make OpenSim's command-line tools easily accessible.


Converting from v4.0 to v4.1
----------------------------
Expand Down
Loading