From 328375323d3a42c128ab800ed86148d97fb433d8 Mon Sep 17 00:00:00 2001 From: Craig Warren Date: Thu, 16 Mar 2017 12:31:50 +0000 Subject: [PATCH] Changed method of appending model number to geometry and output files when running more than a single model. --- gprMax/geometry_outputs.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gprMax/geometry_outputs.py b/gprMax/geometry_outputs.py index 2073f1d2..b1711195 100644 --- a/gprMax/geometry_outputs.py +++ b/gprMax/geometry_outputs.py @@ -82,29 +82,23 @@ class GeometryView(object): self.vtk_materials_offset = round_value(self.vtk_offsets_offset + (self.vtk_numlines * np.dtype(np.uint32).itemsize) + np.dtype(np.uint32).itemsize) self.datawritesize = np.dtype(np.float32).itemsize * self.vtk_numpoints * self.vtk_numpoint_components + np.dtype(np.uint32).itemsize * self.vtk_numlines * self.vtk_numline_components + np.dtype(np.uint32).itemsize * self.vtk_numlines + np.dtype(np.uint32).itemsize * self.vtk_numlines - def set_filename(self, currentmodelrun, numbermodelruns, G): + def set_filename(self, appendmodelnumber, G): """Construct filename from user-supplied name and model run number. Args: - currentmodelrun (int): Current model run number. - numbermodelruns (int): Total number of model runs. + appendmodelnumber (str): Text to append to filename. G (class): Grid class instance - holds essential parameters describing the model. """ - if numbermodelruns == 1: - self.filename = os.path.abspath(os.path.join(G.inputdirectory, self.basefilename)) - else: - self.filename = os.path.abspath(os.path.join(G.inputdirectory, self.basefilename + str(currentmodelrun))) + self.filename = os.path.abspath(os.path.join(G.inputdirectory, self.basefilename + appendmodelnumber)) self.filename += self.fileext - def write_vtk(self, currentmodelrun, numbermodelruns, G, pbar): + def write_vtk(self, G, pbar): """Writes the geometry information to a VTK file. Either ImageData (.vti) for a per-cell geometry view, or PolygonalData (.vtp) for a per-cell-edge geometry view. N.B. No Python 3 support for VTK at time of writing (03/2015) Args: - currentmodelrun (int): Current model run number. - numbermodelruns (int): Total number of model runs. G (class): Grid class instance - holds essential parameters describing the model. pbar (class): Progress bar class instance. """