[yt-svn] commit/yt: 6 new changesets
Bitbucket
commits-noreply at bitbucket.org
Fri Nov 30 11:56:47 PST 2012
6 new commits in yt:
https://bitbucket.org/yt_analysis/yt/changeset/ecfb819035d8/
changeset: ecfb819035d8
branch: yt
user: Yuan Li
date: 2012-11-27 21:34:32
summary: change Numberdensity to HydrogenDensity
affected #: 2 files
diff -r 4a6750aa470968444770411d1dce3b1d10b77a16 -r ecfb819035d8ca3f2322595572eccbcf7a460e2b setup.cfg
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,4 +6,4 @@
detailed-errors=1
where=yt
exclude=answer_testing
-with-xunit=1
\ No newline at end of file
+with-xunit=1
diff -r 4a6750aa470968444770411d1dce3b1d10b77a16 -r ecfb819035d8ca3f2322595572eccbcf7a460e2b yt/analysis_modules/spectral_integrator/spectral_frequency_integrator.py
--- a/yt/analysis_modules/spectral_integrator/spectral_frequency_integrator.py
+++ b/yt/analysis_modules/spectral_integrator/spectral_frequency_integrator.py
@@ -34,6 +34,11 @@
BilinearFieldInterpolator, \
TrilinearFieldInterpolator
+def _HydrogenDensity(field,data):
+ return data["NumberDensity"]*4.0/9.0 # for primordial gas
+add_field("HydrogenDensity", function=_HydrogenDensity)
+
+
class SpectralFrequencyIntegrator(object):
def __init__(self, table, field_names,
bounds, ev_bounds):
@@ -63,6 +68,8 @@
bin_table, self.bounds, self.field_names[:],
truncate=True)
+
+
def add_frequency_bin_field(self, ev_min, ev_max):
"""
Add a new field to the FieldInfoContainer, which is an
@@ -73,7 +80,7 @@
interp = self._get_interpolator(ev_min, ev_max)
name = "XRay_%s_%s" % (ev_min, ev_max)
def frequency_bin_field(field, data):
- dd = {'NumberDensity' : np.log10(data["NumberDensity"]),
+ dd = {'HydrogenDensity' : np.log10(data["HydrogenDensity"]),
'Temperature' : np.log10(data["Temperature"])}
return 10**interp(dd)
add_field(name, function=frequency_bin_field,
https://bitbucket.org/yt_analysis/yt/changeset/75b57438a580/
changeset: 75b57438a580
branch: yt
user: yl2501
date: 2012-11-30 05:42:03
summary: Use H_NumberDensity from Britton
affected #: 1 file
diff -r ecfb819035d8ca3f2322595572eccbcf7a460e2b -r 75b57438a580c735e1932392fe5e15250749b899 yt/analysis_modules/spectral_integrator/spectral_frequency_integrator.py
--- a/yt/analysis_modules/spectral_integrator/spectral_frequency_integrator.py
+++ b/yt/analysis_modules/spectral_integrator/spectral_frequency_integrator.py
@@ -34,9 +34,28 @@
BilinearFieldInterpolator, \
TrilinearFieldInterpolator
-def _HydrogenDensity(field,data):
- return data["NumberDensity"]*4.0/9.0 # for primordial gas
-add_field("HydrogenDensity", function=_HydrogenDensity)
+from yt.frontends.enzo.fields import \
+ _ConvertNumberDensity
+
+def _H_NumberDensity(field, data):
+ field_data = np.zeros(data["Density"].shape,
+ dtype=data["Density"].dtype)
+ if data.pf.parameters["MultiSpecies"] == 0:
+ field_data += data["Density"] * \
+ data.pf.parameters["HydrogenFractionByMass"]
+ if data.pf.parameters["MultiSpecies"] > 0:
+ field_data += data["HI_Density"]
+ field_data += data["HII_Density"]
+ if data.pf.parameters["MultiSpecies"] > 1:
+ field_data += data["HM_Density"]
+ field_data += data["H2I_Density"]
+ field_data += data["H2II_Density"]
+ if data.pf.parameters["MultiSpecies"] > 2:
+ field_data += data["HDI_Density"] / 2.0
+ return field_data
+add_field("H_NumberDensity", units=r"\rm{cm}^{-3}",
+ function=_H_NumberDensity,
+ convert_function=_ConvertNumberDensity)
class SpectralFrequencyIntegrator(object):
@@ -80,7 +99,7 @@
interp = self._get_interpolator(ev_min, ev_max)
name = "XRay_%s_%s" % (ev_min, ev_max)
def frequency_bin_field(field, data):
- dd = {'HydrogenDensity' : np.log10(data["HydrogenDensity"]),
+ dd = {'H_NumberDensity' : np.log10(data["H_NumberDensity"]),
'Temperature' : np.log10(data["Temperature"])}
return 10**interp(dd)
add_field(name, function=frequency_bin_field,
https://bitbucket.org/yt_analysis/yt/changeset/5473ca3383a7/
changeset: 5473ca3383a7
branch: yt
user: yl2501
date: 2012-11-30 20:47:16
summary: define field in yt/frontends/enzo/fields.py
affected #: 1 file
diff -r 75b57438a580c735e1932392fe5e15250749b899 -r 5473ca3383a797b089374bacb6198c9b6a34e10e yt/analysis_modules/spectral_integrator/spectral_frequency_integrator.py
--- a/yt/analysis_modules/spectral_integrator/spectral_frequency_integrator.py
+++ b/yt/analysis_modules/spectral_integrator/spectral_frequency_integrator.py
@@ -37,27 +37,6 @@
from yt.frontends.enzo.fields import \
_ConvertNumberDensity
-def _H_NumberDensity(field, data):
- field_data = np.zeros(data["Density"].shape,
- dtype=data["Density"].dtype)
- if data.pf.parameters["MultiSpecies"] == 0:
- field_data += data["Density"] * \
- data.pf.parameters["HydrogenFractionByMass"]
- if data.pf.parameters["MultiSpecies"] > 0:
- field_data += data["HI_Density"]
- field_data += data["HII_Density"]
- if data.pf.parameters["MultiSpecies"] > 1:
- field_data += data["HM_Density"]
- field_data += data["H2I_Density"]
- field_data += data["H2II_Density"]
- if data.pf.parameters["MultiSpecies"] > 2:
- field_data += data["HDI_Density"] / 2.0
- return field_data
-add_field("H_NumberDensity", units=r"\rm{cm}^{-3}",
- function=_H_NumberDensity,
- convert_function=_ConvertNumberDensity)
-
-
class SpectralFrequencyIntegrator(object):
def __init__(self, table, field_names,
bounds, ev_bounds):
https://bitbucket.org/yt_analysis/yt/changeset/4d260047b882/
changeset: 4d260047b882
branch: yt
user: yl2501
date: 2012-11-30 20:47:35
summary: define H_NumberDensity here
affected #: 1 file
diff -r 5473ca3383a797b089374bacb6198c9b6a34e10e -r 4d260047b882a949253cd1942abcffd19b7271d0 yt/frontends/enzo/fields.py
--- a/yt/frontends/enzo/fields.py
+++ b/yt/frontends/enzo/fields.py
@@ -221,6 +221,27 @@
function=_NumberDensity,
convert_function=_ConvertNumberDensity)
+def _H_NumberDensity(field, data):
+ field_data = np.zeros(data["Density"].shape,
+ dtype=data["Density"].dtype)
+ if data.pf.parameters["MultiSpecies"] == 0:
+ field_data += data["Density"] * \
+ data.pf.parameters["HydrogenFractionByMass"]
+ if data.pf.parameters["MultiSpecies"] > 0:
+ field_data += data["HI_Density"]
+ field_data += data["HII_Density"]
+ if data.pf.parameters["MultiSpecies"] > 1:
+ field_data += data["HM_Density"]
+ field_data += data["H2I_Density"]
+ field_data += data["H2II_Density"]
+ if data.pf.parameters["MultiSpecies"] > 2:
+ field_data += data["HDI_Density"] / 2.0
+ return field_data
+add_field("H_NumberDensity", units=r"\rm{cm}^{-3}",
+ function=_H_NumberDensity,
+ convert_function=_ConvertNumberDensity)
+
+
# Now we add all the fields that we want to control, but we give a null function
# This is every Enzo field we can think of. This will be installation-dependent,
https://bitbucket.org/yt_analysis/yt/changeset/e80bdcb82b42/
changeset: e80bdcb82b42
branch: yt
user: yl2501
date: 2012-11-30 20:51:02
summary: remove import
affected #: 1 file
diff -r 4d260047b882a949253cd1942abcffd19b7271d0 -r e80bdcb82b424ae0741d166cfdeb01b34a37cf91 yt/analysis_modules/spectral_integrator/spectral_frequency_integrator.py
--- a/yt/analysis_modules/spectral_integrator/spectral_frequency_integrator.py
+++ b/yt/analysis_modules/spectral_integrator/spectral_frequency_integrator.py
@@ -34,9 +34,6 @@
BilinearFieldInterpolator, \
TrilinearFieldInterpolator
-from yt.frontends.enzo.fields import \
- _ConvertNumberDensity
-
class SpectralFrequencyIntegrator(object):
def __init__(self, table, field_names,
bounds, ev_bounds):
https://bitbucket.org/yt_analysis/yt/changeset/ab6b8a938ca3/
changeset: ab6b8a938ca3
branch: yt
user: brittonsmith
date: 2012-11-30 20:56:45
summary: Merged in yl2501/yt (pull request #352)
affected #: 3 files
diff -r 59114fb09b62b7164bc34d54bcd0716c03380080 -r ab6b8a938ca3193acf172fb1f6b999060522607b setup.cfg
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,4 +6,4 @@
detailed-errors=1
where=yt
exclude=answer_testing
-with-xunit=1
\ No newline at end of file
+with-xunit=1
diff -r 59114fb09b62b7164bc34d54bcd0716c03380080 -r ab6b8a938ca3193acf172fb1f6b999060522607b yt/analysis_modules/spectral_integrator/spectral_frequency_integrator.py
--- a/yt/analysis_modules/spectral_integrator/spectral_frequency_integrator.py
+++ b/yt/analysis_modules/spectral_integrator/spectral_frequency_integrator.py
@@ -63,6 +63,8 @@
bin_table, self.bounds, self.field_names[:],
truncate=True)
+
+
def add_frequency_bin_field(self, ev_min, ev_max):
"""
Add a new field to the FieldInfoContainer, which is an
@@ -73,7 +75,7 @@
interp = self._get_interpolator(ev_min, ev_max)
name = "XRay_%s_%s" % (ev_min, ev_max)
def frequency_bin_field(field, data):
- dd = {'NumberDensity' : np.log10(data["NumberDensity"]),
+ dd = {'H_NumberDensity' : np.log10(data["H_NumberDensity"]),
'Temperature' : np.log10(data["Temperature"])}
return 10**interp(dd)
add_field(name, function=frequency_bin_field,
diff -r 59114fb09b62b7164bc34d54bcd0716c03380080 -r ab6b8a938ca3193acf172fb1f6b999060522607b yt/frontends/enzo/fields.py
--- a/yt/frontends/enzo/fields.py
+++ b/yt/frontends/enzo/fields.py
@@ -221,6 +221,27 @@
function=_NumberDensity,
convert_function=_ConvertNumberDensity)
+def _H_NumberDensity(field, data):
+ field_data = np.zeros(data["Density"].shape,
+ dtype=data["Density"].dtype)
+ if data.pf.parameters["MultiSpecies"] == 0:
+ field_data += data["Density"] * \
+ data.pf.parameters["HydrogenFractionByMass"]
+ if data.pf.parameters["MultiSpecies"] > 0:
+ field_data += data["HI_Density"]
+ field_data += data["HII_Density"]
+ if data.pf.parameters["MultiSpecies"] > 1:
+ field_data += data["HM_Density"]
+ field_data += data["H2I_Density"]
+ field_data += data["H2II_Density"]
+ if data.pf.parameters["MultiSpecies"] > 2:
+ field_data += data["HDI_Density"] / 2.0
+ return field_data
+add_field("H_NumberDensity", units=r"\rm{cm}^{-3}",
+ function=_H_NumberDensity,
+ convert_function=_ConvertNumberDensity)
+
+
# Now we add all the fields that we want to control, but we give a null function
# This is every Enzo field we can think of. This will be installation-dependent,
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