Changed some subgrid naming

这个提交包含在:
Craig Warren
2022-11-09 15:27:13 +00:00
父节点 49b4b47ddb
当前提交 929403f111
共有 3 个文件被更改,包括 7 次插入7 次删除

查看文件

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

查看文件

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

查看文件

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