From bd9600b6d12f21e38ff626aa1e53948b5e713661 Mon Sep 17 00:00:00 2001 From: Cory Date: Sun, 22 Oct 2023 17:44:08 +0200 Subject: [PATCH] Fix dumb mistake --- include/PenningTrap.hpp | 2 +- include/constants.hpp | 6 +++--- src/PenningTrap.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/PenningTrap.hpp b/include/PenningTrap.hpp index 41af4ab..411b3cc 100644 --- a/include/PenningTrap.hpp +++ b/include/PenningTrap.hpp @@ -75,7 +75,7 @@ public: PenningTrap( double B_0 = T, std::function V_0 - = [](double t) { return 25. * V / 1000.; }, + = [](double t) { return (25. * V) / 1000.; }, double d = 500., double t = 0.); /** @brief Constructor for the PenningTrap class diff --git a/include/constants.hpp b/include/constants.hpp index 592b48a..06942ee 100644 --- a/include/constants.hpp +++ b/include/constants.hpp @@ -12,10 +12,10 @@ #ifndef __CONST__ #define __CONST__ -#define K_E 138935.333 ///< Coulomb constant. unit: \f$\frac{u(\mu m)^3}{(\mu s)^2 e^2}\f$ +#define K_E 1.38935333*1e5 ///< Coulomb constant. unit: \f$\frac{u(\mu m)^3}{(\mu s)^2 e^2}\f$ -#define T 96.4852558 ///< 1 Tesla. unit: \f$ \frac{u}{(\mu s) e} \f$ +#define T 9.64852558*1e1 ///< 1 Tesla. unit: \f$ \frac{u}{(\mu s) e} \f$ -#define V 96485255.8 ///< 1 Volt. unit: \f$ \frac{u (\mu m)^2}{(\mu s)^2 e} \f$ +#define V 9.64852558*1e7 ///< 1 Volt. unit: \f$ \frac{u (\mu m)^2}{(\mu s)^2 e} \f$ #endif diff --git a/src/PenningTrap.cpp b/src/PenningTrap.cpp index d018778..af4b19e 100644 --- a/src/PenningTrap.cpp +++ b/src/PenningTrap.cpp @@ -99,7 +99,7 @@ vec_3d PenningTrap::external_E_field(vec_3d r) { r(2) *= -2.; - return vec_3d(this->V_0(this->t) / (this->d * this->d) * r); + return vec_3d((this->V_0(this->t) / (this->d * this->d)) * r); } vec_3d PenningTrap::external_B_field(vec_3d r) @@ -141,7 +141,7 @@ vec_3d PenningTrap::total_force_particles(unsigned int i) res += this->force_on_particle(i, j); } - return vec_3d(res * K_E * (this->particles[i].q / this->particles[i].m)); + return vec_3d(res * K_E * (this->particles[i].q)); } vec_3d PenningTrap::total_force(unsigned int i)