[Yt-svn] yt-commit r1320 - trunk/yt/lagos

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Thu Jun  4 11:20:10 2009
New Revision: 1320
URL: http://yt.spacepope.org/changeset/1320

Log:
Bringing the in-memory stuff back up to speed.



Modified:
   trunk/yt/lagos/DataReadingFuncs.py
   trunk/yt/lagos/HierarchyType.py
   trunk/yt/lagos/OutputTypes.py

Modified: trunk/yt/lagos/DataReadingFuncs.py
==============================================================================
--- trunk/yt/lagos/DataReadingFuncs.py	(original)
+++ trunk/yt/lagos/DataReadingFuncs.py	Thu Jun  4 11:20:10 2009
@@ -161,7 +161,7 @@
     #sl = tuple(reversed(sl))
     sl = tuple(sl)
     bsl = (slice(3,-3), slice(3,-3), slice(3,-3))
-    return enzo.grid_data[grid.id][field][bsl][sl]#.swapaxes(0,2)
+    return enzo.grid_data[grid.id][field][bsl][sl].swapaxes(0,2)
 
 def getExceptionInMemory():
     return KeyError
@@ -288,11 +288,11 @@
     def _read_set(self, grid, field):
         import enzo
         if grid.id not in self.grids_in_memory: raise KeyError
-        t1 = enzo.yt_parameter_file["InitialTime"]
-        t2 = enzo.hierarchy_information["GridOldTimes"][grid.id - 1]
+        return self.grids_in_memory[grid.id][field][self.my_slice]
         coef1 = max((grid.Time - t1)/(grid.Time - t2), 0.0)
         coef2 = 1.0 - coef1
-        return self.grids_in_memory[grid.id][field][self.my_slice]
+        t1 = enzo.yt_parameter_file["InitialTime"]
+        t2 = enzo.hierarchy_information["GridOldTimes"][grid.id]
         return (coef1*self.grids_in_memory[grid.id][field] + \
                 coef2*self.old_grids_in_memory[grid.id][field])\
                 [self.my_slice]

Modified: trunk/yt/lagos/HierarchyType.py
==============================================================================
--- trunk/yt/lagos/HierarchyType.py	(original)
+++ trunk/yt/lagos/HierarchyType.py	Thu Jun  4 11:20:10 2009
@@ -980,12 +980,12 @@
         data = list(field_list)
         if MPI.COMM_WORLD.rank == 0:
             for i in range(1, MPI.COMM_WORLD.size):
-                data += MPI.COMM_WORLD.Recv(source=i, tag=0)
+                data += MPI.COMM_WORLD.recv(source=i, tag=0)
             data = list(set(data))
         else:
-            MPI.COMM_WORLD.Send(data, dest=0, tag=0)
+            MPI.COMM_WORLD.send(data, dest=0, tag=0)
         MPI.COMM_WORLD.Barrier()
-        return MPI.COMM_WORLD.Bcast(data, root=0)
+        return MPI.COMM_WORLD.bcast(data, root=0)
 
     def _populate_hierarchy(self):
         self._copy_hierarchy_structure()
@@ -1046,6 +1046,9 @@
             random_sample = na.mgrid[0:max(len(gg)-1,1)].astype("int32")
         return gg[(random_sample,)]
 
+    def save_data(self, *args, **kwargs):
+        pass
+
 class EnzoHierarchy1D(EnzoHierarchy):
     def __init__(self, *args, **kwargs):
         EnzoHierarchy.__init__(self, *args, **kwargs)

Modified: trunk/yt/lagos/OutputTypes.py
==============================================================================
--- trunk/yt/lagos/OutputTypes.py	(original)
+++ trunk/yt/lagos/OutputTypes.py	Thu Jun  4 11:20:10 2009
@@ -43,7 +43,7 @@
             output_type_registry[name]=cls
             mylog.debug("Registering: %s as %s", name, cls)
 
-    def __new__(cls, filename, *args, **kwargs):
+    def __new__(cls, filename=None, *args, **kwargs):
         apath = os.path.abspath(filename)
         if not os.path.exists(apath): raise IOError(filename)
         if apath not in _cached_pfs:
@@ -393,6 +393,12 @@
 
 class EnzoStaticOutputInMemory(EnzoStaticOutput):
     _hierarchy_class = EnzoHierarchyInMemory
+
+    def __new__(cls, *args, **kwargs):
+        obj = object.__new__(cls)
+        obj.__init__(*args, **kwargs)
+        return obj
+
     def __init__(self, parameter_override=None, conversion_override=None):
         if parameter_override is None: parameter_override = {}
         self.__parameter_override = parameter_override
@@ -401,8 +407,12 @@
 
         StaticOutput.__init__(self, "InMemoryParameterFile", 8)
 
+        self.field_info = self._fieldinfo_class()
+
     def _parse_parameter_file(self):
         import enzo
+        self.basename = "cycle%08i" % (
+            enzo.yt_parameter_file["NumberOfPythonCalls"])
         self.parameters['CurrentTimeIdentifier'] = time.time()
         self.parameters.update(enzo.yt_parameter_file)
         self.conversion_factors.update(enzo.conversion_factors)