Changed some subgrid naming

gprMax/cmds_multiuse.py

@@ -38,7 +38,7 @@ from .sources import HertzianDipole as HertzianDipoleUser
 from .sources import MagneticDipole as MagneticDipoleUser
 from .sources import TransmissionLine as TransmissionLineUser
 from .sources import VoltageSource as VoltageSourceUser
-from .subgrids.base import SubGridBase
+from .subgrids.grid import SubGridBaseGrid
 from .utilities.utilities import round_value
 from .waveforms import Waveform as WaveformUser
 
@@ -82,7 +82,7 @@ class UserObjectMulti:
             string if the grid is the main grid.
         """
 
-        if isinstance(grid, SubGridBase):
+        if isinstance(grid, SubGridBaseGrid):
             return f'[{grid.name}] '  
         else:
             return ''
@@ -963,7 +963,7 @@ class Snapshot(UserObjectMulti):
         self.hash = '#snapshot'
 
     def create(self, grid, uip):
-        if isinstance(grid, SubGridBase):
+        if isinstance(grid, SubGridBaseGrid):
             logger.exception(self.params_str() + ' do not add snapshots to '
                              'subgrids.')
             raise ValueError
@@ -1444,7 +1444,7 @@ class GeometryView(UserObjectMulti):
         """
 
         if output_type == 'n':
-            if isinstance(grid, SubGridBase):
+            if isinstance(grid, SubGridBaseGrid):
                 from .geometry_outputs import GeometryViewSubgridVoxels as GeometryViewUser            
             else:
                 from .geometry_outputs import GeometryViewVoxels as GeometryViewUser            

gprMax/geometry_outputs.py

@@ -214,7 +214,7 @@ class GeometryViewVoxels(GeometryView):
         # Only create a new array if subsampling is required
         if (self.grid.solid.shape != (self.xf, self.yf, self.zf) or
             (self.dx, self.dy, self.dz) != (1, 1, 1) or
-                (self.xs, self.ys, self.zs) != (0, 0, 0)):
+            (self.xs, self.ys, self.zs) != (0, 0, 0)):
             # Require contiguous for evtk library
             solid = np.ascontiguousarray(self.grid.solid[self.xs:self.xf:self.dx,
                                                          self.ys:self.yf:self.dy, 

gprMax/user_inputs.py

@@ -21,7 +21,7 @@ import logging
 import gprMax.config as config
 import numpy as np
 
-from .subgrids.base import SubGridBase
+from .subgrids.grid import SubGridBaseGrid
 from .utilities.utilities import round_value
 
 logger = logging.getLogger(__name__)
@@ -39,7 +39,7 @@ logger = logging.getLogger(__name__)
 def create_user_input_points(grid, user_obj):
     """Returns a point checker class based on the grid supplied."""
 
-    if isinstance(grid, SubGridBase):
+    if isinstance(grid, SubGridBaseGrid):
         # Local object configuration trumps. User can turn off autotranslate for
         # specific objects.
         if not user_obj.autotranslate and config.sim_config.args.autotranslate: