Updates to benchmarking results.

docs/source/benchmarking.rst

@@ -28,7 +28,7 @@ Using the following steps to collect and report benchmarking results for each of
 
 1. Run gprMax in benchmarking mode, e.g. ``python -m gprMax tests/benchmarking/bench_100x100x100.in -benchmark``
 2. Use the ``plot_benchmark`` module to create plots of the execution time and speed-up, e.g. ``python -m tests.benchmarking.plot_benchmark tests/benchmarking/bench_100x100x100.npz``. You will be prompted to enter information to describe your machine, number and type of CPU/cores, and operating system.
-3. Share your data by commiting the Numpy archive and plot file to our GitHub repository, or by uploading them to a post in our Google group (http://www.gprmax.com/forum.shtml).
+3. Share your data by emailing us your Numpy archives and plot files to info@gprmax.com
 
 Results
 =======
@@ -71,12 +71,18 @@ Windows
 Lenovo T430
 ^^^^^^^^^^^
 
-.. figure:: ../../tests/benchmarking/results/Windows7/Lenovo_T430/Lenovo_T430.png
+.. figure:: ../../tests/benchmarking/results/Windows7/Lenovo_T430/bench_100x100x100.png
+    :width: 600px
+
+.. figure:: ../../tests/benchmarking/results/Windows7/Lenovo_T430/bench_150x150x150.png
     :width: 600px
 
 
 Dell Z420
 ^^^^^^^^^
 
-.. figure:: ../../tests/benchmarking/results/Windows7/Dell_Z420/Dell_Z420.png
+.. figure:: ../../tests/benchmarking/results/Windows7/Dell_Z420/bench_100x100x100.png
+    :width: 600px
+
+.. figure:: ../../tests/benchmarking/results/Windows7/Dell_Z420/bench_150x150x150.png
     :width: 600px

tests/benchmarking/plot_benchmark.py

@@ -16,7 +16,9 @@ args = parser.parse_args()
 platformID = platform.platform()
 machineID = input('Enter manufacturer and short machine description, e.g. Apple_MacPro1,1 or Dell_Z420: ')
 cpuspeed = input ('Enter CPU number, type and speed, e.g. 2 x 2.66GHz Quad-Core Intel Xeon or 1 x 4GHz Quad-Core Intel Core i7: ')
-machineIDextra = '(' + input('Enter any additional machine description, e.g. Retina 5K, 27-inch, Late 2014 or leave empty: ') + ')'
+machineIDextra = input('Enter any additional machine description, e.g. Retina 5K, 27-inch, Late 2014 or leave empty: ')
+if machineIDextra:
+    machineIDextra = '(' + machineIDextra + ')'
 osversion = input('Enter operating system version, e.g. Windows 7 64-bit: ')
 machineIDlong = machineID + ' ' + machineIDextra + '; ' + cpuspeed + '; ' + osversion