r14861 - /1.3/test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py -- October 12, 2011 - 18:57

Author: bugman
Date: Wed Oct 12 18:57:31 2011
New Revision: 14861

URL: http://svn.gna.org/viewcvs/relax?rev=14861&view=rev
Log:
Reverted the last revision (r14860) as the change was rubbish.

The command used was:
svn merge -r14860:r14859 .


Modified:
    1.3/test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py

Modified: 1.3/test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py?rev=14861&r1=14860&r2=14861&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py 
(original)
+++ 1.3/test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py Wed 
Oct 12 18:57:31 2011
@@ -100,7 +100,6 @@
 # Shift the metal.
 print("\nShifting the Ln3+ position.")
 print("Original position: [%.3f, %.3f, %.3f]" % (cdp.paramagnetic_centre[0], 
cdp.paramagnetic_centre[1], cdp.paramagnetic_centre[2]))
-x, y, z = cdp.paramagnetic_centre
 cdp.paramagnetic_centre[0] = cdp.paramagnetic_centre[0] + 0.2
 print("Shifted position:  [%.3f, %.3f, %.3f]\n" % 
(cdp.paramagnetic_centre[0], cdp.paramagnetic_centre[1], 
cdp.paramagnetic_centre[2]))
 calc()
@@ -109,6 +108,7 @@
     raise RelaxError("The chi2 value cannot be zero here!")
 
 # Optimise the Ln3+ position.
+x, y, z = cdp.paramagnetic_centre
 minimise('simplex', constraints=False, max_iter=500)
 
 # Check that the metal moved.