From d20fc36d2986f8f752b7e75417e4038f377244a2 Mon Sep 17 00:00:00 2001 From: nmannall Date: Tue, 10 Dec 2024 10:39:42 +0000 Subject: [PATCH] Move cmds_multiuse.py to new user_objects folder --- gprMax/__init__.py | 8 ++-- gprMax/hash_cmds_multiuse.py | 2 +- gprMax/scene.py | 2 +- gprMax/subgrids/user_objects.py | 7 ++- gprMax/{ => user_objects}/cmds_multiuse.py | 51 +++++++++++----------- 5 files changed, 34 insertions(+), 36 deletions(-) rename gprMax/{ => user_objects}/cmds_multiuse.py (96%) diff --git a/gprMax/__init__.py b/gprMax/__init__.py index 28dfb434..f8e613ad 100644 --- a/gprMax/__init__.py +++ b/gprMax/__init__.py @@ -24,7 +24,10 @@ from .cmds_geometry.geometry_objects_read import GeometryObjectsRead from .cmds_geometry.plate import Plate from .cmds_geometry.sphere import Sphere from .cmds_geometry.triangle import Triangle -from .cmds_multiuse import ( +from .gprMax import run as run +from .scene import Scene +from .subgrids.user_objects import SubGridHSG +from .user_objects.cmds_multiuse import ( PMLCFS, AddDebyeDispersion, AddDrudeDispersion, @@ -46,9 +49,6 @@ from .cmds_multiuse import ( VoltageSource, Waveform, ) -from .gprMax import run as run -from .scene import Scene -from .subgrids.user_objects import SubGridHSG from .user_objects.cmds_singleuse import ( Discretisation, Domain, diff --git a/gprMax/hash_cmds_multiuse.py b/gprMax/hash_cmds_multiuse.py index c933b7c4..688411a4 100644 --- a/gprMax/hash_cmds_multiuse.py +++ b/gprMax/hash_cmds_multiuse.py @@ -18,7 +18,7 @@ import logging -from .cmds_multiuse import ( +from .user_objects.cmds_multiuse import ( PMLCFS, AddDebyeDispersion, AddDrudeDispersion, diff --git a/gprMax/scene.py b/gprMax/scene.py index ee81af3a..96b99506 100644 --- a/gprMax/scene.py +++ b/gprMax/scene.py @@ -24,13 +24,13 @@ from gprMax.cmds_geometry.add_surface_roughness import AddSurfaceRoughness 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.grid.fdtd_grid import FDTDGrid from gprMax.materials import create_built_in_materials from gprMax.model import Model from gprMax.subgrids.grid import SubGridBaseGrid from gprMax.subgrids.user_objects import SubGridBase as SubGridUserBase from gprMax.user_inputs import MainGridUserInput, SubgridUserInput +from gprMax.user_objects.cmds_multiuse import UserObjectMulti from gprMax.user_objects.cmds_singleuse import Discretisation, Domain, TimeWindow, UserObjectSingle logger = logging.getLogger(__name__) diff --git a/gprMax/subgrids/user_objects.py b/gprMax/subgrids/user_objects.py index aa7c8ee0..b7c0582e 100644 --- a/gprMax/subgrids/user_objects.py +++ b/gprMax/subgrids/user_objects.py @@ -22,14 +22,13 @@ from typing import List, Tuple, Union import numpy as np +from gprMax.cmds_geometry.cmds_geometry import UserObjectGeometry from gprMax.grid.fdtd_grid import FDTDGrid from gprMax.model import Model from gprMax.subgrids.grid import SubGridBaseGrid +from gprMax.subgrids.subgrid_hsg import SubGridHSG as SubGridHSGUser from gprMax.user_inputs import MainGridUserInput - -from ..cmds_geometry.cmds_geometry import UserObjectGeometry -from ..cmds_multiuse import UserObjectMulti -from .subgrid_hsg import SubGridHSG as SubGridHSGUser +from gprMax.user_objects.cmds_multiuse import UserObjectMulti logger = logging.getLogger(__name__) diff --git a/gprMax/cmds_multiuse.py b/gprMax/user_objects/cmds_multiuse.py similarity index 96% rename from gprMax/cmds_multiuse.py rename to gprMax/user_objects/cmds_multiuse.py index 55cc64fb..2cc34d35 100644 --- a/gprMax/cmds_multiuse.py +++ b/gprMax/user_objects/cmds_multiuse.py @@ -26,34 +26,33 @@ import numpy.typing as npt from scipy import interpolate import gprMax.config as config -from gprMax.grid.fdtd_grid import FDTDGrid -from gprMax.grid.mpi_grid import MPIGrid -from gprMax.model import Model -from gprMax.user_inputs import MainGridUserInput - -from .cmds_geometry.cmds_geometry import ( +from gprMax.cmds_geometry.cmds_geometry import ( UserObjectGeometry, rotate_2point_object, rotate_polarisation, ) -from .geometry_outputs import GeometryObjects as GeometryObjectsUser -from .geometry_outputs import MPIGeometryObjects as MPIGeometryObjectsUser -from .materials import DispersiveMaterial as DispersiveMaterialUser -from .materials import ListMaterial as ListMaterialUser -from .materials import Material as MaterialUser -from .materials import PeplinskiSoil as PeplinskiSoilUser -from .materials import RangeMaterial as RangeMaterialUser -from .pml import CFS, CFSParameter -from .receivers import Rx as RxUser -from .snapshots import MPISnapshot as MPISnapshotUser -from .snapshots import Snapshot as SnapshotUser -from .sources import HertzianDipole as HertzianDipoleUser -from .sources import MagneticDipole as MagneticDipoleUser -from .sources import TransmissionLine as TransmissionLineUser -from .sources import VoltageSource as VoltageSourceUser -from .subgrids.grid import SubGridBaseGrid -from .utilities.utilities import round_value -from .waveforms import Waveform as WaveformUser +from gprMax.geometry_outputs import GeometryObjects as GeometryObjectsUser +from gprMax.geometry_outputs import MPIGeometryObjects as MPIGeometryObjectsUser +from gprMax.grid.fdtd_grid import FDTDGrid +from gprMax.grid.mpi_grid import MPIGrid +from gprMax.materials import DispersiveMaterial as DispersiveMaterialUser +from gprMax.materials import ListMaterial as ListMaterialUser +from gprMax.materials import Material as MaterialUser +from gprMax.materials import PeplinskiSoil as PeplinskiSoilUser +from gprMax.materials import RangeMaterial as RangeMaterialUser +from gprMax.model import Model +from gprMax.pml import CFS, CFSParameter +from gprMax.receivers import Rx as RxUser +from gprMax.snapshots import MPISnapshot as MPISnapshotUser +from gprMax.snapshots import Snapshot as SnapshotUser +from gprMax.sources import HertzianDipole as HertzianDipoleUser +from gprMax.sources import MagneticDipole as MagneticDipoleUser +from gprMax.sources import TransmissionLine as TransmissionLineUser +from gprMax.sources import VoltageSource as VoltageSourceUser +from gprMax.subgrids.grid import SubGridBaseGrid +from gprMax.user_inputs import MainGridUserInput +from gprMax.utilities.utilities import round_value +from gprMax.waveforms import Waveform as WaveformUser logger = logging.getLogger(__name__) @@ -1888,9 +1887,9 @@ class GeometryView(UserObjectMulti): """ if output_type == "n": - from .geometry_outputs import GeometryViewVoxels as GeometryViewUser + from gprMax.geometry_outputs import GeometryViewVoxels as GeometryViewUser else: - from .geometry_outputs import GeometryViewLines as GeometryViewUser + from gprMax.geometry_outputs import GeometryViewLines as GeometryViewUser return GeometryViewUser