Merge pull request #2068 from OceanParcels/remove_time_origin

Removing grid.py and time_origin for v4

Author: erikvansebille

parcels/__init__.py

@@ -5,7 +5,6 @@
 from parcels.application_kernels import *
 from parcels.field import *
 from parcels.fieldset import *
-from parcels.grid import *
 from parcels.interaction import *
 from parcels.kernel import *
 from parcels.particle import *

parcels/_index_search.py

@@ -18,13 +18,12 @@
     _raise_time_extrapolation_error,
 )
 
-from .grid import GridType
+from .basegrid import GridType
 
 if TYPE_CHECKING:
     from parcels.xgrid import XGrid
 
     from .field import Field
-    # from .grid import Grid
 
 
 def _search_time_index(field: Field, time: datetime):

parcels/basegrid.py

@@ -1,12 +1,20 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
+from enum import IntEnum
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     import numpy as np
 
 
+class GridType(IntEnum):
+    RectilinearZGrid = 0
+    RectilinearSGrid = 1
+    CurvilinearZGrid = 2
+    CurvilinearSGrid = 3
+
+
 class BaseGrid(ABC):
     @abstractmethod
     def search(self, z: float, y: float, x: float, ei=None) -> dict[str, tuple[int, float | np.ndarray]]:

parcels/field.py

@@ -4,7 +4,6 @@
 import warnings
 from collections.abc import Callable
 from datetime import datetime
-from enum import IntEnum
 
 import numpy as np
 import uxarray as ux
@@ -34,14 +33,7 @@
 
 from ._index_search import _search_time_index
 
-__all__ = ["Field", "GridType", "VectorField"]
-
-
-class GridType(IntEnum):
-    RectilinearZGrid = 0
-    RectilinearSGrid = 1
-    CurvilinearZGrid = 2
-    CurvilinearSGrid = 3
+__all__ = ["Field", "VectorField"]
 
 
 def _isParticle(key):