Arabas et al. 2023 immersion freezing example updates to match paper …

…revision (#1339)
open-atmos · Nov 10, 2024 · d00d17c · d00d17c
1 parent 4315ea3
commit d00d17c
Show file tree

Hide file tree

Showing 15 changed files with 80,220 additions and 8,017 deletions.
diff --git a/.github/workflows/tests+artifacts+pypi.yml b/.github/workflows/tests+artifacts+pypi.yml
@@ -237,7 +237,7 @@ jobs:
         test-suite: [ "chemistry_freezing_isotopes", "condensation_a", "condensation_b", "coagulation", "breakup", "multi-process_a", "multi-process_b"]
       fail-fast: false
     runs-on: ${{ matrix.platform }}
-    timeout-minutes: ${{ startsWith(matrix.platform, 'windows-') && 65 || 50 }}
+    timeout-minutes: ${{ !startsWith(matrix.platform, 'ubuntu-') && 65 || 50 }}
     steps:
       - uses: actions/[email protected]
         with:

diff --git a/PySDM/attributes/ice/cooling_rate.py b/PySDM/attributes/ice/cooling_rate.py
@@ -21,6 +21,9 @@ def __init__(self, builder):
         builder.particulator.observers.append(self)
 
     def notify(self):
+        """triggers update to ensure recalculation is done before
+        overwriting `self.prev_T` with current temperature"""
+        self.update()
         cell_id = self.particulator.attributes["cell id"]
         self.prev_T[:] = self.particulator.environment["T"][cell_id]
 

diff --git a/examples/PySDM_examples/Arabas_et_al_2015/spin_up.py b/examples/PySDM_examples/Arabas_et_al_2015/spin_up.py
@@ -1,4 +1,4 @@
-from PySDM.dynamics import Collision, Displacement, Freezing
+from PySDM.dynamics import Collision, Displacement
 
 
 class SpinUp:
@@ -8,13 +8,11 @@ def __init__(self, particulator, spin_up_steps):
         self.particulator = particulator
         self.set(Collision, "enable", False)
         self.set(Displacement, "enable_sedimentation", False)
-        self.set(Freezing, "enable", False)
 
     def notify(self):
         if self.particulator.n_steps == self.spin_up_steps:
             self.set(Collision, "enable", True)
             self.set(Displacement, "enable_sedimentation", True)
-            self.set(Freezing, "enable", True)
 
     def set(self, dynamic, attr, value):
         key = dynamic.__name__

diff --git a/examples/PySDM_examples/Arabas_et_al_2023/__init__.py b/examples/PySDM_examples/Arabas_et_al_2023/__init__.py
@@ -12,7 +12,7 @@
 .. include:: ./fig_2.ipynb.badges.md
 
 fig_11.ipynb:
-.. include:: ./fig_11.ipynb.badges.md
+.. include:: ./figs_10_and_11_and_animations.ipynb
 
 fig_A2.ipynb:
 .. include:: ./fig_A2.ipynb.badges.md

diff --git a/examples/PySDM_examples/Arabas_et_al_2023/commons.py b/examples/PySDM_examples/Arabas_et_al_2023/commons.py
@@ -13,7 +13,7 @@
     "illite": {"ABIFM_M": 54.48, "ABIFM_C": -10.67},
 }
 
-COOLING_RATES = (3.75 * si.K / si.min, 0.75 * si.K / si.min, 0.15 * si.K / si.min)
+COOLING_RATES = (-3.75 * si.K / si.min, -0.75 * si.K / si.min, -0.15 * si.K / si.min)
 
 BEST_FIT_LN_S_GEOM = 0.25