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

Remove kinematics_for_external_loads property #2770

Merged
merged 22 commits into from
Sep 1, 2020
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
111520b
Remove kinematics_for_external_loads property from ExternalLoads obje…
aymanhab May 13, 2020
8260d39
Update externalForces file to latest format and remove reference to e…
aymanhab May 19, 2020
8ba06c4
Fix IAA to handle externalForce.expressedInBody being "ground" which …
aymanhab May 20, 2020
0917baa
Remove kinematics_for_external_loads property from ExternalLoads obje…
aymanhab May 13, 2020
134a5b8
Update externalForces file to latest format and remove reference to e…
aymanhab May 19, 2020
5b81e09
Fix IAA to handle externalForce.expressedInBody being "ground" which …
aymanhab May 20, 2020
40d8f85
Merge branch 'remove_kin_external_loads' of https://github.com/opensi…
aymanhab Jun 11, 2020
25918ab
Merge branch 'master' of github.com:opensim-org/opensim-core into rem…
chrisdembia Jun 12, 2020
9ddd2d8
Remove kinematics_for_external_loads property from ExternalLoads obje…
aymanhab May 13, 2020
ed63930
Update externalForces file to latest format and remove reference to e…
aymanhab May 19, 2020
f4f1639
Fix IAA to handle externalForce.expressedInBody being "ground" which …
aymanhab May 20, 2020
2fc1a97
Merge branch 'remove_kin_external_loads' of https://github.com/opensi…
aymanhab Jun 15, 2020
fcfae60
Use log methods instead of cout
aymanhab Jun 16, 2020
ac99fcf
Port bugfix to IAA from already reviewed PR 2691
aymanhab Jun 16, 2020
035f90f
Fix comment
aymanhab Jun 16, 2020
f4b25fa
log_warn instead of cout
aymanhab Jun 16, 2020
7504d7a
Merge branch 'master' into remove_kin_external_loads
aymanhab Aug 21, 2020
33355c1
Update standard for SO test case to account for removal of Kinematics…
aymanhab Aug 27, 2020
cfc2fd6
Update std for InducedAcceleration test case
aymanhab Aug 27, 2020
d79e572
Fix testCMCWithControlConstraintsGait2354 by updating standard and us…
aymanhab Aug 28, 2020
0f787f2
Fix indentation that failed ci build on linux
aymanhab Aug 28, 2020
dce7562
Undo XMLDocument version upgrade to keep backward compatibility of Mo…
aymanhab Aug 31, 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
Prev Previous commit
Next Next commit
log_warn instead of cout
aymanhab committed Jun 16, 2020
commit f4b25fa940f0187cd888c4e1912b80cdf799499e
12 changes: 6 additions & 6 deletions OpenSim/Simulation/Model/ExternalLoads.cpp
Original file line number Diff line number Diff line change
@@ -413,7 +413,8 @@ void ExternalLoads::updateFromXMLNode(SimTK::Xml::Element& aNode, int versionNum
if (kinFileNode != aNode.element_end()){
SimTK::String transcoded = kinFileNode->getValueAs<SimTK::String>();
if (transcoded.length()>0)
log_warn("ExternalLoads: external_loads_model_kinematics_file option is not supported anymore.");
log_warn("ExternalLoads: external_loads_model_kinematics_file option is not supported anymore."
"Results may change.");
}
SimTK::Xml::element_iterator kinFilterNode = aNode.element_begin("lowpass_cutoff_frequency_for_load_kinematics");
if (kinFilterNode != aNode.element_end()){
@@ -491,11 +492,10 @@ void ExternalLoads::updateFromXMLNode(SimTK::Xml::Element& aNode, int versionNum
SimTK::String transcoded =
kinFileNode->getValueAs<SimTK::String>();
if (transcoded.length() > 0)
std::cout << "Warn: external_loads_model_kinematics_file "
"option is not supported anymore"
<< " result could change, please inspect and "
"update accordingly"
<< std::endl;
log_warn("ExternalLoades: "
"external_loads_model_kinematics_file "
"option is not supported anymore. Results may "
"change.");
}
}
// Call base class now assuming _node has been corrected for current version