Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added collision handler for Huayno OK algorithm #1058

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Added collision handler for Huayno OK algorithm #1058

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e4f517
Added collision handler for Huayno OK algorithm
ErwanH29 May 29, 2024
d395e44
Moved collision algorithms to separate file
ErwanH29 May 30, 2024
aa3335f
Removed the repeated collision function from evolve_ok.c
ErwanH29 May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions src/amuse/community/huayno/src/evolve_ok.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@
#include <tgmath.h>
#include <stdio.h>
#include <stdlib.h>
#ifdef _OPENMP
#include <omp.h>
#endif
#include "evolve.h"
#include "evolve_ok.h"
// AMUSE STOPPING CONDITIONS SUPPORT
#include <stopcond.h>

struct forces zeroforces = {0, NULL};

Expand Down Expand Up @@ -150,6 +155,8 @@ static void ok_kick(int clevel,struct forces f, DOUBLE dt)

void evolve_ok2(int clevel,struct sys s, struct forces f, DOUBLE stime, DOUBLE etime, DOUBLE dt, int calc_timestep)
{
int is_collision_detection_enabled;
is_stopping_condition_enabled(COLLISION_DETECTION, &is_collision_detection_enabled);
if (IS_ZEROFORCES(f) && clevel == 0) { f = ok_main_forces; }
CHECK_TIMESTEP(etime,stime,dt,clevel);
// all particles are drifted together
Expand All @@ -165,5 +172,40 @@ void evolve_ok2(int clevel,struct sys s, struct forces f, DOUBLE stime, DOUBLE e
ok_split((FLOAT) dt, f, &slowf, &fastf);
evolve_ok2(clevel+1,s, fastf, stime, stime+dt/2, dt/2, 0);
ok_kick(clevel,slowf, dt);

if (is_collision_detection_enabled) {
UINT i, j;
FLOAT dx[3], dr2, radius_sum;
struct particle *ipart, *jpart;
#pragma omp parallel for if((ULONG) s.n*s.n>MPWORKLIMIT && !omp_in_parallel()) default(none) \
private(i,j,dx,dr2,radius_sum, ipart, jpart) \
shared(s)
for (i=0; i<s.n; i++) {
ipart=GETPART(s,i);
if (ipart->mass > 0){
for (j=i+1; j<s.n; j++) {
jpart=GETPART(s,j);
dx[0] = ipart->pos[0] - jpart->pos[0];
dx[1] = ipart->pos[1] - jpart->pos[1];
dx[2] = ipart->pos[2] - jpart->pos[2];
dr2 = dx[0]*dx[0] + dx[1]*dx[1] + dx[2]*dx[2];
radius_sum = ipart->radius + jpart->radius;
if (dr2 <= radius_sum*radius_sum) {
#pragma omp critical
{
int stopping_index = next_index_for_stopping_condition();
if (stopping_index >= 0) {
set_stopping_condition_info(stopping_index, COLLISION_DETECTION);
set_stopping_condition_particle_index(stopping_index, 0, ipart->id);
set_stopping_condition_particle_index(stopping_index, 1, jpart->id);
return;
}
}
}
}
}
}
}

evolve_ok2(clevel+1,s, fastf, stime+dt/2, etime, dt/2, 1);
}