Merge pull request #689 from slayoo/freezing

product subsystem refactor

Author: slayoo

PySDM/environments/_moist.py

@@ -46,6 +46,14 @@ def sync(self):
             target['rhod'], target['thd'], target['qv'],
             target['T'], target['p'], target['RH']
         )
+        if 'a_w_ice' in self.variables:
+            self.particulator.backend.a_w_ice(
+                T=target['T'],
+                p=target['p'],
+                RH=target['RH'],
+                qv=target['qv'],
+                a_w_ice=target['a_w_ice']
+            )
         self._values["predicted"] = target
 
     @abstractmethod

PySDM/exporters/netcdf_exporter.py

@@ -38,7 +38,8 @@ def _create_variables(self, ncdf):
         # TODO #340 ParticleVolume var
 
         for name, instance in self.simulator.products.items():
-            assert name not in self.vars
+            if name in self.vars:
+                raise AssertionError(f"product ({name}) has same name as one of netCDF dimensions")
 
             n_dimensions = len(instance.shape)
             if n_dimensions == 3:
@@ -51,7 +52,6 @@ def _create_variables(self, ncdf):
                 raise NotImplementedError()
             self.vars[name] = ncdf.createVariable(name, "f", dimensions)
             self.vars[name].units = instance.unit
-            self.vars[name].long_name = instance.description
 
     def _write_variables(self, i):
         self.vars["T"][i] = self.settings.output_steps[i] * self.settings.dt

PySDM/impl/product.py

@@ -8,30 +8,6 @@
 from .condensation import *
 from .displacement import *
 from .freezing import *
-from .PartMC import *
-
-from .aerosol_specific_concentration import AerosolSpecificConcentration
-from .cloud_droplet_effective_radius import CloudDropletEffectiveRadius
-from .dry_air_density import DryAirDensity
-from .dry_air_potential_temperature import DryAirPotentialTemperature
-from .dynamic_wall_time import DynamicWallTime
-from .parcel_displacement import ParcelDisplacement
-from .particle_mean_radius import ParticleMeanRadius
-from .particles_concentration import (
-    ParticlesConcentration, AerosolConcentration, CloudDropletConcentration, DrizzleConcentration
-)
-from .particles_size_spectrum import (
-    ParticlesSizeSpectrum, ParticlesDrySizeSpectrum, ParticlesWetSizeSpectrum
-)
-from .particles_volume_spectrum import ParticlesVolumeSpectrum
-from .pressure import Pressure
-from .relative_humidity import RelativeHumidity
-from .super_droplet_count import SuperDropletCount
-from .temperature import Temperature
-from .time import Time
-from .timers import CPUTime, WallTime
-from .total_dry_mass_mixing_ratio import TotalDryMassMixingRatio
-from .total_particle_concentration import TotalParticleConcentration
-from .total_particle_specific_concentration import TotalParticleSpecificConcentration
-from .water_mixing_ratio import WaterMixingRatio
-from .water_vapour_mixing_ratio import WaterVapourMixingRatio
+from .ambient_thermodynamics import *
+from .housekeeping import *
+from .size_spectral import *

PySDM/products/PartMC/VolumeFractalDimension.py

@@ -0,0 +1,6 @@
+from .ambient_pressure import AmbientPressure
+from .ambient_temperature import AmbientTemperature
+from .ambient_relative_humidity import AmbientRelativeHumidity
+from .ambient_dry_air_density import AmbientDryAirDensity
+from .ambient_dry_air_potential_temperature import AmbientDryAirPotentialTemperature
+from .ambient_water_vapour_mixing_ratio import AmbientWaterVapourMixingRatio

PySDM/products/PartMC/__init__.py

@@ -0,0 +1,6 @@
+from PySDM.products.impl.moist_environment_product import MoistEnvironmentProduct
+
+
+class AmbientDryAirDensity(MoistEnvironmentProduct):
+    def __init__(self, name="rhod", unit="kg/m^3", var=None):
+        super().__init__(name=name, unit=unit, var=var)

PySDM/products/__init__.py

@@ -0,0 +1,6 @@
+from PySDM.products.impl.moist_environment_product import MoistEnvironmentProduct
+
+
+class AmbientDryAirPotentialTemperature(MoistEnvironmentProduct):
+    def __init__(self, unit='K', name=None, var=None):
+        super().__init__(unit=unit, name=name, var=var)