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

[britton at wrangler.dreamhost.com]

Author: britton
Date: Thu Sep  3 09:05:11 2009
New Revision: 1427
URL: http://yt.spacepope.org/changeset/1427

Log:
Made last update actually work.


Modified:
   trunk/yt/extensions/EnzoSimulation.py

Modified: trunk/yt/extensions/EnzoSimulation.py
==============================================================================
--- trunk/yt/extensions/EnzoSimulation.py	(original)
+++ trunk/yt/extensions/EnzoSimulation.py	Thu Sep  3 09:05:11 2009
@@ -21,6 +21,8 @@
         self.InitialRedshift = initial_redshift
         self.FinalRedshift = final_redshift
         self.links = links
+        self.get_time_outputs = get_time_outputs
+        self.get_redshift_outputs = get_redshift_outputs
 
         # Add any extra parameters to parameter dict.
         EnzoParameterDict.update(enzo_parameters)
@@ -82,11 +84,11 @@
             self.SimulationInitialTime = 0.0
 
         # Calculate redshifts for dt data dumps.
-        if get_time_outputs and self.enzoParameters.has_key('dtDataDump'):
+        if self.enzoParameters.has_key('dtDataDump'):
             self._CalculateTimeDumps()
 
         # Calculate times for redshift dumps.
-        if get_redshift_outputs and self.enzoParameters['ComovingCoordinates']:
+        if self.enzoParameters['ComovingCoordinates']:
             self._CalculateRedshiftDumpTimes()
 
         # Combine all data dumps.
@@ -120,6 +122,9 @@
 
     def _CombineDataOutputs(self):
         "Combines redshift and time data into one sorted list."
+
+        if not self.get_time_outputs: self.timeOutputs = []
+        if not self.get_redshift_outputs: self.redshiftOutputs = []
         self.allOutputs = self.redshiftOutputs + self.timeOutputs
         self.allOutputs.sort(key=lambda obj:obj['time'])