Skip to content

Commit d00d17c

Browse files
authored
Arabas et al. 2023 immersion freezing example updates to match paper revision (#1339)
1 parent 4315ea3 commit d00d17c

File tree

15 files changed

+80220
-8017
lines changed

15 files changed

+80220
-8017
lines changed

.github/workflows/tests+artifacts+pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ jobs:
237237
test-suite: [ "chemistry_freezing_isotopes", "condensation_a", "condensation_b", "coagulation", "breakup", "multi-process_a", "multi-process_b"]
238238
fail-fast: false
239239
runs-on: ${{ matrix.platform }}
240-
timeout-minutes: ${{ startsWith(matrix.platform, 'windows-') && 65 || 50 }}
240+
timeout-minutes: ${{ !startsWith(matrix.platform, 'ubuntu-') && 65 || 50 }}
241241
steps:
242242
- uses: actions/checkout@v4.1.6
243243
with:

PySDM/attributes/ice/cooling_rate.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ def __init__(self, builder):
2121
builder.particulator.observers.append(self)
2222

2323
def notify(self):
24+
"""triggers update to ensure recalculation is done before
25+
overwriting `self.prev_T` with current temperature"""
26+
self.update()
2427
cell_id = self.particulator.attributes["cell id"]
2528
self.prev_T[:] = self.particulator.environment["T"][cell_id]
2629

examples/PySDM_examples/Arabas_et_al_2015/spin_up.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from PySDM.dynamics import Collision, Displacement, Freezing
1+
from PySDM.dynamics import Collision, Displacement
22

33

44
class SpinUp:
@@ -8,13 +8,11 @@ def __init__(self, particulator, spin_up_steps):
88
self.particulator = particulator
99
self.set(Collision, "enable", False)
1010
self.set(Displacement, "enable_sedimentation", False)
11-
self.set(Freezing, "enable", False)
1211

1312
def notify(self):
1413
if self.particulator.n_steps == self.spin_up_steps:
1514
self.set(Collision, "enable", True)
1615
self.set(Displacement, "enable_sedimentation", True)
17-
self.set(Freezing, "enable", True)
1816

1917
def set(self, dynamic, attr, value):
2018
key = dynamic.__name__

examples/PySDM_examples/Arabas_et_al_2023/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
.. include:: ./fig_2.ipynb.badges.md
1313
1414
fig_11.ipynb:
15-
.. include:: ./fig_11.ipynb.badges.md
15+
.. include:: ./figs_10_and_11_and_animations.ipynb
1616
1717
fig_A2.ipynb:
1818
.. include:: ./fig_A2.ipynb.badges.md

examples/PySDM_examples/Arabas_et_al_2023/commons.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"illite": {"ABIFM_M": 54.48, "ABIFM_C": -10.67},
1414
}
1515

16-
COOLING_RATES = (3.75 * si.K / si.min, 0.75 * si.K / si.min, 0.15 * si.K / si.min)
16+
COOLING_RATES = (-3.75 * si.K / si.min, -0.75 * si.K / si.min, -0.15 * si.K / si.min)
1717

1818
BEST_FIT_LN_S_GEOM = 0.25
1919

0 commit comments

Comments
 (0)