From cdd182864af0d6e5e617f3e6ff7f54a324ff920c Mon Sep 17 00:00:00 2001
From: Craig Warren <craig_warren@me.com>
Date: Thu, 4 Aug 2016 12:50:19 +0100
Subject: [PATCH] Updated naming of benchmark graphs.

---
 docs/source/benchmarking.rst                        |   8 ++++----
 .../{MacPro1,1.npz => Apple_MacPro1,1.npz}          | Bin
 .../{MacPro1,1.png => Apple_MacPro1,1.png}          | Bin
 .../{MacPro3,1.npz => Apple_MacPro3,1.npz}          | Bin
 .../{MacPro3,1.png => Apple_MacPro3,1.png}          | Bin
 ...{iMac15,1+Ccode.npz => Apple_iMac15,1+Ccode.npz} | Bin
 ...{iMac15,1+Ccode.png => Apple_iMac15,1+Ccode.png} | Bin
 .../iMac15,1/{iMac15,1.png => Apple_iMac15,1.png}   | Bin
 8 files changed, 4 insertions(+), 4 deletions(-)
 rename tests/benchmarking/results/MacOSX/MacPro1,1/{MacPro1,1.npz => Apple_MacPro1,1.npz} (100%)
 rename tests/benchmarking/results/MacOSX/MacPro1,1/{MacPro1,1.png => Apple_MacPro1,1.png} (100%)
 rename tests/benchmarking/results/MacOSX/MacPro3,1/{MacPro3,1.npz => Apple_MacPro3,1.npz} (100%)
 rename tests/benchmarking/results/MacOSX/MacPro3,1/{MacPro3,1.png => Apple_MacPro3,1.png} (100%)
 rename tests/benchmarking/results/MacOSX/iMac15,1/{iMac15,1+Ccode.npz => Apple_iMac15,1+Ccode.npz} (100%)
 rename tests/benchmarking/results/MacOSX/iMac15,1/{iMac15,1+Ccode.png => Apple_iMac15,1+Ccode.png} (100%)
 rename tests/benchmarking/results/MacOSX/iMac15,1/{iMac15,1.png => Apple_iMac15,1.png} (100%)

diff --git a/docs/source/benchmarking.rst b/docs/source/benchmarking.rst
index 7fb6403a..af8d50c2 100644
--- a/docs/source/benchmarking.rst
+++ b/docs/source/benchmarking.rst
@@ -39,7 +39,7 @@ Mac OS X
 iMac15,1
 ^^^^^^^^
 
-.. figure:: ../../tests/benchmarking/results/MacOSX/iMac15,1/iMac15,1+Ccode.png
+.. figure:: ../../tests/benchmarking/results/MacOSX/iMac15,1/Apple_iMac15,1+Ccode.png
     :width: 600px
 
     Execution time and speed-up factor plots for Python/Cython-based gprMax and previous (v.2) C-based code.
@@ -50,20 +50,20 @@ The results demonstrate that the Python/Cython-based code is faster, in these tw
 
     Zero threads indicates that the code was compiled serially, i.e. without using OpenMP.
 
-.. figure:: ../../tests/benchmarking/results/MacOSX/iMac15,1/iMac15,1.png
+.. figure:: ../../tests/benchmarking/results/MacOSX/iMac15,1/Apple_iMac15,1.png
     :width: 600px
 
 MacPro1,1
 ^^^^^^^^^
 
-.. figure:: ../../tests/benchmarking/results/MacOSX/MacPro1,1/MacPro1,1.png
+.. figure:: ../../tests/benchmarking/results/MacOSX/MacPro1,1/Apple_MacPro1,1.png
     :width: 600px
 
 
 MacPro3,1
 ^^^^^^^^^
 
-.. figure:: ../../tests/benchmarking/results/MacOSX/MacPro3,1/MacPro3,1.png
+.. figure:: ../../tests/benchmarking/results/MacOSX/MacPro3,1/Apple_MacPro3,1.png
     :width: 600px
 
 
diff --git a/tests/benchmarking/results/MacOSX/MacPro1,1/MacPro1,1.npz b/tests/benchmarking/results/MacOSX/MacPro1,1/Apple_MacPro1,1.npz
similarity index 100%
rename from tests/benchmarking/results/MacOSX/MacPro1,1/MacPro1,1.npz
rename to tests/benchmarking/results/MacOSX/MacPro1,1/Apple_MacPro1,1.npz
diff --git a/tests/benchmarking/results/MacOSX/MacPro1,1/MacPro1,1.png b/tests/benchmarking/results/MacOSX/MacPro1,1/Apple_MacPro1,1.png
similarity index 100%
rename from tests/benchmarking/results/MacOSX/MacPro1,1/MacPro1,1.png
rename to tests/benchmarking/results/MacOSX/MacPro1,1/Apple_MacPro1,1.png
diff --git a/tests/benchmarking/results/MacOSX/MacPro3,1/MacPro3,1.npz b/tests/benchmarking/results/MacOSX/MacPro3,1/Apple_MacPro3,1.npz
similarity index 100%
rename from tests/benchmarking/results/MacOSX/MacPro3,1/MacPro3,1.npz
rename to tests/benchmarking/results/MacOSX/MacPro3,1/Apple_MacPro3,1.npz
diff --git a/tests/benchmarking/results/MacOSX/MacPro3,1/MacPro3,1.png b/tests/benchmarking/results/MacOSX/MacPro3,1/Apple_MacPro3,1.png
similarity index 100%
rename from tests/benchmarking/results/MacOSX/MacPro3,1/MacPro3,1.png
rename to tests/benchmarking/results/MacOSX/MacPro3,1/Apple_MacPro3,1.png
diff --git a/tests/benchmarking/results/MacOSX/iMac15,1/iMac15,1+Ccode.npz b/tests/benchmarking/results/MacOSX/iMac15,1/Apple_iMac15,1+Ccode.npz
similarity index 100%
rename from tests/benchmarking/results/MacOSX/iMac15,1/iMac15,1+Ccode.npz
rename to tests/benchmarking/results/MacOSX/iMac15,1/Apple_iMac15,1+Ccode.npz
diff --git a/tests/benchmarking/results/MacOSX/iMac15,1/iMac15,1+Ccode.png b/tests/benchmarking/results/MacOSX/iMac15,1/Apple_iMac15,1+Ccode.png
similarity index 100%
rename from tests/benchmarking/results/MacOSX/iMac15,1/iMac15,1+Ccode.png
rename to tests/benchmarking/results/MacOSX/iMac15,1/Apple_iMac15,1+Ccode.png
diff --git a/tests/benchmarking/results/MacOSX/iMac15,1/iMac15,1.png b/tests/benchmarking/results/MacOSX/iMac15,1/Apple_iMac15,1.png
similarity index 100%
rename from tests/benchmarking/results/MacOSX/iMac15,1/iMac15,1.png
rename to tests/benchmarking/results/MacOSX/iMac15,1/Apple_iMac15,1.png