kindred/solver
1
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Edits for MacOS

Browse Source
This commit is contained in:
Aik-Siong Koh
2023-11-30 21:48:26 -07:00
parent 9b1529f3ed
commit 2b7fba1b0e
9 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OndselSolver/FullColumn.cpp
View File

@@ -9,7 +9,5 @@
#include <sstream>
#include "FullColumn.h"
#include "FullRow.h"
#include "FullMatrix.h"
using namespace MbD;

2
OndselSolver/MBDynBody.h
View File

@@ -14,7 +14,7 @@ namespace MbD {
{
public:
void initialize() override;
void parseMBDyn(std::string line);
void parseMBDyn(std::string line) override;
void readMass(std::vector<std::string>& args);
void readInertiaMatrix(std::vector<std::string>& args);
void createASMT() override;

2
OndselSolver/MBDynDrive.h
View File

@@ -13,7 +13,7 @@ namespace MbD {
class MBDynDrive : public MBDynElement
{
public:
void parseMBDyn(std::string line);
void parseMBDyn(std::string line) override;
void readFunction(std::vector<std::string>& args);
void createASMT() override;

2
OndselSolver/MBDynGravity.h
View File

@@ -13,7 +13,7 @@ namespace MbD {
class MBDynGravity : public MBDynElement
{
public:
void parseMBDyn(std::string line);
void parseMBDyn(std::string line) override;
void readFunction(std::vector<std::string>& args);
void createASMT() override;

7
OndselSolver/MBDynItem.cpp
View File

@@ -34,6 +34,11 @@ void MbD::MBDynItem::parseMBDyn(std::vector<std::string>& lines)
assert(false);
}
void MbD::MBDynItem::parseMBDyn(std::string line)
{
assert(false);
}
std::vector<std::string> MbD::MBDynItem::collectArgumentsFor(std::string title, std::string& statement)
{
size_t previousPos = 0;
@@ -67,7 +72,7 @@ std::vector<std::string> MbD::MBDynItem::collectArgumentsFor(std::string title,
//Need to find matching '"'
auto it = std::find_if(arguments.begin() + 1, arguments.end(), [](const std::string& s) {
auto nn = std::count(s.begin(), s.end(), '"');
if ((nn % 2) == 1) return true;
return (nn % 2) == 1;
});
std::vector<std::string> needToCombineArgs(arguments.begin(), it + 1);
arguments.erase(arguments.begin(), it + 1);

1
OndselSolver/MBDynItem.h
View File

@@ -31,6 +31,7 @@ namespace MbD {
void noop();
//void setName(std::string str);
virtual void parseMBDyn(std::vector<std::string>& lines);
virtual void parseMBDyn(std::string line);
static std::vector<std::string> collectArgumentsFor(std::string title, std::string& statement);
std::vector<std::string>::iterator findLineWith(std::vector<std::string>& lines, std::vector<std::string>& tokens);
bool lineHasTokens(const std::string& line, std::vector<std::string>& tokens);

2
OndselSolver/MBDynJoint.h
View File

@@ -15,7 +15,7 @@ namespace MbD {
{
public:
void initialize() override;
void parseMBDyn(std::string line);
void parseMBDyn(std::string line) override;
void readMarkerI(std::vector<std::string>& args);
void readMarkerJ(std::vector<std::string>& args);
void readClampMarkerJ(std::vector<std::string>& args);

2
OndselSolver/MBDynReference.h
View File

@@ -15,7 +15,7 @@ namespace MbD {
{
public:
void initialize() override;
void parseMBDyn(std::string line);
void parseMBDyn(std::string line) override;
void readVelocity(std::vector<std::string>& args);
void readOmega(std::vector<std::string>& args);

2
OndselSolver/MBDynStructural.h
View File

@@ -14,7 +14,7 @@ namespace MbD {
{
public:
MBDynStructural();
void parseMBDyn(std::string line);
void parseMBDyn(std::string line) override;
void readVelocity(std::vector<std::string>& args);
void readOmega(std::vector<std::string>& args);
void createASMT() override;