Added '_ext' suffix to Cython module names so they can be more easily distinguished when importing.

gprMax/fractals.py

@@ -20,8 +20,8 @@ import numpy as np
 
 from gprMax.constants import floattype
 from gprMax.constants import complextype
-from gprMax.fractals_generate import generate_fractal2D
-from gprMax.fractals_generate import generate_fractal3D
+from gprMax.fractals_generate_ext import generate_fractal2D
+from gprMax.fractals_generate_ext import generate_fractal3D
 from gprMax.utilities import round_value
 
 np.seterr(divide='raise')
@@ -62,7 +62,7 @@ class FractalSurface(object):
 
     def generate_fractal_surface(self, G):
         """Generate a 2D array with a fractal distribution.
-            
+
         Args:
             G (class): Grid class instance - holds essential parameters describing the model.
         """
@@ -135,7 +135,7 @@ class FractalVolume(object):
 
     def generate_fractal_volume(self, G):
         """Generate a 3D volume with a fractal distribution.
-            
+
         Args:
             G (class): Grid class instance - holds essential parameters describing the model.
         """

gprMax/geometry_primitives_ext.pyx

@@ -20,16 +20,16 @@ import numpy as np
 cimport numpy as np
 
 from gprMax.utilities import round_value
-from gprMax.yee_cell_setget_rigid cimport set_rigid_Ex
-from gprMax.yee_cell_setget_rigid cimport set_rigid_Ey
-from gprMax.yee_cell_setget_rigid cimport set_rigid_Ez
-from gprMax.yee_cell_setget_rigid cimport set_rigid_Hx
-from gprMax.yee_cell_setget_rigid cimport set_rigid_Hy
-from gprMax.yee_cell_setget_rigid cimport set_rigid_Hz
-from gprMax.yee_cell_setget_rigid cimport set_rigid_E
-from gprMax.yee_cell_setget_rigid cimport unset_rigid_E
-from gprMax.yee_cell_setget_rigid cimport set_rigid_H
-from gprMax.yee_cell_setget_rigid cimport unset_rigid_H
+from gprMax.yee_cell_setget_rigid_ext cimport set_rigid_Ex
+from gprMax.yee_cell_setget_rigid_ext cimport set_rigid_Ey
+from gprMax.yee_cell_setget_rigid_ext cimport set_rigid_Ez
+from gprMax.yee_cell_setget_rigid_ext cimport set_rigid_Hx
+from gprMax.yee_cell_setget_rigid_ext cimport set_rigid_Hy
+from gprMax.yee_cell_setget_rigid_ext cimport set_rigid_Hz
+from gprMax.yee_cell_setget_rigid_ext cimport set_rigid_E
+from gprMax.yee_cell_setget_rigid_ext cimport unset_rigid_E
+from gprMax.yee_cell_setget_rigid_ext cimport set_rigid_H
+from gprMax.yee_cell_setget_rigid_ext cimport unset_rigid_H
 
 np.seterr(divide='raise')
 
