Skip to content

Commit f4931b6

Browse files
refactor: re-label prescribed-flow 2D-simulation from Szumowski_et_al_1998 to utils/kinematic_2d (#1623)
Co-authored-by: Sylwester Arabas <sylwester.arabas@agh.edu.pl>
1 parent e1c5da0 commit f4931b6

35 files changed

+3617
-602
lines changed

docs/bibliography.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"https://doi.org/10.1007/978-1-935704-36-2_1": {
33
"usages": [
4-
"examples/docs/pysdm_examples_landing.md"
4+
"examples/docs/pysdm_examples_landing.md",
5+
"examples/PySDM_examples/utils/kinematic_2d/__init__.py"
56
],
67
"label": "Kessler 1969 (Meteorol. Monogr. 10)",
78
"title": "On the Distribution and Continuity of Water Substance in Atmospheric Circulations"
@@ -87,9 +88,9 @@
8788
"https://doi.org/10.1175/JAS3980": {
8889
"usages": [
8990
"examples/docs/pysdm_examples_landing.md",
90-
"examples/PySDM_examples/Morrison_and_Grabowski_2007/fig_2.ipynb",
91-
"examples/PySDM_examples/Morrison_and_Grabowski_2007/fig_3.ipynb",
92-
"examples/PySDM_examples/Morrison_and_Grabowski_2007/__init__.py"
91+
"examples/PySDM_examples/utils/kinematic_2d/__init__.py",
92+
"examples/PySDM_examples/Morrison_and_Grabowski_2007/__init__.py",
93+
"examples/PySDM_examples/Morrison_and_Grabowski_2007/fig_1.ipynb"
9394
],
9495
"label": "Morrison & Grabowski 2007 (J. Atmos. Sci. 64)",
9596
"title": "Comparison of Bulk and Bin Warm-Rain Microphysics Models Using a Kinematic Framework"
@@ -255,7 +256,8 @@
255256
"examples/docs/pysdm_examples_landing.md",
256257
"examples/PySDM_examples/Arabas_et_al_2015/gui.ipynb",
257258
"PySDM/dynamics/displacement.py",
258-
"PySDM/physics/particle_advection/implicit_in_space.py"
259+
"PySDM/physics/particle_advection/implicit_in_space.py",
260+
"examples/PySDM_examples/utils/kinematic_2d/__init__.py"
259261
],
260262
"label": "Arabas et al. 2015 (Geosci. Model Dev. 2015)",
261263
"title": "libcloudph++ 1.0: a single-moment bulk, double-moment bulk, and particle-based warm-rain microphysics library in C++"
@@ -604,7 +606,7 @@
604606
},
605607
"https://doi.org/10.1016/S0169-8095(97)00082-3": {
606608
"usages": [
607-
"examples/PySDM_examples/Szumowski_et_al_1998/__init__.py"
609+
"examples/PySDM_examples/utils/kinematic_2d/__init__.py"
608610
],
609611
"label": "Szumowski et al. 1998 (Atmos. Res. 45)",
610612
"title": "Simple two-dimensional kinematic framework designed to test warm rain microphysical models"

examples/PySDM_examples/Arabas_et_al_2015/example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from open_atmos_jupyter_utils import TemporaryFile
22
from PySDM_examples.Arabas_et_al_2015 import Settings, SpinUp
3-
from PySDM_examples.Szumowski_et_al_1998 import Simulation, Storage
3+
from PySDM_examples.utils.kinematic_2d import Simulation, Storage
44
from PySDM_examples.utils import DummyController
55

66
from PySDM import Formulae

examples/PySDM_examples/Arabas_et_al_2015/example_benchmark.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from matplotlib import pyplot as plt
44
from PySDM_examples.Arabas_et_al_2015 import Settings
5-
from PySDM_examples.Szumowski_et_al_1998 import Simulation, Storage
5+
from PySDM_examples.utils.kinematic_2d import Simulation, Storage
66

77
import PySDM.backends.impl_numba.conf
88
from PySDM import Formulae

examples/PySDM_examples/Arabas_et_al_2015/gui.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
}
6565
],
6666
"source": [
67-
"from PySDM_examples.Szumowski_et_al_1998 import gui, Simulation, GUISettings, Storage\n",
67+
"from PySDM_examples.utils.kinematic_2d import gui, Simulation, GUISettings, Storage\n",
6868
"from PySDM_examples.Arabas_et_al_2015 import Settings, SpinUp\n",
6969
"from PySDM import Formulae\n",
7070
"settings = GUISettings(Settings(Formulae()))\n",

examples/PySDM_examples/Arabas_et_al_2025/figs_10_and_11_and_animations.ipynb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"from PySDM.dynamics import Freezing\n",
6767
"\n",
6868
"from PySDM_examples.Arabas_et_al_2015 import Settings\n",
69-
"from PySDM_examples.Szumowski_et_al_1998 import Simulation, Storage\n",
69+
"from PySDM_examples.utils.kinematic_2d import Simulation, Storage\n",
7070
"from PySDM_examples.Arabas_et_al_2025.commons import FREEZING_CONSTANTS, LOGNORMAL_MODE_SURF_A, LOGNORMAL_SGM_G"
7171
]
7272
},
@@ -6221,7 +6221,6 @@
62216221
"\n",
62226222
"import argparse\n",
62236223
"import json\n",
6224-
"from pathlib import Path\n",
62256224
"from paraview import simple as pvs\n",
62266225
"\n",
62276226
"arg_parser = argparse.ArgumentParser()\n",

