From 47616428d54f9e21a921986622e4df72d0560463 Mon Sep 17 00:00:00 2001 From: Michael Kuron <mkuron@icp.uni-stuttgart.de> Date: Wed, 21 Mar 2018 11:55:09 +0100 Subject: [PATCH] Fix implict/explict typos in pe::cr --- src/pe/cr/DEM.h | 6 +++--- src/pe/cr/Integrators.h | 6 +++--- src/pe/cr/PlainIntegrator.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pe/cr/DEM.h b/src/pe/cr/DEM.h index 9d0887e77..dcc19af29 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 30b56e50a..0c978fcda 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 271847f5d..92abbbfb3 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 ) { } -- GitLab