Update authors and tidy imports.

CREDITS

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This is the official list of entities and people who have contributed to gprMax.
 #

docs/source/conf.py

@@ -62,8 +62,8 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'gprMax'
-copyright = '2015-2019, The University of Edinburgh. Authors: Craig Warren and Antonis Giannopoulos'
+copyright = '2015-2019, The University of Edinburgh. Authors: Craig Warren, Antonis Giannopoulos, and John Hartley'
-author = 'Craig Warren and Antonis Giannopoulos'
+author = 'Craig Warren, Antonis Giannopoulos, and John Hartley'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -241,7 +241,7 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     (master_doc, 'gprMax.tex', 'gprMax User Guide',
-     'Craig Warren and Antonis Giannopoulos', 'manual'),
+     'Craig Warren, Antonis Giannopoulos, and John Hartley', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

gprMax/cmds_geometry/add_grass.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -18,12 +18,11 @@
 
 import logging
 
-import gprMax.config as config
 import numpy as np
 
 from ..fractals import FractalSurface, Grass
 from ..materials import create_grass
-from ..utilities import round_value
+from ..utilities.utilities import round_value
 from .cmds_geometry import UserObjectGeometry, rotate_2point_object
 
 logger = logging.getLogger(__name__)

gprMax/cmds_geometry/add_surface_roughness.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -21,7 +21,7 @@ import logging
 import numpy as np
 
 from ..fractals import FractalSurface
-from ..utilities import round_value
+from ..utilities.utilities import round_value
 from .cmds_geometry import UserObjectGeometry, rotate_2point_object
 
 logger = logging.getLogger(__name__)

gprMax/cmds_geometry/add_surface_water.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -18,11 +18,10 @@
 
 import logging
 
-import gprMax.config as config
 import numpy as np
 
 from ..materials import create_water
-from ..utilities import round_value
+from ..utilities.utilities import round_value
 from .cmds_geometry import UserObjectGeometry, rotate_2point_object
 
 logger = logging.getLogger(__name__)

gprMax/cmds_geometry/box.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cmds_geometry/build_templates.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with gprMax.  If not, see <http://www.gnu.org/licenses/>.
 