examples/PySDM_examples/Bartman_et_al_2021/demo.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
},
4545
"source": [
4646
"from PySDM_examples.Arabas_et_al_2015 import Settings, SpinUp\n",
47-
"from PySDM_examples.Szumowski_et_al_1998 import Simulation, Storage\n",
48-
"from PySDM_examples.Szumowski_et_al_1998.plots import _TimeseriesPlot, _ImagePlot\n",
47+
"from PySDM_examples.utils.kinematic_2d import Simulation, Storage\n",
48+
"from PySDM_examples.utils.kinematic_2d.plots import _TimeseriesPlot, _ImagePlot\n",
4949
"from PySDM_examples.utils import ProgBarController\n",
5050
"from PySDM_examples.utils.widgets import HTML, display\n",
5151
"import PySDM.products as PySDM_products\n",

examples/PySDM_examples/Bartman_et_al_2021/demo_fig2.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
},
4545
"source": [
4646
"from PySDM_examples.Arabas_et_al_2015 import Settings, SpinUp\n",
47-
"from PySDM_examples.Szumowski_et_al_1998 import Simulation, Storage\n",
47+
"from PySDM_examples.utils.kinematic_2d import Simulation, Storage\n",
4848
"from PySDM.exporters import NetCDFExporter\n",
4949
"from PySDM_examples.utils import ProgBarController\n",
5050
"from open_atmos_jupyter_utils import show_plot, TemporaryFile\n",

examples/PySDM_examples/Bartman_et_al_2021/demo_fig3.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"from PySDM_examples.utils import ProgBarController\n",
4747
"from open_atmos_jupyter_utils import TemporaryFile, show_plot\n",
4848
"from PySDM.physics import si, convert_to\n",
49-
"from PySDM_examples.Szumowski_et_al_1998 import Simulation, Storage\n",
49+
"from PySDM_examples.utils.kinematic_2d import Simulation, Storage\n",
5050
"from PySDM_examples.Arabas_et_al_2015 import Settings, SpinUp\n",
5151
"from PySDM_examples.Bartman_et_al_2021.label import label\n",
5252
"from PySDM.exporters import NetCDFExporter\n",

examples/PySDM_examples/Morrison_and_Grabowski_2007/__init__.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
prescribed-flow simulation settings data from
44
[Morrison & Grabowski 2007 (JAS)](https://doi.org/10.1175/JAS3980)
55
6-
fig_2.ipynb:
7-
.. include:: ./fig_2.ipynb.badges.md
8-
9-
fig_3.ipynb:
10-
.. include:: ./fig_3.ipynb.badges.md
6+
fig_1.ipynb:
7+
.. include:: ./fig_1.ipynb.badges.md
118
"""
12-
from .cumulus import Cumulus

examples/PySDM_examples/Morrison_and_Grabowski_2007/cumulus.py

Lines changed: 0 additions & 136 deletions
This file was deleted.

0 commit comments

Comments
 (0)