Author: bugman
Date: Mon Dec 9 16:33:33 2013
New Revision: 21910
URL: http://svn.gna.org/viewcvs/relax?rev=21910&view=rev
Log:
Transposed some of the 'NS R1rho 3-site' model evolution matrix elements.
These now match the 'NS R1rho 2-site' model.
Modified:
trunk/docs/latex/dispersion.tex
trunk/lib/dispersion/ns_matrices.py
Modified: trunk/docs/latex/dispersion.tex
URL:
http://svn.gna.org/viewcvs/relax/trunk/docs/latex/dispersion.tex?rev=21910&r1=21909&r2=21910&view=diff
==============================================================================
--- trunk/docs/latex/dispersion.tex (original)
+++ trunk/docs/latex/dispersion.tex Mon Dec 9 16:33:33 2013
@@ -1177,31 +1177,31 @@
\cdots & 0 & \omegaone &
-\RoneC-\kCA-\kCB \\
\end{pmatrix} \nonumber \\
&+ \begin{pmatrix}
- & & & \kAB & 0 & 0 &
\cdots \\
- & \ddots & & 0 & \kAB & 0 &
\cdots \\
- & & & 0 & 0 & \kAB &
\cdots \\
- \kBA & 0 & 0 & & & & \\
- 0 & \kBA & 0 & & \ddots & &
\cdots\\
- 0 & 0 & \kBA & & & & \\
+ & & & \kBA & 0 & 0 &
\cdots \\
+ & \ddots & & 0 & \kBA & 0 &
\cdots \\
+ & & & 0 & 0 & \kBA &
\cdots \\
+ \kAB & 0 & 0 & & & & \\
+ 0 & \kAB & 0 & & \ddots & &
\cdots\\
+ 0 & 0 & \kAB & & & & \\
\vdots & \vdots & \vdots & & \vdots & &
\ddots \\
\end{pmatrix} \nonumber \\
&+ \begin{pmatrix}
- & & & \cdots & \kAC & 0 & 0 \\
- & \ddots & & \cdots & 0 & \kAC & 0 \\
- & & & \cdots & 0 & 0 & \kAC
\\
+ & & & \cdots & \kCA & 0 & 0 \\
+ & \ddots & & \cdots & 0 & \kCA & 0 \\
+ & & & \cdots & 0 & 0 & \kCA
\\
\vdots & \vdots & \vdots & \ddots & \vdots & \vdots &
\vdots \\
- \kCA & 0 & 0 & \cdots & & & \\
- 0 & \kCA & 0 & \cdots & & \ddots & \\
- 0 & 0 & \kCA & \cdots & & & \\
+ \kAC & 0 & 0 & \cdots & & & \\
+ 0 & \kAC & 0 & \cdots & & \ddots & \\
+ 0 & 0 & \kAC & \cdots & & & \\
\end{pmatrix} \nonumber \\
&+ \begin{pmatrix}
\ddots & & \vdots & & \vdots & \vdots &
\vdots \\
- & & & & \kBC & 0 & 0 \\
- \cdots & & \ddots & & 0 & \kBC & 0 \\
- & & & & 0 & 0 & \kBC
\\
- \cdots & \kCB & 0 & 0 & & & \\
- \cdots & 0 & \kCB & 0 & & \ddots & \\
- \cdots & 0 & 0 & \kCB & & & \\
+ & & & & \kCB & 0 & 0 \\
+ \cdots & & \ddots & & 0 & \kCB & 0 \\
+ & & & & 0 & 0 & \kCB
\\
+ \cdots & \kBC & 0 & 0 & & & \\
+ \cdots & 0 & \kBC & 0 & & \ddots & \\
+ \cdots & 0 & 0 & \kBC & & & \\
\end{pmatrix},
\end{align}
@@ -1244,22 +1244,22 @@
\cdots & 0 & \omegaone &
-\RoneC-\kCB \\
\end{pmatrix} \nonumber \\
&+ \begin{pmatrix}
- & & & \kAB & 0 & 0 &
\cdots \\
- & \ddots & & 0 & \kAB & 0 &
\cdots \\
- & & & 0 & 0 & \kAB &
\cdots \\
- \kBA & 0 & 0 & & & & \\
- 0 & \kBA & 0 & & \ddots & &
\cdots\\
- 0 & 0 & \kBA & & & & \\
+ & & & \kBA & 0 & 0 &
\cdots \\
+ & \ddots & & 0 & \kBA & 0 &
\cdots \\
+ & & & 0 & 0 & \kBA &
\cdots \\
+ \kAB & 0 & 0 & & & & \\
+ 0 & \kAB & 0 & & \ddots & &
\cdots\\
+ 0 & 0 & \kAB & & & & \\
\vdots & \vdots & \vdots & & \vdots & &
\ddots \\
\end{pmatrix} \nonumber \\
&+ \begin{pmatrix}
\ddots & & \vdots & & \vdots & \vdots &
\vdots \\
- & & & & \kBC & 0 & 0 \\
- \cdots & & \ddots & & 0 & \kBC & 0 \\
- & & & & 0 & 0 & \kBC
\\
- \cdots & \kCB & 0 & 0 & & & \\
- \cdots & 0 & \kCB & 0 & & \ddots & \\
- \cdots & 0 & 0 & \kCB & & & \\
+ & & & & \kCB & 0 & 0 \\
+ \cdots & & \ddots & & 0 & \kCB & 0 \\
+ & & & & 0 & 0 & \kCB
\\
+ \cdots & \kBC & 0 & 0 & & & \\
+ \cdots & 0 & \kBC & 0 & & \ddots & \\
+ \cdots & 0 & 0 & \kBC & & & \\
\end{pmatrix},
\end{align}
Modified: trunk/lib/dispersion/ns_matrices.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/ns_matrices.py?rev=21910&r1=21909&r2=21910&view=diff
==============================================================================
--- trunk/lib/dispersion/ns_matrices.py (original)
+++ trunk/lib/dispersion/ns_matrices.py Mon Dec 9 16:33:33 2013
@@ -225,29 +225,28 @@
matrix[8, 8] = -R1 - k_CA - k_CB
# The AB cross-block.
- matrix[3, 0] = k_AB
- matrix[4, 1] = k_AB
- matrix[5, 2] = k_AB
- matrix[0, 3] = k_BA
- matrix[1, 4] = k_BA
- matrix[2, 5] = k_BA
+ matrix[3, 0] = k_BA
+ matrix[4, 1] = k_BA
+ matrix[5, 2] = k_BA
+ matrix[0, 3] = k_AB
+ matrix[1, 4] = k_AB
+ matrix[2, 5] = k_AB
# The AC cross-block.
- matrix[6, 0] = k_AC
- matrix[7, 1] = k_AC
- matrix[8, 2] = k_AC
- matrix[0, 6] = k_CA
- matrix[1, 7] = k_CA
- matrix[2, 8] = k_CA
+ matrix[6, 0] = k_CA
+ matrix[7, 1] = k_CA
+ matrix[8, 2] = k_CA
+ matrix[0, 6] = k_AC
+ matrix[1, 7] = k_AC
+ matrix[2, 8] = k_AC
# The BC cross-block.
- matrix[6, 3] = k_BC
- matrix[7, 4] = k_BC
- matrix[8, 5] = k_BC
- matrix[3, 6] = k_CB
- matrix[4, 7] = k_CB
- matrix[5, 8] = k_CB
-
+ matrix[6, 3] = k_CB
+ matrix[7, 4] = k_CB
+ matrix[8, 5] = k_CB
+ matrix[3, 6] = k_BC
+ matrix[4, 7] = k_BC
+ matrix[5, 8] = k_BC
def rr1rho_3d(R1A=None, R1=None, Rinf=None, pA=None, pB=None, wA=None,
wB=None, w1=None, k_AB=None, k_BA=None):
r21910 - in /trunk: docs/latex/dispersion.tex lib/dispersion/ns_matrices.py