diff --git a/src/pe/cr/DEM.h b/src/pe/cr/DEM.h index 9d0887e774253fcfbb7c76e4ded484a30abbd843..dcc19af292c646addf2f0eac477d3c87e5a4218f 100644 --- a/src/pe/cr/DEM.h +++ b/src/pe/cr/DEM.h @@ -79,7 +79,7 @@ private: size_t numberOfContactsTreated_; }; -class DEM : public DEMSolver<IntegrateImplictEuler, ResolveContactSpringDashpotHaffWerner> +class DEM : public DEMSolver<IntegrateImplicitEuler, ResolveContactSpringDashpotHaffWerner> { public: DEM( const shared_ptr<BodyStorage>& globalBodyStorage @@ -88,8 +88,8 @@ public: , domain_decomposition::BlockDataID ccdID , domain_decomposition::BlockDataID fcdID , WcTimingTree* tt = NULL) - : DEMSolver<IntegrateImplictEuler, ResolveContactSpringDashpotHaffWerner>( - IntegrateImplictEuler(), ResolveContactSpringDashpotHaffWerner(), + : DEMSolver<IntegrateImplicitEuler, ResolveContactSpringDashpotHaffWerner>( + IntegrateImplicitEuler(), ResolveContactSpringDashpotHaffWerner(), globalBodyStorage, blockStorage, storageID, ccdID, fcdID, tt ) { } diff --git a/src/pe/cr/Integrators.h b/src/pe/cr/Integrators.h index 30b56e50a9e308917872d03156447d9e3b520157..0c978fcda0d13a19086b5df89ef617856df74f04 100644 --- a/src/pe/cr/Integrators.h +++ b/src/pe/cr/Integrators.h @@ -30,7 +30,7 @@ namespace pe { 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 dt Time step size. @@ -40,7 +40,7 @@ namespace cr { * 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.) */ -class IntegrateImplictEuler { +class IntegrateImplicitEuler { public: void operator()( BodyID id, real_t dt, ICR & solver ) const { @@ -88,7 +88,7 @@ public: * 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.) */ -class IntegrateExplictEuler { +class IntegrateExplicitEuler { public: void operator()( BodyID id, real_t dt, ICR & solver ) const { diff --git a/src/pe/cr/PlainIntegrator.h b/src/pe/cr/PlainIntegrator.h index 271847f5d3d9b601452553d08d4a85bae8a4eb71..92abbbfb3746b59f08927fb9222b4b72bd00045f 100644 --- a/src/pe/cr/PlainIntegrator.h +++ b/src/pe/cr/PlainIntegrator.h @@ -61,14 +61,14 @@ private: WcTimingTree* tt_; }; -class PlainIntegrator : public PlainIntegratorSolver<IntegrateImplictEuler> +class PlainIntegrator : public PlainIntegratorSolver<IntegrateImplicitEuler> { public: PlainIntegrator( const shared_ptr<BodyStorage>& globalBodyStorage , const shared_ptr<BlockStorage>& blockStorage , domain_decomposition::BlockDataID storageID , WcTimingTree* tt = NULL) - : PlainIntegratorSolver<IntegrateImplictEuler>( IntegrateImplictEuler(), globalBodyStorage, blockStorage, + : PlainIntegratorSolver<IntegrateImplicitEuler>( IntegrateImplicitEuler(), globalBodyStorage, blockStorage, storageID, tt ) { }