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.

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

fixing timezone to UTC #13

Merged
merged 1 commit into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions datasets/era5/test_time.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@
# limitations under the License.

import datetime
import pytz
from datasets.era5 import time


def test_datetime_range():
times = time.datetime_range(2018, datetime.timedelta(hours=6), 2)
assert times == [datetime.datetime(2018, 1, 1, 0), datetime.datetime(2018, 1, 1, 6)]
times = time.datetime_range(2018, datetime.timedelta(hours=6), 2, tzinfo=pytz.utc)
assert times == [datetime.datetime(2018, 1, 1, 0, tzinfo=pytz.utc), datetime.datetime(2018, 1, 1, 6, tzinfo=pytz.utc)]


def test_filename_to_year():
Expand Down
4 changes: 2 additions & 2 deletions datasets/era5/time.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from typing import List
import os
import datetime

import pytz

def filename_to_year(path: str) -> int:
filename = os.path.basename(path)
Expand All @@ -26,5 +26,5 @@ def filename_to_year(path: str) -> int:
def datetime_range(
year: int, time_step: datetime.timedelta, n: int
) -> List[datetime.datetime]:
initial_time = datetime.datetime(year=year, month=1, day=1)
initial_time = datetime.datetime(year=year, month=1, day=1, tzinfo=pytz.utc)
return [initial_time + time_step * i for i in range(n)]
7 changes: 5 additions & 2 deletions makani/third_party/climt/zenith_angle.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
# modified 2024: vectorization over coordinates and JIT compilation added

import datetime
import pytz
import numpy as np
from typing import Union, Tuple, TypeVar

Expand All @@ -45,7 +46,7 @@
def _days_from_2000(model_time: np.ndarray) -> np.ndarray:
"""Get the days since year 2000."""
# compute total days
time_diff = model_time - datetime.datetime(2000, 1, 1, 12, 0)
time_diff = model_time - datetime.datetime(2000, 1, 1, 12, 0, tzinfo=pytz.utc)
result = np.asarray(time_diff).astype("timedelta64[us]") / np.timedelta64(1, "D")
result = result.astype(dtype)

Expand Down Expand Up @@ -233,7 +234,9 @@ def cos_zenith_angle(
lon_grid, lat_grid = np.meshgrid(lon, lat)

# model time
model_time = np.asarray([datetime.datetime(2002, 1, 1, 12, 0, 0), datetime.datetime(2002, 6, 1, 12, 0, 0), datetime.datetime(2003, 1, 1, 12, 0, 0)])
model_time = np.asarray([datetime.datetime(2002, 1, 1, 12, 0, 0, tzinfo=pytz.utc),
datetime.datetime(2002, 6, 1, 12, 0, 0, tzinfo=pytz.utc),
datetime.datetime(2003, 1, 1, 12, 0, 0, tzinfo=pytz.utc)])

# test _days_from_2000
days = _days_from_2000(model_time)
Expand Down
3 changes: 2 additions & 1 deletion makani/utils/dataloaders/dali_es_helper_2d.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

# we need this for the zenith angle feature
import datetime
import pytz

# import splitting logic
from modulus.distributed.utils import compute_split_shapes
Expand Down Expand Up @@ -359,7 +360,7 @@ def _compute_zenith_angle(self, zen_inp, zen_tar, local_idx, year_idx):

# compute hours into the year
year = self.years[year_idx]
jan_01_epoch = datetime.datetime(year, 1, 1, 0, 0, 0)
jan_01_epoch = datetime.datetime(year, 1, 1, 0, 0, 0, tzinfo=pytz.utc)

# zenith angle for input
inp_times = np.asarray([jan_01_epoch + datetime.timedelta(hours=idx * self.dhours) for idx in range(local_idx - self.dt * self.n_history, local_idx + 1, self.dt)])
Expand Down
3 changes: 2 additions & 1 deletion makani/utils/dataloaders/data_loader_multifiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

# for the zenith angle
import datetime
import pytz

# for grid conversion
from makani.utils.grids import GridConverter
Expand Down Expand Up @@ -204,7 +205,7 @@ def _compute_zenith_angle(self, local_idx, year_idx):

# compute hours into the year
year = self.years[year_idx]
jan_01_epoch = datetime.datetime(year, 1, 1, 0, 0, 0)
jan_01_epoch = datetime.datetime(year, 1, 1, 0, 0, 0, tzinfo=pytz.utc)

# zenith angle for input
inp_times = np.asarray([jan_01_epoch + datetime.timedelta(hours=idx * self.dhours) for idx in range(local_idx - self.dt * self.n_history, local_idx + 1, self.dt)])
Expand Down