Skip to content

fix: remove deprecated method #2

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

Open
L2ncE wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: remove deprecated method #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions particle_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ def add_particle(self, p, x, v, density, pressure, material, color):

@ti.kernel
def add_particles(self, new_particles_num: int,
new_particles_positions: ti.ext_arr(),
new_particles_velocity: ti.ext_arr(),
new_particle_density: ti.ext_arr(),
new_particle_pressure: ti.ext_arr(),
new_particles_material: ti.ext_arr(),
new_particles_color: ti.ext_arr()):
new_particles_positions: ti.types.ndarray(),
new_particles_velocity: ti.types.ndarray(),
new_particle_density: ti.types.ndarray(),
new_particle_pressure: ti.types.ndarray(),
new_particles_material: ti.types.ndarray(),
new_particles_color: ti.types.ndarray()):
for p in range(self.particle_num[None], self.particle_num[None] + new_particles_num):
v = ti.Vector.zero(float, self.dim)
x = ti.Vector.zero(float, self.dim)
Expand Down Expand Up @@ -101,7 +101,7 @@ def is_valid_cell(self, cell):
def allocate_particles_to_grid(self):
for p in range(self.particle_num[None]):
cell = self.pos_to_index(self.x[p])
offset = self.grid_particles_num[cell].atomic_add(1)
offset = ti.atomic_add(self.grid_particles_num[cell], 1)
self.grid_particles[cell, offset] = p

@ti.kernel
Expand Down Expand Up @@ -133,13 +133,13 @@ def initialize_particle_system(self):
self.search_neighbors()

@ti.kernel
def copy_to_numpy_nd(self, np_arr: ti.ext_arr(), src_arr: ti.template()):
def copy_to_numpy_nd(self, np_arr: ti.types.ndarray(), src_arr: ti.template()):
for i in range(self.particle_num[None]):
for j in ti.static(range(self.dim)):
np_arr[i, j] = src_arr[i][j]

@ti.kernel
def copy_to_numpy(self, np_arr: ti.ext_arr(), src_arr: ti.template()):
def copy_to_numpy(self, np_arr: ti.types.ndarray(), src_arr: ti.template()):
for i in range(self.particle_num[None]):
np_arr[i] = src_arr[i]

Expand Down