Correct srcsteps and rxsteps type (int not float)

这个提交包含在:
nmannall
2024-05-13 16:56:58 +01:00
父节点 bca5bfc1ed
当前提交 6ab48e4b5f
共有 3 个文件被更改,包括 17 次插入16 次删除

查看文件

@@ -93,8 +93,8 @@ class FDTDGrid:
self.magneticdipoles: List[MagneticDipole] = [] self.magneticdipoles: List[MagneticDipole] = []
self.transmissionlines = [] self.transmissionlines = []
self.rxs: List[Rx] = [] self.rxs: List[Rx] = []
self.srcsteps: List[float] = [0, 0, 0] self.srcsteps: List[int] = [0, 0, 0]
self.rxsteps: List[float] = [0, 0, 0] self.rxsteps: List[int] = [0, 0, 0]
self.snapshots = [] self.snapshots = []
self.subgrids = [] self.subgrids = []
@@ -256,7 +256,7 @@ class FDTDGrid:
logger.info(materialstable.table) logger.info(materialstable.table)
def _update_positions( def _update_positions(
self, items: Iterable[Union[Source, Rx]], step_size: List[float], step_number: int self, items: Iterable[Union[Source, Rx]], step_size: List[int], step_number: int
) -> None: ) -> None:
if step_size[0] != 0 or step_size[1] != 0 or step_size[2] != 0: if step_size[0] != 0 or step_size[1] != 0 or step_size[2] != 0:
for item in items: for item in items:

查看文件

@@ -31,12 +31,12 @@ class Rx:
def __init__(self): def __init__(self):
self.ID = None self.ID = None
self.outputs = {} self.outputs = {}
self.xcoord = None self.xcoord: int
self.ycoord = None self.ycoord: int
self.zcoord = None self.zcoord: int
self.xcoordorigin = None self.xcoordorigin: int
self.ycoordorigin = None self.ycoordorigin: int
self.zcoordorigin = None self.zcoordorigin: int
def htod_rx_arrays(G, queue=None): def htod_rx_arrays(G, queue=None):
@@ -63,7 +63,8 @@ def htod_rx_arrays(G, queue=None):
# Array to store field components for receivers on compute device - # Array to store field components for receivers on compute device -
# rows are field components; columns are iterations; pages are receivers # rows are field components; columns are iterations; pages are receivers
rxs = np.zeros( rxs = np.zeros(
(len(Rx.allowableoutputs_dev), G.iterations, len(G.rxs)), dtype=config.sim_config.dtypes["float_or_double"] (len(Rx.allowableoutputs_dev), G.iterations, len(G.rxs)),
dtype=config.sim_config.dtypes["float_or_double"],
) )
# Copy arrays to compute device # Copy arrays to compute device

查看文件

@@ -31,12 +31,12 @@ class Source:
def __init__(self): def __init__(self):
self.ID = None self.ID = None
self.polarisation = None self.polarisation = None
self.xcoord = None self.xcoord: int
self.ycoord = None self.ycoord: int
self.zcoord = None self.zcoord: int
self.xcoordorigin = None self.xcoordorigin: int
self.ycoordorigin = None self.ycoordorigin: int
self.zcoordorigin = None self.zcoordorigin: int
self.start = None self.start = None
self.stop = None self.stop = None
self.waveformID = None self.waveformID = None