Remove __contains__ and __getattr__ from Field

Overloaded behaviour that wasn't justified/used in the rest of the codebase.

Author: VeckoTheGecko

parcels/field.py

@@ -316,9 +316,6 @@ def eval(self, time: datetime, z, y, x, particle=None, applyConversion=True):
         else:
             return value
 
-    def __getattr__(self, key: str):
-        return getattr(self.data, key)
-
     def __getitem__(self, key):
         self._check_velocitysampling()
         try:
@@ -329,9 +326,6 @@ def __getitem__(self, key):
         except tuple(AllParcelsErrorCodes.keys()) as error:
             return _deal_with_errors(error, key, vector_type=None)
 
-    def __contains__(self, key: str):
-        return key in self.data
-
 
 class VectorField:
     """VectorField class that holds vector field data needed to execute particles."""

tests/v4/test_uxarray_fieldset.py

@@ -77,25 +77,25 @@ def uvw_fesom_channel(ds_fesom_channel) -> VectorField:
 def test_fesom_fieldset(ds_fesom_channel, uv_fesom_channel):
     fieldset = FieldSet([uv_fesom_channel, uv_fesom_channel.U, uv_fesom_channel.V])
     # Check that the fieldset has the expected properties
-    assert (fieldset.U == ds_fesom_channel.U).all()
-    assert (fieldset.V == ds_fesom_channel.V).all()
+    assert (fieldset.U.data == ds_fesom_channel.U).all()
+    assert (fieldset.V.data == ds_fesom_channel.V).all()
 
 
 def test_fesom_in_particleset(ds_fesom_channel, uv_fesom_channel):
     fieldset = FieldSet([uv_fesom_channel, uv_fesom_channel.U, uv_fesom_channel.V])
 
     # Check that the fieldset has the expected properties
-    assert (fieldset.U == ds_fesom_channel.U).all()
-    assert (fieldset.V == ds_fesom_channel.V).all()
+    assert (fieldset.U.data == ds_fesom_channel.U).all()
+    assert (fieldset.V.data == ds_fesom_channel.V).all()
     pset = ParticleSet(fieldset, pclass=Particle)
     assert pset.fieldset == fieldset
 
 
 def test_set_interp_methods(ds_fesom_channel, uv_fesom_channel):
     fieldset = FieldSet([uv_fesom_channel, uv_fesom_channel.U, uv_fesom_channel.V])
     # Check that the fieldset has the expected properties
-    assert (fieldset.U == ds_fesom_channel.U).all()
-    assert (fieldset.V == ds_fesom_channel.V).all()
+    assert (fieldset.U.data == ds_fesom_channel.U).all()
+    assert (fieldset.V.data == ds_fesom_channel.V).all()
 
     # Set the interpolation method for each field
     fieldset.U.interp_method = UXPiecewiseConstantFace