From 0ad64b5fa5781e3de9a846d072ea7938bead6a52 Mon Sep 17 00:00:00 2001
From: Craig Warren <craig_warren@me.com>
Date: Thu, 5 May 2016 11:53:19 +0100
Subject: [PATCH] Improved joining of filenames and directory paths.

---
 gprMax/geometry_views.py | 4 ++--
 gprMax/gprMax.py         | 4 ++--
 gprMax/snapshots.py      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gprMax/geometry_views.py b/gprMax/geometry_views.py
index 3f46237e..687399b0 100644
--- a/gprMax/geometry_views.py
+++ b/gprMax/geometry_views.py
@@ -68,9 +68,9 @@ class GeometryView:
         
         # Construct filename from user-supplied name and model run number
         if numbermodelruns == 1:
-            self.filename = G.inputdirectory + self.filename
+            self.filename = os.path.abspath(os.path.join(G.inputdirectory, self.filename))
         else:
-            self.filename = G.inputdirectory + self.filename + str(modelrun)
+            self.filename = os.path.abspath(os.path.join(G.inputdirectory, self.filename + str(modelrun)))
         
         if self.type == 'n':
             self.filename += '.vti'
diff --git a/gprMax/gprMax.py b/gprMax/gprMax.py
index 99a34128..f6c36180 100644
--- a/gprMax/gprMax.py
+++ b/gprMax/gprMax.py
@@ -57,8 +57,8 @@ def main():
     parser.add_argument('--opt-taguchi', action='store_true', default=False, help='optimise parameters using the Taguchi optimisation method')
     args = parser.parse_args()
     numbermodelruns = args.n
-    inputdirectory = os.path.dirname(os.path.abspath(args.inputfile)) + os.sep
-    inputfile = inputdirectory + os.path.basename(args.inputfile)
+    inputdirectory = os.path.dirname(os.path.abspath(args.inputfile))
+    inputfile = os.path.abspath(os.path.join(inputdirectory, os.path.basename(args.inputfile)))
     
     # Create a separate namespace that users can access in any Python code blocks in the input file
     usernamespace = {'c': c, 'e0': e0, 'm0': m0, 'z0': z0, 'number_model_runs': numbermodelruns, 'inputdirectory': inputdirectory}
diff --git a/gprMax/snapshots.py b/gprMax/snapshots.py
index 8766eaa8..ae90bcd6 100644
--- a/gprMax/snapshots.py
+++ b/gprMax/snapshots.py
@@ -85,7 +85,7 @@ class Snapshot:
         
         if not os.path.exists(snapshotdir):
             os.mkdir(snapshotdir)
-        self.filename = os.path.join(snapshotdir, self.filename + '.vti')
+        self.filename = os.path.abspath(os.path.join(snapshotdir, self.filename + '.vti'))
         
         # Calculate number of cells according to requested sampling
         self.vtk_xscells = round_value(self.xs / self.dx)