Skip to content

Fix #14. #16

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
pelson merged 1 commit into from
Mar 31, 2015
Merged

Fix #14. #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions cf_units/cf_units.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,8 @@ def date2num(date, unit, calendar):
unit_string = unit.rstrip(" UTC")
if unit_string.endswith(" since epoch"):
unit_string = unit_string.replace("epoch", EPOCH)
return netcdftime.date2num(date, unit_string, calendar)
cdftime = netcdftime.utime(unit_string, calendar=calendar)
return cdftime.date2num(date)


def num2date(time_value, unit, calendar):
Expand Down Expand Up @@ -700,7 +701,8 @@ def num2date(time_value, unit, calendar):
unit_string = unit.rstrip(" UTC")
if unit_string.endswith(" since epoch"):
unit_string = unit_string.replace("epoch", EPOCH)
return netcdftime.num2date(time_value, unit_string, calendar)
cdftime = netcdftime.utime(unit_string, calendar=calendar)
return cdftime.num2date(time_value)


def _handler(func):
Expand Down Expand Up @@ -1857,7 +1859,7 @@ def convert(self, value, other, ctype=FLOAT64):
result = ut2.date2num(ut1.num2date(value_copy))
# Preserve the datatype of the input array if it was float32.
if (isinstance(value, np.ndarray) and
value.dtype == np.float32):
value.dtype == np.float32):
result = result.astype(np.float32)
else:
ut_converter = _ut_get_converter(self.ut_unit, other.ut_unit)
Expand Down