[Yt-svn] yt-commit r614 - in branches/yt-generalization/yt: lagos reason

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Mon Jun 23 18:17:06 2008
New Revision: 614
URL: http://yt.spacepope.org/changeset/614

Log:
Added some stuff to make reason work with Orion.  It's broken for Enzo now.
Added field detector to the Orion hierarchy constructor.



Modified:
   branches/yt-generalization/yt/lagos/DataReadingFuncs.py
   branches/yt-generalization/yt/lagos/HierarchyType.py
   branches/yt-generalization/yt/lagos/OrionDefs.py
   branches/yt-generalization/yt/reason/App.py
   branches/yt-generalization/yt/reason/Notebook.py

Modified: branches/yt-generalization/yt/lagos/DataReadingFuncs.py
==============================================================================
--- branches/yt-generalization/yt/lagos/DataReadingFuncs.py	(original)
+++ branches/yt-generalization/yt/lagos/DataReadingFuncs.py	Mon Jun 23 18:17:06 2008
@@ -205,5 +205,5 @@
     """
     sl = [slice(None), slice(None), slice(None)]
     sl[axis] = slice(coord, coord + 1)
-    sl = tuple(reversed(sl))
-    return self.readDataFast(field)[sl]
+    #sl = tuple(reversed(sl))
+    return grid.readDataFast(field)[sl]

Modified: branches/yt-generalization/yt/lagos/HierarchyType.py
==============================================================================
--- branches/yt-generalization/yt/lagos/HierarchyType.py	(original)
+++ branches/yt-generalization/yt/lagos/HierarchyType.py	Mon Jun 23 18:17:06 2008
@@ -809,6 +809,7 @@
         self._setup_classes()
         self.readGlobalHeader(header_filename)
         AMRHierarchy.__init__(self,pf)
+        self._setup_field_list()
 
     def readGlobalHeader(self,filename):
         """
@@ -975,6 +976,18 @@
         mask = na.logical_and(mask, (self.gridLevels == (grid.Level+1)).flat)
         return self.grids[mask]
 
+    def _setup_field_list(self):
+        self.derived_field_list = []
+        for field in fieldInfo:
+            try:
+                fd = fieldInfo[field].get_dependencies(pf = self.parameter_file)
+            except:
+                continue
+            available = na.all([f in self.field_list for f in fd.requested])
+            if available: self.derived_field_list.append(field)
+        for field in self.field_list:
+            if field not in self.derived_field_list:
+                self.derived_field_list.append(field)
 
 class OrionLevel:
     def __init__(self,level,ngrids):

Modified: branches/yt-generalization/yt/lagos/OrionDefs.py
==============================================================================
--- branches/yt-generalization/yt/lagos/OrionDefs.py	(original)
+++ branches/yt-generalization/yt/lagos/OrionDefs.py	Mon Jun 23 18:17:06 2008
@@ -39,6 +39,7 @@
                         "z-velocity": "zvel",
                         "Density": "density",
                         "Total_Energy": "eden",
+                        "Temperature": "temperature",
                         }
 orion2ytFieldsDict = {}
 for f,v in yt2orionFieldsDict.items():

Modified: branches/yt-generalization/yt/reason/App.py
==============================================================================
--- branches/yt-generalization/yt/reason/App.py	(original)
+++ branches/yt-generalization/yt/reason/App.py	Mon Jun 23 18:17:06 2008
@@ -35,6 +35,7 @@
 _FidoOutputMenuItems = ["delete",]
 
 class ReasonMainWindow(wx.Frame):
+    _fn = "/Users/matthewturk/Development/yt/branches/yt-generalization/tests/uniformCollapse_base64_maxLev4/plt0005"
     def __init__(self, *args, **kwds):
         kwds["style"] = wx.DEFAULT_FRAME_STYLE
         kwds["title"] = "yt - Reason"
@@ -278,8 +279,9 @@
     def _add_static_output(self, filename):
         # Alright, we choose the hierarchy in the file selector,
         # so let's strip that extension off
-        fn = filename[:-10]
-        eso = lagos.EnzoStaticOutput(fn)
+        fn = filename#[:-10]
+        #eso = lagos.EnzoStaticOutput(fn)
+        eso = lagos.OrionStaticOutput(fn)
         try:
             z = str(eso["CosmologyCurrentRedshift"])
         except:

Modified: branches/yt-generalization/yt/reason/Notebook.py
==============================================================================
--- branches/yt-generalization/yt/reason/Notebook.py	(original)
+++ branches/yt-generalization/yt/reason/Notebook.py	Mon Jun 23 18:17:06 2008
@@ -403,13 +403,16 @@
     def SetupControls(self):
 
         self.widthSlider = wx.Slider(self, -1, wx.SL_HORIZONTAL | wx.SL_AUTOTICKS)
-        self.vals = na.logspace(log10(25*self.outputfile.hierarchy.get_smallest_dx()),0,201)
+        max_val = (self.outputfile["DomainRightEdge"] -
+                   self.outputfile["DomainLeftEdge"]).max()
+        self.vals = na.logspace(log10(25*self.outputfile.hierarchy.get_smallest_dx()),
+                                log10(max_val),201)
         self.widthSlider.SetRange(0, 200)
         self.widthSlider.SetTickFreq(1,1)
         self.widthSlider.SetValue(200)
 
         self.widthBox = wx.TextCtrl(self, style=wx.TE_PROCESS_ENTER)
-        self.widthBox.SetValue("1.0")
+        self.widthBox.SetValue("%s" % max_val)
 
         self.choices = self.outputfile.units.keys()
         self.choices.sort()