Author: bugman
Date: Fri Feb 7 11:33:59 2014
New Revision: 22147
URL: http://svn.gna.org/viewcvs/relax?rev=22147&view=rev
Log:
Merged revisions 22139,22143-22144 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r22139 | bugman | 2014-02-06 16:17:49 +0100 (Thu, 06 Feb 2014) | 6 lines
Small improvement for the devel_scripts/python_seek.py script.
The list of detected Python binaries files are now sorted prior to
determining the installed
modules.
........
r22143 | bugman | 2014-02-07 11:11:55 +0100 (Fri, 07 Feb 2014) | 8 lines
Updated the N_state_model.5_state_xz system test to allow it to complete on
i586 Linux systems.
The optimisation would continue for a huge amount of time on a test system
(Mageia 4 i586 VM) and
would make it appear as though the test suite has hung. By limiting the
maximum number of
iterations in the optimisation to 1000, the test will complete successfully
and the parameters
optimised to the same precision.
........
r22144 | bugman | 2014-02-07 11:17:55 +0100 (Fri, 07 Feb 2014) | 5 lines
Loosened the checks for the Frame_order.test_korzhnev_2005_15n_zq_data
system test.
This is to allow the test to pass on a 32-bit test system (Mageia 4 i586
VM).
........
Modified:
branches/double_rotor/ (props changed)
branches/double_rotor/devel_scripts/python_seek.py
branches/double_rotor/test_suite/system_tests/relax_disp.py
branches/double_rotor/test_suite/system_tests/scripts/n_state_model/5_state_xz.py
Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb 7 11:33:59 2014
@@ -1,1 +1,1 @@
-/trunk:1-22112,22115-22118,22125-22138
+/trunk:1-22112,22115-22118,22125-22144
Modified: branches/double_rotor/devel_scripts/python_seek.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/devel_scripts/python_seek.py?rev=22147&r1=22146&r2=22147&view=diff
==============================================================================
--- branches/double_rotor/devel_scripts/python_seek.py (original)
+++ branches/double_rotor/devel_scripts/python_seek.py Fri Feb 7 11:33:59
2014
@@ -121,6 +121,9 @@
# Add the file, avoiding duplicates.
if file not in binaries:
binaries.append(file)
+
+ # Sort the list.
+ binaries.sort()
# Return the file list.
return binaries
Modified: branches/double_rotor/test_suite/system_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/relax_disp.py?rev=22147&r1=22146&r2=22147&view=diff
==============================================================================
--- branches/double_rotor/test_suite/system_tests/relax_disp.py (original)
+++ branches/double_rotor/test_suite/system_tests/relax_disp.py Fri Feb 7
11:33:59 2014
@@ -1815,7 +1815,7 @@
self.assertAlmostEqual(spin.r2[r20_key3], 6.78922219135537, 2)
self.assertAlmostEqual(spin.pA, 0.942457332074014, 4)
self.assertAlmostEqual(spin.dw, 0.850592422908884, 1)
- self.assertAlmostEqual(spin.dwH, 0.0881272284455416, 3)
+ self.assertAlmostEqual(spin.dwH, 0.0881272284455416, 2)
self.assertAlmostEqual(spin.kex/1000, 372.745483351305/1000, 3)
self.assertAlmostEqual(spin.chi2, 23.8464637019392, 1)
Modified:
branches/double_rotor/test_suite/system_tests/scripts/n_state_model/5_state_xz.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/scripts/n_state_model/5_state_xz.py?rev=22147&r1=22146&r2=22147&view=diff
==============================================================================
---
branches/double_rotor/test_suite/system_tests/scripts/n_state_model/5_state_xz.py
(original)
+++
branches/double_rotor/test_suite/system_tests/scripts/n_state_model/5_state_xz.py
Fri Feb 7 11:33:59 2014
@@ -72,7 +72,7 @@
#self._execute_uf(uf_name='value.set')
# Minimise.
-self._execute_uf('simplex', constraints=False, uf_name='minimise')
+self._execute_uf('simplex', constraints=False, uf_name='minimise',
max_iter=1000)
# Centre of mass analysis.
self._execute_uf(uf_name='n_state_model.CoM', pivot_point=[0.0, 0.0, 0.0],
centre=[0.0, 0.0, 1.0])
r22147 - in /branches/double_rotor: ./ devel_scripts/ test_suite/system_tests/ test_suite/system_tests/scripts/n_state_model/