Skip to content

Commit

Permalink
Merge branch 'main' into backhoe_issues
Browse files Browse the repository at this point in the history
  • Loading branch information
aiksiongkoh authored Jun 25, 2024
2 parents aca6a3e + 79a1e4e commit 7085d9e
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 5 deletions.
1 change: 1 addition & 0 deletions OndselSolver/ASMTAllowRotation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ std::shared_ptr<ItemIJ> MbD::ASMTAllowRotation::mbdClassNew()

void MbD::ASMTAllowRotation::setMotionJoint(std::string motionJoint)
{
(void) motionJoint;
}

void MbD::ASMTAllowRotation::storeOnLevel(std::ofstream& os, size_t level)
Expand Down
11 changes: 6 additions & 5 deletions OndselSolver/ASMTAssembly.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1574,11 +1574,12 @@ void MbD::ASMTAssembly::compareResults(AnalysisType type)

void MbD::ASMTAssembly::outputResults(AnalysisType type)
{
// ASMTSpatialContainer::outputResults(type);
// for (auto& part : *parts) part->outputResults(type);
// for (auto& joint : *joints) joint->outputResults(type);
// for (auto& motion : *motions) motion->outputResults(type);
// for (auto& forceTorque : *forcesTorques) forceTorque->outputResults(type);
(void) type;
//ASMTSpatialContainer::outputResults(type);
//for (auto& part : *parts) part->outputResults(type);
//for (auto& joint : *joints) joint->outputResults(type);
//for (auto& motion : *motions) motion->outputResults(type);
//for (auto& forceTorque : *forcesTorques) forceTorque->outputResults(type);
}

void MbD::ASMTAssembly::addPart(std::shared_ptr<ASMTPart> part)
Expand Down
2 changes: 2 additions & 0 deletions OndselSolver/ASMTItemIJ.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@ void MbD::ASMTItemIJ::parseASMT(std::vector<std::string>& lines)

void MbD::ASMTItemIJ::createMbD(std::shared_ptr<System> mbdSys, std::shared_ptr<Units> mbdUnits)
{
(void) mbdSys;
(void) mbdUnits;
//self dataSeries : OrderedCollection new.
//self discontinuities : OrderedCollection new.
auto mbdJt = this->mbdClassNew();
Expand Down
14 changes: 14 additions & 0 deletions OndselSolver/LimitIJ.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ MbD::LimitIJ::LimitIJ()

void MbD::LimitIJ::fillAccICIterError(FColDsptr col)
{
(void) col;
assert(false);
}

void MbD::LimitIJ::fillAccICIterJacob(SpMatDsptr mat)
{
(void) mat;
assert(false);
}

Expand Down Expand Up @@ -49,16 +51,19 @@ void MbD::LimitIJ::fillConstraints(std::shared_ptr<std::vector<std::shared_ptr<C

void MbD::LimitIJ::fillDispConstraints(std::shared_ptr<std::vector<std::shared_ptr<Constraint>>> dispConstraints)
{
(void) dispConstraints;
assert(false);
}

void MbD::LimitIJ::fillEssenConstraints(std::shared_ptr<std::vector<std::shared_ptr<Constraint>>> essenConstraints)
{
(void) essenConstraints;
assert(false);
}

void MbD::LimitIJ::fillPerpenConstraints(std::shared_ptr<std::vector<std::shared_ptr<Constraint>>> perpenConstraints)
{
(void) perpenConstraints;
assert(false);
}

Expand All @@ -78,16 +83,19 @@ void MbD::LimitIJ::fillPosICJacob(SpMatDsptr mat)

void MbD::LimitIJ::fillPosKineError(FColDsptr col)
{
(void) col;
assert(false);
}

void MbD::LimitIJ::fillPosKineJacob(SpMatDsptr mat)
{
(void) mat;
assert(false);
}

void MbD::LimitIJ::fillqsuddotlam(FColDsptr col)
{
(void) col;
assert(false);
}

Expand All @@ -100,31 +108,37 @@ void MbD::LimitIJ::fillqsulam(FColDsptr col)

void MbD::LimitIJ::fillqsudot(FColDsptr col)
{
(void) col;
assert(false);
}

void MbD::LimitIJ::fillqsudotWeights(DiagMatDsptr diagMat)
{
(void) diagMat;
assert(false);
}

void MbD::LimitIJ::fillVelICError(FColDsptr col)
{
(void) col;
assert(false);
}

void MbD::LimitIJ::fillVelICJacob(SpMatDsptr mat)
{
(void) mat;
assert(false);
}

void MbD::LimitIJ::setqsuddotlam(FColDsptr col)
{
(void) col;
assert(false);
}

void MbD::LimitIJ::setqsudotlam(FColDsptr col)
{
(void) col;
assert(false);
}

Expand Down
1 change: 1 addition & 0 deletions OndselSolver/PosICDragLimitNewtonRaphson.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ void MbD::PosICDragLimitNewtonRaphson::initializeGlobally()

void MbD::PosICDragLimitNewtonRaphson::setdragParts(std::shared_ptr<std::vector<std::shared_ptr<Part>>> dragParts)
{
(void) dragParts;
assert(false);
}

Expand Down

0 comments on commit 7085d9e

Please sign in to comment.