From a548169306f61ef6e8cb031b163a7c598cb5ed46 Mon Sep 17 00:00:00 2001
From: John Hartley <johnmatthewhartley@gmail.com>
Date: Wed, 31 Jul 2019 18:34:54 +0100
Subject: [PATCH] correct imports

---
 gprMax/cmds_geometry/box.py                 | 2 +-
 gprMax/cmds_geometry/cylinder.py            | 2 +-
 gprMax/cmds_geometry/cylindrical_sector.py  | 2 +-
 gprMax/cmds_geometry/edge.py                | 6 +++---
 gprMax/cmds_geometry/fractal_box_builder.py | 4 ++--
 gprMax/cmds_geometry/plate.py               | 6 +++---
 gprMax/cmds_geometry/sphere.py              | 2 +-
 gprMax/cmds_geometry/triangle.py            | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/gprMax/cmds_geometry/box.py b/gprMax/cmds_geometry/box.py
index bb8636f1..b82774c0 100644
--- a/gprMax/cmds_geometry/box.py
+++ b/gprMax/cmds_geometry/box.py
@@ -2,7 +2,7 @@
 from .cmds_geometry import UserObjectGeometry
 from ..exceptions import CmdInputError
 from ..materials import Material
-from ..geometry_primitives_ext import build_box
+from ..cython.geometry_primitives import build_box
 
 from tqdm import tqdm
 import numpy as np
diff --git a/gprMax/cmds_geometry/cylinder.py b/gprMax/cmds_geometry/cylinder.py
index d6f21d55..c66ce2dc 100644
--- a/gprMax/cmds_geometry/cylinder.py
+++ b/gprMax/cmds_geometry/cylinder.py
@@ -2,7 +2,7 @@
 from .cmds_geometry import UserObjectGeometry
 from ..exceptions import CmdInputError
 from ..materials import Material
-from ..geometry_primitives_ext import build_cylinder
+from ..cython.geometry_primitives import build_cylinder
 
 from tqdm import tqdm
 import numpy as np
diff --git a/gprMax/cmds_geometry/cylindrical_sector.py b/gprMax/cmds_geometry/cylindrical_sector.py
index 9fa100f9..3c71769d 100644
--- a/gprMax/cmds_geometry/cylindrical_sector.py
+++ b/gprMax/cmds_geometry/cylindrical_sector.py
@@ -2,7 +2,7 @@
 from .cmds_geometry import UserObjectGeometry
 from ..exceptions import CmdInputError
 from ..materials import Material
-from ..geometry_primitives_ext import build_cylindrical_sector
+from ..cython.geometry_primitives import build_cylindrical_sector
 
 from tqdm import tqdm
 import numpy as np
diff --git a/gprMax/cmds_geometry/edge.py b/gprMax/cmds_geometry/edge.py
index e5158f2b..fd01b97a 100644
--- a/gprMax/cmds_geometry/edge.py
+++ b/gprMax/cmds_geometry/edge.py
@@ -1,9 +1,9 @@
 """Class for edge command."""
 from .cmds_geometry import UserObjectGeometry
 from ..exceptions import CmdInputError
-from ..geometry_primitives_ext import build_edge_x
-from ..geometry_primitives_ext import build_edge_y
-from ..geometry_primitives_ext import build_edge_z
+from ..cython.geometry_primitives import build_edge_x
+from ..cython.geometry_primitives import build_edge_y
+from ..cython.geometry_primitives import build_edge_z
 
 from tqdm import tqdm
 
diff --git a/gprMax/cmds_geometry/fractal_box_builder.py b/gprMax/cmds_geometry/fractal_box_builder.py
index ebce587c..bbf2a6ad 100644
--- a/gprMax/cmds_geometry/fractal_box_builder.py
+++ b/gprMax/cmds_geometry/fractal_box_builder.py
@@ -2,8 +2,8 @@
 from .cmds_geometry import UserObjectGeometry
 from ..exceptions import CmdInputError
 from ..constants import floattype
-from gprMax.geometry_primitives_ext import build_voxels_from_array
-from gprMax.geometry_primitives_ext import build_voxels_from_array_mask
+from ..cython.geometry_primitives import build_voxels_from_array
+from ..cython.geometry_primitives import build_voxels_from_array_mask
 
 import numpy as np
 
diff --git a/gprMax/cmds_geometry/plate.py b/gprMax/cmds_geometry/plate.py
index eea23c47..a2b63340 100644
--- a/gprMax/cmds_geometry/plate.py
+++ b/gprMax/cmds_geometry/plate.py
@@ -1,9 +1,9 @@
 """Class for edge command."""
 from .cmds_geometry import UserObjectGeometry
 from ..exceptions import CmdInputError
-from ..geometry_primitives_ext import build_face_yz
-from ..geometry_primitives_ext import build_face_xz
-from ..geometry_primitives_ext import build_face_xy
+from ..cython.geometry_primitives import build_face_yz
+from ..cython.geometry_primitives import build_face_xz
+from ..cython.geometry_primitives import build_face_xy
 
 from tqdm import tqdm
 
diff --git a/gprMax/cmds_geometry/sphere.py b/gprMax/cmds_geometry/sphere.py
index 983c6e06..590a7ad9 100644
--- a/gprMax/cmds_geometry/sphere.py
+++ b/gprMax/cmds_geometry/sphere.py
@@ -2,7 +2,7 @@
 from .cmds_geometry import UserObjectGeometry
 from ..exceptions import CmdInputError
 from ..materials import Material
-from ..geometry_primitives_ext import build_sphere
+from ..cython.geometry_primitives import build_sphere
 
 from tqdm import tqdm
 import numpy as np
diff --git a/gprMax/cmds_geometry/triangle.py b/gprMax/cmds_geometry/triangle.py
index c742f7cb..bc68c9c2 100644
--- a/gprMax/cmds_geometry/triangle.py
+++ b/gprMax/cmds_geometry/triangle.py
@@ -2,7 +2,7 @@
 from .cmds_geometry import UserObjectGeometry
 from ..exceptions import CmdInputError
 from ..materials import Material
-from ..geometry_primitives_ext import build_triangle
+from ..cython.geometry_primitives import build_triangle
 
 from tqdm import tqdm
 import numpy as np