Remove rudundant dunder adds and simplify

OceanParcels · Jul 31, 2024 · 3221bf8 · 3221bf8
1 parent 3dc6965
commit 3221bf8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/parcels/interaction/interactionkernel.py b/parcels/interaction/interactionkernel.py
@@ -125,16 +125,6 @@ def merge(self, kernel, kclass):
         return kclass(self._fieldset, self._ptype, pyfunc=pyfunc,
                       funcname=funcname)
 
-    def __add__(self, kernel):
-        if not isinstance(kernel, InteractionKernel):
-            kernel = InteractionKernel(self.fieldset, self.ptype, pyfunc=kernel)
-        return self.merge(kernel, InteractionKernel)
-
-    def __radd__(self, kernel):
-        if not isinstance(kernel, InteractionKernel):
-            kernel = InteractionKernel(self.fieldset, self.ptype, pyfunc=kernel)
-        return kernel.merge(self, InteractionKernel)
-
     def __del__(self):
         # Clean-up the in-memory dynamic linked libraries.
         # This is not really necessary, as these programs are not that large, but with the new random

diff --git a/parcels/kernel.py b/parcels/kernel.py
@@ -445,9 +445,7 @@ def __add__(self, kernel):
         return self.merge(kernel, type(self))
 
     def __radd__(self, kernel):
-        if not isinstance(kernel, type(self)):
-            kernel = type(self)(self.fieldset, self.ptype, pyfunc=kernel)
-        return kernel.merge(self, type(self))
+        return self + kernel
 
     @classmethod
     def from_list(cls, fieldset, ptype, pyfunc_list, *args, **kwargs):