@@ -216,16 +216,14 @@ def _update_dataset_attrs_dims(dataset: xr.Dataset, forcing_dict: Dict) -> xr.Da
216216 dataset_expanded = dataset .expand_dims (["x" , "y" ])
217217
218218 # change the order of dims
219+ req_dims = ['time' , 'x' , 'y' ]
220+ if any (dim not in dataset_expanded .dims for dim in req_dims ):
221+ raise ValueError ("Data should have dimensions time, y, x." )
222+
219223 if "z" in dataset_expanded .dims :
220- try :
221- dataset_reordered = dataset_expanded .transpose ("time" , "z" , "y" , "x" )
222- except ValueError as err :
223- raise ValueError ("Data should have dimensions time, y, x, z." ) from err
224+ dataset_reordered = dataset_expanded .transpose ("time" , "z" , "y" , "x" )
224225 else :
225- try :
226- dataset_reordered = dataset_expanded .transpose ("time" , "y" , "x" )
227- except ValueError as err :
228- raise ValueError ("Data should have dimensions time, y, x." ) from err
226+ dataset_reordered = dataset_expanded .transpose ("time" , "y" , "x" )
229227
230228 # additional metadata
231229 lat = forcing_dict ["latitude" ]
0 commit comments