Add more benchmarks

2 files changed, 79 insertions, 2 deletions

diff --git a/benchmarks.csv b/benchmarks.csv
index 55ed72635..f81c902e1 100644
--- a/benchmarks.csv
+++ b/benchmarks.csv
@@ -98,3 +98,80 @@ L-JM,5000,1500,1000.0,14.256678564778646,711.8209704,0.25,1,15/12/2019
 L-JM,5500,1500,1000.0,14.237603645751953,825.8206864,0.25,1,15/12/2019
 L-JM,6000,1101,1000.0,14.04869658132167,909.8488734,0.25,1,15/12/2019
 L-JM,6500,601,1000.0,14.660941845581258,994.2622263000001,0.25,1,15/12/2019
+L-JM,1500,1500,1000.0,13.917265603817388,111.8063593,1,1.5,15/12/2019
+L-JM,2000,1500,1000.0,12.393746784561161,174.0463799,1,1.5,15/12/2019
+L-JM,2500,1500,1000.0,11.310800296285631,242.5622126,1,1.5,15/12/2019
+L-JM,3000,1500,1000.0,10.573622634081524,323.0661685,1,1.5,15/12/2019
+L-JM,3500,1500,1000.0,9.875938797266643,406.5680506,1,1.5,15/12/2019
+L-JM,4000,1500,1000.0,9.510982350137393,503.7767193,1,1.5,15/12/2019
+L-JM,4500,1500,1000.0,9.119124757146201,596.6460913,1,1.5,15/12/2019
+L-JM,5000,1500,1000.0,8.599406629679363,706.859301,1,1.5,15/12/2019
+L-JM,5500,1500,1000.0,8.368502939493816,818.7217491,1,1.5,15/12/2019
+L-JM,6000,1101,1000.0,8.063868108397717,897.7200943,1,1.5,15/12/2019
+L-JM,6500,601,1000.0,8.136913764498198,974.7133005,1,1.5,15/12/2019
+L-JM,1500,1500,1000.0,14.09852163185247,111.0557463,1,2,15/12/2019
+L-JM,2000,1500,1000.0,12.44589603171794,172.8484317,1,2,15/12/2019
+L-JM,2500,1500,1000.0,11.252518187896092,245.6580888,1,2,15/12/2019
+L-JM,3000,1500,1000.0,10.49970513110606,319.36993149999995,1,2,15/12/2019
+L-JM,3500,1500,1000.0,9.76052582794444,409.32987959999997,1,2,15/12/2019
+L-JM,4000,1500,1000.0,9.367906394826731,505.0419491,1,2,15/12/2019
+L-JM,4500,1500,1000.0,8.953196634539921,613.9279513,1,2,15/12/2019
+L-JM,5000,1500,1000.0,8.49635838229116,708.8533507000001,1,2,15/12/2019
+L-JM,5500,1500,1000.0,8.250896130411785,824.6985384,1,2,15/12/2019
+L-JM,6000,1101,1000.0,7.941628870483316,896.7534047,1,2,15/12/2019
+L-JM,6500,601,1000.0,7.984307747999562,967.4740421,1,2,15/12/2019
+L-JM,1500,1500,1000.0,14.530905711745902,113.61682520000001,1,2.5,15/12/2019
+L-JM,2000,1500,1000.0,12.780882489283243,178.76914259999998,1,2.5,15/12/2019
+L-JM,2500,1500,1000.0,11.50745587341436,255.22816189999998,1,2.5,15/12/2019
+L-JM,3000,1500,1000.0,10.72320711825816,329.5140962,1,2.5,15/12/2019
+L-JM,3500,1500,1000.0,9.959901313243869,418.59089370000004,1,2.5,15/12/2019
+L-JM,4000,1500,1000.0,9.540940698993367,514.2713362,1,2.5,15/12/2019
+L-JM,4500,1500,1000.0,9.075100561608632,622.6434419,1,2.5,15/12/2019
+L-JM,5000,1500,1000.0,8.632106214462283,715.8135177,1,2.5,15/12/2019
+L-JM,5500,1500,1000.0,8.353497416613262,834.1856596,1,2.5,15/12/2019
+L-JM,6000,1101,1000.0,7.997364105073893,919.106896,1,2.5,15/12/2019
+L-JM,6500,601,1000.0,8.032743632894189,1003.1057952,1,2.5,15/12/2019
+L-JM,1500,1500,1000.0,14.880831269627889,112.38430980000001,1,3,15/12/2019
+L-JM,2000,1500,1000.0,13.064014818353021,174.3569823,1,3,15/12/2019
+L-JM,2500,1500,1000.0,11.762643989761354,243.2211045,1,3,15/12/2019
+L-JM,3000,1500,1000.0,10.968917869575504,324.5920986,1,3,15/12/2019
+L-JM,3500,1500,1000.0,10.200866189011894,410.9065092,1,3,15/12/2019
+L-JM,4000,1500,1000.0,9.746818656939825,498.6132275,1,3,15/12/2019
+L-JM,4500,1500,1000.0,9.23931041631953,606.2137346000001,1,3,15/12/2019
+L-JM,5000,1500,1000.0,8.780373388102213,705.5607821000001,1,3,15/12/2019
+L-JM,5500,1500,1000.0,8.485089657131196,820.0846994,1,3,15/12/2019
+L-JM,6000,1101,1000.0,8.135665582644734,895.5069686,1,3,15/12/2019
+L-JM,6500,601,1000.0,8.187855192343129,958.1212525999999,1,3,15/12/2019
+L-JM,1500,1500,1000.0,14.046177239428841,114.7886533,1,0.75,15/12/2019
+L-JM,2000,1500,1000.0,12.700155820409142,177.8000633,1,0.75,15/12/2019
+L-JM,2500,1500,1000.0,11.999409877098083,249.8877674,1,0.75,15/12/2019
+L-JM,3000,1500,1000.0,11.349961215230307,331.60657760000004,1,0.75,15/12/2019
+L-JM,3500,1500,1000.0,10.72300334940847,421.4194003,1,0.75,15/12/2019
+L-JM,4000,1500,1000.0,10.448034243490858,514.5383338,1,0.75,15/12/2019
+L-JM,4500,1500,1000.0,10.017663810821535,617.0386821,1,0.75,15/12/2019
+L-JM,5000,1500,1000.0,9.517057082204184,716.4373566,1,0.75,15/12/2019
+L-JM,5500,1500,1000.0,9.273669176727296,832.6763739,1,0.75,15/12/2019
+L-JM,6000,1101,1000.0,8.995569295995784,911.0825957,1,0.75,15/12/2019
+L-JM,6500,601,1000.0,9.010769006846546,979.3535823999999,1,0.75,15/12/2019
+L-JM,1500,1500,1000.0,13.967123082429293,111.65990760000001,1,0.5,15/12/2019
+L-JM,2000,1500,1000.0,12.697881535001121,172.2946484,1,0.5,15/12/2019
+L-JM,2500,1500,1000.0,12.145461895324708,241.1312698,1,0.5,15/12/2019
+L-JM,3000,1500,1000.0,11.588876514109295,323.0631537,1,0.5,15/12/2019
+L-JM,3500,1500,1000.0,11.044433803100585,415.137312,1,0.5,15/12/2019
+L-JM,4000,1500,1000.0,10.80793491441091,504.8102572,1,0.5,15/12/2019
+L-JM,4500,1500,1000.0,10.405684053039552,602.5219337,1,0.5,15/12/2019
+L-JM,5000,1500,1000.0,9.965184934692385,711.8197224,1,0.5,15/12/2019
+L-JM,5500,1500,1000.0,9.748910655822755,825.7830675,1,0.5,15/12/2019
+L-JM,6000,1101,1000.0,9.48353206175095,908.3770869,1,0.5,15/12/2019
+L-JM,6500,601,1000.0,9.485751465046862,971.9107026,1,0.5,15/12/2019
+L-JM,1500,1500,1000.0,14.028847422150934,112.4397257,1,0.25,15/12/2019
+L-JM,2000,1500,1000.0,12.743222420338949,174.4159427,1,0.25,15/12/2019
+L-JM,2500,1500,1000.0,12.272876975964866,249.5782289,1,0.25,15/12/2019
+L-JM,3000,1500,1000.0,11.804296119425455,328.94519329999997,1,0.25,15/12/2019
+L-JM,3500,1500,1000.0,11.369661207082114,412.7472373,1,0.25,15/12/2019
+L-JM,4000,1500,1000.0,11.183031419891359,511.8257998,1,0.25,15/12/2019
+L-JM,4500,1500,1000.0,10.825626690989177,609.6951702,1,0.25,15/12/2019
+L-JM,5000,1500,1000.0,10.460318843851725,721.2592548,1,0.25,15/12/2019
+L-JM,5500,1500,1000.0,10.294279163879395,825.8027392,1,0.25,15/12/2019
+L-JM,6000,1101,1000.0,10.018516495014302,921.2132997,1,0.25,15/12/2019
+L-JM,6500,601,1000.0,10.097973922018602,980.0041144,1,0.25,15/12/2019
diff --git a/main.py b/main.py
index 013ae50fc..1e9a09631 100644
--- a/main.py
+++ b/main.py
@@ -52,7 +52,7 @@ def main():
 
     ljm_recv, ljm_send = Pipe(False)
     p2 = Process(target=lj_matrix_multiple,
-                 args=(molecules, nuclear_charge, ljm_send))
+                 args=(molecules, nuclear_charge, ljm_send, 1, 0.25))
     procs.append(p2)
     pipes.append(ljm_recv)
     p2.start()
@@ -99,7 +99,7 @@ def main():
             # cm_text = ','.join([str(field) for field in cm])\
             #     + ',' + date + '\n'
             ljm_text = ','.join([str(field) for field in ljm])\
-                + ',0.25,1,' + date + '\n'
+                + ',1,0.25,' + date + '\n'
             # save_file.write(cm_text)
             save_file.write(ljm_text)