FYS3150/Project-3
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Coryab/implement penningtrap #3

Merged
coryab merged 20 commits from coryab/implement-Penningtrap into develop 2023-10-02 19:53:15 +00:00
Conversation 0 Commits 20 Files Changed 36 +10 -1
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b26137ea33 - Show all commits

11
src/PenningTrap.cpp
View File

@ -77,8 +77,17 @@ arma::vec PenningTrap::force_on_particle(int i, int j)
arma::vec PenningTrap::total_force_external(int i)
{
Particle p = this->particles.at(i);
arma::vec::fixed<3> v_cross_B;
arma::vec::fixed<3> B = this->external_B_field(p.r_vec);
v_cross_B(0) = p.v_vec(2)*B(3) - p.v_vec(3)*B(2);
v_cross_B(1) = p.v_vec(1)*B(3) - p.v_vec(3)*B(1);
v_cross_B(2) = p.v_vec(1)*B(2) - p.v_vec(2)*B(1);
arma::vec force = p.q
*(this->external_E_field(p.r_vec) + this->external_B_field(p.r_vec));
*(this->external_E_field(p.r_vec) + v_cross_B);
return force;
}