Node-based double linked list of Particles - DO NOT MERGE - DO NOT CLOSE

parcels/__init__.py

@@ -3,14 +3,19 @@
 
 from parcels.fieldset import *  # noqa
 from parcels.particle import *  # noqa
-from parcels.particleset import *  # noqa
-from parcels.particleset_benchmark import *  # noqa
+from parcels.particleset_vectorized import *  # noqa
+from parcels.particleset_vectorized_benchmark import *  # noqa
+# from parcels.particleset_benchmark import *  # noqa
+# from parcels.field import *  # noqa
+from parcels.kernel_vectorized import *  # noqa
 from parcels.field import *  # noqa
-from parcels.kernel import *  # noqa
 import parcels.rng as random  # noqa
-from parcels.particlefile import *  # noqa
+# from parcels import rng as random
+# from parcels.particlefile import *  # noqa
+from parcels.particlefile_vectorized import *  # noqa
 from parcels.kernels import *  # noqa
 from parcels.scripts import *  # noqa
 from parcels.gridset import *  # noqa
 from parcels.grid import *  # noqa
 from parcels.tools import *  # noqa
+from parcels.wrapping import *  # noga

parcels/field.py

@@ -492,12 +492,19 @@ def reshape(self, data, transpose=False):
             data = self.add_periodic_halo(zonal=self.grid.zonal_halo > 0, meridional=self.grid.meridional_halo > 0, halosize=max(self.grid.meridional_halo, self.grid.zonal_halo), data=data)
         return data
 
+    @property
+    def scaling_factor(self):
+        return self._scaling_factor
+
+    @scaling_factor.setter
+    def scaling_factor(self, factor):
+        self.set_scaling_factor(factor)
+
     def set_scaling_factor(self, factor):
         """Scales the field data by some constant factor.
 
         :param factor: scaling factor
         """
-
         if self._scaling_factor:
             raise NotImplementedError(('Scaling factor for field %s already defined.' % self.name))
         self._scaling_factor = factor
@@ -507,9 +514,6 @@ def set_scaling_factor(self, factor):
     def set_depth_from_field(self, field):
         self.grid.depth_field = field
 
-    def __getitem__(self, key):
-        return self.eval(*key)
-
     def calc_cell_edge_sizes(self):
         """Method to calculate cell sizes based on numpy.gradient method
                 Currently only works for Rectilinear Grids"""
@@ -931,6 +935,9 @@ def depth_index(self, depth, lat, lon):
         else:
             return depth_index.argmin() - 1 if depth_index.any() else 0
 
+    def __getitem__(self, key):
+        return self.eval(*key)
+
     def eval(self, time, z, y, x, applyConversion=True):
         """Interpolate field values in space and time.