-from jinja2 import Environment, PackageLoader, select_autoescape
+from jinja2 import Environment, PackageLoader
 
 env = Environment(
     loader=PackageLoader(__name__, 'templates'),

gprMax/cmds_geometry/cmds_geometry.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cmds_geometry/cylinder.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cmds_geometry/cylindrical_sector.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cmds_geometry/edge.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cmds_geometry/fractal_box.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cmds_geometry/fractal_box_builder.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cmds_geometry/geometry_objects_read.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -24,7 +24,7 @@ import h5py
 
 from ..cython.geometry_primitives import build_voxels_from_array
 from ..hash_cmds_file import get_user_objects
-from ..utilities import round_value
+from ..utilities.utilities import round_value
 from .cmds_geometry import UserObjectGeometry
 
 logger = logging.getLogger(__name__)

gprMax/cmds_geometry/plate.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cmds_geometry/sphere.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cmds_geometry/triangle.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cmds_multiuse.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -37,7 +37,7 @@ from .sources import MagneticDipole as MagneticDipoleUser
 from .sources import TransmissionLine as TransmissionLineUser
 from .sources import VoltageSource as VoltageSourceUser
 from .subgrids.base import SubGridBase
-from .utilities import round_value
+from .utilities.utilities import round_value
 from .waveforms import Waveform as WaveformUser
 
 logger = logging.getLogger(__name__)

gprMax/cmds_singleuse.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -24,7 +24,7 @@ import gprMax.config as config
 import numpy as np
 from scipy import interpolate
 
-from .utilities import set_omp_threads
+from .utilities.host_info import set_omp_threads
 from .waveforms import Waveform
 
 logger = logging.getLogger(__name__)

gprMax/config.pxd

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/config.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -28,7 +28,8 @@ from scipy.constants import c
 from scipy.constants import epsilon_0 as e0
 from scipy.constants import mu_0 as m0
 
-from .utilities import detect_gpus, get_host_info, get_terminal_width
+from .utilities.host_info import detect_gpus, get_host_info
+from .utilities.utilities import get_terminal_width
 
 logger = logging.getLogger(__name__)
 

gprMax/contexts.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -25,7 +25,7 @@ import gprMax.config as config
 from ._version import __version__, codename
 from .model_build_run import ModelBuildRun
 from .solvers import create_G, create_solver
-from .utilities import get_terminal_width, human_size, logo, timer
+from .utilities.utilities import get_terminal_width, human_size, logo, timer
 
 logger = logging.getLogger(__name__)
 

gprMax/cuda/fields_updates.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cuda/pml_updates_electric_HORIPML.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cuda/pml_updates_electric_MRIPML.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cuda/pml_updates_magnetic_HORIPML.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cuda/pml_updates_magnetic_MRIPML.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cuda/snapshots.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cuda/source_updates.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cython/fields_updates_hsg.pyx

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cython/fields_updates_normal.pyx

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cython/fractals_generate.pyx

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cython/geometry_outputs.pyx

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cython/geometry_primitives.pyx

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -30,7 +30,7 @@ from gprMax.cython.yee_cell_setget_rigid cimport set_rigid_E
 from gprMax.cython.yee_cell_setget_rigid cimport unset_rigid_E
 from gprMax.cython.yee_cell_setget_rigid cimport set_rigid_H
 from gprMax.cython.yee_cell_setget_rigid cimport unset_rigid_H
-from gprMax.utilities import round_value
+from gprMax.utilities.utilities import round_value
 
 
 cpdef bint are_clockwise(

gprMax/cython/pml_updates_electric_HORIPML.pyx

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cython/pml_updates_electric_MRIPML.pyx

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cython/pml_updates_magnetic_HORIPML.pyx

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cython/pml_updates_magnetic_MRIPML.pyx

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cython/snapshots.pyx

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cython/yee_cell_build.pyx

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cython/yee_cell_setget_rigid.pxd

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/cython/yee_cell_setget_rigid.pyx

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/fields_outputs.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -17,7 +17,6 @@
 # along with gprMax.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-from pathlib import Path
 from string import Template
 
 import h5py

gprMax/fractals.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -21,7 +21,7 @@ import numpy as np
 from scipy import fftpack
 
 from .cython.fractals_generate import generate_fractal2D, generate_fractal3D
-from .utilities import round_value
+from .utilities.utilities import round_value
 
 np.seterr(divide='raise')
 

gprMax/geometry_outputs.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -21,7 +21,6 @@ try:
 except ImportError:
     import xml.etree.ElementTree as ET
 import logging
-import os
 from pathlib import Path
 from struct import pack
 
@@ -32,7 +31,7 @@ import numpy as np
 from ._version import __version__
 from .cython.geometry_outputs import (define_fine_geometry,
                                       define_normal_geometry)
-from .utilities import pretty_xml, round_value
+from .utilities.utilities import pretty_xml, round_value
 
 logger = logging.getLogger(__name__)
 

gprMax/gprMax.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -21,7 +21,7 @@ import argparse
 import gprMax.config as config
 
 from .contexts import Context, MPIContext, SPOTPYContext
-from .utilities import logging_config
+from .utilities.logging import logging_config
 
 # Arguments (used for API) and their default values (used for API and CLI)
 args_defaults = {'scenes': None,

gprMax/grid.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -22,7 +22,7 @@ from collections import OrderedDict
 import gprMax.config as config
 import numpy as np
 from .pml import CFS, PML
-from .utilities import fft_power, human_size, round_value
+from .utilities.utilities import fft_power, human_size, round_value
 
 np.seterr(invalid='raise')
 

gprMax/hash_cmds_file.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -17,7 +17,6 @@
 # along with gprMax.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-import os
 import sys
 from io import StringIO
 from pathlib import Path

gprMax/hash_cmds_geometry.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -30,7 +30,7 @@ from .cmds_geometry.fractal_box import FractalBox
 from .cmds_geometry.plate import Plate
 from .cmds_geometry.sphere import Sphere
 from .cmds_geometry.triangle import Triangle
-from .utilities import round_value
+from .utilities.utilities import round_value
 
 logger = logging.getLogger(__name__)
 

gprMax/hash_cmds_multiuse.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/hash_cmds_singleuse.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/materials.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/model_build_run.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -22,11 +22,13 @@ import logging
 import sys
 from pathlib import Path
 
-import gprMax.config as config
 import numpy as np
 import psutil
 from colorama import Fore, Style, init
 init()
+
+import gprMax.config as config
+
 from terminaltables import SingleTable
 from tqdm import tqdm
 
@@ -38,8 +40,8 @@ from .hash_cmds_file import parse_hash_commands
 from .materials import process_materials
 from .pml import build_pml, print_pml_info
 from .scene import Scene
-from .utilities import (get_terminal_width, human_size, mem_check_all,
+from .utilities.host_info import mem_check_all, set_omp_threads
-                        set_omp_threads)
+from .utilities.utilities import get_terminal_width, human_size
 
 logger = logging.getLogger(__name__)
 

gprMax/pml.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/receivers.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/scene.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -26,7 +26,6 @@ from .cmds_singleuse import (Discretisation, Domain, TimeWindow,
 from .materials import create_built_in_materials
 from .subgrids.user_objects import SubGridBase as SubGridUserBase
 from .user_inputs import create_user_input_points
-from .utilities import human_size
 
 logger = logging.getLogger(__name__)
 

gprMax/snapshots.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with gprMax.  If not, see <http://www.gnu.org/licenses/>.
 
-import sys
 from struct import pack
 
 import h5py
@@ -26,7 +25,7 @@ import gprMax.config as config
 
 from ._version import __version__
 from .cython.snapshots import calculate_snapshot_fields
-from .utilities import round_value
+from .utilities.utilities import round_value
 
 
 class Snapshot:

gprMax/solvers.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/sources.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -22,7 +22,7 @@ import gprMax.config as config
 import numpy as np
 
 from .grid import Ix, Iy, Iz
-from .utilities import round_value
+from .utilities.utilities import round_value
 
 
 class Source:

gprMax/subgrids/base.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/subgrids/multi.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/subgrids/precursor_nodes.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/subgrids/subgrid_hsg.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/subgrids/updates.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/subgrids/user_objects.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -20,7 +20,6 @@ import logging
 from copy import copy
 
 import numpy as np
-from gprMax import config
 
 from ..cmds_geometry.cmds_geometry import UserObjectGeometry
 from ..cmds_multiuse import Rx, UserObjectMulti

gprMax/templates/fields_updates_dispersive_template

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

gprMax/updates.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -19,9 +19,10 @@
 import logging
 from importlib import import_module
 
-import gprMax.config as config
 import numpy as np
 
+import gprMax.config as config
+
 from .cuda.fields_updates import kernel_template_fields
 from .cuda.snapshots import kernel_template_store_snapshot
 from .cuda.source_updates import kernel_template_sources
@@ -34,7 +35,9 @@ from .fields_outputs import store_outputs as store_outputs_cpu
 from .receivers import dtoh_rx_array, htod_rx_arrays
 from .snapshots import Snapshot, dtoh_snapshot_array, htod_snapshot_array
 from .sources import htod_src_arrays
-from .utilities import human_size, round32, timer
+from .utilities.utilities import human_size, round32, timer
+
+logger = logging.getLogger(__name__)
 
 
 class CPUUpdates:

gprMax/user_inputs.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -22,7 +22,7 @@ import gprMax.config as config
 import numpy as np
 
 from .subgrids.base import SubGridBase
-from .utilities import round_value
+from .utilities.utilities import round_value
 
 logger = logging.getLogger(__name__)
 

gprMax/waveforms.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

setup.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -111,7 +111,8 @@ with open('gprMax/_version.py', 'r') as fd:
     version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
                         fd.read(), re.MULTILINE).group(1)
 
-# Parse package name from init file. Importing __init__.py / gprMax will break as gprMax depends on compiled .pyx files.
+# Parse package name from init file. Importing __init__.py / gprMax will break 
+# as gprMax depends on compiled .pyx files.
 with open('gprMax/__init__.py', 'r') as fd:
     packagename = re.search(r'^__name__\s*=\s*[\'"]([^\'"]*)[\'"]',
                             fd.read(), re.MULTILINE).group(1)
@@ -133,14 +134,16 @@ if 'build' in sys.argv:
     sys.argv.append('build_ext')
     sys.argv.append('--inplace')
 
-# Process '--no-cython' command line argument - either Cythonize or just compile the .c files
+# Process '--no-cython' command line argument - either Cythonize or just compile 
+# the .c files
 if '--no-cython' in sys.argv:
     USE_CYTHON = False
     sys.argv.remove('--no-cython')
 else:
     USE_CYTHON = True
 
-# Build a list of all the files that need to be Cythonized looking in gprMax directory
+# Build a list of all the files that need to be Cythonized looking in gprMax 
+# directory
 cythonfiles = []
 for root, dirs, files in os.walk(os.path.join(os.getcwd(), packagename), topdown=True):
     for file in files:
@@ -160,7 +163,9 @@ if 'cleanall' in sys.argv:
             except OSError:
                 print(f'Could not remove: {filebase + ".c"}')
         # Remove compiled Cython modules
-        libfile = glob.glob(os.path.join(os.getcwd(), os.path.splitext(file)[0]) + '*.pyd') + glob.glob(os.path.join(os.getcwd(), os.path.splitext(file)[0]) + '*.so')
+        libfile = glob.glob(os.path.join(os.getcwd(), 
+                            os.path.splitext(file)[0]) + '*.pyd') + glob.glob(os.path.join(os.getcwd(), 
+                            os.path.splitext(file)[0]) + '*.so')
         if libfile:
             libfile = libfile[0]
             try:
@@ -185,8 +190,8 @@ if sys.platform == 'win32':
     linker_args = []
     extra_objects = []
     libraries=[]
-# macOS - needs gcc (usually via HomeBrew) because the default compiler LLVM (clang) does not support OpenMP
+# macOS - needs gcc (usually via HomeBrew) because the default compiler LLVM 
-#          - with gcc -fopenmp option implies -pthread
+#           (clang) does not support OpenMP. With gcc -fopenmp option implies -pthread
 elif sys.platform == 'darwin':
     gccpath = glob.glob('/usr/local/bin/gcc-[4-9]*')
     gccpath += glob.glob('/usr/local/bin/gcc-[10-11]*')
@@ -241,7 +246,7 @@ if USE_CYTHON:
 
 setup(name=packagename,
       version=version,
-      author='Craig Warren and Antonis Giannopoulos',
+      author='Craig Warren, Antonis Giannopoulos, and John Hartley',
       url='http://www.gprmax.com',
       description='Electromagnetic Modelling Software based on the Finite-Difference Time-Domain (FDTD) method',
       long_description=long_description,

tests/analytical_solutions.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

tests/benchmarking/plot_benchmark.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -19,16 +19,14 @@
 import argparse
 import itertools
 import os
-import sys
 
-import h5py
 import matplotlib.pyplot as plt
 import matplotlib.gridspec as gridspec
 import numpy as np
 
 from gprMax._version import __version__
-from gprMax.utilities import get_host_info
+from gprMax.utilities.host_info import get_host_info
-from gprMax.utilities import human_size
+from gprMax.utilities.utilities import human_size
 
 
 """Plots execution times and speedup factors from benchmarking models run with different numbers of CPU (OpenMP) threads. Can also benchmark GPU(s) if required. Results are read from a NumPy archive."""

tests/test_experimental.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -17,7 +17,6 @@
 # along with gprMax.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
-import sys
 from pathlib import Path
 
 import h5py

tests/test_models.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

tools/Paraview macros/gprMax.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

tools/convert_png2h5.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

tools/inputfile_old2new.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

tools/outputfiles_merge.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -25,7 +25,7 @@ from pathlib import Path
 import h5py
 import numpy as np
 from gprMax._version import __version__
-from gprMax.utilities import natural_keys
+from gprMax.utilities.utilities import natural_keys
 
 logger = logging.getLogger(__name__)
 

tools/plot_Ascan.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -25,7 +25,7 @@ import matplotlib.gridspec as gridspec
 import matplotlib.pyplot as plt
 import numpy as np
 from gprMax.receivers import Rx
-from gprMax.utilities import fft_power
+from gprMax.utilities.utilities import fft_power
 
 logger = logging.getLogger(__name__)
 

tools/plot_Bscan.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

tools/plot_antenna_params.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

tools/plot_antenna_params_UtEl.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #

tools/plot_source_wave.py

@@ -1,5 +1,5 @@
 # Copyright (C) 2015-2021: The University of Edinburgh
-#                 Authors: Craig Warren and Antonis Giannopoulos
+#                 Authors: Craig Warren, Antonis Giannopoulos, and John Hartley
 #
 # This file is part of gprMax.
 #
@@ -22,7 +22,7 @@ from pathlib import Path
 
 import matplotlib.pyplot as plt
 import numpy as np
-from gprMax.utilities import fft_power, round_value
+from gprMax.utilities.utilities import fft_power, round_value
 from gprMax.waveforms import Waveform
 
 logger = logging.getLogger(__name__)