warning fixes
This commit is contained in:
@@ -83,7 +83,7 @@ namespace MbD {
|
||||
double calcCharacteristicLength();
|
||||
std::shared_ptr<std::vector<std::shared_ptr<ASMTItemIJ>>> connectorList();
|
||||
std::shared_ptr<std::map<std::string, std::shared_ptr<ASMTMarker>>>markerMap();
|
||||
void deleteMbD();
|
||||
void deleteMbD() override;
|
||||
void createMbD(std::shared_ptr<System> mbdSys, std::shared_ptr<Units> mbdUnits) override;
|
||||
void outputFile(std::string filename);
|
||||
void storeOnLevel(std::ofstream& os, int level) override;
|
||||
|
||||
@@ -22,7 +22,7 @@ namespace MbD {
|
||||
void incrementIterNo() override;
|
||||
void initializeGlobally() override;
|
||||
void logSingularMatrixMessage();
|
||||
void passRootToSystem();
|
||||
void passRootToSystem() override;
|
||||
void postRun() override;
|
||||
void preRun() override;
|
||||
void handleSingularMatrix() override;
|
||||
|
||||
@@ -21,13 +21,13 @@ namespace MbD {
|
||||
void calcPostDynCorrectorIteration() override;
|
||||
void initialize() override;
|
||||
void initializeGlobally() override;
|
||||
FRowDsptr ppvaluepXIpt();
|
||||
FRowDsptr ppvaluepEIpt();
|
||||
FRowDsptr ppvaluepEKpt();
|
||||
FRowDsptr ppvaluepXJpt();
|
||||
FRowDsptr ppvaluepEJpt();
|
||||
double ppvalueptpt();
|
||||
double pvaluept();
|
||||
FRowDsptr ppvaluepXIpt() override;
|
||||
FRowDsptr ppvaluepEIpt() override;
|
||||
FRowDsptr ppvaluepEKpt() override;
|
||||
FRowDsptr ppvaluepXJpt() override;
|
||||
FRowDsptr ppvaluepEJpt() override;
|
||||
double ppvalueptpt() override;
|
||||
double pvaluept() override;
|
||||
void preAccIC() override;
|
||||
void preVelIC() override;
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace MbD {
|
||||
double ppvalueptpt() override;
|
||||
void preAccIC() override;
|
||||
void preVelIC() override;
|
||||
double pvaluept();
|
||||
double pvaluept() override;
|
||||
|
||||
double priIeJeOpt;
|
||||
FRowDsptr ppriIeJeOpEIpt;
|
||||
|
||||
@@ -85,7 +85,7 @@ namespace MbD {
|
||||
FMatsptr<T> transpose();
|
||||
FMatsptr<T> negated();
|
||||
void symLowerWithUpper();
|
||||
void atiput(int i, FRowsptr<T> fullRow);
|
||||
void atiput(int i, FRowsptr<T> fullRow) override;
|
||||
void atijput(int i, int j, T value);
|
||||
void atijputFullColumn(int i, int j, FColsptr<T> fullCol);
|
||||
void atijplusFullRow(int i, int j, FRowsptr<T> fullRow);
|
||||
|
||||
@@ -16,7 +16,7 @@ namespace MbD {
|
||||
{
|
||||
//markowitzPivotRowCount markowitzPivotColCount privateIndicesOfNonZerosInPivotRow rowPositionsOfNonZerosInPivotColumn
|
||||
public:
|
||||
FColDsptr solvewithsaveOriginal(SpMatDsptr spMat, FColDsptr fullCol, bool saveOriginal);
|
||||
FColDsptr solvewithsaveOriginal(SpMatDsptr spMat, FColDsptr fullCol, bool saveOriginal) override;
|
||||
FColDsptr basicSolvewithsaveOriginal(SpMatDsptr spMat, FColDsptr fullCol, bool saveOriginal) override;
|
||||
FColDsptr basicSolvewithsaveOriginal(FMatDsptr fullMat, FColDsptr fullCol, bool saveOriginal) override;
|
||||
void preSolvewithsaveOriginal(FMatDsptr fullMat, FColDsptr fullCol, bool saveOriginal) override;
|
||||
|
||||
@@ -151,13 +151,14 @@ namespace MbD {
|
||||
virtual std::ostream& printOn(std::ostream& s) const;
|
||||
friend std::ostream& operator<<(std::ostream& s, const Item& item)
|
||||
{
|
||||
if (&item) {
|
||||
// the following if cannot be false
|
||||
// if (&item) {
|
||||
return item.printOn(s);
|
||||
}
|
||||
else {
|
||||
s << "NULL";
|
||||
}
|
||||
return s;
|
||||
// }
|
||||
// else {
|
||||
// s << "NULL";
|
||||
// }
|
||||
//return s;
|
||||
}
|
||||
|
||||
std::string name;
|
||||
|
||||
@@ -21,7 +21,7 @@ namespace MbD {
|
||||
RowTypeMatrix(int m) : Array<T>(m) {}
|
||||
RowTypeMatrix(std::initializer_list<T> list) : Array<T>{ list } {}
|
||||
void copyFrom(std::shared_ptr<RowTypeMatrix<T>> x);
|
||||
virtual void zeroSelf() = 0;
|
||||
virtual void zeroSelf() override = 0;
|
||||
//double maxMagnitude() override;
|
||||
int numberOfElements() override;
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ namespace MbD {
|
||||
this->push_back(row);
|
||||
}
|
||||
}
|
||||
void atiput(int i, SpRowsptr<T> spRow);
|
||||
void atiput(int i, SpRowsptr<T> spRow) override;
|
||||
void atijplusDiagonalMatrix(int i, int j, DiagMatDsptr diagMat);
|
||||
void atijminusDiagonalMatrix(int i, int j, DiagMatDsptr diagMat);
|
||||
double sumOfSquares() override;
|
||||
|
||||
@@ -19,7 +19,7 @@ namespace MbD {
|
||||
//
|
||||
public:
|
||||
void initializeGlobally() override;
|
||||
virtual void assignEquationNumbers() = 0;
|
||||
virtual void assignEquationNumbers() override = 0;
|
||||
virtual void createVectorsAndMatrices();
|
||||
std::shared_ptr<MatrixSolver> matrixSolverClassNew() override;
|
||||
void calcdxNorm() override;
|
||||
|
||||
Reference in New Issue
Block a user