diff --git a/src/mxalign/__init__.py b/src/mxalign/__init__.py index 1ce5e4f..d104858 100644 --- a/src/mxalign/__init__.py +++ b/src/mxalign/__init__.py @@ -1,13 +1,16 @@ from .transformations.transform import transform from .transformations.registry import available_transformations, register_transformation -from .interpolations.interpolate import interpolate -from .interpolations.registry import available_interpolations, register_interpolator -from .align.time import align_time -from .align.space import align_space +from .alignment.interpolations.interpolate import interpolate +from .alignment.interpolations.registry import ( + available_interpolations, + register_interpolator, +) +from .alignment.time import align_time +from .alignment.space import align_space -from . import accessors +from . import accessor +from . import alignment from . import transformations -from . import interpolations __all__ = [ "transform", @@ -18,7 +21,7 @@ "register_interpolator", "align_time", "align_space", - "accessors", + "accessor", + "alignment", "transformations", - "interpolations", ] diff --git a/src/mxalign/accessors/__init__.py b/src/mxalign/accessor/__init__.py similarity index 100% rename from src/mxalign/accessors/__init__.py rename to src/mxalign/accessor/__init__.py diff --git a/src/mxalign/accessors/mx.py b/src/mxalign/accessor/mx.py similarity index 99% rename from src/mxalign/accessors/mx.py rename to src/mxalign/accessor/mx.py index b6230ef..d6f39e4 100644 --- a/src/mxalign/accessors/mx.py +++ b/src/mxalign/accessor/mx.py @@ -7,8 +7,8 @@ from mlwp_data_specs.specs.traits.time_coordinate import Time from ..utils.projections import create_cartopy_crs, BUILTIN -from ..align import time as _time -from ..align import space as _space +from ..alignment import time as _time +from ..alignment import space as _space @xr.register_dataset_accessor("mx") diff --git a/src/mxalign/align/__init__.py b/src/mxalign/alignment/__init__.py similarity index 60% rename from src/mxalign/align/__init__.py rename to src/mxalign/alignment/__init__.py index ed4fec2..c341d2d 100644 --- a/src/mxalign/align/__init__.py +++ b/src/mxalign/alignment/__init__.py @@ -1,7 +1,9 @@ from . import time from . import space +from . import interpolations __all__ = [ "time", "space", + "interpolations", ] diff --git a/src/mxalign/interpolations/__init__.py b/src/mxalign/alignment/interpolations/__init__.py similarity index 100% rename from src/mxalign/interpolations/__init__.py rename to src/mxalign/alignment/interpolations/__init__.py diff --git a/src/mxalign/interpolations/base.py b/src/mxalign/alignment/interpolations/base.py similarity index 97% rename from src/mxalign/interpolations/base.py rename to src/mxalign/alignment/interpolations/base.py index c502569..402d9a1 100644 --- a/src/mxalign/interpolations/base.py +++ b/src/mxalign/alignment/interpolations/base.py @@ -1,6 +1,6 @@ import xarray as xr from mlwp_data_specs.specs.traits.spatial_coordinate import Space -from ..utils.traits import update_space_trait +from ...utils.traits import update_space_trait # Attributes set by ds.mx.add_crs / add_grid_mapping that describe a source grid GRID_ONLY_ATTRS = ("crs", "grid_mapping") diff --git a/src/mxalign/interpolations/delaunay.py b/src/mxalign/alignment/interpolations/delaunay.py similarity index 100% rename from src/mxalign/interpolations/delaunay.py rename to src/mxalign/alignment/interpolations/delaunay.py diff --git a/src/mxalign/interpolations/interpolate.py b/src/mxalign/alignment/interpolations/interpolate.py similarity index 100% rename from src/mxalign/interpolations/interpolate.py rename to src/mxalign/alignment/interpolations/interpolate.py diff --git a/src/mxalign/interpolations/registry.py b/src/mxalign/alignment/interpolations/registry.py similarity index 100% rename from src/mxalign/interpolations/registry.py rename to src/mxalign/alignment/interpolations/registry.py diff --git a/src/mxalign/interpolations/xarray.py b/src/mxalign/alignment/interpolations/xarray.py similarity index 100% rename from src/mxalign/interpolations/xarray.py rename to src/mxalign/alignment/interpolations/xarray.py diff --git a/src/mxalign/align/nans.py b/src/mxalign/alignment/nans.py similarity index 100% rename from src/mxalign/align/nans.py rename to src/mxalign/alignment/nans.py diff --git a/src/mxalign/align/space.py b/src/mxalign/alignment/space.py similarity index 97% rename from src/mxalign/align/space.py rename to src/mxalign/alignment/space.py index 8ef60bc..ed23ab5 100644 --- a/src/mxalign/align/space.py +++ b/src/mxalign/alignment/space.py @@ -72,7 +72,7 @@ def align_grid_point( ds1: xr.Dataset, ds2: xr.Dataset, method: str = "xarray", **kwargs ) -> xr.Dataset: """Interpolate grid ``ds1`` to the point locations of ``ds2`` using the named interpolator.""" - from ..interpolations.registry import get_interpolation + from .interpolations.registry import get_interpolation interp_cls = get_interpolation(method) return interp_cls(ds2, **kwargs).interpolate(ds1.copy()) diff --git a/src/mxalign/align/time.py b/src/mxalign/alignment/time.py similarity index 100% rename from src/mxalign/align/time.py rename to src/mxalign/alignment/time.py diff --git a/src/mxalign/runner.py b/src/mxalign/runner.py index 07ba516..3b21117 100644 --- a/src/mxalign/runner.py +++ b/src/mxalign/runner.py @@ -5,8 +5,8 @@ from .utils.config import Config from .transformations.transform import transform -from .align.time import align_time -from .align.nans import broadcast_nans +from .alignment.time import align_time +from .alignment.nans import broadcast_nans from .utils.save import save_dataset, save_metrics from .verification import Metric diff --git a/tests/test_align_time_global.py b/tests/test_align_time_global.py index c725649..9631aca 100644 --- a/tests/test_align_time_global.py +++ b/tests/test_align_time_global.py @@ -19,7 +19,7 @@ import pytest import xarray as xr -from mxalign.align.time import align_time +from mxalign.alignment.time import align_time T0 = np.datetime64("2020-01-01T00:00", "ns") H6 = np.timedelta64(6, "h") @@ -143,7 +143,7 @@ def test_prunes_ref_times_before_reference_window(self, caplog): f2 = fcst(["2020-01-01", "2020-01-02", "2020-01-03"], ["0h", "6h", "12h"]) ref = obs(pd.date_range("2020-01-03", "2020-01-05", freq="3h")) - with caplog.at_level(logging.WARNING, logger="mxalign.align.time"): + with caplog.at_level(logging.WARNING, logger="mxalign.alignment.time"): out = align_time({"f1": f1, "f2": f2, "ref": ref}, reference="ref") np.testing.assert_array_equal( diff --git a/tests/test_interpolations.py b/tests/test_interpolations.py index 0fd8650..12d3504 100644 --- a/tests/test_interpolations.py +++ b/tests/test_interpolations.py @@ -15,10 +15,10 @@ import pytest import xarray as xr -from mxalign.interpolations import delaunay -from mxalign.interpolations.delaunay import DelaunayInterpolator -from mxalign.interpolations.interpolate import interpolate -from mxalign.interpolations.xarray import XarrayInterpolator +from mxalign.alignment.interpolations import delaunay +from mxalign.alignment.interpolations.delaunay import DelaunayInterpolator +from mxalign.alignment.interpolations.interpolate import interpolate +from mxalign.alignment.interpolations.xarray import XarrayInterpolator # ---------------------------------------------------------------------------