From 6ab48e4b5f96172a4ba54c5abbc8773a7c1ded8b Mon Sep 17 00:00:00 2001
From: nmannall <n.mannall@epcc.ed.ac.uk>
Date: Mon, 13 May 2024 16:56:58 +0100
Subject: [PATCH] Correct srcsteps and rxsteps type (int not float)

---
 gprMax/grid/fdtd_grid.py |  6 +++---
 gprMax/receivers.py      | 15 ++++++++-------
 gprMax/sources.py        | 12 ++++++------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/gprMax/grid/fdtd_grid.py b/gprMax/grid/fdtd_grid.py
index d51035f8..f0ee1ea8 100644
--- a/gprMax/grid/fdtd_grid.py
+++ b/gprMax/grid/fdtd_grid.py
@@ -93,8 +93,8 @@ class FDTDGrid:
         self.magneticdipoles: List[MagneticDipole] = []
         self.transmissionlines = []
         self.rxs: List[Rx] = []
-        self.srcsteps: List[float] = [0, 0, 0]
-        self.rxsteps: List[float] = [0, 0, 0]
+        self.srcsteps: List[int] = [0, 0, 0]
+        self.rxsteps: List[int] = [0, 0, 0]
         self.snapshots = []
         self.subgrids = []
 
@@ -256,7 +256,7 @@ class FDTDGrid:
         logger.info(materialstable.table)
 
     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:
         if step_size[0] != 0 or step_size[1] != 0 or step_size[2] != 0:
             for item in items:
diff --git a/gprMax/receivers.py b/gprMax/receivers.py
index d4f5fabf..de3ed87e 100644
--- a/gprMax/receivers.py
+++ b/gprMax/receivers.py
@@ -31,12 +31,12 @@ class Rx:
     def __init__(self):
         self.ID = None
         self.outputs = {}
-        self.xcoord = None
-        self.ycoord = None
-        self.zcoord = None
-        self.xcoordorigin = None
-        self.ycoordorigin = None
-        self.zcoordorigin = None
+        self.xcoord: int
+        self.ycoord: int
+        self.zcoord: int
+        self.xcoordorigin: int
+        self.ycoordorigin: int
+        self.zcoordorigin: int
 
 
 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 -
     #   rows are field components; columns are iterations; pages are receivers
     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
diff --git a/gprMax/sources.py b/gprMax/sources.py
index 0893bc1d..8094675e 100644
--- a/gprMax/sources.py
+++ b/gprMax/sources.py
@@ -31,12 +31,12 @@ class Source:
     def __init__(self):
         self.ID = None
         self.polarisation = None
-        self.xcoord = None
-        self.ycoord = None
-        self.zcoord = None
-        self.xcoordorigin = None
-        self.ycoordorigin = None
-        self.zcoordorigin = None
+        self.xcoord: int
+        self.ycoord: int
+        self.zcoord: int
+        self.xcoordorigin: int
+        self.ycoordorigin: int
+        self.zcoordorigin: int
         self.start = None
         self.stop = None
         self.waveformID = None