Skip to content
Snippets Groups Projects
Commit 0a69b1d0 authored by lukas leufen's avatar lukas leufen
Browse files

Merge branch 'vincent_324-fix-problem-in-multiply-extremes' into 'develop'

Resolve "Fix problem in multiply extremes"

See merge request !328
parents 8bf828f0 e27deddc
Branches
No related tags found
6 merge requests!353add developments to release v1.5.0,!352Resolve "release v1.5.0",!343Update wrf with develop,!342Include sample-uncertainty to wrf workflow,!328Resolve "Fix problem in multiply extremes",!259Draft: Resolve "WRF-Datahandler should inherit from SingleStationDatahandler"
Pipeline #76863 passed
...@@ -230,14 +230,16 @@ class DefaultDataHandler(AbstractDataHandler): ...@@ -230,14 +230,16 @@ class DefaultDataHandler(AbstractDataHandler):
else: else:
extreme_idx = xr.concat([(Y < -extr_val).any(dim=other_dims[0]), extreme_idx = xr.concat([(Y < -extr_val).any(dim=other_dims[0]),
(Y > extr_val).any(dim=other_dims[0])], (Y > extr_val).any(dim=other_dims[0])],
dim=other_dims[1]).any(dim=other_dims[1]) dim=other_dims[0]).any(dim=other_dims[0])
extremes_X = list(map(lambda x: x.sel(**{dim: extreme_idx}), X)) sel = extreme_idx[extreme_idx].coords[dim].values
extremes_X = list(map(lambda x: x.sel(**{dim: sel}), X))
self._add_timedelta(extremes_X, dim, timedelta) self._add_timedelta(extremes_X, dim, timedelta)
# extremes_X = list(map(lambda x: x.coords[dim].values + np.timedelta64(*timedelta), extremes_X)) # extremes_X = list(map(lambda x: x.coords[dim].values + np.timedelta64(*timedelta), extremes_X))
extremes_Y = Y.sel(**{dim: extreme_idx}) extremes_Y = Y.sel(**{dim: extreme_idx})
extremes_Y.coords[dim].values += np.timedelta64(*timedelta) #extremes_Y.coords[dim].values += np.timedelta64(*timedelta)
self._add_timedelta(extremes_Y, dim, timedelta)
self._Y_extreme = xr.concat([Y, extremes_Y], dim=dim) self._Y_extreme = xr.concat([Y, extremes_Y], dim=dim)
self._X_extreme = list(map(lambda x1, x2: xr.concat([x1, x2], dim=dim), X, extremes_X)) self._X_extreme = list(map(lambda x1, x2: xr.concat([x1, x2], dim=dim), X, extremes_X))
...@@ -245,7 +247,7 @@ class DefaultDataHandler(AbstractDataHandler): ...@@ -245,7 +247,7 @@ class DefaultDataHandler(AbstractDataHandler):
@staticmethod @staticmethod
def _add_timedelta(data, dim, timedelta): def _add_timedelta(data, dim, timedelta):
for d in data: for d in data:
d.coords[dim].values += np.timedelta64(*timedelta) d.coords[dim] = d.coords[dim].values + np.timedelta64(*timedelta)
@classmethod @classmethod
def transformation(cls, set_stations, **kwargs): def transformation(cls, set_stations, **kwargs):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment