PySDM 2.72__tar.gz → 2.73__tar.gz

{PySDM-2.72 → PySDM-2.73}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM
-Version: 2.72
+Version: 2.73
 Summary: Pythonic particle-based (super-droplet) warm-rain/aqueous-chemistry cloud microphysics package with box, parcel & 1D/2D prescribed-flow examples in Python, Julia and Matlab
 Home-page: https://github.com/open-atmos/PySDM
 Author: https://github.com/open-atmos/PySDM/graphs/contributors
@@ -521,7 +521,7 @@ Description: # PySDM
         
         r_dry, specific_concentration = spectral_sampling.Logarithmic(spectrum).sample(n_sd)
         v_dry = formulae.trivia.volume(radius=r_dry)
-        r_wet = equilibrate_wet_radii(r_dry=r_dry, environment=env, kappa_times_dry_volume=kappa * v_dry)
+        r_wet = equilibrate_wet_radii(r_dry=r_dry, environment=builder.particulator.environment, kappa_times_dry_volume=kappa * v_dry)
         
         attributes = Dict()
         attributes["multiplicity"] = discretise_multiplicities(specific_concentration * env.mass_of_dry_air)
@@ -606,7 +606,7 @@ Description: # PySDM
         specific_concentration = tmp{2};
         r_wet = equilibrate_wet_radii(pyargs(...
             'r_dry', r_dry, ...
-            'environment', env, ...
+            'environment', builder.particulator.environment, ...
             'kappa_times_dry_volume', kappa * v_dry...
         ));
         
@@ -702,7 +702,7 @@ Description: # PySDM
         
         r_dry, specific_concentration = spectral_sampling.Logarithmic(spectrum).sample(n_sd)
         v_dry = formulae.trivia.volume(radius=r_dry)
