[yt-svn] commit/yt: 16 new changesets
Bitbucket
commits-noreply at bitbucket.org
Thu Jul 12 11:27:31 PDT 2012
16 new commits in yt:
https://bitbucket.org/yt_analysis/yt/changeset/4150cfffd5ff/
changeset: 4150cfffd5ff
branch: yt
user: xarthisius
date: 2012-07-12 04:48:30
summary: [utilities/physical_constants] add conversion factors for time
affected #: 1 file
diff -r 057bb8b6cda1902892411f3831580dff7c1e5092 -r 4150cfffd5fff73041d6e3ffbd6b3300d335761b yt/utilities/physical_constants.py
--- a/yt/utilities/physical_constants.py
+++ b/yt/utilities/physical_constants.py
@@ -35,7 +35,7 @@
mpc_per_rsun = 2.253e-14
mpc_per_miles = 5.216e-20
mpc_per_cm = 3.24e-25
-km_per_pc = 1.3806504e13
+km_per_pc = 1.3806504e13
km_per_m = 1e-3
km_per_cm = 1e-5
@@ -48,6 +48,14 @@
cm_per_km = 1e5
pc_per_km = 3.24e-14
pc_per_cm = 3.24e-19
+# time
+sec_per_Gyr = 31.5576e15
+sec_per_Myr = 31.5576e12
+sec_per_year = 31.5576e6 # "IAU Style Manual" by G.A. Wilkins, Comm. 5, in IAU Transactions XXB (1989)
+sec_per_day = 86400.0
+sec_per_hr = 3600.0
+day_per_year = 365.25
+
#Short cuts
G = gravitational_constant_cgs
me = mass_electron_cgs
https://bitbucket.org/yt_analysis/yt/changeset/03d0fe694d3c/
changeset: 03d0fe694d3c
branch: yt
user: xarthisius
date: 2012-07-12 04:49:35
summary: [utilities/physical_constants] ensure that mpc_per_mpc is float
affected #: 1 file
diff -r 4150cfffd5fff73041d6e3ffbd6b3300d335761b -r 03d0fe694d3cddd8e299c06091a5c20210ecab52 yt/utilities/physical_constants.py
--- a/yt/utilities/physical_constants.py
+++ b/yt/utilities/physical_constants.py
@@ -28,7 +28,7 @@
# Conversion Factors: X au * mpc_per_au = Y mpc
# length
-mpc_per_mpc = 1
+mpc_per_mpc = 1e0
mpc_per_kpc = 1e-3
mpc_per_pc = 1e-6
mpc_per_au = 4.847e-12
https://bitbucket.org/yt_analysis/yt/changeset/ce7b811f9e42/
changeset: ce7b811f9e42
branch: yt
user: xarthisius
date: 2012-07-12 04:51:53
summary: [utilities/definitions] reuse constants that are already defined, provide conversion dictionary for time units
affected #: 1 file
diff -r 03d0fe694d3cddd8e299c06091a5c20210ecab52 -r ce7b811f9e4206d97d4dc3a5f16ab40db78b7975 yt/utilities/definitions.py
--- a/yt/utilities/definitions.py
+++ b/yt/utilities/definitions.py
@@ -25,6 +25,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
+from .physical_constants import \
+ mpc_per_mpc, mpc_per_kpc, mpc_per_pc, mpc_per_au, mpc_per_rsun, \
+ mpc_per_miles, mpc_per_cm, sec_per_Gyr, sec_per_Myr, sec_per_year, \
+ sec_per_day
+
# The number of levels we expect to have at most
MAXLEVEL=48
@@ -43,12 +48,18 @@
y_names = ['z','z','y']
# How many of each thing are in an Mpc
-mpc_conversion = {'mpc' : 1e0,
- 'kpc' : 1e3,
- 'pc' : 1e6,
- 'au' : 2.063e11,
- 'rsun' : 4.43664e13,
- 'cm' : 3.0857e24,
- 'miles' : 1.917e19}
+mpc_conversion = {'mpc' : mpc_per_mpc,
+ 'kpc' : mpc_per_kpc,
+ 'pc' : mpc_per_pc,
+ 'au' : mpc_per_au,
+ 'rsun' : mpc_per_rsun,
+ 'miles' : mpc_per_miles,
+ 'cm' : mpc_per_cm}
+
+# How many seconds are in each thig
+sec_conversion = {'Gyr' : sec_per_Gyr,
+ 'Myr' : sec_per_Myr,
+ 'years' : sec_per_year,
+ 'days' : sec_per_day}
axis_labels = [('y','z'),('x','z'),('x','y')]
https://bitbucket.org/yt_analysis/yt/changeset/ce9db28ff5d7/
changeset: ce9db28ff5d7
branch: yt
user: xarthisius
date: 2012-07-12 04:25:51
summary: [frontends/art] use sec_conversion instead of manually defining time units
affected #: 1 file
diff -r ce7b811f9e4206d97d4dc3a5f16ab40db78b7975 -r ce9db28ff5d731276ca1126b9c2c8ee651e4a912 yt/frontends/art/data_structures.py
--- a/yt/frontends/art/data_structures.py
+++ b/yt/frontends/art/data_structures.py
@@ -42,7 +42,7 @@
from .fields import \
ARTFieldInfo, add_art_field, KnownARTFields
from yt.utilities.definitions import \
- mpc_conversion
+ mpc_conversion, sec_conversion
from yt.utilities.io_handler import \
io_registry
import yt.utilities.lib as amr_utils
@@ -53,8 +53,8 @@
_ramses_reader = None
from yt.utilities.physical_constants import \
- mass_hydrogen_cgs
-
+ mass_hydrogen_cgs, sec_per_Gyr
+
from yt.frontends.art.definitions import art_particle_field_names
from yt.frontends.art.io import _read_child_mask_level
@@ -446,8 +446,7 @@
pbar = get_pbar("Stellar Ages ",n)
sages = \
b2t(tbirth,n=n,logger=lambda x: pbar.update(x)).astype('float64')
- sages *= 1.0e9 #from Gyr to yr
- sages *= 365*24*3600 #to seconds
+ sages *= sec_per_Gyr #from Gyr to seconds
sages = self.pf.current_time-sages
self.pf.particle_age[-nstars:] = sages
pbar.finish()
@@ -720,11 +719,8 @@
# Add on the 1e5 to get to cm/s
self.conversion_factors["%s-velocity" % ax] = self.v0/aexpn
seconds = self.t0
- self.time_units['Gyr'] = 1.0/(1.0e9*365*3600*24.0)
- self.time_units['Myr'] = 1.0/(1.0e6*365*3600*24.0)
- self.time_units['years'] = 1.0/(365*3600*24.0)
- self.time_units['days'] = 1.0 / (3600*24.0)
-
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = 1.0 / sec_conversion[unit]
#we were already in seconds, go back in to code units
#self.current_time /= self.t0
@@ -821,7 +817,7 @@
# integrand_arr = integrand(spacings)
# self.current_time = na.trapz(integrand_arr,dx=na.diff(spacings))
# self.current_time *= self.hubble_time
- self.current_time = b2t(self.current_time_raw)*1.0e9*365*3600*24
+ self.current_time = b2t(self.current_time_raw) * sec_per_Gyr
for to_skip in ['tl','dtl','tlold','dtlold','iSO']:
_skip_record(f)
https://bitbucket.org/yt_analysis/yt/changeset/52c53aeecbef/
changeset: 52c53aeecbef
branch: yt
user: xarthisius
date: 2012-07-12 04:26:03
summary: [frontends/castro] use sec_conversion instead of manually defining time units
affected #: 1 file
diff -r ce9db28ff5d731276ca1126b9c2c8ee651e4a912 -r 52c53aeecbefded9c9e18ae1eb2c22dd8dc79bb9 yt/frontends/castro/data_structures.py
--- a/yt/frontends/castro/data_structures.py
+++ b/yt/frontends/castro/data_structures.py
@@ -38,7 +38,8 @@
from yt.data_objects.grid_patch import AMRGridPatch
from yt.data_objects.hierarchy import AMRHierarchy
from yt.data_objects.static_output import StaticOutput
-from yt.utilities.definitions import mpc_conversion
+from yt.utilities.definitions import \
+ mpc_conversion, sec_conversion
from yt.utilities.lib import get_box_grids_level
from .definitions import \
@@ -713,10 +714,8 @@
self.units['1'] = 1.0
self.units['unitary'] = 1.0 / (self.domain_right_edge - self.domain_left_edge).max()
seconds = 1 #self["Time"]
- self.time_units['years'] = seconds / (365 * 3600 * 24.0)
- self.time_units['days'] = seconds / (3600 * 24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = seconds / sec_conversion[unit]
for key in yt2castroFieldsDict:
self.conversion_factors[key] = 1.0
for key in castro_particle_field_names:
https://bitbucket.org/yt_analysis/yt/changeset/5e5c82e6cdee/
changeset: 5e5c82e6cdee
branch: yt
user: xarthisius
date: 2012-07-12 04:26:14
summary: [frontends/chombo] use sec_conversion instead of manually defining time units
affected #: 1 file
diff -r 52c53aeecbefded9c9e18ae1eb2c22dd8dc79bb9 -r 5e5c82e6cdee90b0c6e283afd2a54e1dad5d7e78 yt/frontends/chombo/data_structures.py
--- a/yt/frontends/chombo/data_structures.py
+++ b/yt/frontends/chombo/data_structures.py
@@ -51,7 +51,7 @@
from yt.data_objects.static_output import \
StaticOutput
from yt.utilities.definitions import \
- mpc_conversion
+ mpc_conversion, sec_conversion
from yt.utilities.parallel_tools.parallel_analysis_interface import \
parallel_root_only
@@ -245,10 +245,8 @@
self.units['1'] = 1.0
self.units['unitary'] = 1.0 / (self.domain_right_edge - self.domain_left_edge).max()
seconds = 1 #self["Time"]
- self.time_units['years'] = seconds / (365*3600*24.0)
- self.time_units['days'] = seconds / (3600*24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = seconds / sec_conversion[unit]
for key in yt2plutoFieldsDict:
self.conversion_factors[key] = 1.0
https://bitbucket.org/yt_analysis/yt/changeset/87497dce579b/
changeset: 87497dce579b
branch: yt
user: xarthisius
date: 2012-07-12 04:26:23
summary: [frontends/enzo] use sec_conversion instead of manually defining time units
affected #: 2 files
diff -r 5e5c82e6cdee90b0c6e283afd2a54e1dad5d7e78 -r 87497dce579b17a0198db3c7e78222c8c61a4af5 yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -47,7 +47,8 @@
StaticOutput
from yt.data_objects.field_info_container import \
FieldInfoContainer, NullFunc
-from yt.utilities.definitions import mpc_conversion
+from yt.utilities.definitions import \
+ mpc_conversion, sec_conversion
from yt.utilities import hdf5_light_reader
from yt.utilities.logger import ytLogger as mylog
@@ -889,11 +890,8 @@
self.time_units['1'] = 1
self.units['1'] = 1
self.units['unitary'] = 1.0 / (self.domain_right_edge - self.domain_left_edge).max()
- seconds = self["Time"]
- self.time_units['years'] = seconds / (365*3600*24.0)
- self.time_units['days'] = seconds / (3600*24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = self["Time"] / sec_conversion[unit]
def _setup_comoving_units(self):
z = self["CosmologyCurrentRedshift"]
diff -r 5e5c82e6cdee90b0c6e283afd2a54e1dad5d7e78 -r 87497dce579b17a0198db3c7e78222c8c61a4af5 yt/frontends/enzo/simulation_handling.py
--- a/yt/frontends/enzo/simulation_handling.py
+++ b/yt/frontends/enzo/simulation_handling.py
@@ -34,6 +34,8 @@
from yt.utilities.cosmology import \
Cosmology, \
EnzoCosmology
+from yt.utilities.definitions import \
+ sec_conversion
from yt.utilities.exceptions import \
AmbiguousOutputs, \
MissingParameter, \
@@ -488,10 +490,8 @@
/ self.hubble_constant / (1 + self.initial_redshift)**1.5
self.time_units['1'] = 1.
self.time_units['seconds'] = self.parameters['TimeUnits']
- self.time_units['years'] = self.time_units['seconds'] / (365*3600*24.0)
- self.time_units['days'] = self.time_units['seconds'] / (3600*24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = self.parameters['TimeUnits'] / sec_conversion[unit]
def _find_outputs(self):
"""
https://bitbucket.org/yt_analysis/yt/changeset/204111225153/
changeset: 204111225153
branch: yt
user: xarthisius
date: 2012-07-12 04:26:33
summary: [frontends/flash] use sec_conversion instead of manually defining time units
affected #: 1 file
diff -r 87497dce579b17a0198db3c7e78222c8c61a4af5 -r 204111225153bb11808c45833f5567a2177546fb yt/frontends/flash/data_structures.py
--- a/yt/frontends/flash/data_structures.py
+++ b/yt/frontends/flash/data_structures.py
@@ -36,7 +36,7 @@
from yt.data_objects.static_output import \
StaticOutput
from yt.utilities.definitions import \
- mpc_conversion
+ mpc_conversion, sec_conversion
from yt.utilities.io_handler import \
io_registry
@@ -246,11 +246,8 @@
self.units['1'] = 1.0
self.units['unitary'] = 1.0 / \
(self.domain_right_edge - self.domain_left_edge).max()
- seconds = 1 #self["Time"]
- self.time_units['years'] = seconds / (365*3600*24.0)
- self.time_units['days'] = seconds / (3600*24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = 1.0 / sec_conversion[unit]
for p, v in self._conversion_override.items():
self.conversion_factors[p] = v
https://bitbucket.org/yt_analysis/yt/changeset/0a78ca2fac61/
changeset: 0a78ca2fac61
branch: yt
user: xarthisius
date: 2012-07-12 04:26:43
summary: [frontends/gadget] use sec_conversion instead of manually defining time units
affected #: 1 file
diff -r 204111225153bb11808c45833f5567a2177546fb -r 0a78ca2fac611314149ab5221958dd28b807783e yt/frontends/gadget/data_structures.py
--- a/yt/frontends/gadget/data_structures.py
+++ b/yt/frontends/gadget/data_structures.py
@@ -36,6 +36,8 @@
AMRHierarchy
from yt.data_objects.static_output import \
StaticOutput
+from yt.utilities.definitions import \
+ sec_conversion
from .fields import GadgetFieldInfo, KnownGadgetFields
from yt.data_objects.field_info_container import \
@@ -159,11 +161,8 @@
self.units['cm'] = 1.0
self.units['unitary'] = 1.0 / \
(self.domain_right_edge - self.domain_left_edge).max()
- seconds = 1 #self["Time"]
- self.time_units['years'] = seconds / (365*3600*24.0)
- self.time_units['days'] = seconds / (3600*24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = 1.0 / sec_conversion[unit]
def _parse_parameter_file(self):
fileh = h5py.File(self.filename)
https://bitbucket.org/yt_analysis/yt/changeset/2907ea164373/
changeset: 2907ea164373
branch: yt
user: xarthisius
date: 2012-07-12 04:26:58
summary: [frontends/gdf] use sec_conversion instead of manually defining time units
affected #: 1 file
diff -r 0a78ca2fac611314149ab5221958dd28b807783e -r 2907ea164373e05e2d5feabeaf303f18203c3c7a yt/frontends/gdf/data_structures.py
--- a/yt/frontends/gdf/data_structures.py
+++ b/yt/frontends/gdf/data_structures.py
@@ -37,6 +37,8 @@
AMRHierarchy
from yt.data_objects.static_output import \
StaticOutput
+from yt.utilities.definitions import \
+ sec_conversion
from .fields import GDFFieldInfo, KnownGDFFields
from yt.data_objects.field_info_container import \
@@ -170,11 +172,8 @@
self.units['1'] = 1.0
self.units['cm'] = 1.0
self.units['unitary'] = 1.0 / (self.domain_right_edge - self.domain_left_edge).max()
- seconds = 1
- self.time_units['years'] = seconds / (365*3600*24.0)
- self.time_units['days'] = seconds / (3600*24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = 1.0 / sec_conversion[unit]
# This should be improved.
self._handle = h5py.File(self.parameter_filename, "r")
https://bitbucket.org/yt_analysis/yt/changeset/e5958f946881/
changeset: e5958f946881
branch: yt
user: xarthisius
date: 2012-07-12 04:27:07
summary: [frontends/maestro] use sec_conversion instead of manually defining time units
affected #: 1 file
diff -r 2907ea164373e05e2d5feabeaf303f18203c3c7a -r e5958f946881cc7a060520b4a4e85c723fab2cd2 yt/frontends/maestro/data_structures.py
--- a/yt/frontends/maestro/data_structures.py
+++ b/yt/frontends/maestro/data_structures.py
@@ -46,7 +46,7 @@
from yt.data_objects.static_output import \
StaticOutput
from yt.utilities.definitions import \
- mpc_conversion
+ mpc_conversion, sec_conversion
from .definitions import \
maestro2enzoDict, \
@@ -532,11 +532,8 @@
self.time_units['1'] = 1
self.units['1'] = 1.0
self.units['unitary'] = 1.0 / (self.domain_right_edge - self.domain_left_edge).max()
- seconds = 1
- self.time_units['years'] = seconds / (365*3600*24.0)
- self.time_units['days'] = seconds / (3600*24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = 1.0 / sec_conversion[unit]
for key in yt2maestroFieldsDict:
self.conversion_factors[key] = 1.0
https://bitbucket.org/yt_analysis/yt/changeset/e17adda2ad83/
changeset: e17adda2ad83
branch: yt
user: xarthisius
date: 2012-07-12 04:27:16
summary: [frontends/nyx] use sec_conversion instead of manually defining time units
affected #: 1 file
diff -r e5958f946881cc7a060520b4a4e85c723fab2cd2 -r e17adda2ad832fad1efa439ba808f070ac3e8b94 yt/frontends/nyx/data_structures.py
--- a/yt/frontends/nyx/data_structures.py
+++ b/yt/frontends/nyx/data_structures.py
@@ -44,7 +44,8 @@
from yt.data_objects.field_info_container import \
FieldInfoContainer, NullFunc
from yt.utilities.lib import get_box_grids_level
-from yt.utilities.definitions import mpc_conversion
+from yt.utilities.definitions import \
+ mpc_conversion, sec_conversion
from .definitions import parameter_type_dict, nyx_to_enzo_dict, \
fab_header_pattern, nyx_particle_field_names
@@ -723,11 +724,8 @@
self.domain_left_edge).max()
# time
- seconds = self.time_units["s"]
- self.time_units["days"] = seconds / (3600 * 24.0)
- self.time_units["years"] = seconds / (3600 * 24.0 * 365)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = self.time_units["s"] / sec_conversion[unit]
# not the most useful right now, but someday
for key in nyx_particle_field_names:
https://bitbucket.org/yt_analysis/yt/changeset/a6c678be0eb7/
changeset: a6c678be0eb7
branch: yt
user: xarthisius
date: 2012-07-12 04:27:25
summary: [frontends/orion] use sec_conversion instead of manually defining time units
affected #: 1 file
diff -r e17adda2ad832fad1efa439ba808f070ac3e8b94 -r a6c678be0eb7a8d1590160b50ee93b295a6dce5a yt/frontends/orion/data_structures.py
--- a/yt/frontends/orion/data_structures.py
+++ b/yt/frontends/orion/data_structures.py
@@ -38,7 +38,8 @@
from yt.data_objects.grid_patch import AMRGridPatch
from yt.data_objects.hierarchy import AMRHierarchy
from yt.data_objects.static_output import StaticOutput
-from yt.utilities.definitions import mpc_conversion
+from yt.utilities.definitions import \
+ mpc_conversion, sec_conversion
from yt.utilities.parallel_tools.parallel_analysis_interface import \
parallel_root_only
@@ -622,11 +623,8 @@
self.time_units['1'] = 1
self.units['1'] = 1.0
self.units['unitary'] = 1.0 / (self.domain_right_edge - self.domain_left_edge).max()
- seconds = 1 #self["Time"]
- self.time_units['years'] = seconds / (365*3600*24.0)
- self.time_units['days'] = seconds / (3600*24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = 1.0 / sec_conversion[unit]
for key in yt2orionFieldsDict:
self.conversion_factors[key] = 1.0
https://bitbucket.org/yt_analysis/yt/changeset/e6145a356800/
changeset: e6145a356800
branch: yt
user: xarthisius
date: 2012-07-12 04:27:34
summary: [frontends/ramses] use sec_conversion instead of manually defining time units
affected #: 1 file
diff -r a6c678be0eb7a8d1590160b50ee93b295a6dce5a -r e6145a356800493c7aefb37f31e3e73e8c63bfff yt/frontends/ramses/data_structures.py
--- a/yt/frontends/ramses/data_structures.py
+++ b/yt/frontends/ramses/data_structures.py
@@ -41,7 +41,7 @@
_ramses_reader = None
from .fields import RAMSESFieldInfo, KnownRAMSESFields
from yt.utilities.definitions import \
- mpc_conversion
+ mpc_conversion, sec_conversion
from yt.utilities.lib import \
get_box_grids_level
from yt.utilities.io_handler import \
@@ -318,11 +318,6 @@
self.time_units['1'] = 1
self.units['1'] = 1.0
self.units['unitary'] = 1.0 / (self.domain_right_edge - self.domain_left_edge).max()
- seconds = self.parameters['unit_t']
- self.time_units['years'] = seconds / (365*3600*24.0)
- self.time_units['days'] = seconds / (3600*24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
self.conversion_factors["Density"] = self.parameters['unit_d']
vel_u = self.parameters['unit_l'] / self.parameters['unit_t']
self.conversion_factors["x-velocity"] = vel_u
@@ -332,6 +327,8 @@
def _setup_nounits_units(self):
for unit in mpc_conversion.keys():
self.units[unit] = self.parameters['unit_l'] * mpc_conversion[unit] / mpc_conversion["cm"]
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = self.parameters['unit_t'] / sec_conversion[unit]
def _parse_parameter_file(self):
# hardcoded for now
https://bitbucket.org/yt_analysis/yt/changeset/1928f998225d/
changeset: 1928f998225d
branch: yt
user: xarthisius
date: 2012-07-12 04:30:13
summary: [data_objects/hierarchy] use sec_per_year constant instead of hardcoded number
affected #: 1 file
diff -r e6145a356800493c7aefb37f31e3e73e8c63bfff -r 1928f998225de5ac0261d4d7684dc4ce2ae8dd79 yt/data_objects/hierarchy.py
--- a/yt/data_objects/hierarchy.py
+++ b/yt/data_objects/hierarchy.py
@@ -37,6 +37,7 @@
from yt.config import ytcfg
from yt.data_objects.field_info_container import NullFunc
from yt.utilities.definitions import MAXLEVEL
+from yt.utilities.physical_constants import sec_per_year
from yt.utilities.io_handler import io_registry
from yt.utilities.parallel_tools.parallel_analysis_interface import \
ParallelAnalysisInterface, parallel_splitter
@@ -401,7 +402,7 @@
t_s = self.pf.current_time * self.pf["Time"]
print "t = %0.8e = %0.8e s = %0.8e years" % \
(self.pf.current_time, \
- t_s, t_s / (365*24*3600.0) )
+ t_s, t_s / sec_per_year )
print "\nSmallest Cell:"
u=[]
for item in self.parameter_file.units.items():
https://bitbucket.org/yt_analysis/yt/changeset/0237664d430e/
changeset: 0237664d430e
branch: yt
user: MatthewTurk
date: 2012-07-12 20:27:29
summary: Merged in xarthisius/yt (pull request #198)
affected #: 15 files
diff -r ff732c1ef7c74f24c5ade73692a19d6ad8ca14f3 -r 0237664d430eb03b485c5157d7e25da0244a6fa6 yt/data_objects/hierarchy.py
--- a/yt/data_objects/hierarchy.py
+++ b/yt/data_objects/hierarchy.py
@@ -37,6 +37,7 @@
from yt.config import ytcfg
from yt.data_objects.field_info_container import NullFunc
from yt.utilities.definitions import MAXLEVEL
+from yt.utilities.physical_constants import sec_per_year
from yt.utilities.io_handler import io_registry
from yt.utilities.parallel_tools.parallel_analysis_interface import \
ParallelAnalysisInterface, parallel_splitter
@@ -401,7 +402,7 @@
t_s = self.pf.current_time * self.pf["Time"]
print "t = %0.8e = %0.8e s = %0.8e years" % \
(self.pf.current_time, \
- t_s, t_s / (365*24*3600.0) )
+ t_s, t_s / sec_per_year )
print "\nSmallest Cell:"
u=[]
for item in self.parameter_file.units.items():
diff -r ff732c1ef7c74f24c5ade73692a19d6ad8ca14f3 -r 0237664d430eb03b485c5157d7e25da0244a6fa6 yt/frontends/art/data_structures.py
--- a/yt/frontends/art/data_structures.py
+++ b/yt/frontends/art/data_structures.py
@@ -42,7 +42,7 @@
from .fields import \
ARTFieldInfo, add_art_field, KnownARTFields
from yt.utilities.definitions import \
- mpc_conversion
+ mpc_conversion, sec_conversion
from yt.utilities.io_handler import \
io_registry
import yt.utilities.lib as amr_utils
@@ -53,8 +53,8 @@
_ramses_reader = None
from yt.utilities.physical_constants import \
- mass_hydrogen_cgs
-
+ mass_hydrogen_cgs, sec_per_Gyr
+
from yt.frontends.art.definitions import art_particle_field_names
from yt.frontends.art.io import _read_child_mask_level
@@ -446,8 +446,7 @@
pbar = get_pbar("Stellar Ages ",n)
sages = \
b2t(tbirth,n=n,logger=lambda x: pbar.update(x)).astype('float64')
- sages *= 1.0e9 #from Gyr to yr
- sages *= 365*24*3600 #to seconds
+ sages *= sec_per_Gyr #from Gyr to seconds
sages = self.pf.current_time-sages
self.pf.particle_age[-nstars:] = sages
pbar.finish()
@@ -720,11 +719,8 @@
# Add on the 1e5 to get to cm/s
self.conversion_factors["%s-velocity" % ax] = self.v0/aexpn
seconds = self.t0
- self.time_units['Gyr'] = 1.0/(1.0e9*365*3600*24.0)
- self.time_units['Myr'] = 1.0/(1.0e6*365*3600*24.0)
- self.time_units['years'] = 1.0/(365*3600*24.0)
- self.time_units['days'] = 1.0 / (3600*24.0)
-
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = 1.0 / sec_conversion[unit]
#we were already in seconds, go back in to code units
#self.current_time /= self.t0
@@ -821,7 +817,7 @@
# integrand_arr = integrand(spacings)
# self.current_time = na.trapz(integrand_arr,dx=na.diff(spacings))
# self.current_time *= self.hubble_time
- self.current_time = b2t(self.current_time_raw)*1.0e9*365*3600*24
+ self.current_time = b2t(self.current_time_raw) * sec_per_Gyr
for to_skip in ['tl','dtl','tlold','dtlold','iSO']:
_skip_record(f)
diff -r ff732c1ef7c74f24c5ade73692a19d6ad8ca14f3 -r 0237664d430eb03b485c5157d7e25da0244a6fa6 yt/frontends/castro/data_structures.py
--- a/yt/frontends/castro/data_structures.py
+++ b/yt/frontends/castro/data_structures.py
@@ -38,7 +38,8 @@
from yt.data_objects.grid_patch import AMRGridPatch
from yt.data_objects.hierarchy import AMRHierarchy
from yt.data_objects.static_output import StaticOutput
-from yt.utilities.definitions import mpc_conversion
+from yt.utilities.definitions import \
+ mpc_conversion, sec_conversion
from yt.utilities.lib import get_box_grids_level
from .definitions import \
@@ -713,10 +714,8 @@
self.units['1'] = 1.0
self.units['unitary'] = 1.0 / (self.domain_right_edge - self.domain_left_edge).max()
seconds = 1 #self["Time"]
- self.time_units['years'] = seconds / (365 * 3600 * 24.0)
- self.time_units['days'] = seconds / (3600 * 24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = seconds / sec_conversion[unit]
for key in yt2castroFieldsDict:
self.conversion_factors[key] = 1.0
for key in castro_particle_field_names:
diff -r ff732c1ef7c74f24c5ade73692a19d6ad8ca14f3 -r 0237664d430eb03b485c5157d7e25da0244a6fa6 yt/frontends/chombo/data_structures.py
--- a/yt/frontends/chombo/data_structures.py
+++ b/yt/frontends/chombo/data_structures.py
@@ -51,7 +51,7 @@
from yt.data_objects.static_output import \
StaticOutput
from yt.utilities.definitions import \
- mpc_conversion
+ mpc_conversion, sec_conversion
from yt.utilities.parallel_tools.parallel_analysis_interface import \
parallel_root_only
@@ -245,10 +245,8 @@
self.units['1'] = 1.0
self.units['unitary'] = 1.0 / (self.domain_right_edge - self.domain_left_edge).max()
seconds = 1 #self["Time"]
- self.time_units['years'] = seconds / (365*3600*24.0)
- self.time_units['days'] = seconds / (3600*24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = seconds / sec_conversion[unit]
for key in yt2plutoFieldsDict:
self.conversion_factors[key] = 1.0
diff -r ff732c1ef7c74f24c5ade73692a19d6ad8ca14f3 -r 0237664d430eb03b485c5157d7e25da0244a6fa6 yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -47,7 +47,8 @@
StaticOutput
from yt.data_objects.field_info_container import \
FieldInfoContainer, NullFunc
-from yt.utilities.definitions import mpc_conversion
+from yt.utilities.definitions import \
+ mpc_conversion, sec_conversion
from yt.utilities import hdf5_light_reader
from yt.utilities.logger import ytLogger as mylog
@@ -889,11 +890,8 @@
self.time_units['1'] = 1
self.units['1'] = 1
self.units['unitary'] = 1.0 / (self.domain_right_edge - self.domain_left_edge).max()
- seconds = self["Time"]
- self.time_units['years'] = seconds / (365*3600*24.0)
- self.time_units['days'] = seconds / (3600*24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = self["Time"] / sec_conversion[unit]
def _setup_comoving_units(self):
z = self["CosmologyCurrentRedshift"]
diff -r ff732c1ef7c74f24c5ade73692a19d6ad8ca14f3 -r 0237664d430eb03b485c5157d7e25da0244a6fa6 yt/frontends/enzo/simulation_handling.py
--- a/yt/frontends/enzo/simulation_handling.py
+++ b/yt/frontends/enzo/simulation_handling.py
@@ -34,6 +34,8 @@
from yt.utilities.cosmology import \
Cosmology, \
EnzoCosmology
+from yt.utilities.definitions import \
+ sec_conversion
from yt.utilities.exceptions import \
AmbiguousOutputs, \
MissingParameter, \
@@ -488,10 +490,8 @@
/ self.hubble_constant / (1 + self.initial_redshift)**1.5
self.time_units['1'] = 1.
self.time_units['seconds'] = self.parameters['TimeUnits']
- self.time_units['years'] = self.time_units['seconds'] / (365*3600*24.0)
- self.time_units['days'] = self.time_units['seconds'] / (3600*24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = self.parameters['TimeUnits'] / sec_conversion[unit]
def _find_outputs(self):
"""
diff -r ff732c1ef7c74f24c5ade73692a19d6ad8ca14f3 -r 0237664d430eb03b485c5157d7e25da0244a6fa6 yt/frontends/flash/data_structures.py
--- a/yt/frontends/flash/data_structures.py
+++ b/yt/frontends/flash/data_structures.py
@@ -36,7 +36,7 @@
from yt.data_objects.static_output import \
StaticOutput
from yt.utilities.definitions import \
- mpc_conversion
+ mpc_conversion, sec_conversion
from yt.utilities.io_handler import \
io_registry
@@ -246,11 +246,8 @@
self.units['1'] = 1.0
self.units['unitary'] = 1.0 / \
(self.domain_right_edge - self.domain_left_edge).max()
- seconds = 1 #self["Time"]
- self.time_units['years'] = seconds / (365*3600*24.0)
- self.time_units['days'] = seconds / (3600*24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = 1.0 / sec_conversion[unit]
for p, v in self._conversion_override.items():
self.conversion_factors[p] = v
diff -r ff732c1ef7c74f24c5ade73692a19d6ad8ca14f3 -r 0237664d430eb03b485c5157d7e25da0244a6fa6 yt/frontends/gadget/data_structures.py
--- a/yt/frontends/gadget/data_structures.py
+++ b/yt/frontends/gadget/data_structures.py
@@ -36,6 +36,8 @@
AMRHierarchy
from yt.data_objects.static_output import \
StaticOutput
+from yt.utilities.definitions import \
+ sec_conversion
from .fields import GadgetFieldInfo, KnownGadgetFields
from yt.data_objects.field_info_container import \
@@ -159,11 +161,8 @@
self.units['cm'] = 1.0
self.units['unitary'] = 1.0 / \
(self.domain_right_edge - self.domain_left_edge).max()
- seconds = 1 #self["Time"]
- self.time_units['years'] = seconds / (365*3600*24.0)
- self.time_units['days'] = seconds / (3600*24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = 1.0 / sec_conversion[unit]
def _parse_parameter_file(self):
fileh = h5py.File(self.filename)
diff -r ff732c1ef7c74f24c5ade73692a19d6ad8ca14f3 -r 0237664d430eb03b485c5157d7e25da0244a6fa6 yt/frontends/gdf/data_structures.py
--- a/yt/frontends/gdf/data_structures.py
+++ b/yt/frontends/gdf/data_structures.py
@@ -37,6 +37,8 @@
AMRHierarchy
from yt.data_objects.static_output import \
StaticOutput
+from yt.utilities.definitions import \
+ sec_conversion
from .fields import GDFFieldInfo, KnownGDFFields
from yt.data_objects.field_info_container import \
@@ -170,11 +172,8 @@
self.units['1'] = 1.0
self.units['cm'] = 1.0
self.units['unitary'] = 1.0 / (self.domain_right_edge - self.domain_left_edge).max()
- seconds = 1
- self.time_units['years'] = seconds / (365*3600*24.0)
- self.time_units['days'] = seconds / (3600*24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = 1.0 / sec_conversion[unit]
# This should be improved.
self._handle = h5py.File(self.parameter_filename, "r")
diff -r ff732c1ef7c74f24c5ade73692a19d6ad8ca14f3 -r 0237664d430eb03b485c5157d7e25da0244a6fa6 yt/frontends/maestro/data_structures.py
--- a/yt/frontends/maestro/data_structures.py
+++ b/yt/frontends/maestro/data_structures.py
@@ -46,7 +46,7 @@
from yt.data_objects.static_output import \
StaticOutput
from yt.utilities.definitions import \
- mpc_conversion
+ mpc_conversion, sec_conversion
from .definitions import \
maestro2enzoDict, \
@@ -532,11 +532,8 @@
self.time_units['1'] = 1
self.units['1'] = 1.0
self.units['unitary'] = 1.0 / (self.domain_right_edge - self.domain_left_edge).max()
- seconds = 1
- self.time_units['years'] = seconds / (365*3600*24.0)
- self.time_units['days'] = seconds / (3600*24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = 1.0 / sec_conversion[unit]
for key in yt2maestroFieldsDict:
self.conversion_factors[key] = 1.0
diff -r ff732c1ef7c74f24c5ade73692a19d6ad8ca14f3 -r 0237664d430eb03b485c5157d7e25da0244a6fa6 yt/frontends/nyx/data_structures.py
--- a/yt/frontends/nyx/data_structures.py
+++ b/yt/frontends/nyx/data_structures.py
@@ -44,7 +44,8 @@
from yt.data_objects.field_info_container import \
FieldInfoContainer, NullFunc
from yt.utilities.lib import get_box_grids_level
-from yt.utilities.definitions import mpc_conversion
+from yt.utilities.definitions import \
+ mpc_conversion, sec_conversion
from .definitions import parameter_type_dict, nyx_to_enzo_dict, \
fab_header_pattern, nyx_particle_field_names
@@ -723,11 +724,8 @@
self.domain_left_edge).max()
# time
- seconds = self.time_units["s"]
- self.time_units["days"] = seconds / (3600 * 24.0)
- self.time_units["years"] = seconds / (3600 * 24.0 * 365)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = self.time_units["s"] / sec_conversion[unit]
# not the most useful right now, but someday
for key in nyx_particle_field_names:
diff -r ff732c1ef7c74f24c5ade73692a19d6ad8ca14f3 -r 0237664d430eb03b485c5157d7e25da0244a6fa6 yt/frontends/orion/data_structures.py
--- a/yt/frontends/orion/data_structures.py
+++ b/yt/frontends/orion/data_structures.py
@@ -38,7 +38,8 @@
from yt.data_objects.grid_patch import AMRGridPatch
from yt.data_objects.hierarchy import AMRHierarchy
from yt.data_objects.static_output import StaticOutput
-from yt.utilities.definitions import mpc_conversion
+from yt.utilities.definitions import \
+ mpc_conversion, sec_conversion
from yt.utilities.parallel_tools.parallel_analysis_interface import \
parallel_root_only
@@ -622,11 +623,8 @@
self.time_units['1'] = 1
self.units['1'] = 1.0
self.units['unitary'] = 1.0 / (self.domain_right_edge - self.domain_left_edge).max()
- seconds = 1 #self["Time"]
- self.time_units['years'] = seconds / (365*3600*24.0)
- self.time_units['days'] = seconds / (3600*24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = 1.0 / sec_conversion[unit]
for key in yt2orionFieldsDict:
self.conversion_factors[key] = 1.0
diff -r ff732c1ef7c74f24c5ade73692a19d6ad8ca14f3 -r 0237664d430eb03b485c5157d7e25da0244a6fa6 yt/frontends/ramses/data_structures.py
--- a/yt/frontends/ramses/data_structures.py
+++ b/yt/frontends/ramses/data_structures.py
@@ -41,7 +41,7 @@
_ramses_reader = None
from .fields import RAMSESFieldInfo, KnownRAMSESFields
from yt.utilities.definitions import \
- mpc_conversion
+ mpc_conversion, sec_conversion
from yt.utilities.lib import \
get_box_grids_level
from yt.utilities.io_handler import \
@@ -318,11 +318,6 @@
self.time_units['1'] = 1
self.units['1'] = 1.0
self.units['unitary'] = 1.0 / (self.domain_right_edge - self.domain_left_edge).max()
- seconds = self.parameters['unit_t']
- self.time_units['years'] = seconds / (365*3600*24.0)
- self.time_units['days'] = seconds / (3600*24.0)
- self.time_units['Myr'] = self.time_units['years'] / 1.0e6
- self.time_units['Gyr'] = self.time_units['years'] / 1.0e9
self.conversion_factors["Density"] = self.parameters['unit_d']
vel_u = self.parameters['unit_l'] / self.parameters['unit_t']
self.conversion_factors["x-velocity"] = vel_u
@@ -332,6 +327,8 @@
def _setup_nounits_units(self):
for unit in mpc_conversion.keys():
self.units[unit] = self.parameters['unit_l'] * mpc_conversion[unit] / mpc_conversion["cm"]
+ for unit in sec_conversion.keys():
+ self.time_units[unit] = self.parameters['unit_t'] / sec_conversion[unit]
def _parse_parameter_file(self):
# hardcoded for now
diff -r ff732c1ef7c74f24c5ade73692a19d6ad8ca14f3 -r 0237664d430eb03b485c5157d7e25da0244a6fa6 yt/utilities/definitions.py
--- a/yt/utilities/definitions.py
+++ b/yt/utilities/definitions.py
@@ -25,6 +25,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
+from .physical_constants import \
+ mpc_per_mpc, mpc_per_kpc, mpc_per_pc, mpc_per_au, mpc_per_rsun, \
+ mpc_per_miles, mpc_per_cm, sec_per_Gyr, sec_per_Myr, sec_per_year, \
+ sec_per_day
+
# The number of levels we expect to have at most
MAXLEVEL=48
@@ -43,12 +48,18 @@
y_names = ['z','z','y']
# How many of each thing are in an Mpc
-mpc_conversion = {'mpc' : 1e0,
- 'kpc' : 1e3,
- 'pc' : 1e6,
- 'au' : 2.063e11,
- 'rsun' : 4.43664e13,
- 'cm' : 3.0857e24,
- 'miles' : 1.917e19}
+mpc_conversion = {'mpc' : mpc_per_mpc,
+ 'kpc' : mpc_per_kpc,
+ 'pc' : mpc_per_pc,
+ 'au' : mpc_per_au,
+ 'rsun' : mpc_per_rsun,
+ 'miles' : mpc_per_miles,
+ 'cm' : mpc_per_cm}
+
+# How many seconds are in each thig
+sec_conversion = {'Gyr' : sec_per_Gyr,
+ 'Myr' : sec_per_Myr,
+ 'years' : sec_per_year,
+ 'days' : sec_per_day}
axis_labels = [('y','z'),('x','z'),('x','y')]
diff -r ff732c1ef7c74f24c5ade73692a19d6ad8ca14f3 -r 0237664d430eb03b485c5157d7e25da0244a6fa6 yt/utilities/physical_constants.py
--- a/yt/utilities/physical_constants.py
+++ b/yt/utilities/physical_constants.py
@@ -28,14 +28,14 @@
# Conversion Factors: X au * mpc_per_au = Y mpc
# length
-mpc_per_mpc = 1
+mpc_per_mpc = 1e0
mpc_per_kpc = 1e-3
mpc_per_pc = 1e-6
mpc_per_au = 4.847e-12
mpc_per_rsun = 2.253e-14
mpc_per_miles = 5.216e-20
mpc_per_cm = 3.24e-25
-km_per_pc = 1.3806504e13
+km_per_pc = 1.3806504e13
km_per_m = 1e-3
km_per_cm = 1e-5
@@ -48,6 +48,14 @@
cm_per_km = 1e5
pc_per_km = 3.24e-14
pc_per_cm = 3.24e-19
+# time
+sec_per_Gyr = 31.5576e15
+sec_per_Myr = 31.5576e12
+sec_per_year = 31.5576e6 # "IAU Style Manual" by G.A. Wilkins, Comm. 5, in IAU Transactions XXB (1989)
+sec_per_day = 86400.0
+sec_per_hr = 3600.0
+day_per_year = 365.25
+
#Short cuts
G = gravitational_constant_cgs
me = mass_electron_cgs
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