Skip to content
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

Jump to bottom

Return numpy.datetime64 arrays for non-standard calendars #126

Merged
merged 8 commits into from
May 16, 2014
Merged

Return numpy.datetime64 arrays for non-standard calendars #126

merged 8 commits into from
May 16, 2014

Commits on May 12, 2014

  1. convert array of netCDF4.datetime objects to numpy.datetime64 array t… 

    …o support virtual_variable indexing, #121
    Joe Hamman committed May 12, 2014
    Configuration menu
    Copy the full SHA
    5515374 View commit details
    Browse the repository at this point in the history

  2. restrict the conversion of netCDF4.datetime objects to numpy.datetime… 

    …64 object to valid years (1677<time<2262)
    Joe Hamman committed May 12, 2014
    Configuration menu
    Copy the full SHA
    16879d2 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2014

  1. Handle arbitrary shape time arrays in nctime_to_nptime. Also added th… 

    …e ability to fallback to netCDF4.datetime objects since this solution does not fix the problem for all calendars in all situations.
    Joe Hamman committed May 13, 2014
    Configuration menu
    Copy the full SHA
    2fa8d3d View commit details
    Browse the repository at this point in the history

  2. cleanup fallback code a bit

    Joe Hamman committed May 13, 2014
    Configuration menu
    Copy the full SHA
    b4b2a3b View commit details
    Browse the repository at this point in the history

Commits on May 15, 2014

  1. Add further testing for single element time ordinals. 

    Expanded warnings for when non numpy.datetime64 arrays are returned.
Use context manager for warnings in test_conventions.py.
    Joe Hamman committed May 15, 2014
    Configuration menu
    Copy the full SHA
    6ed3209 View commit details
    Browse the repository at this point in the history

  2. filter warnings from earlier tests

    Joe Hamman committed May 15, 2014
    Configuration menu
    Copy the full SHA
    fa8bb09 View commit details
    Browse the repository at this point in the history

  3. correct filter message for warnings

    Joe Hamman committed May 15, 2014
    Configuration menu
    Copy the full SHA
    a1e38c7 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2014

  1. add test to catch fallback warnings, insure returning a numpy array d… 

    …uring fallback of single element
    Joe Hamman committed May 16, 2014
    Configuration menu
    Copy the full SHA
    e07bc93 View commit details
    Browse the repository at this point in the history