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

Run clang-format with new rules

Browse Source
This commit is contained in:
Cory Balaton 2023-10-08 00:36:17 +02:00
parent b5acec572f
commit e17da401ec
No known key found for this signature in database
GPG Key ID: 3E5FCEBFD80F432B
3 changed files with 66 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main.cpp
View File

@ -21,14 +21,16 @@
#define CHARGE 1.
#define MASS 40. // unit: amu
void euler_100_particles()
void simulate_100_particles()
{
PenningTrap trap;
// Add particles inside trap
for (int i = 0; i < PARTICLES; i++) {
arma::vec r = arma::vec(3).randn() * 0.1 * trap.get_d(); // random initial position
arma::vec v = arma::vec(3).randn() * 0.1 * trap.get_d(); // random initial velocity
arma::vec r = arma::vec(3).randn() * 0.1 *
trap.get_d(); // random initial position
arma::vec v = arma::vec(3).randn() * 0.1 *
trap.get_d(); // random initial velocity
trap.add_particle(Particle(CHARGE, MASS, r, v));
}
@ -45,7 +47,7 @@ void euler_100_particles()
for (int i = 0; i < PARTICLES; i++) {
res[i][j] = trap.get_particle(i);
}
trap.evolve_forward_euler(dt);
trap.evolve_RK4(dt);
}
std::cout << counter << std::endl;
@ -54,6 +56,7 @@ void euler_100_particles()
arma::vec::fixed<3> cur_elem;
mkdir("output", 0777);
mkdir("output/simulate_100_particles", 0777);
std::ofstream ofile;
@ -61,12 +64,11 @@ void euler_100_particles()
#pragma omp parallel for private(cur_row, cur_elem, ofile)
for (int i = 0; i < PARTICLES; i++) {
cur_row = res[i];
ofile.open("output/p" + std::to_string(i) + ".txt");
ofile.open("output/simulate_100_particles/p" + std::to_string(i) + ".txt");
for (int j = 0; j < N; j++) {
cur_elem = cur_row[j];
ofile << cur_elem(0) << ","
<< cur_elem(1) << ","
<< cur_elem(2) << "\n";
ofile << cur_elem(0) << "," << cur_elem(1) << "," << cur_elem(2)
<< "\n";
}
ofile.close();
}
@ -76,7 +78,7 @@ int main()
{
double start = omp_get_wtime();
euler_100_particles();
simulate_100_particles();
double end = omp_get_wtime();

32
src/test_suite.cpp
View File

@ -26,8 +26,8 @@ public:
// Vector containing inputs and expected results
std::vector<std::pair<arma::vec, arma::vec>> tests;
tests.push_back(std::make_pair(arma::vec{0.,0.,0.},
arma::vec{0.,0.,0.}));
tests.push_back(
std::make_pair(arma::vec{0., 0., 0.}, arma::vec{0., 0., 0.}));
tests.push_back(std::make_pair(arma::vec{10., 0., 0.},
arma::vec{96.4852558, 0., 0.}));
@ -41,7 +41,6 @@ public:
tests.push_back(std::make_pair(arma::vec{0., 0., 10.},
arma::vec{0., 0., -192.9705116}));
arma::vec result;
arma::vec v;
std::stringstream msg;
@ -57,11 +56,10 @@ public:
}
}
static void test_external_B_field()
{
// No point in testing at different points since it's not dependent on
// position.
// No point in testing at different points since it's not dependent
// on position.
PenningTrap trap;
arma::vec expected{0., 0., T};
arma::vec result = trap.external_B_field(arma::vec{0., 0., 0.});
@ -69,7 +67,6 @@ public:
"Testing the external B field at (0,0,0)");
}
static void test_force_on_particle()
{
PenningTrap trap;
@ -98,8 +95,8 @@ public:
static void test_total_force_external()
{
PenningTrap trap;
trap.add_particle(Particle(1.,40.,arma::vec{1.,2.,3.},
arma::vec{3.,4.,5.}));
trap.add_particle(
Particle(1., 40., arma::vec{1., 2., 3.}, arma::vec{3., 4., 5.}));
arma::vec expected{395.58954878, -270.15871624, -57.89115348};
arma::vec result = trap.total_force_external(0);
@ -111,8 +108,8 @@ public:
static void test_total_force_particles()
{
PenningTrap trap;
trap.add_particle(Particle(1.,40.,arma::vec{0.,0.,0.},
arma::vec{0.,0.,0.}));
trap.add_particle(
Particle(1., 40., arma::vec{0., 0., 0.}, arma::vec{0., 0., 0.}));
arma::vec expected{0., 0., 0.};
arma::vec result = trap.total_force_particles(0);
@ -120,12 +117,12 @@ public:
"Testing the total force of all particles on particle 0 "
"with only a single particle");
trap.add_particle(Particle(1.,40.,arma::vec{1.,0.,0.},
arma::vec{0.,0.,0.}));
trap.add_particle(Particle(1.,40.,arma::vec{0.,1.,0.},
arma::vec{0.,0.,0.}));
trap.add_particle(Particle(1.,40.,arma::vec{0.,0.,1.},
arma::vec{0.,0.,0.}));
trap.add_particle(
Particle(1., 40., arma::vec{1., 0., 0.}, arma::vec{0., 0., 0.}));
trap.add_particle(
Particle(1., 40., arma::vec{0., 1., 0.}, arma::vec{0., 0., 0.}));
trap.add_particle(
Particle(1., 40., arma::vec{0., 0., 1.}, arma::vec{0., 0., 0.}));
expected = arma::vec(3, arma::fill::value(-3473.383325));
result = trap.total_force_particles(0);
@ -135,7 +132,6 @@ public:
}
};
int main()
{
PenningTrapTest::test_external_E_field();

12
src/utils.cpp
View File

@ -37,12 +37,8 @@ static void print_message(std::string msg)
}
}
void m_assert(bool expr,
std::string expr_str,
std::string f,
std::string file,
int line,
std::string msg)
void m_assert(bool expr, std::string expr_str, std::string f, std::string file,
int line, std::string msg)
{
std::string new_assert(f.size() + (expr ? 4 : 6), '-');
std::cout << "\x1B[36m" << new_assert << "\033[0m\n";
@ -54,8 +50,8 @@ void m_assert(bool expr,
else {
std::cout << "\x1B[31mFAIL\033[0m\n";
print_message(msg);
std::cout << file << " " << line << ": Assertion \""
<< expr_str << "\" Failed\n\n";
std::cout << file << " " << line << ": Assertion \"" << expr_str
<< "\" Failed\n\n";
abort();
}
}