fixes

tests/unit_tests/dummy_particulator.py

@@ -16,4 +16,4 @@ def __init__(self, backend, n_sd=0, formulae=None):
         self.environment = DummyEnvironment()
         self.environment.register(self)
         self.req_attr = {'n': Multiplicities(self), 'cell id': CellID(self)}
-        self.particles = None
+        self.attributes = None

tests/unit_tests/dynamics/coalescence/test_croupiers.py

@@ -40,8 +40,8 @@ def test_final_state(croupier, backend):
 
     # Act
     u01 = backend.Storage.from_ndarray(np.random.random(n_sd))
-    particulator.particles.permutation(u01, local=particulator.croupier == 'local')
-    _ = particulator.particles.cell_start
+    particulator.attributes.permutation(u01, local=particulator.croupier == 'local')
+    _ = particulator.attributes.cell_start
 
     # Assert
-    assert (np.diff(particulator.particles['cell id'][particulator.particles._Particles__idx]) >= 0).all()
+    assert (np.diff(particulator.attributes['cell id'][particulator.attributes._Particles__idx]) >= 0).all()

tests/unit_tests/particles/test_moments.py

@@ -25,7 +25,7 @@ def test_moment_0d(backend):
         particles = DummyParticulator(backend, n_sd)
         attribute = {'n': n, 'volume': v, 'temperature': T, 'heat': T*v}
         particles.build(attribute)
-        state = particles.particles
+        state = particles.attributes
 
         true_mean, true_var = spectrum.stats(moments='mv')
 
@@ -80,7 +80,7 @@ def test_spectrum_moment_0d(backend):
         particles = DummyParticulator(backend, n_sd)
         attribute = {'n': n, 'volume': v, 'temperature': T, 'heat': T*v}
         particles.build(attribute)
-        state = particles.particles
+        state = particles.attributes
 
         v_bins = np.linspace(0, 5e-6, num=5, endpoint=True)
 

tests/unit_tests/particles/test_particles.py

@@ -33,7 +33,7 @@ def test_housekeeping(backend, volume, n):
         particulator = DummyParticulator(backend, n_sd=len(n))
         attributes = {'n': n, 'volume': volume}
         particulator.build(attributes, int_caster=np.int64)
-        sut = particulator.particles
+        sut = particulator.attributes
         sut.healthy = False
 
         # Act
@@ -61,7 +61,7 @@ def test_sort_by_cell_id(backend, n, cells, n_sd, idx, new_idx, cell_start):
         n_cell = max(cells) + 1
         particulator.environment.mesh.n_cell = n_cell
         particulator.build(attributes={'n': np.ones(n_sd)})
-        sut = particulator.particles
+        sut = particulator.attributes
         sut._Particles__idx = TestParticles.make_indexed_storage(backend, idx)
         sut.attributes['n'].data = TestParticles.make_indexed_storage(backend, n, sut._Particles__idx)
         sut.attributes['cell id'].data = TestParticles.make_indexed_storage(backend, cells, sut._Particles__idx)
@@ -93,7 +93,7 @@ def test_recalculate_cell_id(backend):
         cell_id[droplet_id] = -1
         attribute = {'n': n, 'cell id': cell_id, 'cell origin': cell_origin, 'position in cell': position_in_cell}
         particulator.build(attribute)
-        sut = particulator.particles
+        sut = particulator.attributes
 
         # Act
         sut.recalculate_cell_id()
@@ -194,7 +194,7 @@ def test_permutation_local_repeatable(backend):
             cell_id += [i] * (cell_start[i + 1] - cell_start[i])
         assert len(cell_id) == n_sd
         particulator.build(attributes={'n': np.ones(n_sd)})
-        sut = particulator.particles
+        sut = particulator.attributes
         sut._Particles__idx = TestParticles.make_indexed_storage(backend, idx)
         idx_length = len(sut._Particles__idx)
         sut._Particles__tmp_idx = TestParticles.make_indexed_storage(backend, [0] * idx_length)