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

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Mon Jun 23 17:42:33 2008
New Revision: 613
URL: http://yt.spacepope.org/changeset/613

Log:
Got rid of a bunch of print statements -- and possibly fixed the units.



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

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 17:42:33 2008
@@ -339,7 +339,8 @@
 
 def _Ones(field, data):
     return na.ones(data.ActiveDimensions, dtype='float64')
-add_field("Ones", validators=[ValidateSpatial(0)], projection_conversion="1",
+add_field("Ones", validators=[ValidateSpatial(0)],
+          projection_conversion="unitary",
           display_field = False)
 add_field("CellsPerBin", function=_Ones, validators=[ValidateSpatial(0)],
           display_field = False)

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 17:42:33 2008
@@ -829,7 +829,6 @@
             self.field_indexes[line.rstrip()] =i
         self.field_list = []
         for f in self.field_indexes:
-            print f, orion2ytFieldsDict.get(f,f)
             self.field_list.append(orion2ytFieldsDict.get(f,f))
 
         self.dimension = int(self.__global_header_lines[counter])
@@ -943,7 +942,6 @@
             right_edges += [g.RightEdge for g in level.grids]
         self.gridLeftEdge = na.array(left_edges)
         self.gridRightEdge = na.array(right_edges)
-        print self.gridLeftEdge.shape, self.gridRightEdge.shape
         self.gridReverseTree = [] * self.num_grids
         self.gridReverseTree = [ [] for i in range(self.num_grids)]
         self.gridTree = [ [] for i in range(self.num_grids)]
@@ -960,7 +958,6 @@
     def __setup_grid_tree(self):
         for i, grid in enumerate(self.grids):
             children = self._get_grid_children(grid)
-            print i, grid.id, children
             for child in children:
                 self.gridReverseTree[child.id].append(i)
                 self.gridTree[i].append(weakref.proxy(child))

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 17:42:33 2008
@@ -207,6 +207,7 @@
             self._setup_nounits_units()
         self.time_units['1'] = 1
         self.units['1'] = 1
+        self.units['unitary'] = 1.0 / (self["DomainRightEdge"] - self["DomainLeftEdge"]).max()
         seconds = self["Time"]
         self.time_units['years'] = seconds / (365*3600*24.0)
         self.time_units['days']  = seconds / (3600*24.0)
@@ -374,18 +375,19 @@
         self._setup_nounits_units()
         self.conversion_factors = defaultdict(lambda: 1.0)
         self.time_units['1'] = 1
-        self.units['1'] = 1
+        self.units['1'] = 1.0
+        self.units['unitary'] = 1.0 / (self["DomainRightEdge"] - self["DomainLeftEdge"]).max()
         seconds = 1 #self["Time"]
         self.time_units['years'] = seconds / (365*3600*24.0)
         self.time_units['days']  = seconds / (3600*24.0)
+        for key in yt2orionFieldsDict:
+            self.conversion_factors[key] = 1.0
 
     def _setup_nounits_units(self):
         z = 0
-        box_proper = ytcfg.getfloat("lagos","nounitslength")
-        self.units['aye'] = 1.0
-        mylog.warning("No length units.  Setting 1.0 = %0.3e proper Mpc.", box_proper)
+        mylog.warning("Setting 1.0 in code units to be 1.0 cm")
         if not self.has_key("TimeUnits"):
             mylog.warning("No time units.  Setting 1.0 = 1 second.")
             self.conversion_factors["Time"] = 1.0
         for unit in mpc_conversion.keys():
-            self.units[unit] = mpc_conversion[unit] * box_proper
+            self.units[unit] = mpc_conversion[unit] / mpc_conversion["cm"]