Skip to content

Commit

Permalink
Remove legacy code
Browse files Browse the repository at this point in the history
  • Loading branch information
VeckoTheGecko committed Aug 30, 2024
1 parent f350528 commit 03dbae8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 19 deletions.
3 changes: 0 additions & 3 deletions parcels/field.py
Original file line number Diff line number Diff line change
Expand Up @@ -548,9 +548,6 @@ def from_netcdf(
if "time" in indices:
logger.warning_once("time dimension in indices is not necessary anymore. It is then ignored.")

if "full_load" in kwargs: # for backward compatibility with Parcels < v2.0.0
deferred_load = not kwargs["full_load"]

if grid.time.size <= 2:
deferred_load = False

Expand Down
6 changes: 1 addition & 5 deletions parcels/interaction/interactionkernel.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import inspect
import sys
from collections import defaultdict

import numpy as np
Expand Down Expand Up @@ -113,10 +112,7 @@ def check_kernel_signature_on_version(self):
numkernelargs = []
if self._pyfunc is not None and isinstance(self._pyfunc, list):
for func in self._pyfunc:
if sys.version_info[0] < 3:
numkernelargs.append(len(inspect.getargspec(func).args))
else:
numkernelargs.append(len(inspect.getfullargspec(func).args))
numkernelargs.append(len(inspect.getfullargspec(func).args))
return numkernelargs

def remove_lib(self):
Expand Down
20 changes: 9 additions & 11 deletions parcels/kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,10 @@ def __init__(

numkernelargs = self.check_kernel_signature_on_version()

assert (
numkernelargs == 3
), "Since Parcels v2.0, kernels do only take 3 arguments: particle, fieldset, time !! AND !! Argument order in field interpolation is time, depth, lat, lon."
if numkernelargs != 3:
raise ValueError(
"Since Parcels v2.0, kernels do only take 3 arguments: particle, fieldset, time !! AND !! Argument order in field interpolation is time, depth, lat, lon."

Check warning on line 238 in parcels/kernel.py

View check run for this annotation

Codecov / codecov/patch

parcels/kernel.py#L237-L238

Added lines #L237 - L238 were not covered by tests
)

self.name = f"{ptype.name}{self.funcname}"

Expand Down Expand Up @@ -324,7 +325,7 @@ def Updatecoords(particle, fieldset, time):
particle.depth_nextloop = particle.depth + particle_ddepth # noqa
particle.time_nextloop = particle.time + particle.dt

self._pyfunc = self.__radd__(Setcoords).__add__(Updatecoords)._pyfunc
self._pyfunc = (Setcoords + self + Updatecoords)._pyfunc

def check_fieldsets_in_kernels(self, pyfunc):
"""
Expand Down Expand Up @@ -382,13 +383,10 @@ def check_fieldsets_in_kernels(self, pyfunc):
self.fieldset.add_constant("RK45_max_dt", 60 * 60 * 24)

def check_kernel_signature_on_version(self):
numkernelargs = 0
if self._pyfunc is not None:
if sys.version_info[0] < 3:
numkernelargs = len(inspect.getargspec(self._pyfunc).args)
else:
numkernelargs = len(inspect.getfullargspec(self._pyfunc).args)
return numkernelargs
"""Returns number of arguments in a Python function."""
if self._pyfunc is None:
return 0

Check warning on line 388 in parcels/kernel.py

View check run for this annotation

Codecov / codecov/patch

parcels/kernel.py#L388

Added line #L388 was not covered by tests
return len(inspect.getfullargspec(self._pyfunc).args)

def remove_lib(self):
if self._lib is not None:
Expand Down

0 comments on commit 03dbae8

Please sign in to comment.