[Yt-svn] yt: 2 new changesets

[hg at spacepope.org]

hg Repository: yt
details:   yt/rev/ebfeda31ba98
changeset: 3419:ebfeda31ba98
user:      Matthew Turk <matthewturk at gmail.com>
date:
Wed Sep 29 12:57:09 2010 -0700
description:
Making the Enzo conversion override only have one underscore and porting it to
FLASH

hg Repository: yt
details:   yt/rev/97c275d17e34
changeset: 3420:97c275d17e34
user:      Matthew Turk <matthewturk at gmail.com>
date:
Wed Sep 29 12:57:33 2010 -0700
description:
Merging

diffstat:

 yt/frontends/enzo/data_structures.py  |  19 ++++++++++---------
 yt/frontends/flash/data_structures.py |   9 ++++++++-
 2 files changed, 18 insertions(+), 10 deletions(-)

diffs (87 lines):

diff -r d7e28cdce956 -r 97c275d17e34 yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py	Sat Sep 25 18:21:52 2010 -0700
+++ b/yt/frontends/enzo/data_structures.py	Wed Sep 29 12:57:33 2010 -0700
@@ -45,7 +45,8 @@
 from yt.utilities.logger import ytLogger as mylog
 
 from .definitions import parameterDict
-from .fields import EnzoFieldContainer, add_enzo_field
+from .fields import EnzoFieldContainer, Enzo1DFieldContainer, \
+    Enzo2DFieldContainer, add_enzo_field
 
 from yt.utilities.parallel_tools.parallel_analysis_interface import \
     parallel_blocking_call
@@ -600,9 +601,9 @@
         of {fieldname : conversion_to_cgs} that will override the #DataCGS.
         """
         if parameter_override is None: parameter_override = {}
-        self.__parameter_override = parameter_override
+        self._parameter_override = parameter_override
         if conversion_override is None: conversion_override = {}
-        self.__conversion_override = conversion_override
+        self._conversion_override = conversion_override
         self.storage_filename = storage_filename
 
         StaticOutput.__init__(self, filename, data_style)
@@ -732,9 +733,9 @@
                 self.domain_right_edge = \
                 self.parameters["DomainRightEdge"] = \
                     na.array([float(i) for i in vals.split()])
-        for p, v in self.__parameter_override.items():
+        for p, v in self._parameter_override.items():
             self.parameters[p] = v
-        for p, v in self.__conversion_override.items():
+        for p, v in self._conversion_override.items():
             self.conversion_factors[p] = v
         self.refine_by = self.parameters["RefineBy"]
         self.dimensionality = self.parameters["TopGridRank"]
@@ -856,9 +857,9 @@
 
     def __init__(self, parameter_override=None, conversion_override=None):
         if parameter_override is None: parameter_override = {}
-        self.__parameter_override = parameter_override
+        self._parameter_override = parameter_override
         if conversion_override is None: conversion_override = {}
-        self.__conversion_override = conversion_override
+        self._conversion_override = conversion_override
 
         StaticOutput.__init__(self, "InMemoryParameterFile", self._data_style)
 
@@ -882,9 +883,9 @@
         for i in self.conversion_factors:
             if isinstance(self.conversion_factors[i], types.TupleType):
                 self.conversion_factors[i] = na.array(self.conversion_factors[i])
-        for p, v in self.__parameter_override.items():
+        for p, v in self._parameter_override.items():
             self.parameters[p] = v
-        for p, v in self.__conversion_override.items():
+        for p, v in self._conversion_override.items():
             self.conversion_factors[p] = v
         self.refine_by = self.parameters["RefineBy"]
         self.dimensionality = self.parameters["TopGridRank"]
diff -r d7e28cdce956 -r 97c275d17e34 yt/frontends/flash/data_structures.py
--- a/yt/frontends/flash/data_structures.py	Sat Sep 25 18:21:52 2010 -0700
+++ b/yt/frontends/flash/data_structures.py	Wed Sep 29 12:57:33 2010 -0700
@@ -173,7 +173,12 @@
     _handle = None
     
     def __init__(self, filename, data_style='flash_hdf5',
-                 storage_filename = None):
+                 storage_filename = None,
+                 conversion_override = None):
+
+        if conversion_override is None: conversion_override = {}
+        self._conversion_override = conversion_override
+
         StaticOutput.__init__(self, filename, data_style)
         self.storage_filename = storage_filename
 
@@ -204,6 +209,8 @@
         seconds = 1 #self["Time"]
         self.time_units['years'] = seconds / (365*3600*24.0)
         self.time_units['days']  = seconds / (3600*24.0)
+        for p, v in self._conversion_override.items():
+            self.conversion_factors[p] = v
 
     def _setup_nounits_units(self):
         z = 0