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 +7 -5
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 520728a9c2 - Show all commits

5
include/PenningTrap.hpp
View File

@ -23,11 +23,6 @@
#pragma omp declare reduction(+ : vec_3d : omp_out += omp_in) \ #pragma omp declare reduction(+ : vec_3d : omp_out += omp_in) \
initializer(omp_priv = omp_orig) initializer(omp_priv = omp_orig)
typedef struct simulation {
sim_arr r_vecs;
sim_arr v_vecs;
} simulation_t;
/** @brief A class that simulates a Penning trap. /** @brief A class that simulates a Penning trap.
* *
* This class simulates a Penning trap. It can take in a number of particles * This class simulates a Penning trap. It can take in a number of particles

7
include/typedefs.hpp
View File

@ -35,4 +35,11 @@ typedef std::vector<sim_cols> sim_arr;
* */ * */
typedef arma::vec::fixed<3> vec_3d; typedef arma::vec::fixed<3> vec_3d;
/** @brief Typedef for PenningTrap::simulation return value.
* */
typedef struct simulation {
sim_arr r_vecs;
sim_arr v_vecs;
} simulation_t;
#endif #endif