code formatting changes to comply with black v24.1

.pre-commit-config.yaml

@@ -4,17 +4,17 @@ default_stages: [commit]
 
 repos:
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 24.1.0
     hooks:
       - id: black
 
-  - repo: https://github.com/timothycrosley/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
+#  - repo: https://github.com/timothycrosley/isort
+#    rev: 5.13.2
+#    hooks:
+#      - id: isort
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer

PySDM/attributes/chemistry/__init__.py

@@ -1,6 +1,7 @@
 """
 attributes used by the `PySDM.dynamics.aqueous_chemistry` dynamic
 """
+
 from .acidity import Acidity
 from .concentration import make_concentration_factory
 from .hydrogen_ion_concentration import HydrogenIonConcentration

PySDM/attributes/chemistry/acidity.py

@@ -1,6 +1,7 @@
 """
 pH calculated by finding equilibrium hydrogen ion concentration
 """
+
 from PySDM.attributes.impl.intensive_attribute import DerivedAttribute
 from PySDM.backends.impl_numba.methods.chemistry_methods import _conc
 from PySDM.dynamics.impl.chemistry_utils import AQUEOUS_COMPOUNDS

PySDM/attributes/chemistry/concentration.py

@@ -1,6 +1,7 @@
 """
 concentrations (intensive, derived attributes)
 """
+
 from PySDM.attributes.impl.intensive_attribute import IntensiveAttribute
 
 

PySDM/attributes/chemistry/hydrogen_ion_concentration.py

@@ -1,6 +1,7 @@
 """
 hydrogen ion concentration derived from pH
 """
+
 from PySDM.attributes.impl.derived_attribute import DerivedAttribute
 
 

PySDM/attributes/ice/__init__.py

@@ -1,6 +1,7 @@
 """
 attributes used by the `PySDM.dynamics.freezing.Freezing` dynamic
 """
+
 from .cooling_rate import CoolingRate
 from .freezing_temperature import FreezingTemperature
 from .immersed_surface_area import ImmersedSurfaceArea

PySDM/attributes/ice/cooling_rate.py

@@ -3,6 +3,7 @@
  temperatures divided by the timestep (i.e. equals zero if particle has not
  moved to a different cell since the last timestep)
 """
+
 import numpy as np
 
 from PySDM.attributes.impl import DerivedAttribute

PySDM/attributes/ice/freezing_temperature.py

@@ -2,6 +2,7 @@
 particle freezing temperature (assigned at initialisation, modified through collisions only,
  used in singular regime)
 """
+
 from PySDM.attributes.impl import MaximumAttribute
 
 

PySDM/attributes/ice/immersed_surface_area.py

@@ -2,6 +2,7 @@
 immersed INP surface area (assigned at initialisation, modified through collisions only,
  used in time-dependent regime)
 """
+
 from ..impl import ExtensiveAttribute
 
 

PySDM/attributes/impl/__init__.py

@@ -1,6 +1,7 @@
 """
 common code intended for use from within attribute classes (not in user code)
 """
+
 from .attribute import Attribute
 from .base_attribute import BaseAttribute
 from .cell_attribute import CellAttribute

PySDM/attributes/impl/base_attribute.py

@@ -2,6 +2,7 @@
 logic around `PySDM.attributes.impl.base_attribute.BaseAttribute` - the parent class
 for non-derived attributes
 """
+
 from .attribute import Attribute
 
 

PySDM/attributes/impl/cell_attribute.py

@@ -2,6 +2,7 @@
 logic around `PySDM.attributes.impl.cell_attribute.CellAttribute` - the parent class
 for grid-particle mapping attributes
 """
+
 from .base_attribute import BaseAttribute
 
 

PySDM/attributes/impl/derived_attribute.py

@@ -2,6 +2,7 @@
 logic around `PySDM.attributes.impl.derived_attribute.DerivedAttribute` - the parent class
 for all derived attributes
 """
+
 from .attribute import Attribute
 
 

PySDM/attributes/impl/dummy_attribute.py

@@ -1,5 +1,6 @@
 """ logic around `PySDM.attributes.impl.dummy_attribute.DummyAttribute` - parent class
 for do-nothing attributes """
+
 import warnings
 
 import numpy as np

PySDM/attributes/impl/extensive_attribute.py

@@ -2,6 +2,7 @@
 logic around `PySDM.attributes.impl.extensive_attribute.ExtensiveAttribute` - parent class
  for all extensive attributes
 """
+
 from .base_attribute import BaseAttribute
 
 

PySDM/attributes/impl/intensive_attribute.py

@@ -2,6 +2,7 @@
 logic around `PySDM.attributes.impl.intensive_attribute.IntensiveAttribute` - parent class
  for all intensive attributes
 """
