From 780cedc0cc85d3564be07fa34494515357a867a5 Mon Sep 17 00:00:00 2001
From: Rafael Ravedutti <rafaelravedutti@gmail.com>
Date: Fri, 25 Aug 2023 16:26:11 +0200
Subject: [PATCH] Set number of contacts in the contact history kernel
Signed-off-by: Rafael Ravedutti <rafaelravedutti@gmail.com>
---
src/pairs/sim/contact_history.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/pairs/sim/contact_history.py b/src/pairs/sim/contact_history.py
index 19e30a7..818b559 100644
--- a/src/pairs/sim/contact_history.py
+++ b/src/pairs/sim/contact_history.py
@@ -33,6 +33,7 @@ class BuildContactHistory(Lowerable):
for i in ParticleFor(self.sim):
last_contact = self.sim.add_temp_var(0)
contact_index = self.sim.add_temp_var(0)
+
for neigh in NeighborFor(self.sim, i, cell_lists, neighbor_lists):
j = neigh.particle_index()
contact_index.set(-1)
@@ -40,8 +41,9 @@ class BuildContactHistory(Lowerable):
for _ in Filter(self.sim, ScalarOp.cmp(contact_lists[i][k], j)):
contact_index.set(k)
- for _ in Filter(self.sim, ScalarOp.and_op(contact_index >= 0,
- ScalarOp.neq(last_contact, contact_index))):
+ for _ in Filter(self.sim,
+ ScalarOp.and_op(contact_index >= 0,
+ ScalarOp.neq(last_contact, contact_index))):
for contact_prop in self.sim.contact_properties:
tmp = self.sim.add_temp_var(contact_prop[i, last_contact])
contact_prop[i, last_contact].set(contact_prop[i, contact_index])
@@ -62,3 +64,5 @@ class BuildContactHistory(Lowerable):
contact_lists[i][last_contact].set(j)
last_contact.set(last_contact + 1)
+
+ num_contacts[i].set(last_contact)
--
GitLab