From 5527398e0cd59b99e995480a72455def94ae3d9b Mon Sep 17 00:00:00 2001 From: Sai-Suraj-27 Date: Wed, 26 Jul 2023 22:28:43 +0530 Subject: [PATCH] updated the pre-commit-config.yaml file by adding the isort hook. --- .pre-commit-config.yaml | 5 ++++ examples/subgrids/cylinder_fs.py | 1 + gprMax/cmds_geometry/cmds_geometry.py | 3 ++- gprMax/cmds_geometry/fractal_box_builder.py | 3 ++- gprMax/cmds_geometry/geometry_objects_read.py | 3 ++- gprMax/cmds_singleuse.py | 3 ++- gprMax/config.pxd | 2 +- gprMax/cuda_opencl/knl_snapshots.py | 1 - gprMax/cuda_opencl/knl_store_outputs.py | 1 - gprMax/cython/geometry_primitives.pyx | 25 +++++++++++-------- gprMax/cython/yee_cell_build.pyx | 16 +++++++----- gprMax/materials.py | 3 +-- gprMax/receivers.py | 3 ++- gprMax/snapshots.py | 2 +- gprMax/sources.py | 3 ++- gprMax/subgrids/precursor_nodes.py | 1 + gprMax/user_inputs.py | 3 ++- gprMax/waveforms.py | 1 + setup.py | 1 - testing/benchmarking/bench_simple.py | 6 ++--- .../pml_3D_pec_plate/pml_3D_pec_plate.py | 3 ++- .../pml_3D_pec_plate/pml_3D_pec_plate_ref.py | 3 ++- testing/test_models.py | 2 +- toolboxes/AntennaPatterns/initial_save.py | 3 ++- toolboxes/AntennaPatterns/plot_fields.py | 3 ++- toolboxes/DebyeFit/Debye_Fit.py | 1 - .../DebyeFit/examples/example_ColeCole.py | 3 ++- toolboxes/Plotting/plot_Ascan.py | 1 + toolboxes/Plotting/plot_source_wave.py | 1 + toolboxes/STLtoVoxel/slice.py | 3 ++- 30 files changed, 68 insertions(+), 41 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9ed28854..0c08d1d9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,3 +12,8 @@ repos: hooks: - id: black args: ["--line-length", "120"] # Adjust the max line length value as needed. +- repo: https://github.com/pycqa/isort + rev: 5.12.0 + hooks: + - id: isort + args: ["--line-length", "120", "--profile", "black"] diff --git a/examples/subgrids/cylinder_fs.py b/examples/subgrids/cylinder_fs.py index 90928658..b04921b6 100644 --- a/examples/subgrids/cylinder_fs.py +++ b/examples/subgrids/cylinder_fs.py @@ -10,6 +10,7 @@ source is used with a waveform shaped as the first derivative of a gaussian. """ from pathlib import Path + import gprMax from gprMax.materials import calculate_water_properties diff --git a/gprMax/cmds_geometry/cmds_geometry.py b/gprMax/cmds_geometry/cmds_geometry.py index 918f25a3..46d248cb 100644 --- a/gprMax/cmds_geometry/cmds_geometry.py +++ b/gprMax/cmds_geometry/cmds_geometry.py @@ -18,10 +18,11 @@ import logging -import gprMax.config as config import numpy as np from scipy.spatial.transform import Rotation as R +import gprMax.config as config + logger = logging.getLogger(__name__) diff --git a/gprMax/cmds_geometry/fractal_box_builder.py b/gprMax/cmds_geometry/fractal_box_builder.py index ee97fdce..d680c9e0 100644 --- a/gprMax/cmds_geometry/fractal_box_builder.py +++ b/gprMax/cmds_geometry/fractal_box_builder.py @@ -18,9 +18,10 @@ import logging -import gprMax.config as config import numpy as np +import gprMax.config as config + from ..cython.geometry_primitives import build_voxels_from_array, build_voxels_from_array_mask from .cmds_geometry import UserObjectGeometry diff --git a/gprMax/cmds_geometry/geometry_objects_read.py b/gprMax/cmds_geometry/geometry_objects_read.py index 6f194cd6..e8e487d5 100644 --- a/gprMax/cmds_geometry/geometry_objects_read.py +++ b/gprMax/cmds_geometry/geometry_objects_read.py @@ -19,9 +19,10 @@ import logging from pathlib import Path -import gprMax.config as config import h5py +import gprMax.config as config + from ..cython.geometry_primitives import build_voxels_from_array from ..hash_cmds_file import get_user_objects from ..utilities.utilities import round_value diff --git a/gprMax/cmds_singleuse.py b/gprMax/cmds_singleuse.py index f9354cde..877b2226 100644 --- a/gprMax/cmds_singleuse.py +++ b/gprMax/cmds_singleuse.py @@ -20,10 +20,11 @@ import inspect import logging from pathlib import Path -import gprMax.config as config import numpy as np from scipy import interpolate +import gprMax.config as config + from .pml import PML from .utilities.host_info import set_omp_threads from .waveforms import Waveform diff --git a/gprMax/config.pxd b/gprMax/config.pxd index a2709f39..653171b9 100644 --- a/gprMax/config.pxd +++ b/gprMax/config.pxd @@ -17,8 +17,8 @@ # along with gprMax. If not, see . import numpy as np -cimport numpy as np +cimport numpy as np ctypedef fused float_or_double: float diff --git a/gprMax/cuda_opencl/knl_snapshots.py b/gprMax/cuda_opencl/knl_snapshots.py index db0ef001..2a1e1989 100644 --- a/gprMax/cuda_opencl/knl_snapshots.py +++ b/gprMax/cuda_opencl/knl_snapshots.py @@ -18,7 +18,6 @@ from string import Template - store_snapshot = { "args_cuda": Template( """ diff --git a/gprMax/cuda_opencl/knl_store_outputs.py b/gprMax/cuda_opencl/knl_store_outputs.py index 39020390..bbf66552 100644 --- a/gprMax/cuda_opencl/knl_store_outputs.py +++ b/gprMax/cuda_opencl/knl_store_outputs.py @@ -18,7 +18,6 @@ from string import Template - store_outputs = { "args_cuda": Template( """ diff --git a/gprMax/cython/geometry_primitives.pyx b/gprMax/cython/geometry_primitives.pyx index d89c12b2..f12592a8 100644 --- a/gprMax/cython/geometry_primitives.pyx +++ b/gprMax/cython/geometry_primitives.pyx @@ -17,20 +17,25 @@ # along with gprMax. If not, see . import numpy as np + cimport numpy as np + np.seterr(divide='raise') from cython.parallel import prange -from gprMax.cython.yee_cell_setget_rigid cimport set_rigid_Ex -from gprMax.cython.yee_cell_setget_rigid cimport set_rigid_Ey -from gprMax.cython.yee_cell_setget_rigid cimport set_rigid_Ez -from gprMax.cython.yee_cell_setget_rigid cimport set_rigid_Hx -from gprMax.cython.yee_cell_setget_rigid cimport set_rigid_Hy -from gprMax.cython.yee_cell_setget_rigid cimport set_rigid_Hz -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.cython.yee_cell_setget_rigid cimport ( + set_rigid_E, + set_rigid_Ex, + set_rigid_Ey, + set_rigid_Ez, + set_rigid_H, + set_rigid_Hx, + set_rigid_Hy, + set_rigid_Hz, + unset_rigid_E, + unset_rigid_H, +) + from gprMax.utilities.utilities import round_value diff --git a/gprMax/cython/yee_cell_build.pyx b/gprMax/cython/yee_cell_build.pyx index c0016dd2..d726c25a 100644 --- a/gprMax/cython/yee_cell_build.pyx +++ b/gprMax/cython/yee_cell_build.pyx @@ -17,14 +17,18 @@ # along with gprMax. If not, see . import numpy as np + cimport numpy as np -from gprMax.cython.yee_cell_setget_rigid cimport get_rigid_Ex -from gprMax.cython.yee_cell_setget_rigid cimport get_rigid_Ey -from gprMax.cython.yee_cell_setget_rigid cimport get_rigid_Ez -from gprMax.cython.yee_cell_setget_rigid cimport get_rigid_Hx -from gprMax.cython.yee_cell_setget_rigid cimport get_rigid_Hy -from gprMax.cython.yee_cell_setget_rigid cimport get_rigid_Hz +from gprMax.cython.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.materials import Material diff --git a/gprMax/materials.py b/gprMax/materials.py index ed7b1935..63f442ae 100644 --- a/gprMax/materials.py +++ b/gprMax/materials.py @@ -16,13 +16,12 @@ # You should have received a copy of the GNU General Public License # along with gprMax. If not, see . -import numpy as np import logging +import numpy as np import gprMax.config as config - logger = logging.getLogger(__name__) diff --git a/gprMax/receivers.py b/gprMax/receivers.py index 50781a9f..f24c8263 100644 --- a/gprMax/receivers.py +++ b/gprMax/receivers.py @@ -16,9 +16,10 @@ # You should have received a copy of the GNU General Public License # along with gprMax. If not, see . -import gprMax.config as config import numpy as np +import gprMax.config as config + class Rx: """Receiver output points.""" diff --git a/gprMax/snapshots.py b/gprMax/snapshots.py index 80dd2614..0593a259 100644 --- a/gprMax/snapshots.py +++ b/gprMax/snapshots.py @@ -17,8 +17,8 @@ # along with gprMax. If not, see . import logging -from pathlib import Path import sys +from pathlib import Path import h5py import numpy as np diff --git a/gprMax/sources.py b/gprMax/sources.py index b78d8be7..82648ed7 100644 --- a/gprMax/sources.py +++ b/gprMax/sources.py @@ -18,9 +18,10 @@ from copy import deepcopy -import gprMax.config as config import numpy as np +import gprMax.config as config + from .fields_outputs import Ix, Iy, Iz from .utilities.utilities import round_value diff --git a/gprMax/subgrids/precursor_nodes.py b/gprMax/subgrids/precursor_nodes.py index fb95c841..adbd0056 100644 --- a/gprMax/subgrids/precursor_nodes.py +++ b/gprMax/subgrids/precursor_nodes.py @@ -17,6 +17,7 @@ # along with gprMax. If not, see . import logging + import numpy as np from scipy import interpolate diff --git a/gprMax/user_inputs.py b/gprMax/user_inputs.py index 87698d95..b5be9a3b 100644 --- a/gprMax/user_inputs.py +++ b/gprMax/user_inputs.py @@ -18,9 +18,10 @@ import logging -import gprMax.config as config import numpy as np +import gprMax.config as config + from .subgrids.grid import SubGridBaseGrid from .utilities.utilities import round_value diff --git a/gprMax/waveforms.py b/gprMax/waveforms.py index 9137e4f7..36901e45 100644 --- a/gprMax/waveforms.py +++ b/gprMax/waveforms.py @@ -17,6 +17,7 @@ # along with gprMax. If not, see . import logging + import numpy as np logger = logging.getLogger(__name__) diff --git a/setup.py b/setup.py index 8f23782a..df082040 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,6 @@ from Cython.Build import cythonize from jinja2 import Environment, FileSystemLoader from setuptools import Extension, find_packages, setup - # Check Python version MIN_PYTHON_VERSION = (3, 7) if sys.version_info[:2] < MIN_PYTHON_VERSION: diff --git a/testing/benchmarking/bench_simple.py b/testing/benchmarking/bench_simple.py index 1e7d1edb..7898aaa2 100644 --- a/testing/benchmarking/bench_simple.py +++ b/testing/benchmarking/bench_simple.py @@ -4,10 +4,10 @@ """ -from pathlib import Path -import gprMax - import itertools +from pathlib import Path + +import gprMax # File path for output fn = Path(__file__) diff --git a/testing/models_pmls/pml_3D_pec_plate/pml_3D_pec_plate.py b/testing/models_pmls/pml_3D_pec_plate/pml_3D_pec_plate.py index b3e1b94b..cac3b3e3 100755 --- a/testing/models_pmls/pml_3D_pec_plate/pml_3D_pec_plate.py +++ b/testing/models_pmls/pml_3D_pec_plate/pml_3D_pec_plate.py @@ -1,8 +1,9 @@ from pathlib import Path -import gprMax import numpy as np +import gprMax + # File path for output fn = Path(__file__) parts = fn.parts diff --git a/testing/models_pmls/pml_3D_pec_plate/pml_3D_pec_plate_ref.py b/testing/models_pmls/pml_3D_pec_plate/pml_3D_pec_plate_ref.py index f441c5d8..97e2d75c 100755 --- a/testing/models_pmls/pml_3D_pec_plate/pml_3D_pec_plate_ref.py +++ b/testing/models_pmls/pml_3D_pec_plate/pml_3D_pec_plate_ref.py @@ -1,8 +1,9 @@ from pathlib import Path -import gprMax import numpy as np +import gprMax + # File path for output fn = Path(__file__) parts = fn.parts diff --git a/testing/test_models.py b/testing/test_models.py index de48face..eb5944ee 100644 --- a/testing/test_models.py +++ b/testing/test_models.py @@ -20,11 +20,11 @@ import logging import sys from pathlib import Path -import gprMax import h5py import matplotlib.pyplot as plt import numpy as np +import gprMax from testing.analytical_solutions import hertzian_dipole_fs logger = logging.getLogger(__name__) diff --git a/toolboxes/AntennaPatterns/initial_save.py b/toolboxes/AntennaPatterns/initial_save.py index 27df19fb..b152d4f3 100644 --- a/toolboxes/AntennaPatterns/initial_save.py +++ b/toolboxes/AntennaPatterns/initial_save.py @@ -9,11 +9,12 @@ import argparse import logging import os -import gprMax.config as config import h5py import matplotlib.pyplot as plt import numpy as np +import gprMax.config as config + logger = logging.getLogger(__name__) diff --git a/toolboxes/AntennaPatterns/plot_fields.py b/toolboxes/AntennaPatterns/plot_fields.py index b943369a..ff7c6dea 100644 --- a/toolboxes/AntennaPatterns/plot_fields.py +++ b/toolboxes/AntennaPatterns/plot_fields.py @@ -9,10 +9,11 @@ import argparse import logging import os -import gprMax.config as config import matplotlib.pyplot as plt import numpy as np +import gprMax.config as config + logger = logging.getLogger(__name__) diff --git a/toolboxes/DebyeFit/Debye_Fit.py b/toolboxes/DebyeFit/Debye_Fit.py index 221ca1ac..8c711476 100644 --- a/toolboxes/DebyeFit/Debye_Fit.py +++ b/toolboxes/DebyeFit/Debye_Fit.py @@ -14,7 +14,6 @@ import matplotlib.gridspec as gridspec import numpy as np import scipy.interpolate from matplotlib import pylab as plt - from optimization import DA_DLS, DE_DLS, PSO_DLS diff --git a/toolboxes/DebyeFit/examples/example_ColeCole.py b/toolboxes/DebyeFit/examples/example_ColeCole.py index 39898060..42cf5595 100644 --- a/toolboxes/DebyeFit/examples/example_ColeCole.py +++ b/toolboxes/DebyeFit/examples/example_ColeCole.py @@ -2,7 +2,8 @@ # "Incorporating dispersive electrical properties in FDTD GPR models # using a general Cole-Cole dispersion function," # 2012 14th International Conference on Ground Penetrating Radar (GPR), 2012, pp. 232-236 -import os, sys +import os +import sys sys.path.append(os.path.join(os.path.dirname(__file__), "..")) from Debye_Fit import HavriliakNegami diff --git a/toolboxes/Plotting/plot_Ascan.py b/toolboxes/Plotting/plot_Ascan.py index 9af059cd..843bcaa8 100644 --- a/toolboxes/Plotting/plot_Ascan.py +++ b/toolboxes/Plotting/plot_Ascan.py @@ -24,6 +24,7 @@ import h5py import matplotlib.gridspec as gridspec import matplotlib.pyplot as plt import numpy as np + from gprMax.receivers import Rx from gprMax.utilities.utilities import fft_power diff --git a/toolboxes/Plotting/plot_source_wave.py b/toolboxes/Plotting/plot_source_wave.py index fa86e649..83ad83ec 100644 --- a/toolboxes/Plotting/plot_source_wave.py +++ b/toolboxes/Plotting/plot_source_wave.py @@ -22,6 +22,7 @@ from pathlib import Path import matplotlib.pyplot as plt import numpy as np + from gprMax.utilities.utilities import fft_power, round_value from gprMax.waveforms import Waveform diff --git a/toolboxes/STLtoVoxel/slice.py b/toolboxes/STLtoVoxel/slice.py index 32802c89..96460d02 100644 --- a/toolboxes/STLtoVoxel/slice.py +++ b/toolboxes/STLtoVoxel/slice.py @@ -3,9 +3,10 @@ import multiprocessing as mp import sys import numpy as np -from gprMax.utilities.utilities import get_terminal_width from tqdm import tqdm +from gprMax.utilities.utilities import get_terminal_width + from . import perimeter