diff --git a/gprMax/fields_update.pyx b/gprMax/fields_update.pyx index af5b9ae2..41498681 100644 --- a/gprMax/fields_update.pyx +++ b/gprMax/fields_update.pyx @@ -19,7 +19,7 @@ import numpy as np cimport numpy as np from cython.parallel import prange -from .constants cimport floattype_t, complextype_t +from gprMax.constants cimport floattype_t, complextype_t ######################################### diff --git a/gprMax/fractals.py b/gprMax/fractals.py index 22d64fff..23446651 100644 --- a/gprMax/fractals.py +++ b/gprMax/fractals.py @@ -19,8 +19,8 @@ import numpy as np np.seterr(divide='raise') -from .constants import floattype, complextype -from .utilities import rvalue +from gprMax.constants import floattype, complextype +from gprMax.utilities import rvalue class FractalSurface(): diff --git a/gprMax/geometry_primitives.pyx b/gprMax/geometry_primitives.pyx index cded3eb0..1047fcd5 100644 --- a/gprMax/geometry_primitives.pyx +++ b/gprMax/geometry_primitives.pyx @@ -19,8 +19,8 @@ import numpy as np cimport numpy as np np.seterr(divide='raise') -from .utilities import rvalue -from .yee_cell_setget_rigid cimport set_rigid_Ex, set_rigid_Ey, set_rigid_Ez, set_rigid_Hx, set_rigid_Hy, set_rigid_Hz, set_rigid_E, unset_rigid_E, set_rigid_H, unset_rigid_H +from gprMax.utilities import rvalue +from gprMax.yee_cell_setget_rigid cimport set_rigid_Ex, set_rigid_Ey, set_rigid_Ez, set_rigid_Hx, set_rigid_Hy, set_rigid_Hz, set_rigid_E, unset_rigid_E, set_rigid_H, unset_rigid_H cpdef bint are_clockwise(float v1x, float v1y, float v2x, float v2y): diff --git a/gprMax/geometry_views.py b/gprMax/geometry_views.py index 649f7c2f..51d0954d 100644 --- a/gprMax/geometry_views.py +++ b/gprMax/geometry_views.py @@ -20,7 +20,7 @@ import sys import numpy as np from struct import pack -from .utilities import rvalue +from gprMax.utilities import rvalue class GeometryView: diff --git a/gprMax/gprMax.py b/gprMax/gprMax.py index 7787c919..04bf7556 100644 --- a/gprMax/gprMax.py +++ b/gprMax/gprMax.py @@ -31,20 +31,20 @@ from enum import Enum import numpy as np -from .constants import e0 -from .exceptions import CmdInputError -from .fields_output import prepare_output_file, write_output -from .fields_update import * -from .grid import FDTDGrid -from .input_cmds_geometry import process_geometrycmds -from .input_cmds_file import python_code_blocks, write_python_processed, check_cmd_names -from .input_cmds_multiuse import process_multicmds -from .input_cmds_singleuse import process_singlecmds -from .materials import Material -from .pml_call_updates import update_pml_electric, update_pml_magnetic -from .pml import build_pml, calculate_initial_pml_params -from .utilities import update_progress, logo, human_size -from .yee_cell_build import build_ex_component, build_ey_component, build_ez_component, build_hx_component, build_hy_component, build_hz_component +from gprMax.constants import e0 +from gprMax.exceptions import CmdInputError +from gprMax.fields_output import prepare_output_file, write_output +from gprMax.fields_update import * +from gprMax.grid import FDTDGrid +from gprMax.input_cmds_geometry import process_geometrycmds +from gprMax.input_cmds_file import python_code_blocks, write_python_processed, check_cmd_names +from gprMax.input_cmds_multiuse import process_multicmds +from gprMax.input_cmds_singleuse import process_singlecmds +from gprMax.materials import Material +from gprMax.pml_call_updates import update_pml_electric, update_pml_magnetic +from gprMax.pml import build_pml, calculate_initial_pml_params +from gprMax.utilities import update_progress, logo, human_size +from gprMax.yee_cell_build import build_ex_component, build_ey_component, build_ez_component, build_hx_component, build_hy_component, build_hz_component def main(): diff --git a/gprMax/grid.py b/gprMax/grid.py index 536e61d9..385b848f 100644 --- a/gprMax/grid.py +++ b/gprMax/grid.py @@ -18,8 +18,8 @@ import numpy as np -from .constants import floattype, complextype -from .materials import Material +from gprMax.constants import floattype, complextype +from gprMax.materials import Material class FDTDGrid(): diff --git a/gprMax/input_cmds_file.py b/gprMax/input_cmds_file.py index c40c251b..bc6d1de2 100644 --- a/gprMax/input_cmds_file.py +++ b/gprMax/input_cmds_file.py @@ -18,9 +18,9 @@ import sys, os -from .constants import c, e0, m0, z0 -from .exceptions import CmdInputError -from .utilities import ListStream +from gprMax.constants import c, e0, m0, z0 +from gprMax.exceptions import CmdInputError +from gprMax.utilities import ListStream def python_code_blocks(inputfile, modelrun, numbermodelruns, inputdirectory): diff --git a/gprMax/input_cmds_geometry.py b/gprMax/input_cmds_geometry.py index a536b4a0..cf4c65f8 100644 --- a/gprMax/input_cmds_geometry.py +++ b/gprMax/input_cmds_geometry.py @@ -19,12 +19,12 @@ import sys import numpy as np -from .constants import floattype -from .exceptions import CmdInputError -from .fractals import FractalSurface, FractalVolume, Grass -from .geometry_primitives import build_edge_x, build_edge_y, build_edge_z, build_face_yz, build_face_xz, build_face_xy, build_triangle, build_voxel, build_box, build_cylinder, build_cylindrical_sector, build_sphere -from .materials import Material -from .utilities import rvalue +from gprMax.constants import floattype +from gprMax.exceptions import CmdInputError +from gprMax.fractals import FractalSurface, FractalVolume, Grass +from gprMax.geometry_primitives import build_edge_x, build_edge_y, build_edge_z, build_face_yz, build_face_xz, build_face_xy, build_triangle, build_voxel, build_box, build_cylinder, build_cylindrical_sector, build_sphere +from gprMax.materials import Material +from gprMax.utilities import rvalue def process_geometrycmds(geometry, G): diff --git a/gprMax/input_cmds_multiuse.py b/gprMax/input_cmds_multiuse.py index 8e19425b..dd827dad 100644 --- a/gprMax/input_cmds_multiuse.py +++ b/gprMax/input_cmds_multiuse.py @@ -16,15 +16,15 @@ # You should have received a copy of the GNU General Public License # along with gprMax. If not, see . -from .exceptions import CmdInputError -from .geometry_views import GeometryView -from .materials import Material, PeplinskiSoil -from .pml import CFS -from .receivers import Rx -from .snapshots import Snapshot -from .sources import VoltageSource, HertzianDipole, MagneticDipole -from .utilities import rvalue -from .waveforms import Waveform +from gprMax.exceptions import CmdInputError +from gprMax.geometry_views import GeometryView +from gprMax.materials import Material, PeplinskiSoil +from gprMax.pml import CFS +from gprMax.receivers import Rx +from gprMax.snapshots import Snapshot +from gprMax.sources import VoltageSource, HertzianDipole, MagneticDipole +from gprMax.utilities import rvalue +from gprMax.waveforms import Waveform def process_multicmds(multicmds, G): diff --git a/gprMax/input_cmds_singleuse.py b/gprMax/input_cmds_singleuse.py index f26b1d7c..7d7793f4 100644 --- a/gprMax/input_cmds_singleuse.py +++ b/gprMax/input_cmds_singleuse.py @@ -20,11 +20,11 @@ import os, sys import numpy as np from psutil import virtual_memory -from .constants import c, floattype -from .exceptions import CmdInputError -from .pml import PML, CFS -from .utilities import rvalue, human_size -from .waveforms import Waveform +from gprMax.constants import c, floattype +from gprMax.exceptions import CmdInputError +from gprMax.pml import PML, CFS +from gprMax.utilities import rvalue, human_size +from gprMax.waveforms import Waveform def process_singlecmds(singlecmds, multicmds, G): diff --git a/gprMax/materials.py b/gprMax/materials.py index 72408563..27bec31c 100644 --- a/gprMax/materials.py +++ b/gprMax/materials.py @@ -18,7 +18,7 @@ import numpy as np -from .constants import e0, m0, floattype, complextype +from gprMax.constants import e0, m0, floattype, complextype class Material(): diff --git a/gprMax/pml.py b/gprMax/pml.py index d48139d6..f7e36d26 100644 --- a/gprMax/pml.py +++ b/gprMax/pml.py @@ -18,7 +18,7 @@ import numpy as np -from .constants import e0, z0, floattype +from gprMax.constants import e0, z0, floattype class CFS(): diff --git a/gprMax/pml_1order_update.pyx b/gprMax/pml_1order_update.pyx index aa964007..9751a8b7 100644 --- a/gprMax/pml_1order_update.pyx +++ b/gprMax/pml_1order_update.pyx @@ -19,7 +19,7 @@ import numpy as np cimport numpy as np from cython.parallel import prange -from .constants cimport floattype_t, complextype_t +from gprMax.constants cimport floattype_t, complextype_t ############################################# diff --git a/gprMax/pml_2order_update.pyx b/gprMax/pml_2order_update.pyx index c3af155a..03985394 100644 --- a/gprMax/pml_2order_update.pyx +++ b/gprMax/pml_2order_update.pyx @@ -19,7 +19,7 @@ import numpy as np cimport numpy as np from cython.parallel import prange -from .constants cimport floattype_t, complextype_t +from gprMax.constants cimport floattype_t, complextype_t ############################################# diff --git a/gprMax/pml_call_updates.py b/gprMax/pml_call_updates.py index 17205bed..0ccdedb8 100644 --- a/gprMax/pml_call_updates.py +++ b/gprMax/pml_call_updates.py @@ -16,8 +16,8 @@ # You should have received a copy of the GNU General Public License # along with gprMax. If not, see . -from .pml_1order_update import * -from .pml_2order_update import * +from gprMax.pml_1order_update import * +from gprMax.pml_2order_update import * def update_pml_electric(G): diff --git a/gprMax/snapshots.py b/gprMax/snapshots.py index 32acde19..f6ead258 100644 --- a/gprMax/snapshots.py +++ b/gprMax/snapshots.py @@ -20,8 +20,8 @@ import sys import numpy as np from struct import pack -from .constants import floattype -from .utilities import rvalue +from gprMax.constants import floattype +from gprMax.utilities import rvalue class Snapshot: diff --git a/gprMax/sources.py b/gprMax/sources.py index 6f631f4e..9b53671e 100644 --- a/gprMax/sources.py +++ b/gprMax/sources.py @@ -18,7 +18,7 @@ import numpy as np -from .utilities import rvalue +from gprMax.utilities import rvalue class VoltageSource: diff --git a/gprMax/waveforms.py b/gprMax/waveforms.py index e17613aa..bf2f6ced 100644 --- a/gprMax/waveforms.py +++ b/gprMax/waveforms.py @@ -18,7 +18,7 @@ import numpy as np -from .utilities import rvalue +from gprMax.utilities import rvalue class Waveform: diff --git a/gprMax/yee_cell_build.pyx b/gprMax/yee_cell_build.pyx index f71a1d6c..ed2f7969 100644 --- a/gprMax/yee_cell_build.pyx +++ b/gprMax/yee_cell_build.pyx @@ -18,8 +18,8 @@ import numpy as np cimport numpy as np -from .materials import Material -from .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 +from gprMax.yee_cell_setget_rigid cimport get_rigid_Ex, get_rigid_Ey, get_rigid_Ez, get_rigid_Hx, get_rigid_Hy, get_rigid_Hz cpdef build_ex_component(np.uint32_t[:, :, :] solid, np.int8_t[:, :, :, :] rigidE, np.uint32_t[:, :, :, :] ID, G):