diff --git a/ocf_datapipes/batch/batches.py b/ocf_datapipes/batch/batches.py index 4489fc58..167dfce8 100644 --- a/ocf_datapipes/batch/batches.py +++ b/ocf_datapipes/batch/batches.py @@ -118,15 +118,6 @@ class BatchKey(Enum): gsp_x_osgb_fourier = auto() gsp_time_utc_fourier = auto() # (batch_size, time, n_fourier_features) - # -------------- TIME ------------------------------------------- - # Sine and cosine of date of year and time of day at every timestep. - # shape = (batch_size, n_timesteps) - # This is calculated for wind only inside datapipes. - wind_date_sin = auto() - wind_date_cos = auto() - wind_time_sin = auto() - wind_time_cos = auto() - # -------------- SUN -------------------------------------------- # Solar position at every timestep. shape = (batch_size, n_timesteps) # The solar position data comes from two alternative sources: either the Sun pre-prepared @@ -208,6 +199,15 @@ class BatchKey(Enum): wind_solar_azimuth = auto() wind_solar_elevation = auto() + # -------------- TIME ------------------------------------------- + # Sine and cosine of date of year and time of day at every timestep. + # shape = (batch_size, n_timesteps) + # This is calculated for wind only inside datapipes. + wind_date_sin = auto() + wind_date_cos = auto() + wind_time_sin = auto() + wind_time_cos = auto() + class NWPBatchKey(Enum): """The names of the different elements of each NWP batch.