Skip to content

Commit 673b454

Browse files
committed
black linting
1 parent 6561261 commit 673b454

File tree

5 files changed

+38
-17
lines changed

5 files changed

+38
-17
lines changed

obsarray/err_corr.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ def expand_dim_matrix(self, submatrix, sli):
7575
in_dim=self.dims,
7676
out_dim=list(self._obj[self._unc_var_name][sli].dims),
7777
dim_sizes={
78-
dim: self._obj.dims[dim] for dim in self._obj[self._unc_var_name][sli].dims
78+
dim: self._obj.dims[dim]
79+
for dim in self._obj[self._unc_var_name][sli].dims
7980
},
8081
)
8182

@@ -167,7 +168,7 @@ def build_matrix(self, sli):
167168
dims_matrix = np.ones((n_elems, n_elems))
168169

169170
# expand to correlation matrix over all variable dims
170-
return self.expand_dim_matrix(dims_matrix,sli)
171+
return self.expand_dim_matrix(dims_matrix, sli)
171172

172173
# subset to slice
173174
# return self.slice_full_cov(full_matrix, sli)
@@ -189,7 +190,7 @@ def build_matrix(self, sli):
189190
"""
190191

191192
# expand to correlation matrix over all variable dims
192-
return self.expand_dim_matrix(self._obj[self.params[0]],sli)
193+
return self.expand_dim_matrix(self._obj[self.params[0]], sli)
193194

194195
# # subset to slice
195196
# return self.slice_full_cov(full_matrix, sli)

obsarray/templater/dswriter.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,13 @@ def _write_netcdf(ds, path, compression_level=None):
7474
var_encoding = dict(comp)
7575
var_encoding.update(ds[var_name].encoding)
7676
if "dtype" in var_encoding.keys():
77-
var_encoding.update({"_FillValue": DatasetUtil.get_default_fill_value(var_encoding["dtype"])})
77+
var_encoding.update(
78+
{
79+
"_FillValue": DatasetUtil.get_default_fill_value(
80+
var_encoding["dtype"]
81+
)
82+
}
83+
)
7884
ds[var_name].attrs.pop("_FillValue")
7985
encoding.update({var_name: var_encoding})
8086

obsarray/templater/template_util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ def _create_var(
129129
)
130130

131131
# Create variable and add to dataset
132-
if isinstance(dtype,str):
132+
if isinstance(dtype, str):
133133
if dtype == "flag":
134134
flag_meanings = attributes.pop("flag_meanings")
135135
variable = du.create_flags_variable(

obsarray/test/test_err_corr_forms.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,11 @@ def build_matrix_3ddim(self):
146146
return ecrm
147147

148148
def test_build_matrix(self):
149-
x=self.build_matrix_1stdim()
150-
y=self.build_matrix_2nddim()
151-
time=self.build_matrix_3ddim()
149+
x = self.build_matrix_1stdim()
150+
y = self.build_matrix_2nddim()
151+
time = self.build_matrix_3ddim()
152152
np.testing.assert_equal((x.dot(y)).dot(time), np.ones((12, 12)))
153153

154+
154155
if __name__ == "main":
155156
unittest.main()

obsarray/unc_accessor.py

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -289,15 +289,24 @@ def err_corr_dict(self) -> dict:
289289
# populate with error-correlation matrices built be each error-correlation
290290
# parameterisation object
291291
for dim_err_corr in self.err_corr:
292-
if np.all([dim in self._obj[self._unc_var_name][self._sli].dims for dim in dim_err_corr[1].dims]):
293-
if dim_err_corr[1].form in ["random","systematic"]:
294-
err_corr_dict[dim_err_corr[0]]=dim_err_corr[1].form
292+
if np.all(
293+
[
294+
dim in self._obj[self._unc_var_name][self._sli].dims
295+
for dim in dim_err_corr[1].dims
296+
]
297+
):
298+
if dim_err_corr[1].form in ["random", "systematic"]:
299+
err_corr_dict[dim_err_corr[0]] = dim_err_corr[1].form
295300

296301
elif dim_err_corr[1].form == "err_corr_matrix":
297-
err_corr_dict[dim_err_corr[0]]=self._obj[dim_err_corr[1].params[0]].values
302+
err_corr_dict[dim_err_corr[0]] = self._obj[
303+
dim_err_corr[1].params[0]
304+
].values
298305

299306
else:
300-
raise NotImplementedError("this correlation form is not implemented for err_corr_dict()")
307+
raise NotImplementedError(
308+
"this correlation form is not implemented for err_corr_dict()"
309+
)
301310
return err_corr_dict
302311

303312
def err_corr_dict_numdim(self) -> dict:
@@ -310,13 +319,12 @@ def err_corr_dict_numdim(self) -> dict:
310319
err_corr_dict = self.err_corr_dict()
311320
err_corr_dict_numdim = {}
312321

313-
for idim,dim in enumerate(self._obj.dims):
322+
for idim, dim in enumerate(self._obj.dims):
314323
if dim in err_corr_dict.keys():
315-
err_corr_dict_numdim[str(idim)]=err_corr_dict[dim]
324+
err_corr_dict_numdim[str(idim)] = err_corr_dict[dim]
316325

317326
return err_corr_dict_numdim
318327

319-
320328
def err_corr_matrix(self) -> xr.DataArray:
321329
"""
322330
Error-correlation matrix for uncertainty effect.
@@ -332,7 +340,12 @@ def err_corr_matrix(self) -> xr.DataArray:
332340
# populate with error-correlation matrices built be each error-correlation
333341
# parameterisation object
334342
for dim_err_corr in self.err_corr:
335-
if np.all([dim in self._obj[self._unc_var_name][self._sli].dims for dim in dim_err_corr[1].dims]):
343+
if np.all(
344+
[
345+
dim in self._obj[self._unc_var_name][self._sli].dims
346+
for dim in dim_err_corr[1].dims
347+
]
348+
):
336349
err_corr_matrix.values = err_corr_matrix.values.dot(
337350
dim_err_corr[1].build_matrix(self._sli)
338351
)

0 commit comments

Comments
 (0)