Author: bugman Date: Wed Jun 18 17:02:56 2014 New Revision: 24102 URL: http://svn.gna.org/viewcvs/relax?rev=24102&view=rev Log: Decreased all nr_iter values by 10 and added more dispersion models to the super profiling script. This is for the dispersion model profiling scripts in test_suite/shared_data/dispersion/profiling/, all controlled by the disp_profile_all.py super profiling script for generating statistics using all of the other profiling scripts. The number of iterations needed to be decreased as otherwise it would now take almost 1 day to generate the statistics table. Modified: branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/disp_profile_all.py branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_cr72.py branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_dpl94.py branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_3D.py branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_expanded.py branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_tsmfk01.py Modified: branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/disp_profile_all.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/disp_profile_all.py?rev=24102&r1=24101&r2=24102&view=diff ============================================================================== --- branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/disp_profile_all.py (original) +++ branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/disp_profile_all.py Wed Jun 18 17:02:56 2014 @@ -47,7 +47,9 @@ 'TSMFK01', 'B14', 'NS CPMG 2-site expanded', - 'NS CPMG 2-site 3D' + 'NS CPMG 2-site 3D', + 'DPL94', + 'NS R1rho 2-site' ] # The current scripts. @@ -56,7 +58,9 @@ 'profiling_tsmfk01.py', 'profiling_b14.py', 'profiling_ns_cpmg_2site_expanded.py', - 'profiling_ns_cpmg_2site_3D.py' + 'profiling_ns_cpmg_2site_3D.py', + 'profiling_dpl94.py', + 'profiling_ns_r1rho_2site.py' ] # Multiplication factors (to scale for different nr_iter values). @@ -64,6 +68,8 @@ 1.0, 1.0, 1.0, + 1.0, + 10.0, 1.0, 10.0 ] Modified: branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py?rev=24102&r1=24101&r2=24102&view=diff ============================================================================== --- branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py (original) +++ branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py Wed Jun 18 17:02:56 2014 @@ -62,7 +62,7 @@ def main(): if True: # Nr of iterations. - nr_iter = 1000 + nr_iter = 100 # Print statistics. verbose = True Modified: branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_cr72.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_cr72.py?rev=24102&r1=24101&r2=24102&view=diff ============================================================================== --- branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_cr72.py (original) +++ branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_cr72.py Wed Jun 18 17:02:56 2014 @@ -62,7 +62,7 @@ def main(): if True: # Nr of iterations. - nr_iter = 1000 + nr_iter = 100 # Print statistics. verbose = True Modified: branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_dpl94.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_dpl94.py?rev=24102&r1=24101&r2=24102&view=diff ============================================================================== --- branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_dpl94.py (original) +++ branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_dpl94.py Wed Jun 18 17:02:56 2014 @@ -63,7 +63,7 @@ def main(): if True: # Nr of iterations. - nr_iter = 1000 + nr_iter = 100 # Print statistics. verbose = True Modified: branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_3D.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_3D.py?rev=24102&r1=24101&r2=24102&view=diff ============================================================================== --- branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_3D.py (original) +++ branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_3D.py Wed Jun 18 17:02:56 2014 @@ -62,7 +62,7 @@ def main(): if True: # Nr of iterations. - nr_iter = 100 + nr_iter = 10 # Print statistics. verbose = True Modified: branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_expanded.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_expanded.py?rev=24102&r1=24101&r2=24102&view=diff ============================================================================== --- branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_expanded.py (original) +++ branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_expanded.py Wed Jun 18 17:02:56 2014 @@ -62,7 +62,7 @@ def main(): if True: # Nr of iterations. - nr_iter = 1000 + nr_iter = 100 # Print statistics. verbose = True Modified: branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_tsmfk01.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_tsmfk01.py?rev=24102&r1=24101&r2=24102&view=diff ============================================================================== --- branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_tsmfk01.py (original) +++ branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_tsmfk01.py Wed Jun 18 17:02:56 2014 @@ -62,7 +62,7 @@ def main(): if True: # Nr of iterations. - nr_iter = 1000 + nr_iter = 100 # Print statistics. verbose = True