PySDM-examples 2.125__tar.gz → 2.127__tar.gz

{pysdm_examples-2.125 → pysdm_examples-2.127}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysdm-examples
-Version: 2.125
+Version: 2.127
 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

{pysdm_examples-2.125 → pysdm_examples-2.127}/PySDM_examples/Berry_1967/spectrum_plotter.py

@@ -26,6 +26,8 @@ class SpectrumPlotter(SuperSpectrumPlotter):
         self.ticks()
         show_plot()
 
-    def plot(self, spectrum, t):
+    def plot(
+        self, spectrum, t, label=None, color=None, title=None, add_error_to_label=False
+    ):
         settings = self.settings
-        self.plot_data(settings, t, spectrum)
+        self.plot_data(settings, t, spectrum, label, color)

pysdm_examples-2.127/PySDM_examples/Rogers_1975/__init__.py

@@ -0,0 +1,9 @@
+"""
+based on Rogers 1975 (Atmosphere)
+https://doi.org/10.1080/00046973.1975.9648397
+
+fig_1.ipynb:
+.. include:: ./fig_1.ipynb.badges.md
+"""
+
+# pylint: disable=invalid-name

{pysdm_examples-2.125 → pysdm_examples-2.127}/PySDM_examples/Shima_et_al_2009/spectrum_plotter.py

@@ -81,12 +81,16 @@ class SpectrumPlotter:
         self.finish()
         pyplot.savefig(file, format=self.format)
 
-    def plot(self, spectrum, t):
-        error = self.plot_analytic_solution(self.settings, t, spectrum)
-        self.plot_data(self.settings, t, spectrum)
+    def plot(
+        self, spectrum, t, label=None, color=None, title=None, add_error_to_label=False
+    ):
+        error = self.plot_analytic_solution(self.settings, t, spectrum, title)
+        if label is not None and add_error_to_label:
+            label += f" error={error:.4g}"
+        self.plot_data(self.settings, t, spectrum, label, color)
         return error
 
-    def plot_analytic_solution(self, settings, t, spectrum=None):
+    def plot_analytic_solution(self, settings, t, spectrum, title):
         if t == 0:
             analytic_solution = settings.spectrum.size_distribution
         else:
@@ -123,11 +127,13 @@ class SpectrumPlotter:
         if spectrum is not None:
             y = spectrum * si.kilograms / si.grams
             error = error_measure(y, y_true, x)
-            self.title = f"error measure: {error:.2f}"  # TODO #327 relative error
+            self.title = (
+                title or f"error measure: {error:.2f}"
+            )  # TODO #327 relative error
             return error
         return None
 
-    def plot_data(self, settings, t, spectrum):
+    def plot_data(self, settings, t, spectrum, label, color):
         if self.smooth:
             scope = self.smooth_scope
             if t != 0:
@@ -144,18 +150,16 @@ class SpectrumPlotter:
             self.ax.plot(
                 (x[:-1] + dx / 2) * si.metres / si.micrometres,
                 spectrum[:-scope] * si.kilograms / si.grams,
-                label=f"t = {t}s",
-                color=self.colors(
-                    t / (self.settings.output_steps[-1] * self.settings.dt)
-                ),
+                label=label or f"t = {t}s",
+                color=color
+                or self.colors(t / (self.settings.output_steps[-1] * self.settings.dt)),
             )
         else:
             self.ax.step(
                 settings.radius_bins_edges[:-1] * si.metres / si.micrometres,
                 spectrum * si.kilograms / si.grams,
                 where="post",
-                label=f"t = {t}s",
-                color=self.colors(
-                    t / (self.settings.output_steps[-1] * self.settings.dt)
-                ),
+                label=label or f"t = {t}s",
+                color=color
+                or self.colors(t / (self.settings.output_steps[-1] * self.settings.dt)),
             )

{pysdm_examples-2.125 → pysdm_examples-2.127}/pysdm_examples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysdm-examples
-Version: 2.125
+Version: 2.127
 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

{pysdm_examples-2.125 → pysdm_examples-2.127}/pysdm_examples.egg-info/SOURCES.txt

@@ -96,6 +96,7 @@ PySDM_examples/Pyrcel/__init__.py
 PySDM_examples/Pyrcel/profile_plotter.py
 PySDM_examples/Pyrcel/settings.py
 PySDM_examples/Pyrcel/simulation.py
+PySDM_examples/Rogers_1975/__init__.py
 PySDM_examples/Rozanski_and_Sonntag_1982/__init__.py
 PySDM_examples/Rozanski_and_Sonntag_1982/multibox.py
 PySDM_examples/Shima_et_al_2009/__init__.py