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 -8
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2348d06070 - Show all commits

15
src/main.cpp
View File

@ -139,9 +139,8 @@ void simulate_100_particles()
double time = 50.; // microseconds double time = 50.; // microseconds
//trap.write_simulation_to_dir("output/simulate_100_particles", time, N, trap.write_simulation_to_dir("output/simulate_100_particles", time, N,
//"rk4", false); "rk4", false);
trap.simulate(time, N);
} }
/** @brief Simulate 100 particles over 500 \f$ \mu s \f$ using a time /** @brief Simulate 100 particles over 500 \f$ \mu s \f$ using a time
@ -264,16 +263,16 @@ int main()
{ {
double t0 = omp_get_wtime(); double t0 = omp_get_wtime();
//simulate_single_particle(); simulate_single_particle();
//simulate_two_particles(); simulate_two_particles();
//simulate_single_particle_with_different_steps(); simulate_single_particle_with_different_steps();
simulate_100_particles(); simulate_100_particles();
//simulate_100_particles_with_time_potential_wide_sweep(); simulate_100_particles_with_time_potential_wide_sweep();
//simulate_100_particles_with_time_potential_narrow_sweep(); simulate_100_particles_with_time_potential_narrow_sweep();
double end = omp_get_wtime(); double end = omp_get_wtime();