Move size into FDTDGrid from MPIGrid

gprMax/grid/fdtd_grid.py

@@ -55,9 +55,7 @@ class FDTDGrid:
         self.name = "main_grid"
         self.mem_use = 0
 
-        self.nx = 0
-        self.ny = 0
-        self.nz = 0
+        self.size = np.zeros(3, dtype=np.int32)
         self.dl = np.ones(3, dtype=np.float64)
         self.dt = 0.0
 
@@ -117,6 +115,30 @@ class FDTDGrid:
 
         self.averagevolumeobjects = True
 
+    @property
+    def nx(self) -> int:
+        return self.size[0]
+
+    @nx.setter
+    def nx(self, value: int):
+        self.size[0] = value
+
+    @property
+    def ny(self) -> int:
+        return self.size[1]
+
+    @ny.setter
+    def ny(self, value: int):
+        self.size[1] = value
+
+    @property
+    def nz(self) -> int:
+        return self.size[2]
+
+    @nz.setter
+    def nz(self, value: int):
+        self.size[2] = value
+
     @property
     def dx(self) -> float:
         return self.dl[0]

gprMax/grid/mpi_grid.py

@@ -57,8 +57,6 @@ class MPIGrid(FDTDGrid):
     COORDINATOR_RANK = 0
 
     def __init__(self, comm: MPI.Cartcomm):
-        self.size = np.zeros(3, dtype=np.int32)
-
         self.comm = comm
         self.x_comm = comm.Sub([False, True, True])
         self.y_comm = comm.Sub([True, False, True])
@@ -90,30 +88,6 @@ class MPIGrid(FDTDGrid):
     def coords(self) -> List[int]:
         return self.comm.coords
 
-    @property
-    def nx(self) -> int:
-        return self.size[Dim.X]
-
-    @nx.setter
-    def nx(self, value: int):
-        self.size[Dim.X] = value
-
-    @property
-    def ny(self) -> int:
-        return self.size[Dim.Y]
-
-    @ny.setter
-    def ny(self, value: int):
-        self.size[Dim.Y] = value
-
-    @property
-    def nz(self) -> int:
-        return self.size[Dim.Z]
-
-    @nz.setter
-    def nz(self, value: int):
-        self.size[Dim.Z] = value
-
     @property
     def gx(self) -> int:
         return self.global_size[Dim.X]