Tests & Internal: Modernize API

Avoid using the deprecated APIs.

Author: ax3l

src/amrex/extensions/ParticleContainer.py

@@ -103,7 +103,7 @@ def pc_to_df(self, local=True, comm=None, root_rank=0):
     # local DataFrame(s)
     dfs_local = []
     for lvl in range(self.finest_level + 1):
-        for pti in self.const_iterator(self, level=lvl):
+        for pti in self.const_iterator(level=lvl):
             if pti.size == 0:
                 continue
 

tests/test_particleContainer.py

@@ -63,7 +63,7 @@ def particle_container(Npart, std_geometry, distmap, boxarr, std_real_box):
 
     # assign some values to runtime components
     for lvl in range(pc.finest_level + 1):
-        for pti in pc.iterator(pc, level=lvl):
+        for pti in pc.iterator(level=lvl):
             soa = pti.soa()
             soa.get_real_data(2).assign(1.2345)
             soa.get_int_data(1).assign(42)
@@ -97,7 +97,7 @@ def soa_particle_container(Npart, std_geometry, distmap, boxarr, std_real_box):
 
     # assign some values to runtime components
     for lvl in range(pc.finest_level + 1):
-        for pti in pc.iterator(pc, level=lvl):
+        for pti in pc.iterator(level=lvl):
             soa = pti.soa()
             soa.get_real_data(8).assign(1.2345)
             soa.get_int_data(0).assign(42)
@@ -212,7 +212,7 @@ def test_pc_init():
     # lvl = 0
     for lvl in range(pc.finest_level + 1):
         print(f"at level {lvl}:")
-        for pti in pc.iterator(pc, level=lvl):
+        for pti in pc.iterator(level=lvl):
             print("...")
             assert pti.num_particles == 1
             assert pti.num_real_particles == 1
@@ -243,7 +243,7 @@ def test_pc_init():
 
     # read-only
     for lvl in range(pc.finest_level + 1):
-        for pti in pc.const_iterator(pc, level=lvl):
+        for pti in pc.const_iterator(level=lvl):
             assert pti.num_particles == 1
             assert pti.num_real_particles == 1
             assert pti.num_neighbor_particles == 0
@@ -383,7 +383,7 @@ class Config:
     # iterate over mesh-refinement levels
     for lvl in range(pc.finest_level + 1):
         # loop local tiles of particles
-        for pti in pc.iterator(pc, level=lvl):
+        for pti in pc.iterator(level=lvl):
             # compile-time and runtime attributes
             soa = pti.soa().to_xp()
 
@@ -420,8 +420,8 @@ class Config:
         # print all particle ids in the tile
         print("idcpu =", pti["idcpu"])
 
-        x = pti["x"]
-        y = pti["y"]
+        x = pti["x"]  # this is automatically a cupy or numpy
+        y = pti["y"]  #   array, depending on Config.have_gpu
 
         # write to all particles in the chunk
         # note: careful, if you change particle positions, you might need to
@@ -457,7 +457,7 @@ class Config:
     # iterate over mesh-refinement levels
     for lvl in range(pc.finest_level + 1):
         # loop local tiles of particles
-        for pti in pc.iterator(pc, level=lvl):
+        for pti in pc.iterator(level=lvl):
             # default layout: AoS with positions and idcpu
             # note: not part of the new PureSoA particle container layout
             aos = (

tests/test_plotfileparticledata.py

@@ -65,7 +65,7 @@ def particle_container(Rpart, std_geometry, distmap, boxarr, std_real_box):
     particles_tile_ct = 0
     # assign some values to runtime components
     for lvl in range(pc.finest_level + 1):
-        for pti in pc.iterator(pc, level=lvl):
+        for pti in pc.iterator(level=lvl):
             aos = pti.aos()
             aos_numpy = aos.to_numpy(copy=False)
             for i, p in enumerate(aos_numpy):
@@ -81,7 +81,7 @@ def check_particles_container(pc, reference_particles):
     Checks the contents of `pc` against `reference_particles`
     """
     for lvl in range(pc.finest_level + 1):
-        for i, pti in enumerate(pc.iterator(pc, level=lvl)):
+        for i, pti in enumerate(pc.iterator(level=lvl)):
             aos = pti.aos()
             for p in aos.to_numpy(copy=True):
                 ref = reference_particles[p["idata_0"]]