Skip to content

Validation particle #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 16, 2021
Merged

Validation particle #87

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
81eaf15
add coherence function, and minor corrections
ludwigVonKoopa May 12, 2021
13177b6
correction bug
ludwigVonKoopa May 12, 2021
b5c3101
corrections for merge request
ludwigVonKoopa May 14, 2021
006adc5
correction for documentation
ludwigVonKoopa May 14, 2021
b3f66bc
minor corrections
ludwigVonKoopa May 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/py_eddy_tracker/dataset/grid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2264,6 +2264,16 @@ def from_netcdf_list(cls, filenames, t, x_name, y_name, indexs=None, heigth=None
new.datasets.append((t, d))
return new

def shift_files(self, t, filename, x_name, y_name, indexs, heigth):
Copy link
Owner

@AntSimi AntSimi May 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add default value to index and height? And maybe kwargs directly to regular grid

Copy link
Collaborator Author

@ludwigVonKoopa ludwigVonKoopa May 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok for default values, but what do you mean by kwargs directly to regular grid ?

Copy link
Owner

@AntSimi AntSimi May 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lot of those arguments are not used by method just transfer to another one, so maybe we could **kwargs to be transparent

Copy link
Collaborator Author

@ludwigVonKoopa ludwigVonKoopa May 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, done

"""Add next file to the list and remove the oldest"""

self.datasets = self.datasets[1:]

d = RegularGridDataset(filename, x_name, y_name, indexs=indexs)
if heigth is not None:
d.add_uv(heigth)
self.datasets.append((t, d))

def interp(self, grid_name, t, lons, lats, method="bilinear"):
"""
Compute z over lons, lats
Expand Down Expand Up @@ -2541,6 +2551,11 @@ def get_uv_quad(i0, j0, u, v, m, nb_x=0):
i1, j1 = i0 + 1, j0 + 1
if nb_x != 0:
i1 %= nb_x
i_max, j_max = m.shape

# if i1 >= i_max or j1 >= j_max:
# return True, nan, nan, nan, nan, nan, nan, nan, nan

if m[i0, j0] or m[i0, j1] or m[i1, j0] or m[i1, j1]:
return True, nan, nan, nan, nan, nan, nan, nan, nan
# Extract value for u and v
Expand Down
Loading