[Yt-svn] yt-commit r1584 - branches/yt-1.6/yt/lagos trunk/yt/lagos
mturk at wrangler.dreamhost.com
mturk at wrangler.dreamhost.com
Thu Jan 21 16:01:03 PST 2010
Author: mturk
Date: Thu Jan 21 16:01:01 2010
New Revision: 1584
URL: http://yt.enzotools.org/changeset/1584
Log:
Backporting Jeff's patches to Orion to 1.6, updating a minor docstring in both.
Modified:
branches/yt-1.6/yt/lagos/BaseDataTypes.py
branches/yt-1.6/yt/lagos/HierarchyType.py
branches/yt-1.6/yt/lagos/OutputTypes.py
trunk/yt/lagos/BaseDataTypes.py
Modified: branches/yt-1.6/yt/lagos/BaseDataTypes.py
==============================================================================
--- branches/yt-1.6/yt/lagos/BaseDataTypes.py (original)
+++ branches/yt-1.6/yt/lagos/BaseDataTypes.py Thu Jan 21 16:01:01 2010
@@ -287,7 +287,7 @@
def save_object(self, name, filename = None):
"""
Save an object. If *filename* is supplied, it will be stored in
- a :module:`shelve` file of that name. Otherwise, it will be stored via
+ a :mod:`shelve` file of that name. Otherwise, it will be stored via
:meth:`yt.lagos.AMRHierarchy.save_object`.
"""
if filename is not None:
Modified: branches/yt-1.6/yt/lagos/HierarchyType.py
==============================================================================
--- branches/yt-1.6/yt/lagos/HierarchyType.py (original)
+++ branches/yt-1.6/yt/lagos/HierarchyType.py Thu Jan 21 16:01:01 2010
@@ -1127,7 +1127,19 @@
pass
def _setup_unknown_fields(self):
- pass
+ for field in self.field_list:
+ if field in self.parameter_file.field_info: continue
+ mylog.info("Adding %s to list of fields", field)
+ cf = None
+ if self.parameter_file.has_key(field):
+ def external_wrapper(f):
+ def _convert_function(data):
+ return data.convert(f)
+ return _convert_function
+ cf = external_wrapper(field)
+ add_field(field, lambda a, b: None,
+ convert_function=cf, take_log=False)
+
def _setup_derived_fields(self):
pass
Modified: branches/yt-1.6/yt/lagos/OutputTypes.py
==============================================================================
--- branches/yt-1.6/yt/lagos/OutputTypes.py (original)
+++ branches/yt-1.6/yt/lagos/OutputTypes.py Thu Jan 21 16:01:01 2010
@@ -494,7 +494,7 @@
self.parameters["EOSType"] = -1 # default
if self.fparameters.has_key("mu"):
self.parameters["mu"] = self.fparameters["mu"]
- self.parameters["RefineBy"] = self.parameters["RefineBy"][0]
+
def _localize(self, f, default):
if f is None:
return os.path.join(self.directory, default)
@@ -541,7 +541,11 @@
if len(t) == 1:
self.parameters[paramName] = t[0]
else:
- self.parameters[paramName] = t
+ if paramName == "RefineBy":
+ self.parameters[paramName] = t[0]
+ else:
+ self.parameters[paramName] = t
+
elif param.startswith("geometry.prob_hi"):
self.parameters["DomainRightEdge"] = \
na.array([float(i) for i in vals.split()])
Modified: trunk/yt/lagos/BaseDataTypes.py
==============================================================================
--- trunk/yt/lagos/BaseDataTypes.py (original)
+++ trunk/yt/lagos/BaseDataTypes.py Thu Jan 21 16:01:01 2010
@@ -287,7 +287,7 @@
def save_object(self, name, filename = None):
"""
Save an object. If *filename* is supplied, it will be stored in
- a :module:`shelve` file of that name. Otherwise, it will be stored via
+ a :mod:`shelve` file of that name. Otherwise, it will be stored via
:meth:`yt.lagos.AMRHierarchy.save_object`.
"""
if filename is not None:
More information about the yt-svn
mailing list