Unsplat imports, mostly to break up the few cases of HUGE 180 char imports.

I'm eventually going to try to remove all instances of <from x import y>, but that's further down the line.

gprMax/exceptions.py

@@ -18,7 +18,9 @@
 
 import sys
 
-from colorama import init, Fore
+from colorama import init
+from colorama import Fore
+
 init()
 
 sys.tracebacklimit = None

gprMax/fields_updates.pyx

@@ -20,7 +20,8 @@ import numpy as np
 cimport numpy as np
 from cython.parallel import prange
 
-from gprMax.constants cimport floattype_t, complextype_t
+from gprMax.constants cimport floattype_t
+from gprMax.constants cimport complextype_t
 
 
 ###############################################

gprMax/fractals.py

@@ -18,7 +18,8 @@
 
 import numpy as np
 
-from gprMax.constants import floattype, complextype
+from gprMax.constants import floattype
+from gprMax.constants import complextype
 from gprMax.utilities import round_value
 
 np.seterr(divide='raise')

gprMax/geometry_primitives.pyx

@@ -20,7 +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, set_rigid_Ey, set_rigid_Ez, set_rigid_Hx, set_rigid_Hy, set_rigid_Hz, set_rigid_E, unset_rigid_E, set_rigid_H, unset_rigid_H
+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
 
 np.seterr(divide='raise')
 

gprMax/gprMax.py

@@ -20,19 +20,27 @@
 
 import argparse
 import datetime
-from enum import Enum
 import os
-from time import perf_counter
 import sys
 
+from enum import Enum
+from time import perf_counter
+
 import h5py
 import numpy as np
 
 from gprMax._version import __version__, codename
-from gprMax.constants import c, e0, m0, z0
+from gprMax.constants import c
+from gprMax.constants import e0
+from gprMax.constants import m0
+from gprMax.constants import z0
 from gprMax.exceptions import GeneralError
 from gprMax.model_build_run import run_model
-from gprMax.utilities import get_host_info, get_terminal_width, human_size, logo, open_path_file
+from gprMax.utilities import get_host_info
+from gprMax.utilities import get_terminal_width
+from gprMax.utilities import human_size
+from gprMax.utilities import logo
+from gprMax.utilities import open_path_file
 
 
 def main():

gprMax/grid.py

@@ -18,12 +18,16 @@
 
 from collections import OrderedDict
 
-from colorama import init, Fore, Style
+from colorama import init
+from colorama import Fore
+from colorama import Style
 init()
 import numpy as np
 np.seterr(invalid='raise')
 
-from gprMax.constants import c, floattype, complextype
+from gprMax.constants import c
+from gprMax.constants import floattype
+from gprMax.constants import complextype
 from gprMax.materials import Material
 from gprMax.pml import PML
 from gprMax.utilities import round_value

gprMax/input_cmds_geometry.py

@@ -27,10 +27,25 @@ from gprMax.constants import floattype
 from gprMax.input_cmds_file import check_cmd_names
 from gprMax.input_cmds_multiuse import process_multicmds
 from gprMax.exceptions import CmdInputError
-from gprMax.fractals import FractalSurface, FractalVolume, Grass
-from gprMax.geometry_primitives import build_edge_x, build_edge_y, build_edge_z, build_face_yz, build_face_xz, build_face_xy, build_triangle, build_box, build_cylinder, build_cylindrical_sector, build_sphere, build_voxels_from_array, build_voxels_from_array_mask
+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.materials import Material
-from gprMax.utilities import round_value, get_terminal_width
+from gprMax.utilities import round_value
+from gprMax.utilities import get_terminal_width
 
 
 def process_geometrycmds(geometry, G):

gprMax/input_cmds_multiuse.py

@@ -16,19 +16,28 @@
 # You should have received a copy of the GNU General Public License
 # along with gprMax.  If not, see <http://www.gnu.org/licenses/>.
 
-from colorama import init, Fore, Style
+from colorama import init
+from colorama import Fore
+from colorama import Style
 init()
 import numpy as np
 from tqdm import tqdm
 
-from gprMax.constants import z0, floattype
+from gprMax.constants import z0
+from gprMax.constants import floattype
 from gprMax.exceptions import CmdInputError
-from gprMax.geometry_outputs import GeometryView, GeometryObjects
-from gprMax.materials import Material, PeplinskiSoil
-from gprMax.pml import CFSParameter, CFS
+from gprMax.geometry_outputs import GeometryView
+from gprMax.geometry_outputs import GeometryObjects
+from gprMax.materials import Material
+from gprMax.materials import PeplinskiSoil
+from gprMax.pml import CFSParameter
+from gprMax.pml import CFS
 from gprMax.receivers import Rx
 from gprMax.snapshots import Snapshot
-from gprMax.sources import VoltageSource, HertzianDipole, MagneticDipole, TransmissionLine
+from gprMax.sources import VoltageSource
+from gprMax.sources import HertzianDipole
+from gprMax.sources import MagneticDipole
+from gprMax.sources import TransmissionLine
 from gprMax.utilities import round_value
 from gprMax.waveforms import Waveform
 

gprMax/input_cmds_singleuse.py

@@ -24,9 +24,14 @@ from colorama import init, Fore, Style
 init()
 import numpy as np
 
