daknuett
/
brown
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

merged

This commit is contained in:
Daniel Knüttel 2019-07-15 22:31:53 +02:00
parent 5a6e039e28 1a9ddddc6d
commit 9580818204
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
c/interaction/interaction.c
View File

@ -113,17 +113,13 @@ interaction_ufunc_float2D
char * x_old = args[0]
, * y_old = args[1]
, * p_x_old = args[2]
, * p_y_old = args[3]
, * p_x_new = args[4]
, * p_y_new = args[5];
, * p_x_new = args[2]
, * p_y_new = args[3];
npy_intp x_old_steps = steps[0]
, y_old_steps = steps[1]
, p_x_old_steps = steps[2]
, p_y_old_steps = steps[3]
, p_x_new_steps = steps[4]
, p_y_new_steps = steps[5];
, p_x_new_steps = steps[2]
, p_y_new_steps = steps[3];
float * coefficients = (float *) data;
float dt = coefficients[19];
@ -151,10 +147,8 @@ interaction_ufunc_float2D
this_x_i = *(float *)(x_old + i*x_old_steps);
this_y_i = *(float *)(y_old + i*y_old_steps);
// copy current momenta
*(float *)(p_x_new + i*p_x_new_steps) = *(float *)(p_x_old + i*p_x_old_steps);
*(float *)(p_y_new + i*p_y_new_steps) = *(float *)(p_y_old + i*p_y_old_steps);
*(float *)(p_x_new + i*p_x_new_steps) = 0;
*(float *)(p_y_new + i*p_y_new_steps) = 0;
// compute and add the momentum offset
for(j = 0; j < i; j++)
{
@ -205,7 +199,7 @@ interaction_ufunc_float2D
//NPY_END_THREADS;
}
static char interaction_types[] =
{ NPY_FLOAT, NPY_FLOAT, NPY_FLOAT, NPY_FLOAT, NPY_FLOAT, NPY_FLOAT};
{ NPY_FLOAT, NPY_FLOAT, NPY_FLOAT, NPY_FLOAT};
static char force_types[] =
{ NPY_FLOAT, NPY_FLOAT};
static char potential_types[] =
@ -298,9 +292,9 @@ interaction_UFuncWrapper_init
interaction_funcs
, self->data
, interaction_types
, 1
, 4
, 2
, 1 // ntypes
, 2 // nin
, 2 // nout
, PyUFunc_None
, "interaction2D"
, "Update the momenta according to the given coefficients and positions"

2
particles.py
View File

@ -15,7 +15,7 @@ borders_x = [-100, 100]
borders_y = [-100, 100]
n_particles = 600
frames = 100
spawn_restriction = 3
spawn_restriction = 1.1
dt = 0.1
c[-1] = dt

5
py/brown/brown.py
View File

@ -37,7 +37,10 @@ class BrownIterator(object):
if(self._i == 1):
return self.x, self.y
self.px, self.py = self._interaction(self.x, self.y, self.px, self.py)
delta_px, delta_py = self._interaction(self.x, self.y)
self.px += delta_px
self.py += delta_py
print(self.px)
# XXX: We need the (-1)**i to make the problem
# symmetric.
self.px[np.isnan(self.px)] = self.speed_of_light * (-1)**self._i