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

Develop #14

Merged
coryab merged 124 commits from develop into main 2023-10-24 20:43:56 +00:00
Conversation 0 Commits 124 Files Changed 193 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d7246b05b1 - Show all commits

8
src/PenningTrap.cpp
View File

@ -53,8 +53,8 @@ vec_3d PenningTrap::v_func(unsigned int i, unsigned int j, double dt)
case 2: case 2:
return dt * this->k_v[2][j]; return dt * this->k_v[2][j];
case 3: case 3:
return (dt / 6.) * (this->k_v[0][j] + this->k_v[1][j] + return (dt / 6.) * (this->k_v[0][j] + 2.*this->k_v[1][j] +
this->k_v[2][j] + this->k_v[3][j]); 2.*this->k_v[2][j] + this->k_v[3][j]);
default: default:
std::cout << "Not valid!" << std::endl; std::cout << "Not valid!" << std::endl;
abort(); abort();
@ -71,8 +71,8 @@ vec_3d PenningTrap::r_func(unsigned int i, unsigned int j, double dt)
case 2: case 2:
return dt * this->k_r[2][j]; return dt * this->k_r[2][j];
case 3: case 3:
return (dt / 6.) * (this->k_r[0][j] + this->k_r[1][j] + return (dt / 6.) * (this->k_r[0][j] + 2.*this->k_r[1][j] +
this->k_r[2][j] + this->k_r[3][j]); 2.*this->k_r[2][j] + this->k_r[3][j]);
default: default:
std::cout << "Not valid!" << std::endl; std::cout << "Not valid!" << std::endl;
abort(); abort();