Skip to content
Snippets Groups Projects
Commit 47616428 authored by Michael Kuron's avatar Michael Kuron :mortar_board:
Browse files

Fix implict/explict typos in pe::cr

parent aae402a0
Branches
Tags
No related merge requests found
...@@ -79,7 +79,7 @@ private: ...@@ -79,7 +79,7 @@ private:
size_t numberOfContactsTreated_; size_t numberOfContactsTreated_;
}; };
class DEM : public DEMSolver<IntegrateImplictEuler, ResolveContactSpringDashpotHaffWerner> class DEM : public DEMSolver<IntegrateImplicitEuler, ResolveContactSpringDashpotHaffWerner>
{ {
public: public:
DEM( const shared_ptr<BodyStorage>& globalBodyStorage DEM( const shared_ptr<BodyStorage>& globalBodyStorage
...@@ -88,8 +88,8 @@ public: ...@@ -88,8 +88,8 @@ public:
, domain_decomposition::BlockDataID ccdID , domain_decomposition::BlockDataID ccdID
, domain_decomposition::BlockDataID fcdID , domain_decomposition::BlockDataID fcdID
, WcTimingTree* tt = NULL) , WcTimingTree* tt = NULL)
: DEMSolver<IntegrateImplictEuler, ResolveContactSpringDashpotHaffWerner>( : DEMSolver<IntegrateImplicitEuler, ResolveContactSpringDashpotHaffWerner>(
IntegrateImplictEuler(), ResolveContactSpringDashpotHaffWerner(), IntegrateImplicitEuler(), ResolveContactSpringDashpotHaffWerner(),
globalBodyStorage, blockStorage, storageID, ccdID, fcdID, tt ) globalBodyStorage, blockStorage, storageID, ccdID, fcdID, tt )
{ {
} }
......
...@@ -30,7 +30,7 @@ namespace pe { ...@@ -30,7 +30,7 @@ namespace pe {
namespace cr { namespace cr {
//************************************************************************************************* //*************************************************************************************************
/*!\brief Integrate the trajectory of one body using implict Euler. /*!\brief Integrate the trajectory of one body using implicit Euler.
* *
* \param id Body ID. * \param id Body ID.
* \param dt Time step size. * \param dt Time step size.
...@@ -40,7 +40,7 @@ namespace cr { ...@@ -40,7 +40,7 @@ namespace cr {
* The implicit Euler algorithm, also known as backward Euler, is used. It is a first-order * The implicit Euler algorithm, also known as backward Euler, is used. It is a first-order
* integrator that does conserves energy (i.e. it is symplectic.) * integrator that does conserves energy (i.e. it is symplectic.)
*/ */
class IntegrateImplictEuler { class IntegrateImplicitEuler {
public: public:
void operator()( BodyID id, real_t dt, ICR & solver ) const void operator()( BodyID id, real_t dt, ICR & solver ) const
{ {
...@@ -88,7 +88,7 @@ public: ...@@ -88,7 +88,7 @@ public:
* The explicit Euler algorithm, also known as forward Euler, is used. It is a first-order * The explicit Euler algorithm, also known as forward Euler, is used. It is a first-order
* integrator that does not conserve energy (i.e. it is not symplectic.) * integrator that does not conserve energy (i.e. it is not symplectic.)
*/ */
class IntegrateExplictEuler { class IntegrateExplicitEuler {
public: public:
void operator()( BodyID id, real_t dt, ICR & solver ) const void operator()( BodyID id, real_t dt, ICR & solver ) const
{ {
......
...@@ -61,14 +61,14 @@ private: ...@@ -61,14 +61,14 @@ private:
WcTimingTree* tt_; WcTimingTree* tt_;
}; };
class PlainIntegrator : public PlainIntegratorSolver<IntegrateImplictEuler> class PlainIntegrator : public PlainIntegratorSolver<IntegrateImplicitEuler>
{ {
public: public:
PlainIntegrator( const shared_ptr<BodyStorage>& globalBodyStorage PlainIntegrator( const shared_ptr<BodyStorage>& globalBodyStorage
, const shared_ptr<BlockStorage>& blockStorage , const shared_ptr<BlockStorage>& blockStorage
, domain_decomposition::BlockDataID storageID , domain_decomposition::BlockDataID storageID
, WcTimingTree* tt = NULL) , WcTimingTree* tt = NULL)
: PlainIntegratorSolver<IntegrateImplictEuler>( IntegrateImplictEuler(), globalBodyStorage, blockStorage, : PlainIntegratorSolver<IntegrateImplicitEuler>( IntegrateImplicitEuler(), globalBodyStorage, blockStorage,
storageID, tt ) storageID, tt )
{ {
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment