r19822 - /branches/relax_disp/specific_analyses/relax_disp/parameters.py -- May 31, 2013 - 12:06

Author: bugman
Date: Fri May 31 12:06:25 2013
New Revision: 19822

URL: http://svn.gna.org/viewcvs/relax?rev=19822&view=rev
Log:
Simplified the pA >= pB constraint in the dispersion linear_constraints() 
function.


Modified:
    branches/relax_disp/specific_analyses/relax_disp/parameters.py

Modified: branches/relax_disp/specific_analyses/relax_disp/parameters.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/parameters.py?rev=19822&r1=19821&r2=19822&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/parameters.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/parameters.py Fri May 31 
12:06:25 2013
@@ -429,7 +429,7 @@
         |         |     |        |      |         |
         | 1  0  0 |     |   pA   |      |    0    |
         |         |     |        |      |         |
-        | 2  0  0 |  .  |   pA   |  >=  |    1    |
+        | 1  0  0 |  .  |   pA   |  >=  |   0.5   |
         |         |     |        |      |         |
         | 1  0  0 |     | phi_ex |      |    0    |
         |         |     |        |      |         |
@@ -496,9 +496,9 @@
                 A.append(zero_array * 0.0)
                 A.append(zero_array * 0.0)
                 A[j][i] = 1.0
-                A[j+1][i] = 2.0
+                A[j+1][i] = 1.0
                 b.append(0.0)
-                b.append(1.0 / scaling_matrix[i, i])
+                b.append(0.5 / scaling_matrix[i, i])
                 j += 2
 
             # The pA.pB.dw**2/wH**2 parameter (phi_ex >= 0).