Commits

Sam Skillman committed 958de8e Merge

Merging

Comments (0)

Files changed (3)

yt/analysis_modules/halo_finding/halo_objects.py

         self.bin_count = None
         self.overdensity = None
         self.indices = np.array([])  # Never used for a LoadedHalo.
+        self._saved_fields = {}
+        self._ds_sort = None
+        self._particle_mask = None
         # A supplementary data dict.
         if supp is None:
             self.supp = {}

yt/data_objects/data_containers.py

         Inside = np.zeros(grid["x"].shape, dtype = 'float64')
         dim = grid["x"].shape
         # need this to take into account non-cube root grid tiles
-        dot_evec = np.zeros([3, dim[0], dim[1], dim[2]])
+        if (len(dim) == 1):
+            dot_evec = np.zeros([3, dim[0]])
+        elif (len(dim) == 2):
+            dot_evec = np.zeros([3, dim[0], dim[1]])
+        elif (len(dim) == 3):
+            dot_evec = np.zeros([3, dim[0], dim[1], dim[2]])
+
         for i, ax in enumerate('xyz'):
             # distance to center
             ar  = grid[ax]-self.center[i]

yt/utilities/command_line.py

         print
         print "Recall you can create a new SSH tunnel dynamically by pressing"
         print "~C and then typing -L%s:localhost:%s" % (app.port, app.port)
+        print "where the first number is the port on your local machine. "
+        print
+        print "If you are using %s on your machine already, try -L8889:localhost:%s" % (app.port, app.port)
         print
         print "Additionally, while in the notebook, we recommend you start by"
         print "replacing 'yt.mods' with 'yt.imods' like so:"