[Yt-svn] yt-commit r1340 - trunk/yt/extensions

[britton at wrangler.dreamhost.com]

Author: britton
Date: Tue Jun 16 14:38:45 2009
New Revision: 1340
URL: http://yt.spacepope.org/changeset/1340

Log:
Removed reference to verbose attribute which no longer exists and added 
import EnzoSimulation as ES to mods.py in extensions.


Modified:
   trunk/yt/extensions/EnzoSimulation.py
   trunk/yt/extensions/mods.py

Modified: trunk/yt/extensions/EnzoSimulation.py
==============================================================================
--- trunk/yt/extensions/EnzoSimulation.py	(original)
+++ trunk/yt/extensions/EnzoSimulation.py	Tue Jun 16 14:38:45 2009
@@ -6,7 +6,8 @@
     Super class for performing the same operation over all data dumps in 
     a simulation from one redshift to another.
     """
-    def __init__(self,EnzoParameterFile,initial_time=None,final_time=None,initial_redshift=None,final_redshift=None):
+    def __init__(self,EnzoParameterFile,initial_time=None,final_time=None,initial_redshift=None,final_redshift=None,
+                 links=False):
         self.EnzoParameterFile = EnzoParameterFile
         self.enzoParameters = {}
         self.redshiftOutputs = []
@@ -16,6 +17,7 @@
         self.FinalTime = final_time
         self.InitialRedshift = initial_redshift
         self.FinalRedshift = final_redshift
+        self.links = links
 
         # Set some parameter defaults.
         self._SetParameterDefaults()
@@ -127,15 +129,16 @@
                     elif self.allOutputs[q]['time'] == self.FinalTime:
                         end_index = q
 
-#             if (q == 0):
-#                 self.allOutputs[q]['previous'] = None
-#                 self.allOutputs[q]['next'] = self.allOutputs[q+1]
-#             elif (q == len(self.allOutputs) - 1):
-#                 self.allOutputs[q]['previous'] = self.allOutputs[q-1]                
-#                 self.allOutputs[q]['next'] = None
-#             else:
-#                 self.allOutputs[q]['previous'] = self.allOutputs[q-1]
-#                 self.allOutputs[q]['next'] = self.allOutputs[q+1]
+            if self.links and start_index is not None:
+                if q == start_index:
+                    self.allOutputs[q]['previous'] = None
+                    self.allOutputs[q]['next'] = self.allOutputs[q+1]
+                elif q == end_index:
+                    self.allOutputs[q]['previous'] = self.allOutputs[q-1]                
+                    self.allOutputs[q]['next'] = None
+                elif end_index is None:
+                    self.allOutputs[q]['previous'] = self.allOutputs[q-1]
+                    self.allOutputs[q]['next'] = self.allOutputs[q+1]
 
         del self.redshiftOutputs
         del self.timeOutputs
@@ -158,7 +161,6 @@
                 param = param.strip()
                 vals = vals.strip()
             except ValueError:
-                if self.verbose: mylog.error("Skipping line: %s" % line)
                 continue
             if EnzoParameterDict.has_key(param):
                 t = map(EnzoParameterDict[param], vals.split())

Modified: trunk/yt/extensions/mods.py
==============================================================================
--- trunk/yt/extensions/mods.py	(original)
+++ trunk/yt/extensions/mods.py	Tue Jun 16 14:38:45 2009
@@ -32,6 +32,7 @@
 import lightcone as LC
 import SpectralIntegrator as SI
 import RayTracer as RT
+import EnzoSimulation as ES
 
 import HierarchySubset
 import disk_analysis