r20778 - in /branches/relax_disp: ./ lib/structure/mass.py -- September 03, 2013 - 17:42

Author: bugman
Date: Tue Sep  3 17:42:19 2013
New Revision: 20778

URL: http://svn.gna.org/viewcvs/relax?rev=20778&view=rev
Log:
Merged revisions 20776 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r20776 | bugman | 2013-09-03 17:40:26 +0200 (Tue, 03 Sep 2013) | 6 lines
  
  Fix for bug #21097 (https://gna.org/bugs/?21097).
  
  This was a simple typo.  It has not been encountered before because it is 
in a rarely encountered
  RelaxError.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/lib/structure/mass.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Sep  3 17:42:19 2013
@@ -1,1 +1,1 @@
-/trunk:1-20775
+/trunk:1-20777

Modified: branches/relax_disp/lib/structure/mass.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/structure/mass.py?rev=20778&r1=20777&r2=20778&view=diff
==============================================================================
--- branches/relax_disp/lib/structure/mass.py (original)
+++ branches/relax_disp/lib/structure/mass.py Tue Sep  3 17:42:19 2013
@@ -59,7 +59,7 @@
         try:
             mass = return_atomic_mass(elements[i])
         except RelaxError:
-            warn(RelaxWarning("Skipping the atom '%s' as the element '%s' is 
unknown." % (id, element)))
+            warn(RelaxWarning("Skipping the atom '%s' as the element '%s' is 
unknown." % (id, elements[i])))
 
         # Total mass.
         M = M + mass