Skip to content

Commit f2f5e55

Browse files
committed
Bug fix in grid computation.
1 parent 95e6037 commit f2f5e55

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

setup.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# -*- coding: utf-8 -*-
22
from setuptools import setup, find_packages, Extension
33
from Cython.Distutils import build_ext as cython_build_ext
4+
import numpy
45

56
setup(
67
name="pyeddytracker",
@@ -23,9 +24,10 @@
2324
'build_ext': cython_build_ext,
2425
},
2526
ext_modules=[Extension("py_eddy_tracker.tools",
26-
["src/py_eddy_tracker/tools.pyx"])],
27+
["src/py_eddy_tracker/tools.pyx"],
28+
include_dirs=[numpy.get_include()])],
2729
setup_requires=[
28-
'numpy>=1.9'],
30+
'numpy>=1.8'],
2931
install_requires=[
3032
'numpy>=1.9',
3133
'matplotlib>=1.2.1',

src/py_eddy_tracker/global_tracking.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,14 @@ def create_variable(self, handler_nc, kwargs_variable,
2626
var.setncattr(attr, attr_value)
2727

2828
var[:] = data
29+
# Variable names are "track_0000", "track_0001", etc.
2930

3031
var.setncattr('min', var[:].min())
3132
var.setncattr('max', var[:].max())
3233

3334
def write_netcdf(self):
3435
"""Write a netcdf with eddy
36+
Write eddy property data to tracks.
3537
"""
3638
eddy_size = None
3739
for key in VAR_DESCR:

src/py_eddy_tracker/py_eddy_tracker.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ def half_interp(self, h_one, h_two):
224224
"""
225225
Speed up frequent operations of type 0.5 * (arr[:-1] + arr[1:])
226226
"""
227+
h_one = np.copy(h_one)
227228
h_one += h_two
228229
h_one *= 0.5
229230
return h_one

src/scripts/make_eddy_track_CLS.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
2525
make_eddy_track_CLS.py
2626
27-
Version 1.4.2
27+
Version 2.0.3
2828
2929
3030
===============================================================================

0 commit comments

Comments
 (0)