-        r_wet = equilibrate_wet_radii(r_dry=r_dry, environment=env, kappa_times_dry_volume=kappa * v_dry)
+        r_wet = equilibrate_wet_radii(r_dry=r_dry, environment=builder.particulator.environment, kappa_times_dry_volume=kappa * v_dry)
         
         attributes = {
           'multiplicity': discretise_multiplicities(specific_concentration * env.mass_of_dry_air),

{PySDM-2.72 → PySDM-2.73}/PySDM/builder.py

@@ -49,8 +49,7 @@ class Builder:
     def _set_environment(self, environment):
         if self.particulator.environment is not None:
             raise AssertionError("environment has already been set")
-        self.particulator.environment = environment
-        self.particulator.environment.register(self)
+        self.particulator.environment = environment.instantiate(builder=self)
 
     def add_dynamic(self, dynamic):
         assert self.particulator.environment is not None

{PySDM-2.72 → PySDM-2.73}/PySDM/environments/box.py

@@ -5,8 +5,10 @@ Bare zero-dimensional framework
 import numpy as np
 
 from PySDM.impl.mesh import Mesh
+from PySDM.environments.impl import register_environment
 
 
+@register_environment()
 class Box:
     def __init__(self, dt, dv):
         self.dt = dt

PySDM-2.73/PySDM/environments/impl/__init__.py

@@ -0,0 +1,3 @@
+""" common internals not intended to be imported from user code """
+
+from PySDM.environments.impl.register_environment import register_environment

PySDM-2.73/PySDM/environments/impl/register_environment.py

@@ -0,0 +1,24 @@
+""" decorator for environment classes
+ensuring that their instances can be re-used with multiple builders """
+
+from copy import deepcopy
+
+
+def _instantiate(self, *, builder):
+    copy = deepcopy(self)
+    copy.register(builder=builder)
+    return copy
+
+
+def register_environment():
+    def decorator(cls):
+        if hasattr(cls, "instantiate"):
+            if cls.instantiate is not _instantiate:
+                raise AttributeError(
+                    "decorated class has a different instantiate method"
+                )
+        else:
+            setattr(cls, "instantiate", _instantiate)
+        return cls
+
+    return decorator

{PySDM-2.72 → PySDM-2.73}/PySDM/environments/kinematic_1d.py

@@ -7,10 +7,12 @@ import numpy as np
 
 from PySDM.environments.impl.moist import Moist
 
-from ..impl import arakawa_c
-from ..initialisation.equilibrate_wet_radii import equilibrate_wet_radii
+from PySDM.impl import arakawa_c
+from PySDM.initialisation.equilibrate_wet_radii import equilibrate_wet_radii
+from PySDM.environments.impl import register_environment
 
 
+@register_environment()
 class Kinematic1D(Moist):
     def __init__(self, *, dt, mesh, thd_of_z, rhod_of_z, z0=0):
         super().__init__(dt, mesh, [])

{PySDM-2.72 → PySDM-2.73}/PySDM/environments/kinematic_2d.py

@@ -12,10 +12,11 @@ from PySDM.initialisation.equilibrate_wet_radii import (
     equilibrate_wet_radii,
 )
 from PySDM.initialisation.sampling.spectral_sampling import ConstantMultiplicity
-
-from ..impl import arakawa_c
+from PySDM.impl import arakawa_c
+from PySDM.environments.impl import register_environment
 
 
+@register_environment()
 class Kinematic2D(Moist):
     def __init__(self, *, dt, grid, size, rhod_of, mixed_phase=False):
         super().__init__(dt, Mesh(grid, size), [], mixed_phase=mixed_phase)

{PySDM-2.72 → PySDM-2.73}/PySDM/environments/parcel.py

@@ -12,8 +12,10 @@ from PySDM.initialisation.equilibrate_wet_radii import (
     default_rtol,
     equilibrate_wet_radii,
 )
+from PySDM.environments.impl import register_environment
 
 
+@register_environment()
 class Parcel(Moist):  # pylint: disable=too-many-instance-attributes
     def __init__(
         self,

{PySDM-2.72 → PySDM-2.73}/PySDM.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM
-Version: 2.72
+Version: 2.73
 Summary: Pythonic particle-based (super-droplet) warm-rain/aqueous-chemistry cloud microphysics package with box, parcel & 1D/2D prescribed-flow examples in Python, Julia and Matlab
 Home-page: https://github.com/open-atmos/PySDM
 Author: https://github.com/open-atmos/PySDM/graphs/contributors
@@ -521,7 +521,7 @@ Description: # PySDM
         
         r_dry, specific_concentration = spectral_sampling.Logarithmic(spectrum).sample(n_sd)
         v_dry = formulae.trivia.volume(radius=r_dry)
-        r_wet = equilibrate_wet_radii(r_dry=r_dry, environment=env, kappa_times_dry_volume=kappa * v_dry)
+        r_wet = equilibrate_wet_radii(r_dry=r_dry, environment=builder.particulator.environment, kappa_times_dry_volume=kappa * v_dry)
         
         attributes = Dict()
         attributes["multiplicity"] = discretise_multiplicities(specific_concentration * env.mass_of_dry_air)
@@ -606,7 +606,7 @@ Description: # PySDM
         specific_concentration = tmp{2};
         r_wet = equilibrate_wet_radii(pyargs(...
             'r_dry', r_dry, ...
-            'environment', env, ...
+            'environment', builder.particulator.environment, ...
             'kappa_times_dry_volume', kappa * v_dry...
         ));
         
@@ -702,7 +702,7 @@ Description: # PySDM
         
         r_dry, specific_concentration = spectral_sampling.Logarithmic(spectrum).sample(n_sd)
         v_dry = formulae.trivia.volume(radius=r_dry)
-        r_wet = equilibrate_wet_radii(r_dry=r_dry, environment=env, kappa_times_dry_volume=kappa * v_dry)
+        r_wet = equilibrate_wet_radii(r_dry=r_dry, environment=builder.particulator.environment, kappa_times_dry_volume=kappa * v_dry)
         
         attributes = {
           'multiplicity': discretise_multiplicities(specific_concentration * env.mass_of_dry_air),

{PySDM-2.72 → PySDM-2.73}/PySDM.egg-info/SOURCES.txt

@@ -188,6 +188,7 @@ PySDM/environments/kinematic_2d.py
 PySDM/environments/parcel.py
 PySDM/environments/impl/__init__.py
 PySDM/environments/impl/moist.py
+PySDM/environments/impl/register_environment.py
 PySDM/exporters/__init__.py
 PySDM/exporters/netcdf_exporter.py
 PySDM/exporters/netcdf_exporter_1d.py
@@ -799,6 +800,8 @@ tests/unit_tests/dynamics/displacement/displacement_settings.py
 tests/unit_tests/dynamics/displacement/test_advection.py
 tests/unit_tests/dynamics/displacement/test_courant_product.py
 tests/unit_tests/dynamics/displacement/test_sedimentation.py
+tests/unit_tests/environments/__init__.py
+tests/unit_tests/environments/test_impl.py
 tests/unit_tests/impl/__init__.py
 tests/unit_tests/impl/test_camel_case.py
 tests/unit_tests/impl/test_mesh.py

{PySDM-2.72 → PySDM-2.73}/README.md

@@ -510,7 +510,7 @@ builder.add_dynamic(Condensation())
 
 r_dry, specific_concentration = spectral_sampling.Logarithmic(spectrum).sample(n_sd)
 v_dry = formulae.trivia.volume(radius=r_dry)
-r_wet = equilibrate_wet_radii(r_dry=r_dry, environment=env, kappa_times_dry_volume=kappa * v_dry)
+r_wet = equilibrate_wet_radii(r_dry=r_dry, environment=builder.particulator.environment, kappa_times_dry_volume=kappa * v_dry)
 
 attributes = Dict()
 attributes["multiplicity"] = discretise_multiplicities(specific_concentration * env.mass_of_dry_air)
@@ -595,7 +595,7 @@ v_dry = formulae.trivia.volume(pyargs('radius', r_dry));
 specific_concentration = tmp{2};
 r_wet = equilibrate_wet_radii(pyargs(...
     'r_dry', r_dry, ...
-    'environment', env, ...
+    'environment', builder.particulator.environment, ...
     'kappa_times_dry_volume', kappa * v_dry...
 ));
 
@@ -691,7 +691,7 @@ builder.add_dynamic(Condensation())
 
 r_dry, specific_concentration = spectral_sampling.Logarithmic(spectrum).sample(n_sd)
 v_dry = formulae.trivia.volume(radius=r_dry)
-r_wet = equilibrate_wet_radii(r_dry=r_dry, environment=env, kappa_times_dry_volume=kappa * v_dry)
+r_wet = equilibrate_wet_radii(r_dry=r_dry, environment=builder.particulator.environment, kappa_times_dry_volume=kappa * v_dry)
 
 attributes = {
   'multiplicity': discretise_multiplicities(specific_concentration * env.mass_of_dry_air),

{PySDM-2.72 → PySDM-2.73}/examples/PySDM_examples/Abade_and_Albuquerque_2024/simulation.py

@@ -12,18 +12,17 @@ from PySDM.environments import Parcel
 
 class Simulation(BasicSimulation):
     def __init__(self, settings):
-        parcel = Parcel(
-            dt=settings.timestep,
-            mass_of_dry_air=settings.mass_of_dry_air,
-            p0=settings.initial_total_pressure,
-            initial_water_vapour_mixing_ratio=settings.initial_water_vapour_mixing_ratio,
-            T0=settings.initial_temperature,
-            w=settings.updraft,
-        )
         builder = Builder(
             backend=CPU(settings.formulae, override_jit_flags={"parallel": False}),
             n_sd=settings.n_sd,
-            environment=parcel,
+            environment=Parcel(
+                dt=settings.timestep,
+                mass_of_dry_air=settings.mass_of_dry_air,
+                p0=settings.initial_total_pressure,
+                initial_water_vapour_mixing_ratio=settings.initial_water_vapour_mixing_ratio,
+                T0=settings.initial_temperature,
+                w=settings.updraft,
+            ),
         )
         builder.add_dynamic(AmbientThermodynamics())
         builder.add_dynamic(Condensation())
@@ -31,7 +30,7 @@ class Simulation(BasicSimulation):
         r_dry, n_in_dv = ConstantMultiplicity(settings.soluble_aerosol).sample(
             n_sd=settings.n_sd
         )
-        attributes = parcel.init_attributes(
+        attributes = builder.particulator.environment.init_attributes(
             n_in_dv=n_in_dv, kappa=settings.kappa, r_dry=r_dry
         )
         self.products = (

{PySDM-2.72 → PySDM-2.73}/examples/PySDM_examples/Abdul_Razzak_Ghan_2000/run_ARG_parcel.py

@@ -65,7 +65,8 @@ def run_parcel(
         v_dry = builder.formulae.trivia.volume(radius=r_dry)
         specific_concentration = concentration / builder.formulae.constants.rho_STP
         attributes["multiplicity"] = np.append(
-            attributes["multiplicity"], specific_concentration * env.mass_of_dry_air
+            attributes["multiplicity"],
+            specific_concentration * builder.particulator.environment.mass_of_dry_air,
         )
         attributes["dry volume"] = np.append(attributes["dry volume"], v_dry)
         attributes["kappa times dry volume"] = np.append(
@@ -74,7 +75,7 @@ def run_parcel(
 
     r_wet = equilibrate_wet_radii(
         r_dry=builder.formulae.trivia.radius(volume=attributes["dry volume"]),
-        environment=env,
+        environment=builder.particulator.environment,
         kappa_times_dry_volume=attributes["kappa times dry volume"],
     )
     attributes["volume"] = builder.formulae.trivia.volume(radius=r_wet)

{PySDM-2.72 → PySDM-2.73}/examples/PySDM_examples/Alpert_and_Knopf_2016/simulation.py

@@ -215,8 +215,11 @@ def simulation(
         constants=constants,
         particle_shape_and_density="MixedPhaseSpheres",
     )
-    env = Box(dt=time_step, dv=volume)
-    builder = Builder(n_sd=n_sd, backend=CPU(formulae=formulae), environment=env)
+    builder = Builder(
+        n_sd=n_sd,
+        backend=CPU(formulae=formulae),
+        environment=Box(dt=time_step, dv=volume),
+    )
     builder.add_dynamic(Freezing(singular=False))
 
     if hasattr(spectrum, "s_geom") and spectrum.s_geom == 1:
@@ -236,6 +239,7 @@ def simulation(
         TotalUnfrozenImmersedSurfaceArea(name="A_tot"),
     )
     particulator = builder.build(attributes=attributes, products=products)
+    env = particulator.environment
 
     env["T"] = initial_temperature
     env["a_w_ice"] = np.nan