From 7ed191a209e7e2d6e7f6433dfb607c1f8d8347d6 Mon Sep 17 00:00:00 2001
From: Rafael Ravedutti <rafael.r.ravedutti@fau.de>
Date: Thu, 8 Feb 2024 03:07:25 +0100
Subject: [PATCH] Small adjustments
Signed-off-by: Rafael Ravedutti <rafael.r.ravedutti@fau.de>
---
runtime/boundary_weights.hpp | 14 +++++++-------
src/pairs/sim/domain_partitioning.py | 11 +++--------
2 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/runtime/boundary_weights.hpp b/runtime/boundary_weights.hpp
index 165a62d..bf8ffbf 100644
--- a/runtime/boundary_weights.hpp
+++ b/runtime/boundary_weights.hpp
@@ -5,7 +5,7 @@
//---
#include "pairs.hpp"
#include "pairs_common.hpp"
-#include "gen/property_interface.hpp"
+#include "gen/interfaces.hpp"
#pragma once
@@ -27,9 +27,9 @@ void compute_boundary_weights(
*comm_weight = 0;
for(int i = 0; i < nlocal; i++) {
- real_t pos_x = pairs_interface::getPosition(position_ptr, i, 0, particle_capacity);
- real_t pos_y = pairs_interface::getPosition(position_ptr, i, 1, particle_capacity);
- real_t pos_z = pairs_interface::getPosition(position_ptr, i, 2, particle_capacity);
+ real_t pos_x = pairs_interface::get_position(position_ptr, i, 0, particle_capacity);
+ real_t pos_y = pairs_interface::get_position(position_ptr, i, 1, particle_capacity);
+ real_t pos_z = pairs_interface::get_position(position_ptr, i, 2, particle_capacity);
if( pos_x > xmin && pos_x <= xmax &&
pos_y > ymin && pos_y <= ymax &&
@@ -39,9 +39,9 @@ void compute_boundary_weights(
}
for(int i = nlocal; i < nlocal + nghost; i++) {
- real_t pos_x = pairs_interface::getPosition(position_ptr, i, 0, particle_capacity);
- real_t pos_y = pairs_interface::getPosition(position_ptr, i, 1, particle_capacity);
- real_t pos_z = pairs_interface::getPosition(position_ptr, i, 2, particle_capacity);
+ real_t pos_x = pairs_interface::get_position(position_ptr, i, 0, particle_capacity);
+ real_t pos_y = pairs_interface::get_position(position_ptr, i, 1, particle_capacity);
+ real_t pos_z = pairs_interface::get_position(position_ptr, i, 2, particle_capacity);
if( pos_x > xmin && pos_x <= xmax &&
pos_y > ymin && pos_y <= ymax &&
diff --git a/src/pairs/sim/domain_partitioning.py b/src/pairs/sim/domain_partitioning.py
index af06862..e3668be 100644
--- a/src/pairs/sim/domain_partitioning.py
+++ b/src/pairs/sim/domain_partitioning.py
@@ -1,13 +1,10 @@
-from pairs.ir.block import pairs_device_block, pairs_host_block
-from pairs.ir.branches import Branch, Filter
-from pairs.ir.functions import Call_Void
-from pairs.ir.loops import For, ParticleFor
-from pairs.ir.utils import Print
+from pairs.ir.assign import Assign
+from pairs.ir.branches import Filter
+from pairs.ir.functions import Call_Int, Call_Void
from pairs.ir.scalars import ScalarOp
from pairs.ir.select import Select
from pairs.ir.types import Types
from pairs.sim.flags import Flags
-from pairs.sim.lowerable import Lowerable
class DimensionRanges:
@@ -50,8 +47,6 @@ class DimensionRanges:
pbc_shifts = [0 if d != step else self.pbc[j] for d in range(self.sim.ndims())]
yield i, j, self.neighbor_ranks[j], pbc_shifts
-
-
def prev_neighbor(self, j, step, position, offset, flags_to_exclude):
particle_flags = self.sim.particle_flags
for i in For(self.sim, 0, self.sim.nlocal + self.sim.nghost):
--
GitLab