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

Coryab/create tests #4

Merged
coryab merged 10 commits from coryab/create-tests into develop 2023-10-07 20:01:08 +00:00
Conversation 0 Commits 10 Files Changed 8 +6 -8
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 21b94acbd8 - Show all commits

6
include/PenningTrap.hpp
View File

@ -13,9 +13,13 @@
#define __PENNING_TRAP__ #define __PENNING_TRAP__
#include <armadillo> #include <armadillo>
#include <omp.h>
#include "constants.hpp"
#include "Particle.hpp" #include "Particle.hpp"
#include "constants.hpp"
#pragma omp declare reduction( + : arma::vec : omp_out += omp_in ) \
initializer( omp_priv = omp_orig )
/** @brief A class that simulates a Penning trap. /** @brief A class that simulates a Penning trap.
* *

8
src/PenningTrap.cpp
View File

@ -13,15 +13,9 @@
* @todo Implement evolve_forward_euler * @todo Implement evolve_forward_euler
* */ * */
#include "utils.hpp"
#include "PenningTrap.hpp" #include "PenningTrap.hpp"
#include "constants.hpp" #include "constants.hpp"
#include <algorithm> #include "utils.hpp"
#include <stdexcept>
#include <omp.h>
#pragma omp declare reduction( + : arma::vec : omp_out += omp_in ) \
initializer( omp_priv = omp_orig )
PenningTrap::PenningTrap(double B_0, double V_0, double d) PenningTrap::PenningTrap(double B_0, double V_0, double d)
{ {