PyPartMC 1.1.1__tar.gz → 1.1.2__tar.gz

{PyPartMC-1.1.1/PyPartMC.egg-info → PyPartMC-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPartMC
-Version: 1.1.1
+Version: 1.1.2
 Summary: Python interface to PartMC
 Author: PyPartMC team (see https://github.com/open-atmos/PyPartMC/graphs/contributors)
 Author-email: nriemer@illinois.edu
@@ -27,7 +27,7 @@ PyPartMC is a Python interface to [PartMC](https://lagrange.mechse.illinois.edu/
 PyPartMC is implemented in C++ and it also constitutes a C++ API to the PartMC Fortran internals.
 The Python API can facilitate using PartMC from other environments - see, e.g., Julia and Matlab examples below.
 
-For an outline of the project, rationale, architecture, and features, refer to: [D'Aquino et al., 2023 (arXiv)](https://doi.org/10.48550/arXiv.2308.02052) (please cite if PyPartMC is used in your research).
+For an outline of the project, rationale, architecture, and features, refer to: [D'Aquino et al., 2024 (SoftwareX)](https://doi.org/10.1016/j.softx.2023.101613) (please cite if PyPartMC is used in your research).
 For a list of talks and other relevant resources, please see [project Wiki](https://github.com/open-atmos/PyPartMC/wiki/).
 
 [![US Funding](https://img.shields.io/static/v1?label=US%20DOE%20Funding%20by&color=267c32&message=ASR&logoWidth=25&logo=image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAQCAMAAAA25D/gAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAASFBMVEVOTXyyIjRDQnNZWINZWITtzdFUU4BVVIFVVYHWiZM9PG/KZnNXVoJaWYT67/FKSXhgX4hgX4lcW4VbWoX03uHQeIN2VXj///9pZChlAAAAAWJLR0QXC9aYjwAAAAd0SU1FB+EICRMGJV+KCCQAAABdSURBVBjThdBJDoAgEETRkkkZBBX0/kd11QTTpH1/STqpAAwWBkobSlkGbt0o5xmEfqxDZJB2Q6XMoBwnVSbTylWp0hi42rmbwTOYPDfR5Kc+07IIUQQvghX9THsBHcES8/SiF0kAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTctMDgtMDlUMTk6MDY6MzcrMDA6MDCX1tBgAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE3LTA4LTA5VDE5OjA2OjM3KzAwOjAw5oto3AAAAABJRU5ErkJggg==)](https://asr.science.energy.gov/)

PyPartMC-1.1.2/PyPartMC/__init__.py

@@ -0,0 +1,74 @@
+# pylint: disable=invalid-name,wrong-import-position
+import os
+from collections import namedtuple
+from contextlib import contextmanager
+from pathlib import Path
+
+
+# https://github.com/diegoferigo/cmake-build-extension/blob/master/src/cmake_build_extension/__init__.py
+@contextmanager
+def __build_extension_env():
+    cookies = []
+    # https://docs.python.org/3/whatsnew/3.8.html#bpo-36085-whatsnew
+    if hasattr(os, "add_dll_directory"):
+        basepath = os.path.dirname(os.path.abspath(__file__))
+        dllspath = os.path.join(basepath, "..")
+        os.environ["PATH"] = dllspath + os.pathsep + os.environ["PATH"]
+        for path in os.environ.get("PATH", "").split(os.pathsep):
+            if path and Path(path).is_absolute() and Path(path).is_dir():
+                cookies.append(os.add_dll_directory(path))
+    try:
+        yield
+    finally:
+        for cookie in cookies:
+            cookie.close()
+
+
+def __generate_si():
+    prefixes = {
+        "T": 1e12,
+        "G": 1e9,
+        "M": 1e6,
+        "k": 1e3,
+        "h": 1e2,
+        "da": 1e1,
+        "": 1e0,
+        "d": 1e-1,
+        "c": 1e-2,
+        "m": 1e-3,
+        "u": 1e-6,
+        "n": 1e-9,
+        "p": 1e-12,
+    }
+    units = {
+        "m": 1e0,
+        "g": 1e-3,
+        "s": 1e0,
+        "K": 1e0,
+        "Pa": 1e0,
+        "mol": 1e0,
+        "W": 1e0,
+        "J": 1e0,
+        "N": 1e0,
+    }
+    return namedtuple("SI", [prefix + unit for prefix in prefixes for unit in units])(
+        **{
+            prefix_k + unit_k: prefix_v * unit_v
+            for prefix_k, prefix_v in prefixes.items()
+            for unit_k, unit_v in units.items()
+        }
+    )
+
+
+si = __generate_si()
+""" a utility namedtuple aimed at clrifying physics-related code by providing
+    SI-prefix-aware unit multipliers, resulting in e.g.: `p = 1000 * si.hPa`
+    notation. Note: no dimensional analysis is done! """
+
+with __build_extension_env():
+    import _PyPartMC
+    from _PyPartMC import *
+    from _PyPartMC import __all__ as _PyPartMC_all  # pylint: disable=no-name-in-module
+    from _PyPartMC import __version__, __versions_of_build_time_dependencies__
+
+    __all__ = tuple([*_PyPartMC_all, "si"])

{PyPartMC-1.1.1 → PyPartMC-1.1.2/PyPartMC.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPartMC
-Version: 1.1.1
+Version: 1.1.2
 Summary: Python interface to PartMC
 Author: PyPartMC team (see https://github.com/open-atmos/PyPartMC/graphs/contributors)
 Author-email: nriemer@illinois.edu
@@ -27,7 +27,7 @@ PyPartMC is a Python interface to [PartMC](https://lagrange.mechse.illinois.edu/
 PyPartMC is implemented in C++ and it also constitutes a C++ API to the PartMC Fortran internals.
 The Python API can facilitate using PartMC from other environments - see, e.g., Julia and Matlab examples below.
 
-For an outline of the project, rationale, architecture, and features, refer to: [D'Aquino et al., 2023 (arXiv)](https://doi.org/10.48550/arXiv.2308.02052) (please cite if PyPartMC is used in your research).
+For an outline of the project, rationale, architecture, and features, refer to: [D'Aquino et al., 2024 (SoftwareX)](https://doi.org/10.1016/j.softx.2023.101613) (please cite if PyPartMC is used in your research).
 For a list of talks and other relevant resources, please see [project Wiki](https://github.com/open-atmos/PyPartMC/wiki/).
 
 [![US Funding](https://img.shields.io/static/v1?label=US%20DOE%20Funding%20by&color=267c32&message=ASR&logoWidth=25&logo=image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAQCAMAAAA25D/gAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAASFBMVEVOTXyyIjRDQnNZWINZWITtzdFUU4BVVIFVVYHWiZM9PG/KZnNXVoJaWYT67/FKSXhgX4hgX4lcW4VbWoX03uHQeIN2VXj///9pZChlAAAAAWJLR0QXC9aYjwAAAAd0SU1FB+EICRMGJV+KCCQAAABdSURBVBjThdBJDoAgEETRkkkZBBX0/kd11QTTpH1/STqpAAwWBkobSlkGbt0o5xmEfqxDZJB2Q6XMoBwnVSbTylWp0hi42rmbwTOYPDfR5Kc+07IIUQQvghX9THsBHcES8/SiF0kAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTctMDgtMDlUMTk6MDY6MzcrMDA6MDCX1tBgAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE3LTA4LTA5VDE5OjA2OjM3KzAwOjAw5oto3AAAAABJRU5ErkJggg==)](https://asr.science.energy.gov/)

{PyPartMC-1.1.1 → PyPartMC-1.1.2}/README.md

@@ -7,7 +7,7 @@ PyPartMC is a Python interface to [PartMC](https://lagrange.mechse.illinois.edu/
 PyPartMC is implemented in C++ and it also constitutes a C++ API to the PartMC Fortran internals.
 The Python API can facilitate using PartMC from other environments - see, e.g., Julia and Matlab examples below.
 
-For an outline of the project, rationale, architecture, and features, refer to: [D'Aquino et al., 2023 (arXiv)](https://doi.org/10.48550/arXiv.2308.02052) (please cite if PyPartMC is used in your research).
+For an outline of the project, rationale, architecture, and features, refer to: [D'Aquino et al., 2024 (SoftwareX)](https://doi.org/10.1016/j.softx.2023.101613) (please cite if PyPartMC is used in your research).
 For a list of talks and other relevant resources, please see [project Wiki](https://github.com/open-atmos/PyPartMC/wiki/).
 
 [![US Funding](https://img.shields.io/static/v1?label=US%20DOE%20Funding%20by&color=267c32&message=ASR&logoWidth=25&logo=image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAQCAMAAAA25D/gAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAASFBMVEVOTXyyIjRDQnNZWINZWITtzdFUU4BVVIFVVYHWiZM9PG/KZnNXVoJaWYT67/FKSXhgX4hgX4lcW4VbWoX03uHQeIN2VXj///9pZChlAAAAAWJLR0QXC9aYjwAAAAd0SU1FB+EICRMGJV+KCCQAAABdSURBVBjThdBJDoAgEETRkkkZBBX0/kd11QTTpH1/STqpAAwWBkobSlkGbt0o5xmEfqxDZJB2Q6XMoBwnVSbTylWp0hi42rmbwTOYPDfR5Kc+07IIUQQvghX9THsBHcES8/SiF0kAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTctMDgtMDlUMTk6MDY6MzcrMDA6MDCX1tBgAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE3LTA4LTA5VDE5OjA2OjM3KzAwOjAw5oto3AAAAABJRU5ErkJggg==)](https://asr.science.energy.gov/)

{PyPartMC-1.1.1 → PyPartMC-1.1.2}/tests/test_units.py

@@ -13,10 +13,12 @@ class TestUnits:
     @staticmethod
     def test_temperatur():
         assert ppmc.si.K == 1
+        assert ppmc.si.pK == 1e-12
 
     @staticmethod
     def test_time():
         assert ppmc.si.s == 1
+        assert ppmc.si.us == 1e-6
 
     @staticmethod
     def test_pressure():
@@ -26,8 +28,24 @@ class TestUnits:
     @staticmethod
     def test_amount():
         assert ppmc.si.mol == 1
+        assert ppmc.si.Tmol == 1e12
 
     @staticmethod
     def test_mass():
         assert ppmc.si.kg == 1
         assert ppmc.si.g == 1e-3
+
+    @staticmethod
+    def test_energy():
+        assert ppmc.si.J == 1
+        assert ppmc.si.MJ == 1e6
+
+    @staticmethod
+    def test_force():
+        assert ppmc.si.N == 1
+        assert ppmc.si.GN == 1e9
+
+    @staticmethod
+    def test_work():
+        assert ppmc.si.W == 1
+        assert ppmc.si.uW == 1e-6

PyPartMC-1.1.1/PyPartMC/__init__.py

@@ -1,50 +0,0 @@
-# pylint: disable=invalid-name,wrong-import-position
-import os
-from collections import namedtuple
-from contextlib import contextmanager
-from pathlib import Path
-
-
-# https://github.com/diegoferigo/cmake-build-extension/blob/master/src/cmake_build_extension/__init__.py
-@contextmanager
-def __build_extension_env():
-    cookies = []
-    # https://docs.python.org/3/whatsnew/3.8.html#bpo-36085-whatsnew
-    if hasattr(os, "add_dll_directory"):
-        basepath = os.path.dirname(os.path.abspath(__file__))
-        dllspath = os.path.join(basepath, "..")
-        os.environ["PATH"] = dllspath + os.pathsep + os.environ["PATH"]
-        for path in os.environ.get("PATH", "").split(os.pathsep):
-            if path and Path(path).is_absolute() and Path(path).is_dir():
-                cookies.append(os.add_dll_directory(path))
-    try:
-        yield
-    finally:
-        for cookie in cookies:
-            cookie.close()
-
-
-# TODO #113: 2 x loop over prefixes and units
-si = namedtuple("SI", ("m", "cm", "um", "nm", "kg", "g", "s", "K", "Pa", "hPa", "mol"))(
-    m=1.0,
-    cm=0.01,
-    um=1e-6,
-    nm=1e-9,
-    kg=1.0,
-    g=1e-3,
-    s=1.0,
-    K=1.0,
-    Pa=1.0,
-    hPa=100.0,
-    mol=1.0,
-)
-""" TODO #113 """
-
-with __build_extension_env():
-    import _PyPartMC
-    from _PyPartMC import *
-    from _PyPartMC import (  # pylint: disable=no-name-in-module
-        __all__,
-        __version__,
-        __versions_of_build_time_dependencies__,
-    )