Add more benchmarks

2 files changed, 79 insertions, 2 deletions

diff --git a/benchmarks.csv b/benchmarks.csv
index eb0ff0333..55ed72635 100644
--- a/benchmarks.csv
+++ b/benchmarks.csv
@@ -21,3 +21,80 @@ CM,6000,1101,1000.0,18.989775833821966,894.5558989,na,na,14/12/2019
 L-JM,6000,1101,1000.0,8.595942764490113,885.4234397,1,1,14/12/2019
 CM,6500,601,1000.0,19.424238707695146,956.2706457,na,na,14/12/2019
 L-JM,6500,601,1000.0,8.636351001125403,950.2348745,1,1,14/12/2019
+L-JM,1500,1500,1000.0,25.971068591988388,113.6740279,1.5,1,14/12/2019
+L-JM,2000,1500,1000.0,23.332141255879883,176.44235379999998,1.5,1,14/12/2019
+L-JM,2500,1500,1000.0,21.692867970005768,245.19673870000003,1.5,1,14/12/2019
+L-JM,3000,1500,1000.0,20.59071302639572,328.621371,1.5,1,14/12/2019
+L-JM,3500,1500,1000.0,19.735266507048408,415.9199613,1.5,1,14/12/2019
+L-JM,4000,1500,1000.0,18.834051404314636,519.1557511,1.5,1,14/12/2019
+L-JM,4500,1500,1000.0,17.957638371625624,617.7238379,1.5,1,14/12/2019
+L-JM,5000,1500,1000.0,16.972922026017606,730.4018292,1.5,1,14/12/2019
+L-JM,5500,1500,1000.0,16.395492789509397,846.8666075,1.5,1,14/12/2019
+L-JM,6000,1101,1000.0,15.777389296181523,927.473866,1.5,1,14/12/2019
+L-JM,6500,601,1000.0,14.209911716905589,1009.5176146,1.5,1,14/12/2019
+L-JM,1500,1500,1000.0,28.83987694576565,113.8754708,2,1,14/12/2019
+L-JM,2000,1500,1000.0,26.596450258715805,175.00251580000003,2,1,14/12/2019
+L-JM,2500,1500,1000.0,25.24225833702623,250.13395500000001,2,1,14/12/2019
+L-JM,3000,1500,1000.0,24.218064992425827,331.4902702,2,1,14/12/2019
+L-JM,3500,1500,1000.0,23.753584334828926,418.1716937,2,1,14/12/2019
+L-JM,4000,1500,1000.0,22.796982394926633,508.1620121,2,1,14/12/2019
+L-JM,4500,1500,1000.0,22.094972526780207,620.0088331000001,2,1,14/12/2019
+L-JM,5000,1500,1000.0,21.32928554974122,719.5075616,2,1,14/12/2019
+L-JM,5500,1500,1000.0,20.839213236756795,853.7258727,2,1,14/12/2019
+L-JM,6000,1101,1000.0,20.469720091240188,919.2635181,2,1,14/12/2019
+L-JM,6500,601,1000.0,18.97332428701078,991.9277882,2,1,14/12/2019
+L-JM,1500,1500,1000.0,28.834687237181544,112.75118160000001,2.5,1,15/12/2019
+L-JM,2000,1500,1000.0,26.524798614302835,174.36785940000001,2.5,1,15/12/2019
+L-JM,2500,1500,1000.0,25.21431444031365,247.27555790000002,2.5,1,15/12/2019
+L-JM,3000,1500,1000.0,24.1868798509265,327.2753287,2.5,1,15/12/2019
+L-JM,3500,1500,1000.0,23.70991305338383,414.2050979,2.5,1,15/12/2019
+L-JM,4000,1500,1000.0,22.76540519550355,511.5177748,2.5,1,15/12/2019
+L-JM,4500,1500,1000.0,22.114765667859746,609.2158499,2.5,1,15/12/2019
+L-JM,5000,1500,1000.0,21.358232378530058,717.5175853000001,2.5,1,15/12/2019
+L-JM,5500,1500,1000.0,20.85827359348054,833.1339069,2.5,1,15/12/2019
+L-JM,6000,1101,1000.0,20.47802544079168,913.8767508999999,2.5,1,15/12/2019
+L-JM,6500,601,1000.0,18.974561750612214,983.2796894999999,2.5,1,15/12/2019
+L-JM,1500,1500,1000.0,32.66494718071635,115.4841954,3,1,15/12/2019
+L-JM,2000,1500,1000.0,28.7706412893922,177.2390435,3,1,15/12/2019
+L-JM,2500,1500,1000.0,26.93394969655416,249.6755776,3,1,15/12/2019
+L-JM,3000,1500,1000.0,25.592547303146002,331.0301091,3,1,15/12/2019
+L-JM,3500,1500,1000.0,24.823386571052417,424.3857741,3,1,15/12/2019
+L-JM,4000,1500,1000.0,23.723362785716677,516.4350475,3,1,15/12/2019
+L-JM,4500,1500,1000.0,22.96364383080498,615.7131781,3,1,15/12/2019
+L-JM,5000,1500,1000.0,22.097596606763833,732.2697349,3,1,15/12/2019
+L-JM,5500,1500,1000.0,21.463723095992123,850.7737075,3,1,15/12/2019
+L-JM,6000,1101,1000.0,21.098415947303895,909.3228279,3,1,15/12/2019
+L-JM,6500,601,1000.0,19.604458837712464,985.2199813000001,3,1,15/12/2019
+L-JM,1500,1500,1000.0,13.25081292192078,113.2111716,0.75,1,15/12/2019
+L-JM,2000,1500,1000.0,11.898306360562803,176.1226983,0.75,1,15/12/2019
+L-JM,2500,1500,1000.0,11.331479928387962,245.3395849,0.75,1,15/12/2019
+L-JM,3000,1500,1000.0,10.822743636769616,328.4253929,0.75,1,15/12/2019
+L-JM,3500,1500,1000.0,10.341161537587485,416.6295876,0.75,1,15/12/2019
+L-JM,4000,1500,1000.0,10.05422347022756,512.5809536,0.75,1,15/12/2019
+L-JM,4500,1500,1000.0,9.678447398895264,616.4628192,0.75,1,15/12/2019
+L-JM,5000,1500,1000.0,9.348294603434246,722.3488736,0.75,1,15/12/2019
+L-JM,5500,1500,1000.0,9.158434114440919,839.2501411999999,0.75,1,15/12/2019
+L-JM,6000,1101,1000.0,8.85969851676255,918.4742979,0.75,1,15/12/2019
+L-JM,6500,601,1000.0,8.978569760943016,997.4762726,0.75,1,15/12/2019
+L-JM,1500,1500,1000.0,14.31648555157471,112.708166,0.5,1,15/12/2019
+L-JM,2000,1500,1000.0,13.100616600819906,173.49587910000002,0.5,1,15/12/2019
+L-JM,2500,1500,1000.0,12.631016832621258,244.59541330000002,0.5,1,15/12/2019
+L-JM,3000,1500,1000.0,12.372139003845216,325.2085343,0.5,1,15/12/2019
+L-JM,3500,1500,1000.0,12.052149805135091,412.00539760000004,0.5,1,15/12/2019
+L-JM,4000,1500,1000.0,11.926307619750977,506.9327447,0.5,1,15/12/2019
+L-JM,4500,1500,1000.0,11.605206087137859,603.1267876000001,0.5,1,15/12/2019
+L-JM,5000,1500,1000.0,11.364976841634116,709.4308111,0.5,1,15/12/2019
+L-JM,5500,1500,1000.0,11.303823874104818,825.9382915000001,0.5,1,15/12/2019
+L-JM,6000,1101,1000.0,11.054803368952145,915.2881399,0.5,1,15/12/2019
+L-JM,6500,601,1000.0,11.402072457096146,984.6962941,0.5,1,15/12/2019
+L-JM,1500,1500,1000.0,16.515109934611004,117.3274013,0.25,1,15/12/2019
+L-JM,2000,1500,1000.0,15.618779733296712,177.3680046,0.25,1,15/12/2019
+L-JM,2500,1500,1000.0,15.289220743123371,247.515579,0.25,1,15/12/2019
+L-JM,3000,1500,1000.0,15.11142683183797,327.60220580000004,0.25,1,15/12/2019
+L-JM,3500,1500,1000.0,14.843900964528402,411.6829181,0.25,1,15/12/2019
+L-JM,4000,1500,1000.0,14.726752273071288,513.3648273,0.25,1,15/12/2019
+L-JM,4500,1500,1000.0,14.419325491251628,613.8661824000001,0.25,1,15/12/2019
+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
diff --git a/main.py b/main.py
index 88f0a26f5..013ae50fc 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, 1.5))
+                 args=(molecules, nuclear_charge, ljm_send))
     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])\
-                + ',1.5,1,' + date + '\n'
+                + ',0.25,1,' + date + '\n'
             # save_file.write(cm_text)
             save_file.write(ljm_text)