-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #657 from slayoo/dev
adding critical supersaturation attribute and activable fraction product
- Loading branch information
Showing
8 changed files
with
116 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
from PySDM.attributes.impl.derived_attribute import DerivedAttribute | ||
from PySDM.physics import constants as const | ||
|
||
|
||
class CriticalSupersaturation(DerivedAttribute): | ||
def __init__(self, builder): | ||
self.v_crit = builder.get_attribute('critical volume') | ||
self.v_dry = builder.get_attribute('dry volume') | ||
self.kappa = builder.get_attribute('kappa') | ||
self.f_org = builder.get_attribute('dry volume organic fraction') | ||
|
||
super().__init__( | ||
builder=builder, | ||
name='critical supersaturation', | ||
dependencies=(self.v_crit, self.kappa, self.v_dry, self.f_org) | ||
) | ||
self.formulae = builder.particulator.formulae | ||
self.environment = builder.particulator.environment | ||
|
||
def recalculate(self): | ||
if len(self.environment['T']) != 1: | ||
raise NotImplementedError() | ||
T = self.environment['T'][0] | ||
r_cr = self.formulae.trivia.radius(self.v_crit.data.data) | ||
rd3 = self.v_dry.data.data / const.pi_4_3 | ||
sgm = self.formulae.surface_tension.sigma( | ||
T, self.v_crit.data.data, self.v_dry.data.data, self.f_org.data.data | ||
) | ||
|
||
self.data.data[:] = self.formulae.hygroscopicity.RH_eq( | ||
r_cr, | ||
T=T, | ||
kp=self.kappa.data.data, | ||
rd3=rd3, | ||
sgm=sgm | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
from .condensation_timestep import CondensationTimestepMin, CondensationTimestepMax | ||
from .event_rates import RipeningRate, ActivatingRate, DeactivatingRate | ||
from .peak_supersaturation import PeakSupersaturation | ||
from .activable_fraction import ActivableFraction |
29 changes: 29 additions & 0 deletions
29
PySDM/products/dynamics/condensation/activable_fraction.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
from ...product import MomentProduct | ||
|
||
|
||
class ActivableFraction(MomentProduct): | ||
def __init__(self): | ||
super().__init__( | ||
name="activable fraction", | ||
unit="1", | ||
description="" | ||
) | ||
|
||
def register(self, builder): | ||
super().register(builder) | ||
builder.request_attribute('critical supersaturation') | ||
|
||
def get(self, S_max): | ||
self.download_moment_to_buffer( | ||
'volume', | ||
rank=0, | ||
filter_range=(0, 1 + S_max / 100), | ||
filter_attr='critical supersaturation' | ||
) | ||
frac = self.buffer.copy() | ||
self.download_moment_to_buffer( | ||
'volume', | ||
rank=0 | ||
) | ||
frac /= self.buffer | ||
return frac |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
tests/unit_tests/attributes/physics/test_critical_supersaturation.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
import numpy as np | ||
from PySDM.products.dynamics.condensation import ActivableFraction | ||
from PySDM import Builder | ||
from PySDM.backends import CPU | ||
from PySDM.environments import Box | ||
from PySDM.physics import si | ||
|
||
|
||
def test_critical_supersaturation(): | ||
# arrange | ||
T = 300 * si.K | ||
n_sd = 100 | ||
S_max = .01 | ||
vdry = np.linspace(.001, 1, n_sd) * si.um**3 | ||
|
||
builder = Builder(n_sd=n_sd, backend=CPU()) | ||
env = Box(dt=np.nan, dv=np.nan) | ||
builder.set_environment(env) | ||
env['T'] = T | ||
particulator = builder.build( | ||
attributes={ | ||
'n': np.ones(n_sd), | ||
'volume': np.linspace(.01, 10, n_sd) * si.um**3, | ||
'dry volume': vdry, | ||
'kappa times dry volume': .9 * vdry, | ||
'dry volume organic': np.zeros(n_sd) | ||
}, | ||
products=[ActivableFraction()] | ||
) | ||
|
||
# act | ||
AF = particulator.products['activable fraction'].get(S_max) | ||
|
||
# assert | ||
assert 0 < AF < 1 |