-from gprMax.constants import c, floattype
-from gprMax.exceptions import CmdInputError, GeneralError
-from gprMax.utilities import get_host_info, human_size, memory_usage, round_value
+from gprMax.constants import c
+from gprMax.constants import floattype
+from gprMax.exceptions import CmdInputError
+from gprMax.exceptions import GeneralError
+from gprMax.utilities import get_host_info
+from gprMax.utilities import human_size
+from gprMax.utilities import memory_usage
+from gprMax.utilities import round_value
 from gprMax.waveforms import Waveform
 
 

gprMax/materials.py

@@ -18,7 +18,9 @@
 
 import numpy as np
 
-from gprMax.constants import e0, m0, complextype
+from gprMax.constants import e0
+from gprMax.constants import m0
+from gprMax.constants import complextype
 
 
 class Material(object):

gprMax/model_build_run.py

@@ -31,17 +31,33 @@ from tqdm import tqdm
 
 from gprMax.constants import floattype, cfloattype, ccomplextype
 from gprMax.exceptions import GeneralError
-from gprMax.fields_outputs import store_outputs, write_hdf5_outputfile
-from gprMax.fields_updates import update_electric, update_magnetic, update_electric_dispersive_multipole_A, update_electric_dispersive_multipole_B, update_electric_dispersive_1pole_A, update_electric_dispersive_1pole_B
-from gprMax.grid import FDTDGrid, dispersion_analysis
+
+from gprMax.fields_outputs import 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.grid import FDTDGrid
+from gprMax.grid import dispersion_analysis
 from gprMax.input_cmds_geometry import process_geometrycmds
-from gprMax.input_cmds_file import process_python_include_code, write_processed_file, check_cmd_names
+from gprMax.input_cmds_file import process_python_include_code
+from gprMax.input_cmds_file import write_processed_file
+from gprMax.input_cmds_file import check_cmd_names
 from gprMax.input_cmds_multiuse import process_multicmds
 from gprMax.input_cmds_singleuse import process_singlecmds
 from gprMax.materials import Material, process_materials
-from gprMax.pml import PML, build_pmls
-from gprMax.utilities import get_terminal_width, human_size, open_path_file
-from gprMax.yee_cell_build import build_electric_components, build_magnetic_components
+from gprMax.pml import PML
+from gprMax.pml import build_pmls
+from gprMax.utilities import get_terminal_width
+from gprMax.utilities import human_size
+from gprMax.utilities import open_path_file
+from gprMax.yee_cell_build import build_electric_components
+from gprMax.yee_cell_build import build_magnetic_components
 
 
 def run_model(args, currentmodelrun, modelend, numbermodelruns, inputfile, usernamespace):

gprMax/optimisation_taguchi.py

@@ -30,8 +30,10 @@ import numpy as np
 
 from gprMax.constants import floattype
 from gprMax.exceptions import CmdInputError
-from gprMax.gprMax import run_std_sim, run_mpi_sim
-from gprMax.utilities import get_terminal_width, open_path_file
+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
 
 
 def run_opt_sim(args, inputfile, usernamespace):

gprMax/pml.py

@@ -21,7 +21,9 @@ from importlib import import_module
 import numpy as np
 from tqdm import tqdm
 
-from gprMax.constants import e0, z0, floattype
+from gprMax.constants import e0
+from gprMax.constants import z0
+from gprMax.constants import floattype
 
 
 class CFSParameter(object):

gprMax/pml_1order_update.pyx

@@ -20,7 +20,8 @@ import numpy as np
 cimport numpy as np
 from cython.parallel import prange
 
-from gprMax.constants cimport floattype_t, complextype_t
+from gprMax.constants cimport floattype_t
+from gprMax.constants cimport complextype_t
 
 
 ############################################

gprMax/pml_2order_update.pyx

@@ -20,7 +20,8 @@ import numpy as np
 cimport numpy as np
 from cython.parallel import prange
 
-from gprMax.constants cimport floattype_t, complextype_t
+from gprMax.constants cimport floattype_t
+from gprMax.constants cimport complextype_t
 
 
 ############################################

gprMax/snapshots.py

@@ -23,7 +23,9 @@ from struct import pack
 import numpy as np
 
 from gprMax.constants import floattype
-from gprMax.grid import Ix, Iy, Iz
+from gprMax.grid import Ix
+from gprMax.grid import Iy
+from gprMax.grid import Iz
 from gprMax.utilities import round_value
 
 

gprMax/sources.py

@@ -20,8 +20,11 @@ from copy import deepcopy
 
 import numpy as np
 
-from gprMax.constants import c, floattype
-from gprMax.grid import Ix, Iy, Iz
+from gprMax.constants import c
+from gprMax.constants import floattype
+from gprMax.grid import Ix
+from gprMax.grid import Iy
+from gprMax.grid import Iz
 from gprMax.utilities import round_value
 
 

gprMax/utilities.py

@@ -26,7 +26,9 @@ from shutil import get_terminal_size
 import sys
 import textwrap
 
-from colorama import init, Fore, Style
+from colorama import init
+from colorama import Fore
+from colorama import Style
 init()
 import numpy as np
 

gprMax/yee_cell_build.pyx

@@ -20,7 +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, get_rigid_Ey, get_rigid_Ez, get_rigid_Hx, get_rigid_Hy, get_rigid_Hz
+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
 
 
 cpdef void create_electric_average(int i, int j, int k, int numID1, int numID2, int numID3, int numID4, int componentID, G):