[yt-svn] commit/yt: 4 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Wed Jun 4 11:06:09 PDT 2014
4 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/05bb300d6c29/
Changeset: 05bb300d6c29
Branch: yt-3.0
User: ngoldbaum
Date: 2014-05-29 23:26:16
Summary: Do not override log level in the particle trajectories analysis module.
Affected #: 1 file
diff -r f1fa8e20ab513e87f18447c48c299cbee5fdfd39 -r 05bb300d6c29abd38bb4101a0294c2bccdccdffa yt/analysis_modules/particle_trajectories/particle_trajectories.py
--- a/yt/analysis_modules/particle_trajectories/particle_trajectories.py
+++ b/yt/analysis_modules/particle_trajectories/particle_trajectories.py
@@ -191,14 +191,13 @@
with shape (num_indices, num_steps)
"""
if not self.field_data.has_key(field):
- old_level = int(ytcfg.get("yt","loglevel"))
- mylog.setLevel(40)
dd_first = self.data_series[0].all_data()
fd = dd_first._determine_fields(field)[0]
if field not in self.particle_fields:
if self.data_series[0].field_info[fd].particle_type:
self.particle_fields.append(field)
- particles = np.empty((self.num_indices,self.num_steps)) * np.nan
+ particles = np.empty((self.num_indices,self.num_steps))
+ particles[:] = np.nan
step = int(0)
pbar = get_pbar("Generating field %s in trajectories." % (field), self.num_steps)
my_storage={}
@@ -232,7 +231,6 @@
for i, (fn, (indices, pfield)) in enumerate(sorted(my_storage.items())):
particles[indices,i] = pfield
self.field_data[field] = array_like_field(dd_first, particles, fd)
- mylog.setLevel(old_level)
return self.field_data[field]
def trajectory_from_index(self, index):
https://bitbucket.org/yt_analysis/yt/commits/40b6366f7dc4/
Changeset: 40b6366f7dc4
Branch: yt-3.0
User: ngoldbaum
Date: 2014-05-29 23:33:41
Summary: Missed another place where particle_trajectories touches the logLevel.
Affected #: 1 file
diff -r 05bb300d6c29abd38bb4101a0294c2bccdccdffa -r 40b6366f7dc4567e5c688eb6f1a61e4f036052af yt/analysis_modules/particle_trajectories/particle_trajectories.py
--- a/yt/analysis_modules/particle_trajectories/particle_trajectories.py
+++ b/yt/analysis_modules/particle_trajectories/particle_trajectories.py
@@ -83,8 +83,6 @@
fields.append("particle_position_z")
fields = list(OrderedDict.fromkeys(fields))
- old_level = int(ytcfg.get("yt","loglevel"))
- mylog.setLevel(40)
my_storage = {}
pbar = get_pbar("Constructing trajectory information", len(self.data_series))
for i, (sto, ds) in enumerate(self.data_series.piter(storage=my_storage)):
@@ -101,8 +99,6 @@
pbar.update(i)
pbar.finish()
- mylog.setLevel(old_level)
-
times = []
for fn, time in sorted(my_storage.items()):
times.append(time)
https://bitbucket.org/yt_analysis/yt/commits/efc5a331e326/
Changeset: efc5a331e326
Branch: yt-3.0
User: ngoldbaum
Date: 2014-05-30 20:24:32
Summary: Make the particle_trajectories logging suppression behavior a keyword argument.
Affected #: 1 file
diff -r 40b6366f7dc4567e5c688eb6f1a61e4f036052af -r efc5a331e326c8ebd465fa5d1f6bf8a16690e644 yt/analysis_modules/particle_trajectories/particle_trajectories.py
--- a/yt/analysis_modules/particle_trajectories/particle_trajectories.py
+++ b/yt/analysis_modules/particle_trajectories/particle_trajectories.py
@@ -43,6 +43,10 @@
collection is instantiated.
Default : None (will default to the fields 'particle_position_x',
'particle_position_y', 'particle_position_z')
+ suppress_logging : boolean
+ Suppress yt's logging when iterating over the simulation time
+ series.
+ Default : False
Examples
________
@@ -59,7 +63,7 @@
>>> for t in trajs :
>>> print t["particle_velocity_x"].max(), t["particle_velocity_x"].min()
"""
- def __init__(self, outputs, indices, fields=None) :
+ def __init__(self, outputs, indices, fields=None, suppress_logging=False):
indices.sort() # Just in case the caller wasn't careful
self.field_data = YTFieldData()
@@ -74,6 +78,7 @@
self.num_indices = len(indices)
self.num_steps = len(outputs)
self.times = []
+ self.suppress_logging = suppress_logging
# Default fields
@@ -83,6 +88,9 @@
fields.append("particle_position_z")
fields = list(OrderedDict.fromkeys(fields))
+ if self.suppress_logging:
+ old_level = int(ytcfg.get("yt","loglevel"))
+ mylog.setLevel(40)
my_storage = {}
pbar = get_pbar("Constructing trajectory information", len(self.data_series))
for i, (sto, ds) in enumerate(self.data_series.piter(storage=my_storage)):
@@ -99,6 +107,9 @@
pbar.update(i)
pbar.finish()
+ if self.suppress_logging:
+ mylog.setLevel(old_level)
+
times = []
for fn, time in sorted(my_storage.items()):
times.append(time)
@@ -187,6 +198,9 @@
with shape (num_indices, num_steps)
"""
if not self.field_data.has_key(field):
+ if self.suppress_logging:
+ old_level = int(ytcfg.get("yt","loglevel"))
+ mylog.setLevel(40)
dd_first = self.data_series[0].all_data()
fd = dd_first._determine_fields(field)[0]
if field not in self.particle_fields:
@@ -227,6 +241,8 @@
for i, (fn, (indices, pfield)) in enumerate(sorted(my_storage.items())):
particles[indices,i] = pfield
self.field_data[field] = array_like_field(dd_first, particles, fd)
+ if self.suppress_logging:
+ mylog.setLevel(old_level)
return self.field_data[field]
def trajectory_from_index(self, index):
https://bitbucket.org/yt_analysis/yt/commits/094b6fc94471/
Changeset: 094b6fc94471
Branch: yt-3.0
User: jzuhone
Date: 2014-06-04 20:06:03
Summary: Merged in ngoldbaum/yt/yt-3.0 (pull request #928)
Do not override log level in the particle trajectories analysis module.
Affected #: 1 file
diff -r f1c3b63909c3599564d9b1552de8d9c8b65cac72 -r 094b6fc944711b4d719fb70770c8e79548bfd919 yt/analysis_modules/particle_trajectories/particle_trajectories.py
--- a/yt/analysis_modules/particle_trajectories/particle_trajectories.py
+++ b/yt/analysis_modules/particle_trajectories/particle_trajectories.py
@@ -43,6 +43,10 @@
collection is instantiated.
Default : None (will default to the fields 'particle_position_x',
'particle_position_y', 'particle_position_z')
+ suppress_logging : boolean
+ Suppress yt's logging when iterating over the simulation time
+ series.
+ Default : False
Examples
________
@@ -59,7 +63,7 @@
>>> for t in trajs :
>>> print t["particle_velocity_x"].max(), t["particle_velocity_x"].min()
"""
- def __init__(self, outputs, indices, fields=None) :
+ def __init__(self, outputs, indices, fields=None, suppress_logging=False):
indices.sort() # Just in case the caller wasn't careful
self.field_data = YTFieldData()
@@ -74,6 +78,7 @@
self.num_indices = len(indices)
self.num_steps = len(outputs)
self.times = []
+ self.suppress_logging = suppress_logging
# Default fields
@@ -83,8 +88,9 @@
fields.append("particle_position_z")
fields = list(OrderedDict.fromkeys(fields))
- old_level = int(ytcfg.get("yt","loglevel"))
- mylog.setLevel(40)
+ if self.suppress_logging:
+ old_level = int(ytcfg.get("yt","loglevel"))
+ mylog.setLevel(40)
my_storage = {}
pbar = get_pbar("Constructing trajectory information", len(self.data_series))
for i, (sto, ds) in enumerate(self.data_series.piter(storage=my_storage)):
@@ -101,7 +107,8 @@
pbar.update(i)
pbar.finish()
- mylog.setLevel(old_level)
+ if self.suppress_logging:
+ mylog.setLevel(old_level)
times = []
for fn, time in sorted(my_storage.items()):
@@ -191,14 +198,16 @@
with shape (num_indices, num_steps)
"""
if not self.field_data.has_key(field):
- old_level = int(ytcfg.get("yt","loglevel"))
- mylog.setLevel(40)
+ if self.suppress_logging:
+ old_level = int(ytcfg.get("yt","loglevel"))
+ mylog.setLevel(40)
dd_first = self.data_series[0].all_data()
fd = dd_first._determine_fields(field)[0]
if field not in self.particle_fields:
if self.data_series[0].field_info[fd].particle_type:
self.particle_fields.append(field)
- particles = np.empty((self.num_indices,self.num_steps)) * np.nan
+ particles = np.empty((self.num_indices,self.num_steps))
+ particles[:] = np.nan
step = int(0)
pbar = get_pbar("Generating field %s in trajectories." % (field), self.num_steps)
my_storage={}
@@ -232,7 +241,8 @@
for i, (fn, (indices, pfield)) in enumerate(sorted(my_storage.items())):
particles[indices,i] = pfield
self.field_data[field] = array_like_field(dd_first, particles, fd)
- mylog.setLevel(old_level)
+ if self.suppress_logging:
+ mylog.setLevel(old_level)
return self.field_data[field]
def trajectory_from_index(self, index):
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