r18981 - in /trunk: extern/sobol/ generic_fns/ generic_fns/structure/ maths_fns/frame_order/ specific_fns/ test_suite/unit_t...r18981 - in /trunk: extern/sobol/ generic_fns/ generic_fns/structure/ maths_fns/frame_order/ specific_fns/ test_suite/unit_t...Author: bugman Date: Fri Mar 22 16:47:10 2013 New Revision: 18981 URL: http://svn.gna.org/viewcvs/relax?rev=18981&view=rev Log: Next block of the manual merger of the frame_order_testing branch. The commands used were: svn merge -r17330:17331 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17847:17848 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17848:17849 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17849:17850 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17850:17851 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17851:17852 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17852:17853 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17853:17854 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17854:17855 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17858:17859 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . The console messages were: [edau@localhost relax-trunk]$ svn merge -r17330:17331 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r17331 into '.': A test_suite/unit_tests/_maths_fns/_frame_order A test_suite/unit_tests/_maths_fns/_frame_order/__init__.py A test_suite/unit_tests/_maths_fns/_frame_order/test_matrix_ops.py A test_suite/unit_tests/_maths_fns/_frame_order/test_pec.py D test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py D test_suite/unit_tests/_maths_fns/test_pseudo_ellipse.py [edau@localhost relax-trunk]$ svn merge -r17847:17848 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r17848 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/rotor.py U specific_fns/frame_order.py U extern/sobol/sobol_lib.py [edau@localhost relax-trunk]$ svn merge -r17848:17849 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r17849 into '.': U generic_fns/structure/api_base.py [edau@localhost relax-trunk]$ svn merge -r17849:17850 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r17850 into '.': U maths_fns/frame_order/__init__.py U maths_fns/frame_order/matrix_ops.py G maths_fns/frame_order/rotor.py U generic_fns/structure/internal.py U generic_fns/align_tensor.py G specific_fns/frame_order.py U extern/sobol/sobol_lib-not_tested.py U extern/sobol/sobol_test.py G extern/sobol/sobol_lib.py [edau@localhost relax-trunk]$ svn merge -r17850:17851 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r17851 into '.': G extern/sobol/sobol_lib-not_tested.py G extern/sobol/sobol_test.py G extern/sobol/sobol_lib.py [edau@localhost relax-trunk]$ svn merge -r17851:17852 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r17852 into '.': G generic_fns/align_tensor.py [edau@localhost relax-trunk]$ svn merge -r17852:17853 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . [edau@localhost relax-trunk]$ svn merge -r17853:17854 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r17854 into '.': G specific_fns/frame_order.py [edau@localhost relax-trunk]$ svn merge -r17854:17855 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r17855 into '.': G specific_fns/frame_order.py [edau@localhost relax-trunk]$ svn merge -r17858:17859 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . [edau@localhost relax-trunk]$ Added: trunk/test_suite/unit_tests/_maths_fns/_frame_order/ - copied from r17331, branches/frame_order_testing/test_suite/unit_tests/_maths_fns/_frame_order/ Removed: trunk/test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py trunk/test_suite/unit_tests/_maths_fns/test_pseudo_ellipse.py Modified: trunk/extern/sobol/sobol_lib-not_tested.py trunk/extern/sobol/sobol_lib.py trunk/extern/sobol/sobol_test.py trunk/generic_fns/align_tensor.py trunk/generic_fns/structure/api_base.py trunk/generic_fns/structure/internal.py trunk/maths_fns/frame_order/__init__.py trunk/maths_fns/frame_order/iso_cone.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_torsionless.py trunk/maths_fns/frame_order/rotor.py trunk/specific_fns/frame_order.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/extern/sobol/sobol_lib-not_tested.py URL: http://svn.gna.org/viewcvs/relax/trunk/extern/sobol/sobol_lib-not_tested.py?rev=18981&r1=18980&r2=18981&view=diff Modified: trunk/extern/sobol/sobol_lib.py URL: http://svn.gna.org/viewcvs/relax/trunk/extern/sobol/sobol_lib.py?rev=18981&r1=18980&r2=18981&view=diff Modified: trunk/extern/sobol/sobol_test.py URL: http://svn.gna.org/viewcvs/relax/trunk/extern/sobol/sobol_test.py?rev=18981&r1=18980&r2=18981&view=diff Modified: trunk/generic_fns/align_tensor.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/align_tensor.py?rev=18981&r1=18980&r2=18981&view=diff Modified: trunk/generic_fns/structure/api_base.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/api_base.py?rev=18981&r1=18980&r2=18981&view=diff Modified: trunk/generic_fns/structure/internal.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/internal.py?rev=18981&r1=18980&r2=18981&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=18981&r1=18980&r2=18981&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=18981&r1=18980&r2=18981&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=18981&r1=18980&r2=18981&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=18981&r1=18980&r2=18981&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=18981&r1=18980&r2=18981&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=18981&r1=18980&r2=18981&view=diff Modified: trunk/specific_fns/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_fns/frame_order.py?rev=18981&r1=18980&r2=18981&view=diff Removed: trunk/test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py?rev=18980&view=auto Removed: trunk/test_suite/unit_tests/_maths_fns/test_pseudo_ellipse.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_maths_fns/test_pseudo_ellipse.py?rev=18980&view=auto