[yt-svn] commit/yt: 4 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Mon Sep 14 11:06:39 PDT 2015
4 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/2c612f042f53/
Changeset: 2c612f042f53
Branch: yt
User: MatthewTurk
Date: 2015-09-10 15:16:56+00:00
Summary: Remove projload and tkinter from convenience.py.
Affected #: 1 file
diff -r 47da0c1a0142b30d6ff793f84090761fca977f67 -r 2c612f042f53627897320e23ab9759430ed9b9fe yt/convenience.py
--- a/yt/convenience.py
+++ b/yt/convenience.py
@@ -32,18 +32,6 @@
match, at which point it returns an instance of the appropriate
:class:`yt.data_objects.api.Dataset` subclass.
"""
- if len(args) == 0:
- try:
- from yt.extern.six.moves import tkinter
- import tkinter, tkFileDialog
- except ImportError:
- raise YTOutputNotIdentified(args, kwargs)
- root = tkinter.Tk()
- filename = tkFileDialog.askopenfilename(parent=root,title='Choose a file')
- if filename != None:
- return load(filename)
- else:
- raise YTOutputNotIdentified(args, kwargs)
candidates = []
args = [os.path.expanduser(arg) if isinstance(arg, str)
else arg for arg in args]
@@ -100,32 +88,6 @@
mylog.error(" Possible: %s", c)
raise YTOutputNotIdentified(args, kwargs)
-def projload(ds, axis, weight_field = None):
- # This is something of a hack, so that we can just get back a projection
- # and not utilize any of the intermediate index objects.
- class ProjMock(dict):
- pass
- import h5py
- f = h5py.File(os.path.join(ds.fullpath, ds.parameter_filename + ".yt"))
- b = f["/Projections/%s/" % (axis)]
- wf = "weight_field_%s" % weight_field
- if wf not in b: raise KeyError(wf)
- fields = []
- for k in b:
- if k.startswith("weight_field"): continue
- if k.endswith("_%s" % weight_field):
- fields.append(k)
- proj = ProjMock()
- for f in ["px","py","pdx","pdy"]:
- proj[f] = b[f][:]
- for f in fields:
- new_name = f[:-(len(weight_field) + 1)]
- proj[new_name] = b[f][:]
- proj.axis = axis
- proj.ds = ds
- f.close()
- return proj
-
def simulation(parameter_filename, simulation_type, find_outputs=False):
"""
Loads a simulation time series object of the specified
https://bitbucket.org/yt_analysis/yt/commits/b9522ba4b5d4/
Changeset: b9522ba4b5d4
Branch: yt
User: MatthewTurk
Date: 2015-09-10 15:49:44+00:00
Summary: Clean up some things in the static output
Affected #: 1 file
diff -r 2c612f042f53627897320e23ab9759430ed9b9fe -r b9522ba4b5d4b816371510409ce3523a02ac7834 yt/data_objects/static_output.py
--- a/yt/data_objects/static_output.py
+++ b/yt/data_objects/static_output.py
@@ -691,8 +691,7 @@
"""
from yt.units.dimensions import length
- if hasattr(self, "cosmological_simulation") \
- and getattr(self, "cosmological_simulation"):
+ if getattr(self, "cosmological_simulation", False):
# this dataset is cosmological, so add cosmological units.
self.unit_registry.modify("h", self.hubble_constant)
# Comoving lengths
@@ -705,16 +704,15 @@
self.set_code_units()
- if hasattr(self, "cosmological_simulation") \
- and getattr(self, "cosmological_simulation"):
+ if getattr(self, "cosmological_simulation", False):
# this dataset is cosmological, add a cosmology object
- setattr(self, "cosmology",
+ self.cosmology = \
Cosmology(hubble_constant=self.hubble_constant,
omega_matter=self.omega_matter,
omega_lambda=self.omega_lambda,
- unit_registry=self.unit_registry))
- setattr(self, "critical_density",
- self.cosmology.critical_density(self.current_redshift))
+ unit_registry=self.unit_registry)
+ self = critical_density \
+ self.cosmology.critical_density(self.current_redshift)
self.scale_factor = 1.0 / (1.0 + self.current_redshift)
def get_unit_from_registry(self, unit_str):
https://bitbucket.org/yt_analysis/yt/commits/07089054b271/
Changeset: 07089054b271
Branch: yt
User: MatthewTurk
Date: 2015-09-10 17:05:47+00:00
Summary: Fixing typo
Affected #: 1 file
diff -r b9522ba4b5d4b816371510409ce3523a02ac7834 -r 07089054b2719ee9a19dc6d92d37ff7dd62abddb yt/data_objects/static_output.py
--- a/yt/data_objects/static_output.py
+++ b/yt/data_objects/static_output.py
@@ -711,7 +711,7 @@
omega_matter=self.omega_matter,
omega_lambda=self.omega_lambda,
unit_registry=self.unit_registry)
- self = critical_density \
+ self.critical_density = \
self.cosmology.critical_density(self.current_redshift)
self.scale_factor = 1.0 / (1.0 + self.current_redshift)
https://bitbucket.org/yt_analysis/yt/commits/1e1fc6fb63d4/
Changeset: 1e1fc6fb63d4
Branch: yt
User: ngoldbaum
Date: 2015-09-14 18:06:29+00:00
Summary: Merged in MatthewTurk/yt (pull request #1743)
Remove some stub functions
Affected #: 2 files
diff -r 98fd66d8cfb26fd6ab648b5ca2982bc177970f26 -r 1e1fc6fb63d4dd5fc7183a3900902a0c0638ae9a yt/convenience.py
--- a/yt/convenience.py
+++ b/yt/convenience.py
@@ -32,18 +32,6 @@
match, at which point it returns an instance of the appropriate
:class:`yt.data_objects.api.Dataset` subclass.
"""
- if len(args) == 0:
- try:
- from yt.extern.six.moves import tkinter
- import tkinter, tkFileDialog
- except ImportError:
- raise YTOutputNotIdentified(args, kwargs)
- root = tkinter.Tk()
- filename = tkFileDialog.askopenfilename(parent=root,title='Choose a file')
- if filename != None:
- return load(filename)
- else:
- raise YTOutputNotIdentified(args, kwargs)
candidates = []
args = [os.path.expanduser(arg) if isinstance(arg, str)
else arg for arg in args]
@@ -100,32 +88,6 @@
mylog.error(" Possible: %s", c)
raise YTOutputNotIdentified(args, kwargs)
-def projload(ds, axis, weight_field = None):
- # This is something of a hack, so that we can just get back a projection
- # and not utilize any of the intermediate index objects.
- class ProjMock(dict):
- pass
- import h5py
- f = h5py.File(os.path.join(ds.fullpath, ds.parameter_filename + ".yt"))
- b = f["/Projections/%s/" % (axis)]
- wf = "weight_field_%s" % weight_field
- if wf not in b: raise KeyError(wf)
- fields = []
- for k in b:
- if k.startswith("weight_field"): continue
- if k.endswith("_%s" % weight_field):
- fields.append(k)
- proj = ProjMock()
- for f in ["px","py","pdx","pdy"]:
- proj[f] = b[f][:]
- for f in fields:
- new_name = f[:-(len(weight_field) + 1)]
- proj[new_name] = b[f][:]
- proj.axis = axis
- proj.ds = ds
- f.close()
- return proj
-
def simulation(parameter_filename, simulation_type, find_outputs=False):
"""
Loads a simulation time series object of the specified
diff -r 98fd66d8cfb26fd6ab648b5ca2982bc177970f26 -r 1e1fc6fb63d4dd5fc7183a3900902a0c0638ae9a yt/data_objects/static_output.py
--- a/yt/data_objects/static_output.py
+++ b/yt/data_objects/static_output.py
@@ -691,8 +691,7 @@
"""
from yt.units.dimensions import length
- if hasattr(self, "cosmological_simulation") \
- and getattr(self, "cosmological_simulation"):
+ if getattr(self, "cosmological_simulation", False):
# this dataset is cosmological, so add cosmological units.
self.unit_registry.modify("h", self.hubble_constant)
# Comoving lengths
@@ -705,16 +704,15 @@
self.set_code_units()
- if hasattr(self, "cosmological_simulation") \
- and getattr(self, "cosmological_simulation"):
+ if getattr(self, "cosmological_simulation", False):
# this dataset is cosmological, add a cosmology object
- setattr(self, "cosmology",
+ self.cosmology = \
Cosmology(hubble_constant=self.hubble_constant,
omega_matter=self.omega_matter,
omega_lambda=self.omega_lambda,
- unit_registry=self.unit_registry))
- setattr(self, "critical_density",
- self.cosmology.critical_density(self.current_redshift))
+ unit_registry=self.unit_registry)
+ self.critical_density = \
+ self.cosmology.critical_density(self.current_redshift)
self.scale_factor = 1.0 / (1.0 + self.current_redshift)
def get_unit_from_registry(self, unit_str):
Repository URL: https://bitbucket.org/yt_analysis/yt/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list