Fix importing cmds_geometry.cmds_geometry

gprMax/scene.py

@@ -18,14 +18,14 @@
 import logging
 from typing import List, Sequence
 
-from gprMax.cmds_geometry.add_grass import AddGrass
-from gprMax.cmds_geometry.add_surface_roughness import AddSurfaceRoughness
-from gprMax.cmds_geometry.add_surface_water import AddSurfaceWater
-from gprMax.cmds_geometry.fractal_box import FractalBox
 from gprMax.grid.fdtd_grid import FDTDGrid
 from gprMax.materials import create_built_in_materials
 from gprMax.model import Model
 from gprMax.subgrids.user_objects import SubGridBase as SubGridUserBase
+from gprMax.user_objects.cmds_geometry.add_grass import AddGrass
+from gprMax.user_objects.cmds_geometry.add_surface_roughness import AddSurfaceRoughness
+from gprMax.user_objects.cmds_geometry.add_surface_water import AddSurfaceWater
+from gprMax.user_objects.cmds_geometry.fractal_box import FractalBox
 from gprMax.user_objects.cmds_singleuse import Discretisation, Domain, TimeWindow
 from gprMax.user_objects.user_objects import (
     GeometryUserObject,

gprMax/subgrids/user_objects.py

@@ -22,12 +22,12 @@ 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 gprMax.user_objects.cmds_geometry.cmds_geometry import UserObjectGeometry
 from gprMax.user_objects.user_objects import (
     GeometryUserObject,
     GridUserObject,

gprMax/user_objects/cmds_geometry/fractal_box.py

@@ -21,11 +21,10 @@ import logging
 import numpy as np
 
 import gprMax.config as config
-from gprMax.cmds_geometry.cmds_geometry import UserObjectGeometry, rotate_2point_object
+from gprMax.cython.geometry_primitives import build_voxels_from_array, build_voxels_from_array_mask
 from gprMax.fractals import FractalVolume
 from gprMax.materials import ListMaterial
-
+from gprMax.user_objects.cmds_geometry.cmds_geometry import UserObjectGeometry, rotate_2point_object
-from ..cython.geometry_primitives import build_voxels_from_array, build_voxels_from_array_mask
 
 logger = logging.getLogger(__name__)