Author: bugman
Date: Wed Mar 19 15:33:59 2014
New Revision: 22513
URL: http://svn.gna.org/viewcvs/relax?rev=22513&view=rev
Log:
Merged revisions 22512 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r22512 | bugman | 2014-03-19 15:32:34 +0100 (Wed, 19 Mar 2014) | 6 lines
The verbosity flag is now used in the centre of mass calculations.
The pipe_control.structure.mass.pipe_centre_of_mass() function now passes
the verbosity argument
into the lib.structure.mass.centre_of_mass() function.
........
Modified:
branches/double_rotor/ (props changed)
branches/double_rotor/pipe_control/structure/mass.py
Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 19 15:33:59 2014
@@ -1 +1 @@
-/trunk:1-22509
+/trunk:1-22512
Modified: branches/double_rotor/pipe_control/structure/mass.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/pipe_control/structure/mass.py?rev=22513&r1=22512&r2=22513&view=diff
==============================================================================
--- branches/double_rotor/pipe_control/structure/mass.py (original)
+++ branches/double_rotor/pipe_control/structure/mass.py Wed Mar 19
15:33:59 2014
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2003-2013 Edward d'Auvergne
#
+# Copyright (C) 2003-2014 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -91,7 +91,7 @@
element_list.append(element)
# Calculate the CoM.
- com, mass = centre_of_mass(pos=coord, elements=element_list)
+ com, mass = centre_of_mass(pos=coord, elements=element_list,
verbosity=verbosity)
# Return the centre of mass.
if return_mass:
r22513 - in /branches/double_rotor: ./ pipe_control/structure/mass.py