[yt-svn] commit/yt: 10 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Thu Aug 27 09:17:52 PDT 2015
10 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/b322ca1bdf6c/
Changeset: b322ca1bdf6c
Branch: yt
User: RicardaBeckmann
Date: 2015-08-14 16:18:15+00:00
Summary: added print_stats to oct_geometry_handler
Affected #: 1 file
diff -r 603eab147248f1a165778c76208906201eb7baae -r b322ca1bdf6c55f296fd1dc464c5091e09a93e78 yt/geometry/oct_geometry_handler.py
--- a/yt/geometry/oct_geometry_handler.py
+++ b/yt/geometry/oct_geometry_handler.py
@@ -41,6 +41,7 @@
def _setup_geometry(self):
mylog.debug("Initializing Octree Geometry Handler.")
self._initialize_oct_handler()
+ self._initialize_level_stats()
def get_smallest_dx(self):
"""
@@ -51,3 +52,48 @@
def convert(self, unit):
return self.dataset.conversion_factors[unit]
+
+ def _initialize_level_stats(self):
+ levels=sum([dom.level_count for dom in self.domains])
+ desc = {'names': ['numcells','level'],
+ 'formats':['Int64']*2}
+ max_level=self.dataset.max_level+1
+ self.level_stats = blankRecordArray(desc, max_level)
+ self.level_stats['level'] = [i for i in range(max_level)]
+ self.level_stats['numcells'] = [0 for i in range(max_level)]
+ for level in range(self.dataset.min_level+1):
+ self.level_stats[level+1]['numcells']=2**(level*self.dataset.dimensionality)
+ for level in range(self.max_level+1):
+ self.level_stats[level+self.dataset.min_level+1]['numcells'] = levels[level]
+
+
+ def print_stats(self):
+ """
+ Prints out (stdout) relevant information about the simulation
+ """
+ header = "%3s\t%14s\t%14s" % ("level", "# cells","# cells^3")
+ print(header)
+ print("%s" % (len(header.expandtabs())*"-"))
+ for level in range(self.dataset.max_level+1):
+ print("% 3i\t% 14i\t% 14i" % \
+ (level,
+ self.level_stats['numcells'][level],
+ np.ceil(self.level_stats['numcells'][level]**(1./3))))
+ print("-" * 46)
+ print(" \t% 14i" % (self.level_stats['numcells'].sum()))
+ print("\n")
+
+ dx = self.get_smallest_dx()
+ try:
+ print("z = %0.8f" % (self["CosmologyCurrentRedshift"]))
+ except:
+ pass
+ print("t = %0.8e = %0.8e s = %0.8e years" % \
+ (self.ds.current_time.in_units("code_time"),
+ self.ds.current_time.in_units("s"),
+ self.ds.current_time.in_units("yr")))
+ print("\nSmallest Cell:")
+ u=[]
+ for item in ("Mpc", "pc", "AU", "cm"):
+ print("\tWidth: %0.3e %s" % (dx.in_units(item), item))
+
https://bitbucket.org/yt_analysis/yt/commits/a0b79b7e8a8d/
Changeset: a0b79b7e8a8d
Branch: yt
User: RicardaBeckmann
Date: 2015-08-20 15:28:07+00:00
Summary: moved print_stats function into ramses file directly
Affected #: 2 files
diff -r b322ca1bdf6c55f296fd1dc464c5091e09a93e78 -r a0b79b7e8a8d9c69374e11b9847cb7b58cfed9d9 yt/frontends/ramses/data_structures.py
--- a/yt/frontends/ramses/data_structures.py
+++ b/yt/frontends/ramses/data_structures.py
@@ -44,6 +44,7 @@
RAMSESOctreeContainer
from yt.fields.particle_fields import \
standard_particle_fields
+from yt.arraytypes import blankRecordArray
class RAMSESDomainFile(object):
_last_mask = None
@@ -464,6 +465,51 @@
for subset in oobjs:
yield YTDataChunk(dobj, "io", [subset], None, cache = cache)
+ def _initialize_level_stats(self):
+ levels=sum([dom.level_count for dom in self.domains])
+ desc = {'names': ['numcells','level'],
+ 'formats':['Int64']*2}
+ max_level=self.dataset.max_level+1
+ self.level_stats = blankRecordArray(desc, max_level)
+ self.level_stats['level'] = [i for i in range(max_level)]
+ self.level_stats['numcells'] = [0 for i in range(max_level)]
+ for level in range(self.dataset.min_level+1):
+ self.level_stats[level+1]['numcells']=2**(level*self.dataset.dimensionality)
+ for level in range(self.max_level+1):
+ self.level_stats[level+self.dataset.min_level+1]['numcells'] = levels[level]
+
+ def print_stats(self):
+ """
+ Prints out (stdout) relevant information about the simulation
+ """
+ header = "%3s\t%14s\t%14s" % ("level", "# cells","# cells^3")
+ print(header)
+ print("%s" % (len(header.expandtabs())*"-"))
+ for level in range(self.dataset.max_level+1):
+ print("% 3i\t% 14i\t% 14i" % \
+ (level,
+ self.level_stats['numcells'][level],
+ np.ceil(self.level_stats['numcells'][level]**(1./3))))
+ print("-" * 46)
+ print(" \t% 14i" % (self.level_stats['numcells'].sum()))
+ print("\n")
+
+ dx = self.get_smallest_dx()
+ try:
+ print("z = %0.8f" % (self["CosmologyCurrentRedshift"]))
+ except:
+ pass
+ print("t = %0.8e = %0.8e s = %0.8e years" % \
+ (self.ds.current_time.in_units("code_time"),
+ self.ds.current_time.in_units("s"),
+ self.ds.current_time.in_units("yr")))
+ print("\nSmallest Cell:")
+ u=[]
+ for item in ("Mpc", "pc", "AU", "cm"):
+ print("\tWidth: %0.3e %s" % (dx.in_units(item), item))
+
+
+
class RAMSESDataset(Dataset):
_index_class = RAMSESIndex
_field_info_class = RAMSESFieldInfo
diff -r b322ca1bdf6c55f296fd1dc464c5091e09a93e78 -r a0b79b7e8a8d9c69374e11b9847cb7b58cfed9d9 yt/geometry/oct_geometry_handler.py
--- a/yt/geometry/oct_geometry_handler.py
+++ b/yt/geometry/oct_geometry_handler.py
@@ -53,47 +53,6 @@
def convert(self, unit):
return self.dataset.conversion_factors[unit]
- def _initialize_level_stats(self):
- levels=sum([dom.level_count for dom in self.domains])
- desc = {'names': ['numcells','level'],
- 'formats':['Int64']*2}
- max_level=self.dataset.max_level+1
- self.level_stats = blankRecordArray(desc, max_level)
- self.level_stats['level'] = [i for i in range(max_level)]
- self.level_stats['numcells'] = [0 for i in range(max_level)]
- for level in range(self.dataset.min_level+1):
- self.level_stats[level+1]['numcells']=2**(level*self.dataset.dimensionality)
- for level in range(self.max_level+1):
- self.level_stats[level+self.dataset.min_level+1]['numcells'] = levels[level]
- def print_stats(self):
- """
- Prints out (stdout) relevant information about the simulation
- """
- header = "%3s\t%14s\t%14s" % ("level", "# cells","# cells^3")
- print(header)
- print("%s" % (len(header.expandtabs())*"-"))
- for level in range(self.dataset.max_level+1):
- print("% 3i\t% 14i\t% 14i" % \
- (level,
- self.level_stats['numcells'][level],
- np.ceil(self.level_stats['numcells'][level]**(1./3))))
- print("-" * 46)
- print(" \t% 14i" % (self.level_stats['numcells'].sum()))
- print("\n")
- dx = self.get_smallest_dx()
- try:
- print("z = %0.8f" % (self["CosmologyCurrentRedshift"]))
- except:
- pass
- print("t = %0.8e = %0.8e s = %0.8e years" % \
- (self.ds.current_time.in_units("code_time"),
- self.ds.current_time.in_units("s"),
- self.ds.current_time.in_units("yr")))
- print("\nSmallest Cell:")
- u=[]
- for item in ("Mpc", "pc", "AU", "cm"):
- print("\tWidth: %0.3e %s" % (dx.in_units(item), item))
-
https://bitbucket.org/yt_analysis/yt/commits/342057de1a2d/
Changeset: 342057de1a2d
Branch: yt
User: RicardaBeckmann
Date: 2015-08-20 15:40:42+00:00
Summary: fixed a bug in print_stats for RAMSES
Affected #: 2 files
diff -r a0b79b7e8a8d9c69374e11b9847cb7b58cfed9d9 -r 342057de1a2d11d71786e294f19ddded862f58d0 yt/frontends/ramses/data_structures.py
--- a/yt/frontends/ramses/data_structures.py
+++ b/yt/frontends/ramses/data_structures.py
@@ -479,6 +479,7 @@
self.level_stats[level+self.dataset.min_level+1]['numcells'] = levels[level]
def print_stats(self):
+ self._initialize_level_stats()
"""
Prints out (stdout) relevant information about the simulation
"""
diff -r a0b79b7e8a8d9c69374e11b9847cb7b58cfed9d9 -r 342057de1a2d11d71786e294f19ddded862f58d0 yt/geometry/oct_geometry_handler.py
--- a/yt/geometry/oct_geometry_handler.py
+++ b/yt/geometry/oct_geometry_handler.py
@@ -41,7 +41,7 @@
def _setup_geometry(self):
mylog.debug("Initializing Octree Geometry Handler.")
self._initialize_oct_handler()
- self._initialize_level_stats()
+
def get_smallest_dx(self):
"""
https://bitbucket.org/yt_analysis/yt/commits/d7abfe708e84/
Changeset: d7abfe708e84
Branch: yt
User: RicardaBeckmann
Date: 2015-08-20 15:46:15+00:00
Summary: sorted out some cosmetic difference in file
Affected #: 1 file
diff -r 342057de1a2d11d71786e294f19ddded862f58d0 -r d7abfe708e84c8d0009c95c4021b6c04ea185875 yt/geometry/oct_geometry_handler.py
--- a/yt/geometry/oct_geometry_handler.py
+++ b/yt/geometry/oct_geometry_handler.py
@@ -42,7 +42,6 @@
mylog.debug("Initializing Octree Geometry Handler.")
self._initialize_oct_handler()
-
def get_smallest_dx(self):
"""
Returns (in code units) the smallest cell size in the simulation.
@@ -52,7 +51,3 @@
def convert(self, unit):
return self.dataset.conversion_factors[unit]
-
-
-
-
https://bitbucket.org/yt_analysis/yt/commits/e6fe562fb2c1/
Changeset: e6fe562fb2c1
Branch: yt
User: RicardaBeckmann
Date: 2015-08-20 18:39:28+00:00
Summary: data_structures.py edited online with Bitbucket
Affected #: 1 file
diff -r d7abfe708e84c8d0009c95c4021b6c04ea185875 -r e6fe562fb2c1d2f7ae6c5c824cba251b3c027225 yt/frontends/ramses/data_structures.py
--- a/yt/frontends/ramses/data_structures.py
+++ b/yt/frontends/ramses/data_structures.py
@@ -497,7 +497,7 @@
dx = self.get_smallest_dx()
try:
- print("z = %0.8f" % (self["CosmologyCurrentRedshift"]))
+ print("z = %0.8f" % (self.current_redshift))
except:
pass
print("t = %0.8e = %0.8e s = %0.8e years" % \
https://bitbucket.org/yt_analysis/yt/commits/eba41e2433db/
Changeset: eba41e2433db
Branch: yt
User: RicardaBeckmann
Date: 2015-08-21 13:04:19+00:00
Summary: fixed handling of max_level
Affected #: 1 file
diff -r d7abfe708e84c8d0009c95c4021b6c04ea185875 -r eba41e2433db17489c5eb49f6e3b5674a1e54571 yt/frontends/ramses/data_structures.py
--- a/yt/frontends/ramses/data_structures.py
+++ b/yt/frontends/ramses/data_structures.py
@@ -469,13 +469,14 @@
levels=sum([dom.level_count for dom in self.domains])
desc = {'names': ['numcells','level'],
'formats':['Int64']*2}
- max_level=self.dataset.max_level+1
+ max_level=self.dataset.min_level+self.dataset.max_level+2
self.level_stats = blankRecordArray(desc, max_level)
self.level_stats['level'] = [i for i in range(max_level)]
self.level_stats['numcells'] = [0 for i in range(max_level)]
for level in range(self.dataset.min_level+1):
self.level_stats[level+1]['numcells']=2**(level*self.dataset.dimensionality)
for level in range(self.max_level+1):
+ print(level)
self.level_stats[level+self.dataset.min_level+1]['numcells'] = levels[level]
def print_stats(self):
@@ -486,7 +487,7 @@
header = "%3s\t%14s\t%14s" % ("level", "# cells","# cells^3")
print(header)
print("%s" % (len(header.expandtabs())*"-"))
- for level in range(self.dataset.max_level+1):
+ for level in range(self.dataset.min_level+self.dataset.max_level+2):
print("% 3i\t% 14i\t% 14i" % \
(level,
self.level_stats['numcells'][level],
@@ -497,7 +498,7 @@
dx = self.get_smallest_dx()
try:
- print("z = %0.8f" % (self["CosmologyCurrentRedshift"]))
+ print("z = %0.8f" % (self.dataset.current_redshift))
except:
pass
print("t = %0.8e = %0.8e s = %0.8e years" % \
https://bitbucket.org/yt_analysis/yt/commits/c7f0ed324d35/
Changeset: c7f0ed324d35
Branch: yt
User: RicardaBeckmann
Date: 2015-08-21 13:10:30+00:00
Summary: merged in accidental branching
Affected #: 1 file
https://bitbucket.org/yt_analysis/yt/commits/07cb9c82c99d/
Changeset: 07cb9c82c99d
Branch: yt
User: RicardaBeckmann
Date: 2015-08-24 14:10:39+00:00
Summary: Evaded error for DM only runs using print_stats
Affected #: 1 file
diff -r c7f0ed324d35d3249287408292308780f455df3a -r 07cb9c82c99dbabe3af18586ce2a71fd4e85098c yt/frontends/ramses/data_structures.py
--- a/yt/frontends/ramses/data_structures.py
+++ b/yt/frontends/ramses/data_structures.py
@@ -109,7 +109,7 @@
print("You are running with the wrong number of fields.")
print("If you specified these in the load command, check the array length.")
print("In this file there are %s hydro fields." % skipped)
- #print "The last set of field sizes was: %s" % skipped
+ #print"The last set of field sizes was: %s" % skipped
raise
if hvals['file_ncache'] == 0: continue
assert(hvals['file_ilevel'] == level+1)
@@ -476,10 +476,16 @@
for level in range(self.dataset.min_level+1):
self.level_stats[level+1]['numcells']=2**(level*self.dataset.dimensionality)
for level in range(self.max_level+1):
- print(level)
self.level_stats[level+self.dataset.min_level+1]['numcells'] = levels[level]
def print_stats(self):
+
+ # This function prints information based on the fluid on the grids,
+ # and therefore does not work for DM only runs.
+ if not self.fluid_field_list:
+ print("This functions is not implements for DM only runs")
+ return
+
self._initialize_level_stats()
"""
Prints out (stdout) relevant information about the simulation
https://bitbucket.org/yt_analysis/yt/commits/bb373d291f9b/
Changeset: bb373d291f9b
Branch: yt
User: RicardaBeckmann
Date: 2015-08-24 15:43:29+00:00
Summary: Fixed spelling errors
Affected #: 1 file
diff -r 07cb9c82c99dbabe3af18586ce2a71fd4e85098c -r bb373d291f9b74cab0188c2d2889386f40b2bda5 yt/frontends/ramses/data_structures.py
--- a/yt/frontends/ramses/data_structures.py
+++ b/yt/frontends/ramses/data_structures.py
@@ -483,7 +483,7 @@
# This function prints information based on the fluid on the grids,
# and therefore does not work for DM only runs.
if not self.fluid_field_list:
- print("This functions is not implements for DM only runs")
+ print("This function is not implemented for DM only runs")
return
self._initialize_level_stats()
https://bitbucket.org/yt_analysis/yt/commits/f40bc8a8486d/
Changeset: f40bc8a8486d
Branch: yt
User: ngoldbaum
Date: 2015-08-27 16:17:40+00:00
Summary: Merged in RicardaBeckmann/yt (pull request #1713)
A print_stats function for RAMSES
Affected #: 2 files
diff -r 89dd8b5534fee839aa66ece835c93beb36eb74db -r f40bc8a8486daeedee4c1a84238303283a91d445 yt/frontends/ramses/data_structures.py
--- a/yt/frontends/ramses/data_structures.py
+++ b/yt/frontends/ramses/data_structures.py
@@ -44,6 +44,7 @@
RAMSESOctreeContainer
from yt.fields.particle_fields import \
standard_particle_fields
+from yt.arraytypes import blankRecordArray
class RAMSESDomainFile(object):
_last_mask = None
@@ -108,7 +109,7 @@
print("You are running with the wrong number of fields.")
print("If you specified these in the load command, check the array length.")
print("In this file there are %s hydro fields." % skipped)
- #print "The last set of field sizes was: %s" % skipped
+ #print"The last set of field sizes was: %s" % skipped
raise
if hvals['file_ncache'] == 0: continue
assert(hvals['file_ilevel'] == level+1)
@@ -464,6 +465,59 @@
for subset in oobjs:
yield YTDataChunk(dobj, "io", [subset], None, cache = cache)
+ def _initialize_level_stats(self):
+ levels=sum([dom.level_count for dom in self.domains])
+ desc = {'names': ['numcells','level'],
+ 'formats':['Int64']*2}
+ max_level=self.dataset.min_level+self.dataset.max_level+2
+ self.level_stats = blankRecordArray(desc, max_level)
+ self.level_stats['level'] = [i for i in range(max_level)]
+ self.level_stats['numcells'] = [0 for i in range(max_level)]
+ for level in range(self.dataset.min_level+1):
+ self.level_stats[level+1]['numcells']=2**(level*self.dataset.dimensionality)
+ for level in range(self.max_level+1):
+ self.level_stats[level+self.dataset.min_level+1]['numcells'] = levels[level]
+
+ def print_stats(self):
+
+ # This function prints information based on the fluid on the grids,
+ # and therefore does not work for DM only runs.
+ if not self.fluid_field_list:
+ print("This function is not implemented for DM only runs")
+ return
+
+ self._initialize_level_stats()
+ """
+ Prints out (stdout) relevant information about the simulation
+ """
+ header = "%3s\t%14s\t%14s" % ("level", "# cells","# cells^3")
+ print(header)
+ print("%s" % (len(header.expandtabs())*"-"))
+ for level in range(self.dataset.min_level+self.dataset.max_level+2):
+ print("% 3i\t% 14i\t% 14i" % \
+ (level,
+ self.level_stats['numcells'][level],
+ np.ceil(self.level_stats['numcells'][level]**(1./3))))
+ print("-" * 46)
+ print(" \t% 14i" % (self.level_stats['numcells'].sum()))
+ print("\n")
+
+ dx = self.get_smallest_dx()
+ try:
+ print("z = %0.8f" % (self.dataset.current_redshift))
+ except:
+ pass
+ print("t = %0.8e = %0.8e s = %0.8e years" % \
+ (self.ds.current_time.in_units("code_time"),
+ self.ds.current_time.in_units("s"),
+ self.ds.current_time.in_units("yr")))
+ print("\nSmallest Cell:")
+ u=[]
+ for item in ("Mpc", "pc", "AU", "cm"):
+ print("\tWidth: %0.3e %s" % (dx.in_units(item), item))
+
+
+
class RAMSESDataset(Dataset):
_index_class = RAMSESIndex
_field_info_class = RAMSESFieldInfo
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