+
 from .derived_attribute import DerivedAttribute
 
 

PySDM/attributes/impl/mapper.py

@@ -1,6 +1,7 @@
 """
 attribute name-class mapping logic (each new attribute must be added here)
 """
+
 from functools import partial
 
 from PySDM.attributes.chemistry import (
@@ -54,9 +55,9 @@
         and formulae.surface_tension.__name__ == Constant.__name__
         else DryVolumeOrganic
     ),
-    "dry volume": lambda dynamics, formulae: DryVolumeDynamic
-    if "AqueousChemistry" in dynamics
-    else DryVolume,
+    "dry volume": lambda dynamics, formulae: (
+        DryVolumeDynamic if "AqueousChemistry" in dynamics else DryVolume
+    ),
     "dry volume organic fraction": lambda dynamics, formulae: (
         make_dummy_attribute_factory("dry volume organic fraction")
         if "Condensation" in dynamics

PySDM/attributes/impl/maximum_attribute.py

@@ -4,6 +4,7 @@
  value is set to maximum of values of colliding particle (e.g., freezing temperature
   in singular immersion freezing)
 """
+
 from .base_attribute import BaseAttribute
 
 

PySDM/attributes/impl/mole_amount.py

@@ -1,6 +1,7 @@
 """
 mole amounts (extensive, base attributes)
 """
+
 from PySDM.attributes.impl.extensive_attribute import ExtensiveAttribute
 
 

PySDM/attributes/isotopes/__init__.py

@@ -1,4 +1,5 @@
 """
 isotopic fractionation related attributes
 """
+
 from .moles_light_isotopes import Moles1H, Moles16O, MolesLightWater

PySDM/attributes/isotopes/delta.py

@@ -2,6 +2,7 @@
 per-droplet isotopic ratio of heavy-to-light isotope number concentrations
 expressed vs the VSMOW reference in SI units (i.e., not per mille)
 """
+
 from PySDM.attributes.impl.derived_attribute import DerivedAttribute
 
 

PySDM/attributes/isotopes/moles_light_isotopes.py

@@ -20,6 +20,7 @@
         moles_1H = 2 * (moles_H2O + moles_17O + moles_18O) + moles_2H + moles_3H
         moles_16O =  .5 * (moles_2H + moles_3H) + moles_H2O
 """
+
 from PySDM.attributes.impl import DerivedAttribute
 
 

PySDM/attributes/numerics/__init__.py

@@ -1,6 +1,7 @@
 """
 attributes used for tracking cell-particle mapping in multi-dimensional simulations
 """
+
 from .cell_id import CellID
 from .cell_origin import CellOrigin
 from .position_in_cell import PositionInCell

PySDM/attributes/numerics/cell_id.py

@@ -1,6 +1,7 @@
 """
 grid cell id attribute
 """
+
 from PySDM.attributes.impl.cell_attribute import CellAttribute
 
 

PySDM/attributes/numerics/cell_origin.py

@@ -1,6 +1,7 @@
 """
 grid-cell origin (multi-dimensional)
 """
+
 from PySDM.attributes.impl.cell_attribute import CellAttribute
 
 

PySDM/attributes/numerics/position_in_cell.py

@@ -1,6 +1,7 @@
 """
 position-within-cell attribute (multi-dimensional, values normalised to one)
 """
+
 from PySDM.attributes.impl.cell_attribute import CellAttribute
 
 

PySDM/attributes/physics/__init__.py

@@ -1,6 +1,7 @@
 """
 attributes carrying information on particle physical properties
 """
+
 from .area import Area
 from .critical_supersaturation import CriticalSupersaturation
 from .critical_volume import CriticalVolume, WetToCriticalVolumeRatio

PySDM/attributes/physics/area.py

@@ -1,6 +1,7 @@
 """
 particle wet radius (calculated from the volume)
 """
+
 from PySDM.attributes.impl.derived_attribute import DerivedAttribute
 
 

PySDM/attributes/physics/critical_supersaturation.py

@@ -1,6 +1,7 @@
 """
 kappa-Koehler critical supersaturation calculated for actual environment temperature
 """
+
 from PySDM.attributes.impl.derived_attribute import DerivedAttribute
 
 

PySDM/attributes/physics/critical_volume.py

@@ -1,6 +1,7 @@
 """
 critical wet volume (kappa-Koehler, computed using actual temperature)
 """
+
 from PySDM.attributes.impl.derived_attribute import DerivedAttribute
 
 

PySDM/attributes/physics/dry_radius.py

@@ -1,6 +1,7 @@
 """
 particle dry radius computed from dry volume
 """
+
 from PySDM.attributes.impl.derived_attribute import DerivedAttribute
 
 

PySDM/attributes/physics/dry_volume.py

@@ -1,6 +1,7 @@
 """
 particle dry volume (subject to evolution due to collisions or aqueous chemistry)
 """
+
 from PySDM.attributes.impl.derived_attribute import DerivedAttribute
 from PySDM.attributes.impl.extensive_attribute import ExtensiveAttribute
 

PySDM/attributes/physics/equilibrium_supersaturation.py

@@ -1,6 +1,7 @@
 """
 kappa-Koehler equilibrium supersaturation calculated for actual environment temperature
 """
+
 from PySDM.attributes.impl.derived_attribute import DerivedAttribute
 
 

PySDM/attributes/physics/heat.py

@@ -1,6 +1,7 @@
 """
 particle heat content (test-use only for now, exemplifying intensive/extensive attribute logic)
 """
+
 from PySDM.attributes.impl.extensive_attribute import ExtensiveAttribute
 
 

PySDM/attributes/physics/hygroscopicity.py

@@ -3,6 +3,7 @@
  the `PySDM.attributes.physics.hygroscopicity.KappaTimesDryVolume` base attribute
  and the derived `PySDM.attributes.physics.hygroscopicity.Kappa` attribute
 """
+
 from ..impl.derived_attribute import DerivedAttribute
 from ..impl.extensive_attribute import ExtensiveAttribute
 

PySDM/attributes/physics/mass.py

@@ -3,6 +3,7 @@
 in simulation involving mixed-phase clouds, positive values correspond to
 liquid water and negative values to ice
 """
+
 from PySDM.attributes.impl import ExtensiveAttribute
 
 

PySDM/attributes/physics/multiplicities.py

@@ -2,6 +2,7 @@
 super-particle multiplicity (aka weighting factor) - the number of real-world particles
  represented in the simulation with a given super particle
 """
+
 import numpy as np
 
 from PySDM.attributes.impl.base_attribute import BaseAttribute

PySDM/attributes/physics/radius.py

@@ -1,6 +1,7 @@
 """
 particle wet radius (calculated from the volume)
 """
+
 from PySDM.attributes.impl.derived_attribute import DerivedAttribute
 
 

PySDM/attributes/physics/temperature.py

@@ -1,6 +1,7 @@
 """
 particle temperature (test-use only for now, exemplifying intensive/extensive attribute logic)
 """
+
 from PySDM.attributes.impl.intensive_attribute import IntensiveAttribute
 
 

PySDM/attributes/physics/terminal_velocity.py

@@ -1,6 +1,7 @@
 """
 particle terminal velocity (used for collision probability and particle displacement)
 """
+
 from PySDM.attributes.impl.derived_attribute import DerivedAttribute
 
 

PySDM/attributes/physics/volume.py

@@ -3,6 +3,7 @@
 in simulation involving mixed-phase clouds, positive values correspond to
 liquid water and negative values to ice
 """
+
 from PySDM.attributes.impl import DerivedAttribute
 
 

PySDM/backends/__init__.py

@@ -2,6 +2,7 @@
 Backend classes: CPU=`PySDM.backends.numba.Numba`
 and GPU=`PySDM.backends.thrust_rtc.ThrustRTC`
 """
+
 import ctypes
 import os
 import sys

PySDM/backends/impl_common/freezing_attributes.py

@@ -1,6 +1,7 @@
 """
 groups of attributes used in either singular or time-dependent immmersion freezing regimes
 """
+
 from collections import namedtuple
 
 

PySDM/backends/impl_common/index.py

@@ -1,6 +1,7 @@
 """
 permutation-defining Index class (can be shared between multiple IndexedStorage instances)
 """
+
 import numpy as np
 
 from .storage_utils import StorageSignature

PySDM/backends/impl_common/indexed_storage.py

@@ -1,6 +1,7 @@
 """
 attribute storage class featuring particle permutation logic
 """
+
 from .storage_utils import StorageSignature
 
 

PySDM/backends/impl_common/storage_utils.py

@@ -2,7 +2,6 @@
 common code for storage classes
 """
 
-
 from abc import abstractmethod
 from collections import namedtuple
 from typing import Type