Commits

Sam Leitner committed 1b2eb42

small fixes to last commit

Comments (0)

Files changed (3)

yt/frontends/artio/_artio_caller.pyx

     # 0-level ART octs do not exist in memory (the ART root cells are not children)
     ytlevel = level+1 
     artioroutines = <object>pyobject
-    print '_artio_caller.pyx:octpositionsandvalues',ytlevel, pos[0],pos[1],pos[2],level,variables[0]
+    #    print '_artio_caller.pyx:octpositionsandvalues',ytlevel, pos[0],pos[1],pos[2],level,variables[0]
     artioroutines.cell_pos_callback(ytlevel, refined, isfc, position)
 
 cdef void wrap_cell_var_callback(float *variables, int level, int refined, 

yt/frontends/artio/data_structures.py

     def fwidth(self, dobj):
         # Recall domain_dimensions is the number of cells, not octs
         # snl FIX: please don't hardcode this here 
-        DRE = self.oct_handler.parameter_file.domain_right_edge 
-        DLE = self.oct_handler.parameter_file.domain_left_edge
-        nn = self.oct_handler.parameter_file.domain_dimension
-        for i in range(3):
-            base_dx = (DRE[i] - DLE[i])/nn[i]
-        print 'in fwidth in data_structures.py', DRE, DLE, nn
-        print base_dx
-        sys.exit(1)
+#        DRE = self.oct_handler.parameter_file.domain_right_edge 
+#        DLE = self.oct_handler.parameter_file.domain_left_edge
+#        nn = self.oct_handler.parameter_file.domain_dimension
+#        for i in range(3):
+#            base_dx = (DRE[i] - DLE[i])/nn[i]
+#        print 'in fwidth in data_structures.py', DRE, DLE, nn
+#        print base_dx
+        base_dx = [1.0,1.0,1.0]
         widths = np.empty((self.masked_cell_count, 3), dtype="float64")
         dds = (2**self.ires(dobj))
         for i in range(3):

yt/geometry/oct_container.pyx

             cur = cur.next
 
     cdef void oct_bounds(self, Oct *o, np.float64_t *corner, np.float64_t *size):
-        cdef np.float64_t base_dx[3]
         cdef int i
         for i in range(3):
             size[i] = (self.DRE[i] - self.DLE[i]) / (self.nn[i] << o.level)
         cdef np.float64_t corner[3], size[3]
         bounds = np.zeros((27,6), dtype="float64")
         cdef int i, ii
-        cdef np.float64_t base_dx[3]
         tnp = 0
         for i in range(27):
             self.oct_bounds(neighbors[i], corner, size)
         # pos here is CELL center, not OCT center.
         cdef np.float64_t pos[3]
         cdef int n = mask.shape[0]
-        cdef np.float64_t base_dx[3], dx[3]
         cdef int eterm[3]
         cdef np.ndarray[np.int64_t, ndim=1] count
         count = np.zeros(self.max_domain + 1, 'int64')