From e842d8a2f66b4c619082aaebfe36cd26f56d34d9 Mon Sep 17 00:00:00 2001 From: Craig Warren Date: Mon, 3 Jun 2024 21:01:29 +0100 Subject: [PATCH] Tidied import sorting --- gprMax/cmds_multiuse.py | 7 +++++-- gprMax/contexts.py | 3 ++- gprMax/hash_cmds_geometry.py | 5 +++-- gprMax/hash_cmds_multiuse.py | 28 +++++++--------------------- gprMax/hash_cmds_singleuse.py | 15 +++------------ gprMax/model_build_run.py | 6 ++++-- gprMax/scene.py | 3 ++- gprMax/updates.py | 9 ++++++--- 8 files changed, 32 insertions(+), 44 deletions(-) diff --git a/gprMax/cmds_multiuse.py b/gprMax/cmds_multiuse.py index e7689a0d..bd4a6517 100644 --- a/gprMax/cmds_multiuse.py +++ b/gprMax/cmds_multiuse.py @@ -25,7 +25,9 @@ from scipy import interpolate import gprMax.config as config -from .cmds_geometry.cmds_geometry import UserObjectGeometry, rotate_2point_object, rotate_polarisation +from .cmds_geometry.cmds_geometry import (UserObjectGeometry, + rotate_2point_object, + rotate_polarisation) from .geometry_outputs import GeometryObjects as GeometryObjectsUser from .materials import DispersiveMaterial as DispersiveMaterialUser from .materials import ListMaterial as ListMaterialUser @@ -1647,7 +1649,8 @@ class GeometryView(UserObjectMulti): """ if output_type == "n": - from .geometry_outputs import GeometryViewVoxels as GeometryViewUser + from .geometry_outputs import \ + GeometryViewVoxels as GeometryViewUser else: from .geometry_outputs import GeometryViewLines as GeometryViewUser diff --git a/gprMax/contexts.py b/gprMax/contexts.py index b841f0e6..b807458b 100644 --- a/gprMax/contexts.py +++ b/gprMax/contexts.py @@ -31,7 +31,8 @@ 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.host_info import print_cuda_info, print_host_info, print_opencl_info +from .utilities.host_info import (print_cuda_info, print_host_info, + print_opencl_info) from .utilities.utilities import get_terminal_width, logo, timer logger = logging.getLogger(__name__) diff --git a/gprMax/hash_cmds_geometry.py b/gprMax/hash_cmds_geometry.py index 089cc2ae..1d53b980 100644 --- a/gprMax/hash_cmds_geometry.py +++ b/gprMax/hash_cmds_geometry.py @@ -24,6 +24,7 @@ from .cmds_geometry.add_grass import AddGrass from .cmds_geometry.add_surface_roughness import AddSurfaceRoughness from .cmds_geometry.add_surface_water import AddSurfaceWater from .cmds_geometry.box import Box +from .cmds_geometry.cmds_geometry import check_averaging from .cmds_geometry.cone import Cone from .cmds_geometry.cylinder import Cylinder from .cmds_geometry.cylindrical_sector import CylindricalSector @@ -33,7 +34,6 @@ 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 .cmds_geometry.cmds_geometry import check_averaging from .utilities.utilities import round_value logger = logging.getLogger(__name__) @@ -57,7 +57,8 @@ def process_geometrycmds(geometry): tmp = object.split() if tmp[0] == "#geometry_objects_read:": - from .cmds_geometry.geometry_objects_read import GeometryObjectsRead + from .cmds_geometry.geometry_objects_read import \ + GeometryObjectsRead if len(tmp) != 6: logger.exception("'" + " ".join(tmp) + "'" + " requires exactly five parameters") diff --git a/gprMax/hash_cmds_multiuse.py b/gprMax/hash_cmds_multiuse.py index 2c99f78f..9cd330dd 100644 --- a/gprMax/hash_cmds_multiuse.py +++ b/gprMax/hash_cmds_multiuse.py @@ -18,27 +18,13 @@ import logging -from .cmds_multiuse import ( - PMLCFS, - AddDebyeDispersion, - AddDrudeDispersion, - AddLorentzDispersion, - ExcitationFile, - GeometryObjectsWrite, - GeometryView, - HertzianDipole, - MagneticDipole, - Material, - MaterialList, - MaterialRange, - Rx, - RxArray, - Snapshot, - SoilPeplinski, - TransmissionLine, - VoltageSource, - Waveform, -) +from .cmds_multiuse import (PMLCFS, AddDebyeDispersion, AddDrudeDispersion, + AddLorentzDispersion, ExcitationFile, + GeometryObjectsWrite, GeometryView, HertzianDipole, + MagneticDipole, Material, MaterialList, + MaterialRange, Rx, RxArray, Snapshot, + SoilPeplinski, TransmissionLine, VoltageSource, + Waveform) logger = logging.getLogger(__name__) diff --git a/gprMax/hash_cmds_singleuse.py b/gprMax/hash_cmds_singleuse.py index 60cba910..2ff9eaf5 100644 --- a/gprMax/hash_cmds_singleuse.py +++ b/gprMax/hash_cmds_singleuse.py @@ -18,18 +18,9 @@ import logging -from .cmds_singleuse import ( - Discretisation, - Domain, - OMPThreads, - OutputDir, - PMLProps, - RxSteps, - SrcSteps, - TimeStepStabilityFactor, - TimeWindow, - Title, -) +from .cmds_singleuse import (Discretisation, Domain, OMPThreads, OutputDir, + PMLProps, RxSteps, SrcSteps, + TimeStepStabilityFactor, TimeWindow, Title) logger = logging.getLogger(__name__) diff --git a/gprMax/model_build_run.py b/gprMax/model_build_run.py index b375eff7..abea2942 100644 --- a/gprMax/model_build_run.py +++ b/gprMax/model_build_run.py @@ -33,7 +33,8 @@ from tqdm import tqdm import gprMax.config as config -from .cython.yee_cell_build import build_electric_components, build_magnetic_components +from .cython.yee_cell_build import (build_electric_components, + build_magnetic_components) from .fields_outputs import write_hdf5_outputfile from .geometry_outputs import save_geometry_views from .grid import dispersion_analysis @@ -42,7 +43,8 @@ from .materials import process_materials from .pml import CFS, build_pml, print_pml_info from .scene import Scene from .snapshots import save_snapshots -from .utilities.host_info import mem_check_build_all, mem_check_run_all, set_omp_threads +from .utilities.host_info import (mem_check_build_all, mem_check_run_all, + set_omp_threads) from .utilities.utilities import get_terminal_width logger = logging.getLogger(__name__) diff --git a/gprMax/scene.py b/gprMax/scene.py index 28b93cde..0489bcc5 100644 --- a/gprMax/scene.py +++ b/gprMax/scene.py @@ -24,7 +24,8 @@ from gprMax.cmds_geometry.add_surface_water import AddSurfaceWater from gprMax.cmds_geometry.cmds_geometry import UserObjectGeometry from gprMax.cmds_geometry.fractal_box import FractalBox from gprMax.cmds_multiuse import UserObjectMulti -from gprMax.cmds_singleuse import Discretisation, Domain, TimeWindow, UserObjectSingle +from gprMax.cmds_singleuse import (Discretisation, Domain, TimeWindow, + UserObjectSingle) from gprMax.materials import create_built_in_materials from gprMax.subgrids.user_objects import SubGridBase as SubGridUserBase from gprMax.user_inputs import create_user_input_points diff --git a/gprMax/updates.py b/gprMax/updates.py index 1935de19..0b31c7c7 100644 --- a/gprMax/updates.py +++ b/gprMax/updates.py @@ -25,9 +25,12 @@ from jinja2 import Environment, PackageLoader import gprMax.config as config -from .cuda_opencl import knl_fields_updates, knl_snapshots, knl_source_updates, knl_store_outputs -from .cython.fields_updates_normal import update_electric as update_electric_cpu -from .cython.fields_updates_normal import update_magnetic as update_magnetic_cpu +from .cuda_opencl import (knl_fields_updates, knl_snapshots, + knl_source_updates, knl_store_outputs) +from .cython.fields_updates_normal import \ + update_electric as update_electric_cpu +from .cython.fields_updates_normal import \ + update_magnetic as update_magnetic_cpu 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