dev

Author: davidhassell

cf/data/data.py

@@ -267,10 +267,6 @@ def __contains__(self, value):
 
         return bool(dx.any())
 
-    def __data__(self):
-        """Returns a new reference to self."""
-        return self
-
     def __getitem__(self, indices):
         """Return a subspace of the data defined by indices.
 
@@ -4784,73 +4780,6 @@ def clip(self, a_min, a_max, units=None, inplace=False, i=False):
         d._set_dask(dx)
         return d
 
-    @classmethod
-    def asdata(cls, d, dtype=None, copy=False):
-        """Convert the input to a `Data` object.
-
-        If the input *d* has the Data interface (i.e. it has a
-        `__data__` method), then the output of this method is used as
-        the returned `Data` object. Otherwise, `Data(d)` is returned.
-
-        :Parameters:
-
-            d: data-like
-                Input data in any form that can be converted to a
-                `Data` object. This includes `Data` and `Field`
-                objects, and objects with the Data interface, numpy
-                arrays and any object which may be converted to a
-                numpy array.
-
-           dtype: data-type, optional
-                By default, the data-type is inferred from the input data.
-
-           copy: `bool`, optional
-                If True and *d* has the Data interface, then a copy of
-                `d.__data__()` is returned.
-
-        :Returns:
-
-            `Data`
-                `Data` interpretation of *d*. No copy is performed on the
-                input if it is already a `Data` object with matching dtype
-                and *copy* is False.
-
-        **Examples**
-
-        >>> d = cf.Data([1, 2])
-        >>> cf.Data.asdata(d) is d
-        True
-        >>> d.asdata(d) is d
-        True
-
-        >>> cf.Data.asdata([1, 2])
-        <CF Data: [1, 2]>
-
-        >>> cf.Data.asdata(numpy.array([1, 2]))
-        <CF Data: [1, 2]>
-
-        """
-        data = getattr(d, "__data__", None)
-        if data is None:
-            # d does not have a Data interface
-            data = cls(d)
-            if dtype is not None:
-                data.dtype = dtype
-
-            return data
-
-        # d does have a Data interface
-        data = data()
-        if copy:
-            data = data.copy()
-            if dtype is not None and np.dtype(dtype) != data.dtype:
-                data.dtype = dtype
-        elif dtype is not None and np.dtype(dtype) != data.dtype:
-            data = data.copy()
-            data.dtype = dtype
-
-        return data
-
     @classmethod
     def arctan2(cls, x1, x2):
         """Element-wise arc tangent of ``x1/x2`` with correct quadrant.
@@ -7978,167 +7907,6 @@ def trunc(self, inplace=False, i=False):
         d._set_dask(dx)
         return d
 
-    @classmethod
-    def full(
-        cls,
-        shape,
-        fill_value,
-        dtype=None,
-        units=None,
-        calendar=None,
-        chunks="auto",
-    ):
-        """Return a new array of given shape and type, filled with a
-        fill value.
-
-        .. seealso:: `empty`, `ones`, `zeros`
-
-        :Parameters:
-
-            shape: `int` or `tuple` of `int`
-                The shape of the new array. e.g. ``(2, 3)`` or ``2``.
-
-            fill_value: scalar
-                The fill value.
-
-            dtype: data-type
-                The desired data-type for the array. The default, `None`,
-                means ``np.array(fill_value).dtype``.
-
-            units: `str` or `Units`
-                The units for the new data array.
-
-            calendar: `str`, optional
-                The calendar for reference time units.
-
-            {{chunks: `int`, `tuple`, `dict` or `str`, optional}}
-
-                .. versionadded:: 3.14.0
-
-        :Returns:
-
-            `Data`
-                Array of *fill_value* with the given shape and data
-                type.
-
-        **Examples**
-
-        >>> d = cf.Data.full((2, 3), -99)
-        >>> print(d.array)
-        [[-99 -99 -99]
-         [-99 -99 -99]]
-
-        >>> d = cf.Data.full(2, 0.0)
-        >>> print(d.array)
-        [0. 0.]
-
-        >>> d = cf.Data.full((2,), 0, dtype=bool)
-        >>> print(d.array)
-        [False False]
-
-        """
-        if dtype is None:
-            # Need to explicitly set the default because dtype is not
-            # a named keyword of da.full
-            dtype = getattr(fill_value, "dtype", None)
-            if dtype is None:
-                dtype = np.array(fill_value).dtype
-
-        dx = da.full(shape, fill_value, dtype=dtype, chunks=chunks)
-        return cls(dx, units=units, calendar=calendar)
-
-    @classmethod
-    def ones(cls, shape, dtype=None, units=None, calendar=None, chunks="auto"):
-        """Returns a new array filled with ones of set shape and type.
-
-        .. seealso:: `empty`, `full`, `zeros`
-
-        :Parameters:
-
-            shape: `int` or `tuple` of `int`
-                The shape of the new array. e.g. ``(2, 3)`` or ``2``.
-
-            dtype: data-type
-                The desired data-type for the array, e.g.
-                `numpy.int8`. The default is `numpy.float64`.
-
-            units: `str` or `Units`
-                The units for the new data array.
-
-            calendar: `str`, optional
-                The calendar for reference time units.
-
-            {{chunks: `int`, `tuple`, `dict` or `str`, optional}}
-
-                .. versionadded:: 3.14.0
-
-        :Returns:
-
-            `Data`
-                Array of ones with the given shape and data type.
-
-        **Examples**
-
-        >>> d = cf.Data.ones((2, 3))
-        >>> print(d.array)
-        [[1. 1. 1.]
-         [1. 1. 1.]]
-
-        >>> d = cf.Data.ones((2,), dtype=bool)
-        >>> print(d.array)
-        [ True  True]
-
-        """
-        dx = da.ones(shape, dtype=dtype, chunks=chunks)
-        return cls(dx, units=units, calendar=calendar)
-
-    @classmethod
-    def zeros(
-        cls, shape, dtype=None, units=None, calendar=None, chunks="auto"
-    ):
-        """Returns a new array filled with zeros of set shape and type.
-
-        .. seealso:: `empty`, `full`, `ones`
-
-        :Parameters:
-
-            shape: `int` or `tuple` of `int`
-                The shape of the new array.
-
-            dtype: data-type
-                The data-type of the new array. By default the
-                data-type is ``float``.
-
-            units: `str` or `Units`
-                The units for the new data array.
-
-            calendar: `str`, optional
-                The calendar for reference time units.
-
-            {{chunks: `int`, `tuple`, `dict` or `str`, optional}}
-
-                .. versionadded:: 3.14.0
-
-        :Returns:
-
-            `Data`
-                Array of zeros with the given shape and data type.
-
-        **Examples**
-
-        >>> d = cf.Data.zeros((2, 3))
-        >>> print(d.array)
-        [[0. 0. 0.]
-         [0. 0. 0.]]
-
-        >>> d = cf.Data.zeros((2,), dtype=bool)
-        >>> print(d.array)
-        [False False]
-
-        """
-        dx = da.zeros(shape, dtype=dtype, chunks=chunks)
-        return cls(dx, units=units, calendar=calendar)
-
     @_deprecated_kwarg_check("out", version="3.14.0", removed_at="5.0.0")
     @_deprecated_kwarg_check("i", version="3.0.0", removed_at="4.0.0")
     @_inplace_enabled(default=False)