PySDM-examples 2.53__tar.gz → 2.58__tar.gz

{PySDM-examples-2.53 → PySDM-examples-2.58}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM-examples
-Version: 2.53
+Version: 2.58
 Summary: PySDM usage examples reproducing results from literature and depicting how to use PySDM from Python Jupyter notebooks
 Home-page: https://github.com/open-atmos/PySDM
 Author: https://github.com/open-atmos/PySDM/graphs/contributors
@@ -18,11 +18,21 @@ Description:
               [![View notebook](https://img.shields.io/static/v1?label=render%20on&logo=github&color=87ce3e&message=GitHub)](https://github.com/open-atmos/PySDM/blob/main/examples/PySDM_examples/Merlivat_and_Nief_1967/fig_2.ipynb)
               [![launch on mybinder.org](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/open-atmos/PySDM.git/main?urlpath=lab/tree/examples/PySDM_examples/Merlivat_and_Nief_1967/fig_2.ipynb)
               [![launch on Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/open-atmos/PySDM/blob/main/examples/PySDM_examples/Merlivat_and_Nief_1967/fig_2.ipynb)    
+        - [Miyake et al. 1968](https://doi.org/10.2467/mripapers1950.19.2_243):
+          - Fig. 19:
+              [![View notebook](https://img.shields.io/static/v1?label=render%20on&logo=github&color=87ce3e&message=GitHub)](https://github.com/open-atmos/PySDM/blob/main/examples/PySDM_examples/Miyake_et_al_1968/fig_19.ipynb)
+              [![launch on mybinder.org](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/open-atmos/PySDM.git/main?urlpath=lab/tree/examples/PySDM_examples/Miyake_et_al_1968/fig_19.ipynb)
+              [![launch on Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/open-atmos/PySDM/blob/main/examples/PySDM_examples/Miyake_et_al_1968/fig_19.ipynb)    
         - [Van Hook 1968](https://doi.org/10.1021/j100850a028):
           - Fig. 1:
               [![View notebook](https://img.shields.io/static/v1?label=render%20on&logo=github&color=87ce3e&message=GitHub)](https://github.com/open-atmos/PySDM/blob/main/examples/PySDM_examples/Van_Hook_1968/fig_1.ipynb)
               [![launch on mybinder.org](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/open-atmos/PySDM.git/main?urlpath=lab/tree/examples/PySDM_examples/Van_Hook_1968/fig_1.ipynb)
               [![launch on Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/open-atmos/PySDM/blob/main/examples/PySDM_examples/Van_Hook_1968/fig_1.ipynb)    
+        - [Gedzelman & Arnold 1994](https://doi.org/10.1029/93JD03518):
+          - Fig. 2:
+              [![View notebook](https://img.shields.io/static/v1?label=render%20on&logo=github&color=87ce3e&message=GitHub)](https://github.com/open-atmos/PySDM/blob/main/examples/PySDM_examples/Gedzelman_and_Arnold_1994/fig_2.ipynb)
+              [![launch on mybinder.org](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/open-atmos/PySDM.git/main?urlpath=lab/tree/examples/PySDM_examples/Gedzelman_and_Arnold_1994/fig_2.ipynb)
+              [![launch on Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/open-atmos/PySDM/blob/main/examples/PySDM_examples/Gedzelman_and_Arnold_1994/fig_2.ipynb)    
         - [Bolot et al. 2013](http://doi.org/10.5194/acp-13-7903-2013):
           - Fig. 1:
               [![View notebook](https://img.shields.io/static/v1?label=render%20on&logo=github&color=87ce3e&message=GitHub)](https://github.com/open-atmos/PySDM/blob/main/examples/PySDM_examples/Bolot_et_al_2013/fig_1.ipynb)

PySDM-examples-2.58/PySDM_examples/Gedzelman_and_Arnold_1994/__init__.py

@@ -0,0 +1,6 @@
+# pylint: disable=invalid-name
+"""
+Formulae-only example depicting changes in drop and ambient vapour isotopic composition
+upon evaporation of rain in subsaturated environment based on
+[Gedzelman and Arnold 1994](https://doi.org/10.1029/93JD03518)
+"""

PySDM-examples-2.58/PySDM_examples/Miyake_et_al_1968/__init__.py

@@ -0,0 +1,5 @@
+# pylint: disable=invalid-name
+"""
+isotopic adjustment time plot following
+[Friedman et al. 1962 (JGR)](https://doi.org/10.1029/JZ067i007p02761)
+"""

{PySDM-examples-2.53 → PySDM-examples-2.58}/PySDM_examples/Shipway_and_Hill_2012/simulation.py

@@ -168,6 +168,7 @@ class Simulation:
                     PySDM_products.CoalescenceRatePerGridbox(
                         name="coalescence_rate",
                     ),
+                    PySDM_products.SurfacePrecipitation(),
                 ]
             )
         self.particulator = self.builder.build(
@@ -182,7 +183,9 @@ class Simulation:
         }
         self.output_products = {}
         for k, v in self.particulator.products.items():
-            if len(v.shape) == 1:
+            if len(v.shape) == 0:
+                self.output_products[k] = np.zeros(self.nt + 1)
+            elif len(v.shape) == 1:
                 self.output_products[k] = np.zeros((self.mesh.grid[-1], self.nt + 1))
             elif len(v.shape) == 2:
                 number_of_time_sections = len(self.save_spec_and_attr_times)
@@ -203,7 +206,10 @@ class Simulation:
         for k, v in self.particulator.products.items():
             if len(v.shape) > 1:
                 continue
-            self.output_products[k][:, step] = v.get()
+            if len(v.shape) == 1:
+                self.output_products[k][:, step] = v.get()
+            else:
+                self.output_products[k][step] = v.get()
 
     def save_spectrum(self, index):
         for k, v in self.particulator.products.items():

{PySDM-examples-2.53 → PySDM-examples-2.58}/PySDM_examples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySDM-examples
-Version: 2.53
+Version: 2.58
 Summary: PySDM usage examples reproducing results from literature and depicting how to use PySDM from Python Jupyter notebooks
 Home-page: https://github.com/open-atmos/PySDM
 Author: https://github.com/open-atmos/PySDM/graphs/contributors
@@ -18,11 +18,21 @@ Description:
               [![View notebook](https://img.shields.io/static/v1?label=render%20on&logo=github&color=87ce3e&message=GitHub)](https://github.com/open-atmos/PySDM/blob/main/examples/PySDM_examples/Merlivat_and_Nief_1967/fig_2.ipynb)
               [![launch on mybinder.org](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/open-atmos/PySDM.git/main?urlpath=lab/tree/examples/PySDM_examples/Merlivat_and_Nief_1967/fig_2.ipynb)
               [![launch on Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/open-atmos/PySDM/blob/main/examples/PySDM_examples/Merlivat_and_Nief_1967/fig_2.ipynb)    
+        - [Miyake et al. 1968](https://doi.org/10.2467/mripapers1950.19.2_243):
+          - Fig. 19:
+              [![View notebook](https://img.shields.io/static/v1?label=render%20on&logo=github&color=87ce3e&message=GitHub)](https://github.com/open-atmos/PySDM/blob/main/examples/PySDM_examples/Miyake_et_al_1968/fig_19.ipynb)
+              [![launch on mybinder.org](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/open-atmos/PySDM.git/main?urlpath=lab/tree/examples/PySDM_examples/Miyake_et_al_1968/fig_19.ipynb)
+              [![launch on Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/open-atmos/PySDM/blob/main/examples/PySDM_examples/Miyake_et_al_1968/fig_19.ipynb)    
         - [Van Hook 1968](https://doi.org/10.1021/j100850a028):
           - Fig. 1:
               [![View notebook](https://img.shields.io/static/v1?label=render%20on&logo=github&color=87ce3e&message=GitHub)](https://github.com/open-atmos/PySDM/blob/main/examples/PySDM_examples/Van_Hook_1968/fig_1.ipynb)
               [![launch on mybinder.org](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/open-atmos/PySDM.git/main?urlpath=lab/tree/examples/PySDM_examples/Van_Hook_1968/fig_1.ipynb)
               [![launch on Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/open-atmos/PySDM/blob/main/examples/PySDM_examples/Van_Hook_1968/fig_1.ipynb)    
+        - [Gedzelman & Arnold 1994](https://doi.org/10.1029/93JD03518):
+          - Fig. 2:
+              [![View notebook](https://img.shields.io/static/v1?label=render%20on&logo=github&color=87ce3e&message=GitHub)](https://github.com/open-atmos/PySDM/blob/main/examples/PySDM_examples/Gedzelman_and_Arnold_1994/fig_2.ipynb)
+              [![launch on mybinder.org](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/open-atmos/PySDM.git/main?urlpath=lab/tree/examples/PySDM_examples/Gedzelman_and_Arnold_1994/fig_2.ipynb)
+              [![launch on Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/open-atmos/PySDM/blob/main/examples/PySDM_examples/Gedzelman_and_Arnold_1994/fig_2.ipynb)    
         - [Bolot et al. 2013](http://doi.org/10.5194/acp-13-7903-2013):
           - Fig. 1:
               [![View notebook](https://img.shields.io/static/v1?label=render%20on&logo=github&color=87ce3e&message=GitHub)](https://github.com/open-atmos/PySDM/blob/main/examples/PySDM_examples/Bolot_et_al_2013/fig_1.ipynb)

{PySDM-examples-2.53 → PySDM-examples-2.58}/PySDM_examples.egg-info/SOURCES.txt

@@ -53,6 +53,7 @@ PySDM_examples/Bulenok_2023_MasterThesis/setups.py
 PySDM_examples/Bulenok_2023_MasterThesis/utils.py
 PySDM_examples/Ervens_and_Feingold_2012/__init__.py
 PySDM_examples/Ervens_and_Feingold_2012/settings.py
+PySDM_examples/Gedzelman_and_Arnold_1994/__init__.py
 PySDM_examples/Grabowski_and_Pawlowska_2023/__init__.py
 PySDM_examples/Grabowski_and_Pawlowska_2023/settings.py
 PySDM_examples/Grabowski_and_Pawlowska_2023/simulation.py
@@ -75,6 +76,7 @@ PySDM_examples/Lowe_et_al_2019/plot_helper.py
 PySDM_examples/Lowe_et_al_2019/settings.py
 PySDM_examples/Lowe_et_al_2019/simulation.py
 PySDM_examples/Merlivat_and_Nief_1967/__init__.py
+PySDM_examples/Miyake_et_al_1968/__init__.py
 PySDM_examples/Morrison_and_Grabowski_2007/__init__.py
 PySDM_examples/Morrison_and_Grabowski_2007/common.py
 PySDM_examples/Morrison_and_Grabowski_2007/cumulus.py

{PySDM-examples-2.53 → PySDM-examples-2.58}/PySDM_examples.egg-info/requires.txt

@@ -7,7 +7,6 @@ joblib
 ipywidgets
 seaborn
 numdifftools
-pyvinecopulib
 vtk
 
 [tests]

{PySDM-examples-2.53 → PySDM-examples-2.58}/README.md

@@ -7,11 +7,21 @@
       [![View notebook](https://img.shields.io/static/v1?label=render%20on&logo=github&color=87ce3e&message=GitHub)](https://github.com/open-atmos/PySDM/blob/main/examples/PySDM_examples/Merlivat_and_Nief_1967/fig_2.ipynb)
       [![launch on mybinder.org](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/open-atmos/PySDM.git/main?urlpath=lab/tree/examples/PySDM_examples/Merlivat_and_Nief_1967/fig_2.ipynb)
       [![launch on Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/open-atmos/PySDM/blob/main/examples/PySDM_examples/Merlivat_and_Nief_1967/fig_2.ipynb)    
+- [Miyake et al. 1968](https://doi.org/10.2467/mripapers1950.19.2_243):
+  - Fig. 19:
+      [![View notebook](https://img.shields.io/static/v1?label=render%20on&logo=github&color=87ce3e&message=GitHub)](https://github.com/open-atmos/PySDM/blob/main/examples/PySDM_examples/Miyake_et_al_1968/fig_19.ipynb)
+      [![launch on mybinder.org](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/open-atmos/PySDM.git/main?urlpath=lab/tree/examples/PySDM_examples/Miyake_et_al_1968/fig_19.ipynb)
+      [![launch on Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/open-atmos/PySDM/blob/main/examples/PySDM_examples/Miyake_et_al_1968/fig_19.ipynb)    
 - [Van Hook 1968](https://doi.org/10.1021/j100850a028):
   - Fig. 1:
       [![View notebook](https://img.shields.io/static/v1?label=render%20on&logo=github&color=87ce3e&message=GitHub)](https://github.com/open-atmos/PySDM/blob/main/examples/PySDM_examples/Van_Hook_1968/fig_1.ipynb)
       [![launch on mybinder.org](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/open-atmos/PySDM.git/main?urlpath=lab/tree/examples/PySDM_examples/Van_Hook_1968/fig_1.ipynb)
       [![launch on Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/open-atmos/PySDM/blob/main/examples/PySDM_examples/Van_Hook_1968/fig_1.ipynb)    
+- [Gedzelman & Arnold 1994](https://doi.org/10.1029/93JD03518):
+  - Fig. 2:
+      [![View notebook](https://img.shields.io/static/v1?label=render%20on&logo=github&color=87ce3e&message=GitHub)](https://github.com/open-atmos/PySDM/blob/main/examples/PySDM_examples/Gedzelman_and_Arnold_1994/fig_2.ipynb)
+      [![launch on mybinder.org](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/open-atmos/PySDM.git/main?urlpath=lab/tree/examples/PySDM_examples/Gedzelman_and_Arnold_1994/fig_2.ipynb)
+      [![launch on Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/open-atmos/PySDM/blob/main/examples/PySDM_examples/Gedzelman_and_Arnold_1994/fig_2.ipynb)    
 - [Bolot et al. 2013](http://doi.org/10.5194/acp-13-7903-2013):
   - Fig. 1:
       [![View notebook](https://img.shields.io/static/v1?label=render%20on&logo=github&color=87ce3e&message=GitHub)](https://github.com/open-atmos/PySDM/blob/main/examples/PySDM_examples/Bolot_et_al_2013/fig_1.ipynb)

{PySDM-examples-2.53 → PySDM-examples-2.58}/setup.py

@@ -32,7 +32,11 @@ setup(
         "seaborn",
         "numdifftools",
     ]
-    + (["pyvinecopulib", "vtk"] if platform.architecture()[0] != "32bit" else []),
+    + (
+        ["pyvinecopulib" + "==0.6.4" if CI else "", "vtk"]
+        if platform.architecture()[0] != "32bit"
+        else []
+    ),
     extras_require={
         "tests": [
             "pytest",