diff --git a/test/test_exodus.py b/test/test_exodus.py index dda8c6603..a07bbb65d 100644 --- a/test/test_exodus.py +++ b/test/test_exodus.py @@ -5,7 +5,7 @@ from pathlib import Path import uxarray as ux -from uxarray.utils.constants import INT_DTYPE, INT_FILL_VALUE +from uxarray.constants import INT_DTYPE, INT_FILL_VALUE current_path = Path(os.path.dirname(os.path.realpath(__file__))) diff --git a/test/test_helpers.py b/test/test_helpers.py index 88266d9e4..5d260bf95 100644 --- a/test/test_helpers.py +++ b/test/test_helpers.py @@ -10,7 +10,7 @@ import uxarray as ux from uxarray.grid.utils import _replace_fill_values -from uxarray.utils.constants import INT_DTYPE, INT_FILL_VALUE +from uxarray.constants import INT_DTYPE, INT_FILL_VALUE try: import constants diff --git a/test/test_mpas.py b/test/test_mpas.py index d95dd3632..2c401d6bd 100644 --- a/test/test_mpas.py +++ b/test/test_mpas.py @@ -7,7 +7,7 @@ import os from pathlib import Path -from uxarray.utils.constants import INT_DTYPE, INT_FILL_VALUE +from uxarray.constants import INT_DTYPE, INT_FILL_VALUE current_path = Path(os.path.dirname(os.path.realpath(__file__))) diff --git a/test/test_scrip.py b/test/test_scrip.py index c1c9b660c..ab48296f0 100644 --- a/test/test_scrip.py +++ b/test/test_scrip.py @@ -7,7 +7,7 @@ import numpy.testing as nt import uxarray as ux -from uxarray.utils.constants import INT_DTYPE, INT_FILL_VALUE +from uxarray.constants import INT_DTYPE, INT_FILL_VALUE try: import constants diff --git a/test/test_ugrid.py b/test/test_ugrid.py index c1c9b660c..ab48296f0 100644 --- a/test/test_ugrid.py +++ b/test/test_ugrid.py @@ -7,7 +7,7 @@ import numpy.testing as nt import uxarray as ux -from uxarray.utils.constants import INT_DTYPE, INT_FILL_VALUE +from uxarray.constants import INT_DTYPE, INT_FILL_VALUE try: import constants diff --git a/uxarray/__init__.py b/uxarray/__init__.py index 0f8020a2f..469693f25 100644 --- a/uxarray/__init__.py +++ b/uxarray/__init__.py @@ -1,5 +1,5 @@ # from uxarray.utils.helpers import * -from uxarray.utils.constants import (INT_DTYPE, INT_FILL_VALUE) +from uxarray.constants import (INT_DTYPE, INT_FILL_VALUE) from uxarray.grid.grid import Grid from uxarray.core.api import (open_grid, open_dataset, open_mfdataset) from uxarray.core.dataarray import UxDataArray diff --git a/uxarray/core/api.py b/uxarray/core/api.py index a039b54ae..50f8d353f 100644 --- a/uxarray/core/api.py +++ b/uxarray/core/api.py @@ -1,15 +1,13 @@ """UXarray dataset module.""" import os +import numpy as np +import xarray as xr from pathlib import Path from typing import Any, Dict, Optional, Union -import numpy as np -import xarray as xr - from uxarray.grid.grid import Grid - from uxarray.core.dataset import UxDataset diff --git a/uxarray/grid/connectivity.py b/uxarray/grid/connectivity.py index 80d4e640d..5b567bc60 100644 --- a/uxarray/grid/connectivity.py +++ b/uxarray/grid/connectivity.py @@ -1,7 +1,7 @@ import numpy as np import xarray as xr -from uxarray.utils.constants import INT_DTYPE, INT_FILL_VALUE +from uxarray.constants import INT_DTYPE, INT_FILL_VALUE def close_face_nodes(Mesh2_face_nodes, nMesh2_face, nMaxMesh2_face_nodes): diff --git a/uxarray/grid/coordinates.py b/uxarray/grid/coordinates.py index 2aa2a7e6e..a14cc7728 100644 --- a/uxarray/grid/coordinates.py +++ b/uxarray/grid/coordinates.py @@ -1,8 +1,9 @@ import xarray as xr import numpy as np -from numba import njit, config import math +from numba import njit, config + config.DISABLE_JIT = False diff --git a/uxarray/grid/grid.py b/uxarray/grid/grid.py index d81de1645..758b42d32 100644 --- a/uxarray/grid/grid.py +++ b/uxarray/grid/grid.py @@ -8,12 +8,13 @@ from uxarray.io._ugrid import _read_ugrid, _encode_ugrid from uxarray.io._shapefile import _read_shpfile from uxarray.io._scrip import _read_scrip, _encode_scrip - from uxarray.io.utils import parse_grid_type -from uxarray.grid.area import get_all_face_area_from_coords -from uxarray.grid.connectivity import _build_edge_node_connectivity, _build_face_edges_connectivity, _build_nNodes_per_face -from uxarray.utils.constants import INT_DTYPE, INT_FILL_VALUE +from uxarray.grid.area import get_all_face_area_from_coords +from uxarray.grid.connectivity import (_build_edge_node_connectivity, + _build_face_edges_connectivity, + _build_nNodes_per_face) +from uxarray.constants import INT_DTYPE, INT_FILL_VALUE class Grid: diff --git a/uxarray/io/_exodus.py b/uxarray/io/_exodus.py index 112e627cd..45c9187db 100644 --- a/uxarray/io/_exodus.py +++ b/uxarray/io/_exodus.py @@ -4,7 +4,7 @@ from datetime import datetime from uxarray.grid.utils import _replace_fill_values -from uxarray.utils.constants import INT_DTYPE, INT_FILL_VALUE +from uxarray.constants import INT_DTYPE, INT_FILL_VALUE # Exodus Number is one-based. diff --git a/uxarray/io/_mpas.py b/uxarray/io/_mpas.py index a42f3b9cb..fb0cb9cdf 100644 --- a/uxarray/io/_mpas.py +++ b/uxarray/io/_mpas.py @@ -2,7 +2,7 @@ import numpy as np import warnings -from uxarray.utils.constants import INT_DTYPE, INT_FILL_VALUE +from uxarray.constants import INT_DTYPE, INT_FILL_VALUE def _primal_to_ugrid(in_ds, out_ds): diff --git a/uxarray/io/_scrip.py b/uxarray/io/_scrip.py index 89be6966e..bf58d0a54 100644 --- a/uxarray/io/_scrip.py +++ b/uxarray/io/_scrip.py @@ -3,7 +3,7 @@ from uxarray.grid.utils import _replace_fill_values from uxarray.grid.coordinates import grid_center_lat_lon -from uxarray.utils.constants import INT_DTYPE, INT_FILL_VALUE +from uxarray.constants import INT_DTYPE, INT_FILL_VALUE def _to_ugrid(in_ds, out_ds): diff --git a/uxarray/io/_ugrid.py b/uxarray/io/_ugrid.py index 50a771c5a..2a9e79c4e 100644 --- a/uxarray/io/_ugrid.py +++ b/uxarray/io/_ugrid.py @@ -1,7 +1,6 @@ -import xarray as xr import numpy as np from uxarray.grid.utils import _replace_fill_values -from uxarray.utils.constants import INT_DTYPE, INT_FILL_VALUE +from uxarray.constants import INT_DTYPE, INT_FILL_VALUE def _read_ugrid(xr_ds, var_names_dict): diff --git a/uxarray/utils/__init__.py b/uxarray/utils/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/uxarray/utils/constants.py b/uxarray/utils/constants.py deleted file mode 100644 index 7a8f322f8..000000000 --- a/uxarray/utils/constants.py +++ /dev/null @@ -1,5 +0,0 @@ -import numpy as np - -# numpy indexing code is written for np.intp -INT_DTYPE = np.intp -INT_FILL_VALUE = np.iinfo(INT_DTYPE).min