[Yt-svn] yt-commit r611 - branches/yt-generalization/yt/lagos

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Mon Jun 23 16:46:20 2008
New Revision: 611
URL: http://yt.spacepope.org/changeset/611

Log:
Very, very  close for Orion.  Child masking now correct, but projections are
(again) truncating at the y-axis.



Modified:
   branches/yt-generalization/yt/lagos/BaseGridType.py
   branches/yt-generalization/yt/lagos/DerivedFields.py
   branches/yt-generalization/yt/lagos/OutputTypes.py

Modified: branches/yt-generalization/yt/lagos/BaseGridType.py
==============================================================================
--- branches/yt-generalization/yt/lagos/BaseGridType.py	(original)
+++ branches/yt-generalization/yt/lagos/BaseGridType.py	Mon Jun 23 16:46:20 2008
@@ -31,6 +31,7 @@
     _spatial = True
     _num_ghost_zones = 0
     _grids = None
+    _id_offset = 1
 
     def __init__(self, id, filename=None, hierarchy = None):
         self.data = {}
@@ -86,13 +87,14 @@
     def _setup_dx(self):
         # So first we figure out what the index is.  We don't assume
         # that dx=dy=dz , at least here.  We probably do elsewhere.
-        self.dx = self.hierarchy.gridDxs[self.id-1,0]
-        self.dy = self.hierarchy.gridDys[self.id-1,0]
-        self.dz = self.hierarchy.gridDzs[self.id-1,0]
+        id = self.id - self._id_offset
+        self.dx = self.hierarchy.gridDxs[id,0]
+        self.dy = self.hierarchy.gridDys[id,0]
+        self.dz = self.hierarchy.gridDzs[id,0]
         self.data['dx'] = self.dx
         self.data['dy'] = self.dy
         self.data['dz'] = self.dz
-        self._corners = self.hierarchy.gridCorners[:,:,self.id-1]
+        self._corners = self.hierarchy.gridCorners[:,:,id]
 
 
     def _generate_overlap_masks(self, axis, LE, RE):
@@ -414,6 +416,7 @@
         return
 
 class OrionGridBase(AMRGridPatch):
+    _id_offset = 0
     def __init__(self, LeftEdge, RightEdge, index, level, filename, offset, dimensions,start,stop,paranoia=True):
         AMRGridPatch.__init__(self, index)
         self._file_access_pooling = False

Modified: branches/yt-generalization/yt/lagos/DerivedFields.py
==============================================================================
--- branches/yt-generalization/yt/lagos/DerivedFields.py	(original)
+++ branches/yt-generalization/yt/lagos/DerivedFields.py	Mon Jun 23 16:46:20 2008
@@ -328,7 +328,7 @@
                                    ValidateSpatial(0)])
 
 def _GridIndices(field, data):
-    return na.ones(data["Density"].shape)*(data.id-1)
+    return na.ones(data["Density"].shape)*(data.id-data._id_offset)
 add_field("GridIndices", validators=[#ValidateProperty('id'),
                                      ValidateSpatial(0)], take_log=False)
 

Modified: branches/yt-generalization/yt/lagos/OutputTypes.py
==============================================================================
--- branches/yt-generalization/yt/lagos/OutputTypes.py	(original)
+++ branches/yt-generalization/yt/lagos/OutputTypes.py	Mon Jun 23 16:46:20 2008
@@ -180,6 +180,9 @@
                 dataType = param[20:].rstrip()
                 convFactor = float(line.split("=")[-1])
                 self.conversion_factors[dataType] = convFactor
+            elif param.startswith("DomainLeftEdge"):
+                self.parameters["DomainLeftEdge"] = \
+                    na.array([float(i) for i in vals.split()])
             elif param.startswith("DomainRightEdge"):
                 self.parameters["DomainRightEdge"] = \
                     na.array([float(i) for i in vals.split()])