Skip to content

fixes for 'lat=0' and 0 time series issues #62

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

Open
apatlpo wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fixes for 'lat=0' and 0 time series issues #62

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5548e4
fix issue with lat=0
Jun 21, 2018
f00d018
catches error in the computation of confidence intervals for null tim…
Jun 21, 2018
fcabbff
minor updates to proposed fixes
Jun 21, 2018
530edcf
more compact division
Jun 21, 2018
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
4 changes: 3 additions & 1 deletion utide/confidence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,9 @@ def _confidence(coef, cnstit, opt, t, e, tin, elor, xraw, xmod, W, m, B,
varcov_mCw[c, :2, :2] = Duu

if not opt.white:
Duu = Puu[c] * Duu / np.trace(Duu)
Duu = Puu[c] * Duu

@ocefpaf ocefpaf Jun 21, 2018

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

There is a trailing space after Duu.

if np.trace(Duu) != 0. :

@ocefpaf ocefpaf Jun 21, 2018

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

There is a whitespace before :.

Duu = Duu / np.trace(Duu)

@ocefpaf ocefpaf Jun 21, 2018

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Don't compute np.trace twice and we can do the Duu division in place:

trace = np.trace(Duu)
if trace != 0. :
    Duu /= trace

varcov_mCc[c, :2, :2] = Duu

if not opt.twodim:
Expand Down
4 changes: 3 additions & 1 deletion utide/harmonics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@ def FUV(t, tref, lind, lat, ngflgs):

astro, ader = ut_astron(tt)

if abs(lat) < 5:
if lat == 0:
lat = 5
elif abs(lat) < 5:

@ocefpaf ocefpaf Jun 21, 2018

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM

lat = np.sign(lat) * 5

slat = np.sin(np.deg2rad(lat))
Expand Down