@@ -964,4 +964,3 @@ cpdef void build_voxels_from_array_mask(
                 elif mask[i - xs, j - ys, k - zs] == 3:
                     numID = numIDx = numIDy = numIDz = grassnumID
                     build_voxel(i, j, k, numID, numIDx, numIDy, numIDz, averaging, solid, rigidE, rigidH, ID)
-

gprMax/input_cmds_geometry.py

@@ -30,19 +30,19 @@ from gprMax.exceptions import CmdInputError
 from gprMax.fractals import FractalSurface
 from gprMax.fractals import FractalVolume
 from gprMax.fractals import Grass
-from gprMax.geometry_primitives import build_edge_x
-from gprMax.geometry_primitives import build_edge_y
-from gprMax.geometry_primitives import build_edge_z
-from gprMax.geometry_primitives import build_face_yz
-from gprMax.geometry_primitives import build_face_xz
-from gprMax.geometry_primitives import build_face_xy
-from gprMax.geometry_primitives import build_triangle
-from gprMax.geometry_primitives import build_box
-from gprMax.geometry_primitives import build_cylinder
-from gprMax.geometry_primitives import build_cylindrical_sector
-from gprMax.geometry_primitives import build_sphere
-from gprMax.geometry_primitives import build_voxels_from_array
-from gprMax.geometry_primitives import build_voxels_from_array_mask
+from gprMax.geometry_primitives_ext import build_edge_x
+from gprMax.geometry_primitives_ext import build_edge_y
+from gprMax.geometry_primitives_ext import build_edge_z
+from gprMax.geometry_primitives_ext import build_face_yz
+from gprMax.geometry_primitives_ext import build_face_xz
+from gprMax.geometry_primitives_ext import build_face_xy
+from gprMax.geometry_primitives_ext import build_triangle
+from gprMax.geometry_primitives_ext import build_box
+from gprMax.geometry_primitives_ext import build_cylinder
+from gprMax.geometry_primitives_ext import build_cylindrical_sector
+from gprMax.geometry_primitives_ext import build_sphere
+from gprMax.geometry_primitives_ext import build_voxels_from_array
+from gprMax.geometry_primitives_ext import build_voxels_from_array_mask
 from gprMax.materials import Material
 from gprMax.utilities import round_value
 from gprMax.utilities import get_terminal_width

gprMax/model_build_run.py

@@ -38,12 +38,12 @@ from gprMax.fields_outputs import store_outputs
 from gprMax.fields_outputs import kernel_template_store_outputs
 from gprMax.fields_outputs import write_hdf5_outputfile
 
-from gprMax.fields_updates import update_electric
-from gprMax.fields_updates import update_magnetic
-from gprMax.fields_updates import update_electric_dispersive_multipole_A
-from gprMax.fields_updates import update_electric_dispersive_multipole_B
-from gprMax.fields_updates import update_electric_dispersive_1pole_A
-from gprMax.fields_updates import update_electric_dispersive_1pole_B
+from gprMax.fields_updates_ext import update_electric
+from gprMax.fields_updates_ext import update_magnetic
+from gprMax.fields_updates_ext import update_electric_dispersive_multipole_A
+from gprMax.fields_updates_ext import update_electric_dispersive_multipole_B
+from gprMax.fields_updates_ext import update_electric_dispersive_1pole_A
+from gprMax.fields_updates_ext import update_electric_dispersive_1pole_B
 from gprMax.fields_updates_gpu import kernels_template_fields
 
 from gprMax.grid import FDTDGrid
@@ -68,8 +68,8 @@ from gprMax.utilities import human_size
 from gprMax.utilities import memory_usage
 from gprMax.utilities import open_path_file
 from gprMax.utilities import round32
-from gprMax.yee_cell_build import build_electric_components
-from gprMax.yee_cell_build import build_magnetic_components
+from gprMax.yee_cell_build_ext import build_electric_components
+from gprMax.yee_cell_build_ext import build_magnetic_components
 
 
 def run_model(args, currentmodelrun, modelend, numbermodelruns, inputfile, usernamespace):

gprMax/optimisation_taguchi.py

@@ -33,7 +33,7 @@ from gprMax.exceptions import CmdInputError
 from gprMax.gprMax import run_std_sim
 from gprMax.gprMax import run_mpi_sim
 from gprMax.utilities import get_terminal_width
-from gprMax.utilities import  open_path_file
+from gprMax.utilities import open_path_file
 
 
 def run_opt_sim(args, inputfile, usernamespace):

gprMax/pml.py

@@ -253,7 +253,7 @@ class PML(object):
             G (class): Grid class instance - holds essential parameters describing the model.
         """
 
-        func = getattr(import_module('gprMax.pml_updates'), 'update_pml_' + str(len(self.CFS)) + 'order_electric_' + self.direction)
+        func = getattr(import_module('gprMax.pml_updates_ext'), 'update_pml_' + str(len(self.CFS)) + 'order_electric_' + self.direction)
         func(self.xs, self.xf, self.ys, self.yf, self.zs, self.zf, G.nthreads, G.updatecoeffsE, G.ID, G.Ex, G.Ey, G.Ez, G.Hx, G.Hy, G.Hz, self.EPhi1, self.EPhi2, self.ERA, self.ERB, self.ERE, self.ERF, self.d)
 
     def update_magnetic(self, G):
@@ -263,7 +263,7 @@ class PML(object):
             G (class): Grid class instance - holds essential parameters describing the model.
         """
 
-        func = getattr(import_module('gprMax.pml_updates'), 'update_pml_' + str(len(self.CFS)) + 'order_magnetic_' + self.direction)
+        func = getattr(import_module('gprMax.pml_updates_ext'), 'update_pml_' + str(len(self.CFS)) + 'order_magnetic_' + self.direction)
         func(self.xs, self.xf, self.ys, self.yf, self.zs, self.zf, G.nthreads, G.updatecoeffsH, G.ID, G.Ex, G.Ey, G.Ez, G.Hx, G.Hy, G.Hz, self.HPhi1, self.HPhi2, self.HRA, self.HRB, self.HRE, self.HRF, self.d)
 
     def gpu_set_blocks_per_grid(self, G):

gprMax/yee_cell_build_ext.pyx

@@ -20,12 +20,12 @@ import numpy as np
 cimport numpy as np
 
 from gprMax.materials import Material
-from gprMax.yee_cell_setget_rigid cimport get_rigid_Ex
-from gprMax.yee_cell_setget_rigid cimport get_rigid_Ey
-from gprMax.yee_cell_setget_rigid cimport get_rigid_Ez
-from gprMax.yee_cell_setget_rigid cimport get_rigid_Hx
-from gprMax.yee_cell_setget_rigid cimport get_rigid_Hy
-from gprMax.yee_cell_setget_rigid cimport get_rigid_Hz
+from gprMax.yee_cell_setget_rigid_ext cimport get_rigid_Ex
+from gprMax.yee_cell_setget_rigid_ext cimport get_rigid_Ey
+from gprMax.yee_cell_setget_rigid_ext cimport get_rigid_Ez
+from gprMax.yee_cell_setget_rigid_ext cimport get_rigid_Hx
+from gprMax.yee_cell_setget_rigid_ext cimport get_rigid_Hy
+from gprMax.yee_cell_setget_rigid_ext cimport get_rigid_Hz
 
 
 cpdef void create_electric_average(int i, int j, int k, int numID1, int numID2, int numID3, int numID4, int componentID, G):