Fixed bugs with geometry objects write

gprMax/geometry_outputs.py

@@ -357,13 +357,14 @@ class GeometryObjects:
         self.nx = self.xf - self.xs
         self.ny = self.yf - self.ys
         self.nz = self.zf - self.zs
+        self.basefilename = basefilename
 
         # Set filenames
         parts = config.sim_config.input_file_path.with_suffix('').parts
-        self.filename_hdf5 = Path(*parts[:-1], basefilename)
+        self.filename_hdf5 = Path(*parts[:-1], self.basefilename)
         self.filename_hdf5 = self.filename_hdf5.with_suffix('.h5')
         self.filename_materials = Path(
-            *parts[:-1], basefilename + '_materials')
+            *parts[:-1], self.basefilename + '_materials')
         self.filename_materials = self.filename_materials.with_suffix('.txt')
 
         # Sizes of arrays to write necessary to update progress bar
@@ -414,7 +415,7 @@ class GeometryObjects:
                 if material.numID == numID:
                     fmaterials.write(
                         f'#material: {material.er:g} {material.se:g} {material.mr:g} {material.sm:g} {material.ID}\n')
-                    if material.poles > 0:
+                    if hasattr(material, 'poles'):
                         if 'debye' in material.type:
                             dispersionstr = f'#add_dispersion_debye: {material.poles:g} '
                             for pole in range(material.poles):

gprMax/model_build_run.py

@@ -117,7 +117,7 @@ class ModelBuildRun:
             logger.info('')
             for i, go in enumerate(G.geometryobjectswrite):
                 pbar = tqdm(total=go.datawritesize, unit='byte', unit_scale=True,
-                            desc=f'Writing geometry object file {i + 1}/{len(G.geometryobjectswrite)}, {go.filename.name}',
+                            desc=f'Writing geometry object file {i + 1}/{len(G.geometryobjectswrite)}, {go.filename_hdf5.name}',
                             ncols=get_terminal_width() - 1, file=sys.stdout,
                             disable=not config.sim_config.general['progressbars'])
                 go.write_hdf5(G, pbar)