r24052 - in /branches/disp_spin_speed: ./ test_suite/system_tests/relax_disp.py -- June 17, 2014 - 18:46

Author: tlinnet
Date: Tue Jun 17 18:46:01 2014
New Revision: 24052

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

........
  r24051 | bugman | 2014-06-17 18:27:39 +0200 (Tue, 17 Jun 2014) | 6 lines
  
  Modified the Relax_disp.test_sprangers_data_to_mmq_cr72 system test to pass 
on certain systems.
  
  This test fails on 32-bit Linux (and probably other systems as well).  To 
fix the test, the kex
  values are all divided by 100 before checking them to 4 decimal places of 
accuracy.
........

Modified:
    branches/disp_spin_speed/   (props changed)
    branches/disp_spin_speed/test_suite/system_tests/relax_disp.py

Propchange: branches/disp_spin_speed/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 17 18:46:01 2014
@@ -1 +1 @@
-/trunk:1-24049
+/trunk:1-24051

Modified: branches/disp_spin_speed/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/system_tests/relax_disp.py?rev=24052&r1=24051&r2=24052&view=diff
==============================================================================
--- branches/disp_spin_speed/test_suite/system_tests/relax_disp.py      
(original)
+++ branches/disp_spin_speed/test_suite/system_tests/relax_disp.py      Tue 
Jun 17 18:46:01 2014
@@ -5434,7 +5434,7 @@
         self.assertAlmostEqual(spin135S.pA, 0.836591714049569, 4)
         self.assertAlmostEqual(spin135S.dw, 0.583003004605869, 4)
         self.assertAlmostEqual(spin135S.dwH, 0.0361441894065963, 4)
-        self.assertAlmostEqual(spin135S.kex, 241.806464344233, 4)
+        self.assertAlmostEqual(spin135S.kex/100, 241.806464344233/100, 4)
         self.assertAlmostEqual(spin135S.chi2, 12.4224060116473, 4)
 
         # Checks for residue :135F.
@@ -5443,7 +5443,7 @@
         self.assertAlmostEqual(spin135F.pA, 0.836591714049569, 4)
         self.assertAlmostEqual(spin135F.dw, 0.805849748711916, 4)
         self.assertAlmostEqual(spin135F.dwH, 0.0215791669142752, 4)
-        self.assertAlmostEqual(spin135F.kex, 241.806464344233, 4)
+        self.assertAlmostEqual(spin135F.kex/100, 241.806464344233/100, 4)
         self.assertAlmostEqual(spin135F.chi2, 12.4224060116473, 4)
 
         # Checks for residue :137S.
@@ -5452,7 +5452,7 @@
         self.assertAlmostEqual(spin137S.pA, 0.836591714049569, 4)
         self.assertAlmostEqual(spin137S.dw, 0.688107406812537, 4)
         self.assertAlmostEqual(spin137S.dwH, 0.034446357344577, 4)
-        self.assertAlmostEqual(spin137S.kex, 241.806464344233, 4)
+        self.assertAlmostEqual(spin137S.kex/100, 241.806464344233/100, 4)
         self.assertAlmostEqual(spin137S.chi2, 12.4224060116473, 4)
 
         # Checks for residue :137F.
@@ -5461,7 +5461,7 @@
         self.assertAlmostEqual(spin137F.pA, 0.836591714049569, 4)
         self.assertAlmostEqual(spin137F.dw, 0.94978325541294, 4)
         self.assertAlmostEqual(spin137F.dwH, 1.5189362257653e-07, 4)
-        self.assertAlmostEqual(spin137F.kex, 241.806464344233, 4)
+        self.assertAlmostEqual(spin137F.kex/100, 241.806464344233/100, 4)
         self.assertAlmostEqual(spin137F.chi2, 12.4224060116473, 4)