Format

Author: JoerivanEngelen

imod/common/constants.py

@@ -3,11 +3,10 @@
 imports and to have a single source of truth for these values.
 """
 
-import numpy as np
-
-
 from dataclasses import dataclass
 
+import numpy as np
+
 
 @dataclass
 class MaskValues:
@@ -18,4 +17,4 @@ class MaskValues:
 
     float = np.nan
     integer = 0
-    msw_default = -9999.0
+    msw_default = -9999.0

imod/common/utilities/clip.py

@@ -129,7 +129,11 @@ def _filter_inactive_cells(package: IPackage, active: GridDataArray):
         return
 
     package_vars = package.dataset.data_vars
-    to_mask = [var for var in package_vars if (package_vars[var].shape != () and is_spatial_grid(package.dataset[var]))]
+    to_mask = [
+        var
+        for var in package_vars
+        if (package_vars[var].shape != () and is_spatial_grid(package.dataset[var]))
+    ]
     # Shortcut if nothing to mask to avoid computing mask unnecessarily.
     if not to_mask:
         return

imod/common/utilities/dtype.py

@@ -2,9 +2,10 @@
 
 from numpy.typing import DTypeLike
 
+
 def is_float(dtype: DTypeLike) -> bool:
     return issubclass(dtype.type, numbers.Real)
 
 
 def is_integer(dtype: DTypeLike) -> bool:
-    return issubclass(dtype.type, numbers.Integral)
+    return issubclass(dtype.type, numbers.Integral)

imod/common/utilities/mask.py

@@ -1,13 +1,12 @@
-
 import xarray as xr
 from plum import Dispatcher
 from xarray.core.utils import is_scalar
 
+from imod.common.constants import MaskValues
 from imod.common.interfaces.imaskingsettings import IMaskingSettings
 from imod.common.interfaces.imodel import IModel
 from imod.common.interfaces.ipackage import IPackage
 from imod.common.interfaces.isimulation import ISimulation
-from imod.common.constants import MaskValues
 from imod.common.utilities.dtype import is_float, is_integer
 from imod.typing.grid import (
     GridDataArray,

imod/common/utilities/regrid.py

@@ -9,6 +9,7 @@
 from xarray.core.utils import is_scalar
 from xugrid.regrid.regridder import BaseRegridder
 
+from imod.common.constants import MaskValues
 from imod.common.interfaces.ilinedatapackage import ILineDataPackage
 from imod.common.interfaces.imodel import IModel
 from imod.common.interfaces.ipackage import IPackage
@@ -17,9 +18,8 @@
 from imod.common.interfaces.isimulation import ISimulation
 from imod.common.utilities.clip import clip_by_grid
 from imod.common.utilities.dataclass_type import DataclassType, EmptyRegridMethod
-from imod.common.utilities.value_filters import is_valid
-from imod.common.constants import MaskValues
 from imod.common.utilities.dtype import is_integer
+from imod.common.utilities.value_filters import is_valid
 from imod.typing.grid import (
     GridDataArray,
     GridDataset,
@@ -454,6 +454,8 @@ def _get_regridding_domain(
         idomain_regridder_type = regridder.regrid(is_active)
         included_in_all = included_in_all.where(idomain_regridder_type.notnull())
 
-    new_idomain = regridded_domain.where(included_in_all.notnull(), other=MaskValues.integer).astype(int)
+    new_idomain = regridded_domain.where(
+        included_in_all.notnull(), other=MaskValues.integer
+    ).astype(int)
 
     return new_idomain

imod/msw/infiltration.py

@@ -2,8 +2,8 @@
 
 import xarray as xr
 
-from imod.common.interfaces.iregridpackage import IRegridPackage
 from imod.common.constants import MaskValues
+from imod.common.interfaces.iregridpackage import IRegridPackage
 from imod.logging import LogLevel, logger
 from imod.msw.fixed_format import VariableMetaData
 from imod.msw.pkgbase import MetaSwapPackage

imod/msw/meteo_grid.py

@@ -8,9 +8,9 @@
 import xarray as xr
 
 import imod
+from imod.common.constants import MaskValues
 from imod.common.interfaces.iregridpackage import IRegridPackage
 from imod.common.utilities.dataclass_type import DataclassType, EmptyRegridMethod
-from imod.common.constants import MaskValues
 from imod.msw.pkgbase import MetaSwapPackage
 from imod.msw.regrid.regrid_schemes import MeteoGridRegridMethod
 from imod.msw.timeutil import to_metaswap_timeformat

imod/msw/model.py

@@ -10,8 +10,8 @@
 import numpy as np
 import xarray as xr
 
-from imod.common.utilities.clip import clip_by_grid
 from imod.common.constants import MaskValues
+from imod.common.utilities.clip import clip_by_grid
 from imod.common.utilities.partitioninfo import create_partition_info
 from imod.common.utilities.value_filters import enforce_scalar
 from imod.common.utilities.version import prepend_content_with_version_info