[yt-svn] commit/yt-3.0: scopatz: modifications to make empty field units work.

[Bitbucket]

1 new commit in yt-3.0:


https://bitbucket.org/yt_analysis/yt-3.0/changeset/f1edaf9e2496/
changeset:   f1edaf9e2496
branch:      yt-3.0
user:        scopatz
date:        2012-10-16 21:10:56
summary:     modifications to make empty field units work.
affected #:  2 files

diff -r 1c467764bc9dbbe5a2a97b087b27251df5c544dd -r f1edaf9e24969b8b2224740ff32a379b6effbbc2 yt/frontends/flash/fields.py
--- a/yt/frontends/flash/fields.py
+++ b/yt/frontends/flash/fields.py
@@ -447,12 +447,12 @@
 ## Derived FLASH Fields
 def _nele(field, data):
     return data['ye'] * data['dens'] * data['sumy'] * 6.022E23
-add_field('nele', function=_nele, take_log=True, units=r"\rm{n}/\rm{cm}^3")
-add_field('edens', function=_nele, take_log=True, units=r"\rm{n}/\rm{cm}^3")
+add_field('nele', function=_nele, take_log=True, units=r"\rm{cm}^{-3}")
+add_field('edens', function=_nele, take_log=True, units=r"\rm{cm}^{-3}")
 
 def _nion(field, data):
     return data['dens'] * data['sumy'] * 6.022E23
-add_field('nion', function=_nion, take_log=True, units=r"\rm{n}/\rm{cm}^3")
+add_field('nion', function=_nion, take_log=True, units=r"\rm{cm}^{-3}")
 
 
 def _abar(field, data):


diff -r 1c467764bc9dbbe5a2a97b087b27251df5c544dd -r f1edaf9e24969b8b2224740ff32a379b6effbbc2 yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -820,14 +820,13 @@
             except ParseFatalException, err:
                 raise YTCannotParseFieldDisplayName(fname,field_name,str(err))
 
-            try:
-                parser.parse(r'$'+md['units']+r'$')
-            except ParseFatalException, err:
-                raise YTCannotParseUnitDisplayName(f, md['units'],str(err))
-
-            if md['units'] == None or md['units'] == '':
+            if md['units'] is None or md['units'] == '':
                 label = field_name
             else:
+                try:
+                    parser.parse(r'$'+md['units']+r'$')
+                except ParseFatalException, err:
+                    raise YTCannotParseUnitDisplayName(f, md['units'],str(err))
                 label = field_name+r'$\/\/('+md['units']+r')$'
 
             self.plots[f].cb.set_label(label)

Repository URL: https://bitbucket.org/yt_analysis/yt-3.0/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.