From 2eadd377f2caf4406b64370cad20d630899d1413 Mon Sep 17 00:00:00 2001 From: Stephan Rasp Date: Thu, 6 Feb 2025 00:00:04 -0800 Subject: [PATCH] No public description PiperOrigin-RevId: 723810417 --- weatherbench2/derived_variables.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/weatherbench2/derived_variables.py b/weatherbench2/derived_variables.py index e7d8199..8d942c2 100644 --- a/weatherbench2/derived_variables.py +++ b/weatherbench2/derived_variables.py @@ -686,16 +686,16 @@ def interp_at_one_lat(da: xr.DataArray) -> xr.DataArray: class AggregatePrecipitationAccumulation(DerivedVariable): """Compute longer aggregation periods from existing shorter accumulations. - Note: This assumes a 6h raw time step and prediction_timedelta starting at 6h. - Attributes: accumulation_hours: Hours to accumulate precipitaiton over - raw_accumulation_name: Name of the 6hr accumulation + raw_accumulation_name: Name of the accumulation + raw_accumulation_hours: Hours of the raw accumulation lead_time_name: Name of lead_time dimension """ accumulation_hours: int raw_accumulation_name: str = 'total_precipitation_6hr' + raw_accumulation_hours: int = 6 lead_time_name: str = 'prediction_timedelta' @property @@ -711,7 +711,8 @@ def compute(self, dataset: xr.Dataset): # Compute aggregation steps steps = float( - np.timedelta64(self.accumulation_hours, 'h') / np.timedelta64(6, 'h') + np.timedelta64(self.accumulation_hours, 'h') + / np.timedelta64(self.raw_accumulation_hours, 'h') ) assert steps.is_integer(), 'Accumulation time must be multiple of timestep.' # Compute accumulation @@ -763,4 +764,10 @@ def compute(self, dataset: xr.Dataset): accumulation_hours=24, lead_time_name='prediction_timedelta', ), + 'total_precipitation_24hr_from_12hr': AggregatePrecipitationAccumulation( + accumulation_hours=24, + lead_time_name='prediction_timedelta', + raw_accumulation_name='total_precipitation_12hr', + raw_accumulation_hours=12, + ), }