Merge pull request #1833 from knutfrode/dev

Readers are now subclasses of a single class, either StructuredReader…

Author: knutfrode

opendrift/readers/basereader/__init__.py

@@ -28,9 +28,6 @@
 import cartopy.crs as ccrs
 import cartopy.feature as cfeature
 
-from .structured import StructuredReader
-from .unstructured import UnstructuredReader
-from .continuous import ContinuousReader
 from .variables import Variables
 from .consts import *
 from ..operators.ops import Combine, Filter

opendrift/readers/basereader/continuous.py

@@ -1,11 +1,11 @@
 from abc import abstractmethod
 import numpy as np
-from .variables import Variables
+from . import BaseReader
 from .consts import vector_pairs_xy
 import logging
 logger = logging.getLogger(__name__)
 
-class ContinuousReader(Variables):
+class ContinuousReader(BaseReader):
     """
     A continuous (in space and time) reader, able to provide
     exact values at any desired point (within bounds). This reader type is

opendrift/readers/basereader/structured.py

@@ -6,13 +6,13 @@
 from pathlib import Path
 
 from opendrift.readers.interpolation.structured import ReaderBlock
-from .variables import Variables
+from . import BaseReader
 
 import logging
 logger = logging.getLogger(__name__)
 
 
-class StructuredReader(Variables):
+class StructuredReader(BaseReader):
     """
     A structured reader. Data is gridded on a regular grid. Used by e.g.:
     :class:`opendrift.readers.reader_netCDF_CF_generic.Reader`.

opendrift/readers/basereader/unstructured.py

@@ -4,10 +4,10 @@
 import logging
 logger = logging.getLogger(__name__)
 
-from .variables import Variables
+from . import BaseReader
 
 
-class UnstructuredReader(Variables):
+class UnstructuredReader(BaseReader):
     """
     An unstructured reader. Data is gridded irregularily.
 

opendrift/readers/reader_ArtificialOceanEddy.py

@@ -17,10 +17,10 @@
 import numpy as np
 import pyproj
 
-from opendrift.readers.basereader import BaseReader, ContinuousReader
+from opendrift.readers.basereader.continuous import ContinuousReader
 
 
-class Reader(BaseReader, ContinuousReader):
+class Reader(ContinuousReader):
     """Artificial reader, with cyclonic surface current around selected centre.
 
     Purpose is demonstration and testing (unittest).

opendrift/readers/reader_FVCOM_xarray.py

@@ -20,12 +20,12 @@
 import scipy, scipy.spatial
 import pyproj
 import logging
-from opendrift.readers.basereader import BaseReader, UnstructuredReader
+from opendrift.readers.basereader.unstructured import UnstructuredReader
 
 logger = logging.getLogger(__name__)
 
 
-class Reader(BaseReader, UnstructuredReader):
+class Reader(UnstructuredReader):
     """
     A reader for unstructured (irregularily gridded) `CF compliant
     <https://cfconventions.org/>`_ netCDF files.

opendrift/readers/reader_ROMS_native.py

@@ -25,11 +25,12 @@
 import xarray as xr
 
 from opendrift.readers import open_dataset_opendrift
-from opendrift.readers.basereader import BaseReader, vector_pairs_xy, StructuredReader
+from opendrift.readers.basereader import vector_pairs_xy
+from opendrift.readers.basereader.structured import StructuredReader
 from opendrift.readers.roppy import depth
 
 
-class Reader(BaseReader, StructuredReader):
+class Reader(StructuredReader):
     """
     A reader for ROMS Output files. It can take a single file, a file pattern, a URL or an xarray Dataset.
 

opendrift/readers/reader_constant.py

@@ -14,10 +14,10 @@
 #
 # Copyright 2015, Knut-Frode Dagestad, MET Norway
 
-from opendrift.readers.basereader import BaseReader, ContinuousReader
+from opendrift.readers.basereader.continuous import ContinuousReader
 import numpy as np
 
-class Reader(BaseReader, ContinuousReader):
+class Reader(ContinuousReader):
     '''A very simple reader that always give the same value for its variables'''
 
     def __init__(self, *args, **kwargs):

opendrift/readers/reader_constant_2d.py

@@ -14,10 +14,10 @@
 #
 # Copyright 2015,2020 Knut-Frode Dagestad, MET Norway
 
-from opendrift.readers.basereader import BaseReader, StructuredReader
+from opendrift.readers.basereader.structured import StructuredReader
 
 
-class Reader(BaseReader, StructuredReader):
+class Reader(StructuredReader):
     '''Reader based on static 2D arrays of variables'''
 
     def __init__(self, x, y, array_dict, proj4='+proj=latlong'):

opendrift/readers/reader_current_from_drifter.py

@@ -19,10 +19,10 @@
 import numpy as np
 import pyproj
 
-from opendrift.readers.basereader import BaseReader, ContinuousReader
+from opendrift.readers.basereader.continuous import ContinuousReader
 
 
-class Reader(BaseReader, ContinuousReader):
+class Reader(ContinuousReader):
     variables = ['x_sea_water_velocity', 'y_sea_water_velocity']
 
     def __init__(self, lons, lats, times, waves=None, z=0,