r18955 - in /trunk: extern/ extern/sobol/ maths_fns/ test_suite/shared_data/frame_order/free_rotor/ test_suite/shared_data/f... -- March 22, 2013

Author: bugman
Date: Fri Mar 22 12:34:25 2013
New Revision: 18955

URL: http://svn.gna.org/viewcvs/relax?rev=18955&view=rev
Log:
Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15150:15151 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15151:15152 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15152:15153 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15153:15154 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15154:15155 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15155:15156 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15156:15157 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15157:15158 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15158:15159 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15159:15160 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r15150:15151 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15151 into '.':
U    
test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.bz2
U    test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_dy.txt
U    test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/tensors.py
U    test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_tm.txt
U    
test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/tensor_fit.log.bz2
U    test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/cone.pdb
U    test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_tb.txt
U    test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_er.txt
U    test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/README
U    test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_dy.txt
U    test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/ave_pos.pdb
U    
test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.log.bz2
U    test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_tm.txt
U    test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_tb.txt
U    
test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.py
U    test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_er.txt
[edau@localhost relax-trunk]$ svn merge -r15151:15152 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15152 into '.':
U    test_suite/shared_data/frame_order/iso_cone_free_rotor/README
U    test_suite/shared_data/frame_order/rotor_2_state/README
U    test_suite/shared_data/frame_order/rotor2/README
U    test_suite/shared_data/frame_order/free_rotor2/README
U    test_suite/shared_data/frame_order/iso_cone/README
U    test_suite/shared_data/frame_order/rotor/README
U    test_suite/shared_data/frame_order/iso_cone_free_rotor2/README
A    test_suite/shared_data/frame_order/free_rotor/README
[edau@localhost relax-trunk]$ svn merge -r15152:15153 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15153 into '.':
U    maths_fns/frame_order_matrix_ops.py
[edau@localhost relax-trunk]$ svn merge -r15153:15154 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15154 into '.':
U    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15154:15155 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15155 into '.':
G    maths_fns/frame_order_matrix_ops.py
[edau@localhost relax-trunk]$ svn merge -r15155:15156 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15156 into '.':
U    test_suite/shared_data/frame_order/rotor2/frame_order.py
U    test_suite/shared_data/frame_order/rigid/frame_order.py
U    test_suite/shared_data/frame_order/rotor/frame_order.py
U    test_suite/shared_data/frame_order/iso_cone_free_rotor2/frame_order.py
U    test_suite/shared_data/frame_order/free_rotor/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15156:15157 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15157 into '.':
G    
test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.py
U    test_suite/shared_data/frame_order/iso_cone_free_rotor/frame_order.py
G    test_suite/shared_data/frame_order/rotor2/frame_order.py
U    test_suite/shared_data/frame_order/free_rotor2/frame_order.py
U    test_suite/shared_data/frame_order/iso_cone/frame_order.py
G    test_suite/shared_data/frame_order/rigid/frame_order.py
U    
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.py
G    test_suite/shared_data/frame_order/rotor/frame_order.py
G    test_suite/shared_data/frame_order/iso_cone_free_rotor2/frame_order.py
G    test_suite/shared_data/frame_order/free_rotor/frame_order.py
U    test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15157:15158 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15158 into '.':
U    extern/__init__.py
A    extern/sobol
A    extern/sobol/sobol_lib-not_tested.py
A    extern/sobol/sobol_test.py
A    extern/sobol/__init__.py
A    extern/sobol/sobol_lib.py
A    extern/sobol/sobol_test_output.txt
[edau@localhost relax-trunk]$ svn merge -r15158:15159 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15159 into '.':
A    test_suite/shared_data/frame_order/iso_cone_torsionless
A    
test_suite/shared_data/frame_order/iso_cone_torsionless/generate_distribution.py
A    test_suite/shared_data/frame_order/iso_cone_torsionless/frame_order.bz2
A    test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_dy.txt
A    test_suite/shared_data/frame_order/iso_cone_torsionless/tensors.py
A    test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_tm.txt
A    
test_suite/shared_data/frame_order/iso_cone_torsionless/tensor_fit.log.bz2
A    test_suite/shared_data/frame_order/iso_cone_torsionless/cone.pdb
A    test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_tb.txt
A    test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_er.txt
A    test_suite/shared_data/frame_order/iso_cone_torsionless/README
A    test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_dy.txt
A    test_suite/shared_data/frame_order/iso_cone_torsionless/ave_pos.pdb
A    
test_suite/shared_data/frame_order/iso_cone_torsionless/frame_order.log.bz2
A    test_suite/shared_data/frame_order/iso_cone_torsionless/tensor_fit.py
A    test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_tm.txt
A    
test_suite/shared_data/frame_order/iso_cone_torsionless/generate_distribution.log.bz2
A    test_suite/shared_data/frame_order/iso_cone_torsionless/animate.py
A    test_suite/shared_data/frame_order/iso_cone_torsionless/axis.pdb
A    test_suite/shared_data/frame_order/iso_cone_torsionless/back_calc.py
A    test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_tb.txt
A    test_suite/shared_data/frame_order/iso_cone_torsionless/frame_order.py
A    test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_er.txt
[edau@localhost relax-trunk]$ svn merge -r15159:15160 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15160 into '.':
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$


Added:
    trunk/extern/sobol/
      - copied from r15158, branches/frame_order_testing/extern/sobol/
    trunk/test_suite/shared_data/frame_order/free_rotor/README
      - copied unchanged from r15152, 
branches/frame_order_testing/test_suite/shared_data/frame_order/free_rotor/README
    trunk/test_suite/shared_data/frame_order/iso_cone_torsionless/
      - copied from r15159, 
branches/frame_order_testing/test_suite/shared_data/frame_order/iso_cone_torsionless/
Modified:
    trunk/extern/__init__.py
    trunk/maths_fns/frame_order.py
    trunk/maths_fns/frame_order_matrix_ops.py
    trunk/test_suite/shared_data/frame_order/free_rotor/frame_order.py
    trunk/test_suite/shared_data/frame_order/free_rotor2/README
    trunk/test_suite/shared_data/frame_order/free_rotor2/frame_order.py
    trunk/test_suite/shared_data/frame_order/iso_cone/README
    trunk/test_suite/shared_data/frame_order/iso_cone/frame_order.py
    trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor/README
    
trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor/frame_order.py
    trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor2/README
    
trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor2/frame_order.py
    trunk/test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.py
    
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.py
    trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/README
    
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/ave_pos.pdb
    
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/cone.pdb
    
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.bz2
    
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.log.bz2
    
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.py
    
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_dy.txt
    
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_er.txt
    
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_tb.txt
    
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_tm.txt
    
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_dy.txt
    
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_er.txt
    
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_tb.txt
    
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_tm.txt
    
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/tensor_fit.log.bz2
    
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/tensors.py
    trunk/test_suite/shared_data/frame_order/rigid/frame_order.py
    trunk/test_suite/shared_data/frame_order/rotor/README
    trunk/test_suite/shared_data/frame_order/rotor/frame_order.py
    trunk/test_suite/shared_data/frame_order/rotor2/README
    trunk/test_suite/shared_data/frame_order/rotor2/frame_order.py
    trunk/test_suite/shared_data/frame_order/rotor_2_state/README

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/extern/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/extern/__init__.py?rev=18955&r1=18954&r2=18955&view=diff

Modified: trunk/maths_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order.py?rev=18955&r1=18954&r2=18955&view=diff

Modified: trunk/maths_fns/frame_order_matrix_ops.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order_matrix_ops.py?rev=18955&r1=18954&r2=18955&view=diff

Modified: trunk/test_suite/shared_data/frame_order/free_rotor/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/free_rotor/frame_order.py?rev=18955&r1=18954&r2=18955&view=diff

Modified: trunk/test_suite/shared_data/frame_order/free_rotor2/README
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/free_rotor2/README?rev=18955&r1=18954&r2=18955&view=diff

Modified: trunk/test_suite/shared_data/frame_order/free_rotor2/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/free_rotor2/frame_order.py?rev=18955&r1=18954&r2=18955&view=diff

Modified: trunk/test_suite/shared_data/frame_order/iso_cone/README
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/iso_cone/README?rev=18955&r1=18954&r2=18955&view=diff

Modified: trunk/test_suite/shared_data/frame_order/iso_cone/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/iso_cone/frame_order.py?rev=18955&r1=18954&r2=18955&view=diff

Modified: trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor/README
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor/README?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor/frame_order.py?rev=18955&r1=18954&r2=18955&view=diff

Modified: trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor2/README
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor2/README?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor2/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor2/frame_order.py?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.py?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.py?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/README
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/README?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/ave_pos.pdb
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/ave_pos.pdb?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/cone.pdb
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/cone.pdb?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.bz2
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.bz2?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.log.bz2
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.log.bz2?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.py?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_dy.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_dy.txt?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_er.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_er.txt?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_tb.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_tb.txt?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_tm.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_tm.txt?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_dy.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_dy.txt?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_er.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_er.txt?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_tb.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_tb.txt?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_tm.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_tm.txt?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/tensor_fit.log.bz2
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/tensor_fit.log.bz2?rev=18955&r1=18954&r2=18955&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/tensors.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/tensors.py?rev=18955&r1=18954&r2=18955&view=diff

Modified: trunk/test_suite/shared_data/frame_order/rigid/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rigid/frame_order.py?rev=18955&r1=18954&r2=18955&view=diff

Modified: trunk/test_suite/shared_data/frame_order/rotor/README
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rotor/README?rev=18955&r1=18954&r2=18955&view=diff

Modified: trunk/test_suite/shared_data/frame_order/rotor/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rotor/frame_order.py?rev=18955&r1=18954&r2=18955&view=diff

Modified: trunk/test_suite/shared_data/frame_order/rotor2/README
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rotor2/README?rev=18955&r1=18954&r2=18955&view=diff

Modified: trunk/test_suite/shared_data/frame_order/rotor2/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rotor2/frame_order.py?rev=18955&r1=18954&r2=18955&view=diff

Modified: trunk/test_suite/shared_data/frame_order/rotor_2_state/README
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rotor_2_state/README?rev=18955&r1=18954&r2=18955&view=diff
r18955 - in /trunk: extern/ extern/sobol/ maths_fns/ test_suite/shared_data/frame_order/free_rotor/ test_suite/shared_data/f...

Header

Content

Related Messages
