Skip to content
Snippets Groups Projects
Commit 29a66100 authored by Alexis Girault's avatar Alexis Girault
Browse files

COMP: Fix timeintegrator errors on windows

parent a2f4ae30
No related branches found
No related tags found
No related merge requests found
......@@ -40,13 +40,8 @@ public:
///
/// \brief Constructor
///
BackwardEuler(const double dT = 0.01) : TimeIntegrator(dT)
{
m_type = Type::BackwardEuler;
m_alpha = { { 1, 0, 0 } };
m_beta = { { 1, -1, 0 } };
m_gamma = { { 1, -2, -1 } };
};
BackwardEuler(const double dT = 0.01) : TimeIntegrator(Type::BackwardEuler, dT)
{}
///
/// \brief Destructor
......@@ -82,12 +77,10 @@ public:
Vectord& u);
protected:
// Coefficients of the time integrator
std::array<double, 3> m_alpha;
std::array<double, 3> m_beta;
std::array<double, 3> m_gamma;
double m_dT; ///> Delta T
// // Coefficients of the time integrator
// std::array<double, 3> m_alpha = { { 1, 0, 0 } };
// std::array<double, 3> m_beta = { { 1, -1, 0 } };
// std::array<double, 3> m_gamma = { { 1, -2, -1 } };
};
} // imstk
......
......@@ -40,7 +40,8 @@ public:
///
/// \brief Constructor
///
NewmarkBeta(const double dT, const double beta = 0.25, const double gamma = 0.5) : TimeIntegrator(dT), m_type(Type::NewmarkBeta), m_gamma(gamma), m_beta(beta){};
NewmarkBeta(const double dT, const double beta = 0.25, const double gamma = 0.5) : TimeIntegrator(Type::NewmarkBeta, dT), m_gamma(gamma), m_beta(beta)
{}
///
/// \brief Destructor
......@@ -74,12 +75,10 @@ protected:
double m_beta;
double m_gamma;
// Coefficients of the time integrator
std::array<double, 3> m_alpha = { { 1, 0, 0 } };
std::array<double, 3> m_beta = { { 1, -1, 0 } };
std::array<double, 3> m_gamma = { { 1, -2, -1 } };
double m_dT; ///> Delta T
// // Coefficients of the time integrator
// std::array<double, 3> m_alpha = { { 1, 0, 0 } };
// std::array<double, 3> m_beta = { { 1, -1, 0 } };
// std::array<double, 3> m_gamma = { { 1, -2, -1 } };
};
} // imstk
......
......@@ -57,7 +57,8 @@ public:
///
/// \brief Constructor
///
TimeIntegrator(double dT) : m_type(Type::none), m_dT(dT){};
TimeIntegrator(Type type, double dT) : m_type(type), m_dT(dT)
{}
///
/// \brief Destructor
......@@ -67,7 +68,7 @@ public:
///
/// \brief Return the type of the time integrator
///
TimeIntegrator::Type getType() const { return m_type; };
TimeIntegrator::Type getType() const { return m_type; }
///
/// \brief Set/Get the time step size
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment