r18997 - in /trunk: auto_analyses/ maths_fns/frame_order/ specific_fns/ test_suite/shared_data/frame_order/displacements/ te...r18997 - in /trunk: auto_analyses/ maths_fns/frame_order/ specific_fns/ test_suite/shared_data/frame_order/displacements/ te...Author: bugman Date: Fri Mar 22 17:24:22 2013 New Revision: 18997 URL: http://svn.gna.org/viewcvs/relax?rev=18997&view=rev Log: Next block of the manual merger of the frame_order_testing branch. The commands used were: svn merge -r18619:18620 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r18620:18621 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r18621:18622 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r18622:18623 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r18623:18624 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r18624:18625 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r18625:18626 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r18626:18627 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r18627:18628 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r18628:18629 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r18629:18630 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . The console messages were: [edau@localhost relax-trunk]$ svn merge -r18619:18620 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r18620 into '.': U maths_fns/frame_order/__init__.py [edau@localhost relax-trunk]$ svn merge -r18620:18621 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r18621 into '.': U maths_fns/frame_order/iso_cone.py U maths_fns/frame_order/pseudo_ellipse_torsionless.py U maths_fns/frame_order/iso_cone_torsionless.py U maths_fns/frame_order/pseudo_ellipse_free_rotor.py U maths_fns/frame_order/iso_cone_free_rotor.py U maths_fns/frame_order/rotor.py U maths_fns/frame_order/free_rotor.py [edau@localhost relax-trunk]$ svn merge -r18621:18622 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r18622 into '.': U maths_fns/frame_order/pseudo_ellipse.py G maths_fns/frame_order/__init__.py [edau@localhost relax-trunk]$ svn merge -r18622:18623 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r18623 into '.': G maths_fns/frame_order/__init__.py U maths_fns/frame_order/matrix_ops.py G maths_fns/frame_order/rotor.py [edau@localhost relax-trunk]$ svn merge -r18623:18624 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r18624 into '.': G maths_fns/frame_order/__init__.py [edau@localhost relax-trunk]$ svn merge -r18624:18625 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r18625 into '.': U test_suite/shared_data/frame_order/displacements/rigid_test.py A test_suite/shared_data/frame_order/displacements/rigid_test.log [edau@localhost relax-trunk]$ svn merge -r18625:18626 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r18626 into '.': A test_suite/system_tests/scripts/frame_order/rigid_test.py U test_suite/system_tests/frame_order.py [edau@localhost relax-trunk]$ svn merge -r18626:18627 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r18627 into '.': U specific_fns/frame_order.py U user_functions/frame_order.py [edau@localhost relax-trunk]$ svn merge -r18627:18628 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r18628 into '.': G test_suite/shared_data/frame_order/displacements/rigid_test.py [edau@localhost relax-trunk]$ svn merge -r18628:18629 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r18629 into '.': U auto_analyses/frame_order.py [edau@localhost relax-trunk]$ svn merge -r18629:18630 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r18630 into '.': G auto_analyses/frame_order.py [edau@localhost relax-trunk]$ Added: trunk/test_suite/shared_data/frame_order/displacements/rigid_test.log - copied unchanged from r18625, branches/frame_order_testing/test_suite/shared_data/frame_order/displacements/rigid_test.log trunk/test_suite/system_tests/scripts/frame_order/rigid_test.py - copied unchanged from r18626, branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/rigid_test.py Modified: trunk/auto_analyses/frame_order.py trunk/maths_fns/frame_order/__init__.py trunk/maths_fns/frame_order/free_rotor.py trunk/maths_fns/frame_order/iso_cone.py trunk/maths_fns/frame_order/iso_cone_free_rotor.py trunk/maths_fns/frame_order/iso_cone_torsionless.py trunk/maths_fns/frame_order/matrix_ops.py trunk/maths_fns/frame_order/pseudo_ellipse.py trunk/maths_fns/frame_order/pseudo_ellipse_free_rotor.py trunk/maths_fns/frame_order/pseudo_ellipse_torsionless.py trunk/maths_fns/frame_order/rotor.py trunk/specific_fns/frame_order.py trunk/test_suite/shared_data/frame_order/displacements/rigid_test.py trunk/test_suite/system_tests/frame_order.py trunk/user_functions/frame_order.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/auto_analyses/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/frame_order.py?rev=18997&r1=18996&r2=18997&view=diff Modified: trunk/maths_fns/frame_order/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/__init__.py?rev=18997&r1=18996&r2=18997&view=diff Modified: trunk/maths_fns/frame_order/free_rotor.py URL: http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/free_rotor.py?rev=18997&r1=18996&r2=18997&view=diff Modified: trunk/maths_fns/frame_order/iso_cone.py URL: http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/iso_cone.py?rev=18997&r1=18996&r2=18997&view=diff Modified: trunk/maths_fns/frame_order/iso_cone_free_rotor.py URL: http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/iso_cone_free_rotor.py?rev=18997&r1=18996&r2=18997&view=diff Modified: trunk/maths_fns/frame_order/iso_cone_torsionless.py URL: http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/iso_cone_torsionless.py?rev=18997&r1=18996&r2=18997&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=18997&r1=18996&r2=18997&view=diff Modified: trunk/maths_fns/frame_order/pseudo_ellipse.py URL: http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/pseudo_ellipse.py?rev=18997&r1=18996&r2=18997&view=diff Modified: trunk/maths_fns/frame_order/pseudo_ellipse_free_rotor.py URL: http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/pseudo_ellipse_free_rotor.py?rev=18997&r1=18996&r2=18997&view=diff Modified: trunk/maths_fns/frame_order/pseudo_ellipse_torsionless.py URL: http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/pseudo_ellipse_torsionless.py?rev=18997&r1=18996&r2=18997&view=diff Modified: trunk/maths_fns/frame_order/rotor.py URL: http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/rotor.py?rev=18997&r1=18996&r2=18997&view=diff Modified: trunk/specific_fns/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_fns/frame_order.py?rev=18997&r1=18996&r2=18997&view=diff Modified: trunk/test_suite/shared_data/frame_order/displacements/rigid_test.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/rigid_test.py?rev=18997&r1=18996&r2=18997&view=diff Modified: trunk/test_suite/system_tests/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/frame_order.py?rev=18997&r1=18996&r2=18997&view=diff Modified: trunk/user_functions/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/user_functions/frame_order.py?rev=18997&r1=18996&r2=18997&view=diff