foamlib 0.9.0__py3-none-any.whl → 0.9.1__py3-none-any.whl

foamlib/__init__.py

@@ -1,6 +1,6 @@
 """A Python interface for interacting with OpenFOAM."""
 
-__version__ = "0.9.0"
+__version__ = "0.9.1"
 
 from ._cases import (
     AsyncFoamCase,

foamlib/_files/_parsing.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import re
 import sys
-from typing import Tuple, Union, cast
+from typing import TYPE_CHECKING, Tuple, Union, cast
 
 if sys.version_info >= (3, 9):
     from collections.abc import Iterator, Mapping, MutableMapping, Sequence
@@ -40,46 +40,43 @@ from pyparsing import (
 
 from ._types import Data, Dimensioned, DimensionSet, File
 
+if TYPE_CHECKING:
+    from numpy.typing import DTypeLike
 
-def _numeric_list(
-    *, nested: int | None = None, ignore: Regex | None = None, force_float: bool = False
+
+def _ascii_numeric_list(
+    dtype: DTypeLike,
+    *,
+    nested: int | None = None,
+    ignore: Regex | None = None,
+    empty_ok: bool = False,
 ) -> ParserElement:
-    if not force_float:
-        int_pattern = r"(?:-?\d+)"
-    float_pattern = r"(?i:[+-]?(?:(?:\d+\.?\d*(?:e[+-]?\d+)?)|nan|inf(?:inity)?))"
+    dtype = np.dtype(dtype)
+
+    if np.issubdtype(dtype, np.floating):
+        element = common.ieee_float
+        element_pattern = r"(?i:[+-]?(?:(?:\d+\.?\d*(?:e[+-]?\d+)?)|nan|inf(?:inity)?))"
+    elif np.issubdtype(dtype, np.integer):
+        element = common.integer
+        element_pattern = r"(?:-?\d+)"
+    else:
+        msg = f"Unsupported dtype: {dtype}"
+        raise TypeError(msg)
+
     spacing_pattern = (
-        rf"(?:(?:\s|{ignore.re.pattern})+)" if ignore is not None else r"\s+"
+        rf"(?:(?:\s|{ignore.re.pattern})+)" if ignore is not None else r"(?:\s+)"
     )
 
-    if nested is None:
-        if not force_float:
-            int_element_pattern = int_pattern
-            int_element = common.integer
-        float_element_pattern = float_pattern
-        float_element = common.ieee_float
-    else:
-        if not force_float:
-            int_element_pattern = rf"(?:(?:{nested})?{spacing_pattern}?\({spacing_pattern}?(?:{int_pattern}{spacing_pattern}){{{nested - 1}}}{int_pattern}{spacing_pattern}?\))"
-            int_element = (
-                Opt(Literal(str(nested))).suppress()
-                + Literal("(").suppress()
-                + Group(common.integer[nested])
-                + Literal(")").suppress()
-            )
-        float_element_pattern = rf"(?:(?:{nested})?{spacing_pattern}?\({spacing_pattern}?(?:{float_pattern}{spacing_pattern}){{{nested - 1}}}{float_pattern}{spacing_pattern}?\))"
-        float_element = (
-            Opt(Literal(str(nested))).suppress()
-            + Literal("(").suppress()
-            + Group(common.ieee_float[nested])
-            + Literal(")").suppress()
+    if nested is not None:
+        element = (
+            Literal("(").suppress() + Group(element[nested]) + Literal(")").suppress()
         )
+        element_pattern = rf"(?:{spacing_pattern}?\({element_pattern}?(?:{element_pattern}{spacing_pattern}){{{nested - 1}}}{element_pattern}{spacing_pattern}?\))"
 
-    if not force_float:
-        int_list = Forward()
-    float_list = Forward()
+    list_ = Forward()
 
     def process_count(tks: ParseResults) -> None:
-        nonlocal int_list, float_list
+        nonlocal list_
 
         if not tks:
             count = None
@@ -88,46 +85,41 @@ def _numeric_list(
             assert isinstance(count, int)
 
         if count is None:
-            if not force_float:
-                int_list_pattern = rf"\({spacing_pattern}?(?:{int_element_pattern}{spacing_pattern})*{int_element_pattern}{spacing_pattern}?\)"
-                float_list_pattern = rf"\({spacing_pattern}?(?:{float_element_pattern}{spacing_pattern})*{float_element_pattern}{spacing_pattern}?\)"
+            if not empty_ok:
+                list_pattern = rf"\({spacing_pattern}?(?:{element_pattern}{spacing_pattern})*{element_pattern}{spacing_pattern}?\)"
             else:
-                float_list_pattern = rf"\({spacing_pattern}?(?:{float_element_pattern}{spacing_pattern})*{float_element_pattern}?{spacing_pattern}?\)"
+                list_pattern = rf"\({spacing_pattern}?(?:{element_pattern}{spacing_pattern})*{element_pattern}?{spacing_pattern}?\)"
 
         elif count == 0:
-            if not force_float:
-                int_list <<= NoMatch()
-                float_list <<= NoMatch()
+            if not empty_ok:
+                list_ <<= NoMatch()
             else:
-                float_list <<= (Literal("(") + Literal(")")).add_parse_action(
-                    lambda: np.empty((0, nested) if nested else 0, dtype=float)
+                list_ <<= (Literal("(") + Literal(")")).add_parse_action(
+                    lambda: np.empty((0, nested) if nested else 0, dtype=dtype)
                 )
             return
 
         else:
-            if not force_float:
-                int_list_pattern = rf"\({spacing_pattern}?(?:{int_element_pattern}{spacing_pattern}){{{count - 1}}}{int_element_pattern}{spacing_pattern}?\)"
-            float_list_pattern = rf"\({spacing_pattern}?(?:{float_element_pattern}{spacing_pattern}){{{count - 1}}}{float_element_pattern}{spacing_pattern}?\)"
+            list_pattern = rf"\({spacing_pattern}?(?:{element_pattern}{spacing_pattern}){{{count - 1}}}{element_pattern}{spacing_pattern}?\)"
 
-        if not force_float:
-            int_list <<= Regex(int_list_pattern).add_parse_action(
-                lambda tks: to_array(tks, dtype=int)
-            )
-        float_list <<= Regex(float_list_pattern).add_parse_action(
-            lambda tks: to_array(tks, dtype=float)
+        list_ <<= Regex(list_pattern).add_parse_action(
+            lambda tks: to_array(tks, dtype=dtype)
         )
 
     def to_array(
-        tks: ParseResults, *, dtype: type
-    ) -> np.ndarray[tuple[int] | tuple[int, int], np.dtype[np.int64 | np.float64]]:
+        tks: ParseResults, *, dtype: DTypeLike
+    ) -> np.ndarray[tuple[int] | tuple[int, int], np.dtype[np.integer | np.floating]]:
         (s,) = tks
-        s = s.replace("(", "").replace(")", "")
-
+        assert s.startswith("(")
+        assert s.endswith(")")
+        s = s[1:-1]
         if ignore is not None:
             s = re.sub(ignore.re, " ", s)
+        if nested is not None:
+            s = s.replace("(", " ").replace(")", " ")
 
         ret: np.ndarray[
-            tuple[int] | tuple[int, int], np.dtype[np.int64 | np.float64]
+            tuple[int] | tuple[int, int], np.dtype[np.integer | np.floating]
         ] = np.fromstring(s, sep=" ", dtype=dtype)  # type: ignore[assignment]
 
         if nested is not None:
@@ -137,7 +129,7 @@ def _numeric_list(
 
     def to_full_array(
         tks: ParseResults, *, dtype: type
-    ) -> np.ndarray[tuple[int] | tuple[int, int], np.dtype[np.int64 | np.float64]]:
+    ) -> np.ndarray[tuple[int] | tuple[int, int], np.dtype[np.integer | np.floating]]:
         count, lst = tks
         assert isinstance(count, int)
 
@@ -146,24 +138,8 @@ def _numeric_list(
 
         return np.full((count, nested), lst, dtype=dtype)  # type: ignore[return-value]
 
-    count = Opt(common.integer).add_parse_action(process_count)
-
-    ret = count.suppress() + (
-        (int_list | float_list) if not force_float else float_list
-    )
-
-    if not force_float:
-        ret |= (
-            common.integer
-            + Literal("{").suppress()
-            + int_element
-            + Literal("}").suppress()
-        ).add_parse_action(lambda tks: to_full_array(tks, dtype=int))
-    ret |= (
-        common.integer
-        + Literal("{").suppress()
-        + float_element
-        + Literal("}").suppress()
+    ret = ((Opt(common.integer).add_parse_action(process_count)).suppress() + list_) | (
+        common.integer + Literal("{").suppress() + element + Literal("}").suppress()
     ).add_parse_action(lambda tks: to_full_array(tks, dtype=float))
 
     if ignore is not None:
@@ -172,23 +148,29 @@ def _numeric_list(
     return ret
 
 
-def _binary_field(*, nested: int | None = None) -> ParserElement:
+def _binary_numeric_list(
+    dtype: DTypeLike, *, nested: int | None = None, empty_ok: bool = False
+) -> ParserElement:
+    dtype = np.dtype(dtype)
+
     elsize = nested if nested is not None else 1
 
-    binary_field = Forward()
+    list_ = Forward()
 
     def process_count(tks: ParseResults) -> None:
-        nonlocal binary_field
+        nonlocal list_
         (size,) = tks
         assert isinstance(size, int)
 
-        binary_field <<= Regex(
-            rf"\((?s:({'.' * 8 * elsize}|{'.' * 4 * elsize}){{{size}}})\)"
-        )
+        if size == 0 and not empty_ok:
+            list_ <<= NoMatch()
+            return
+
+        list_ <<= Regex(rf"\((?s:{'.' * dtype.itemsize * elsize}){{{size}}}\)")
 
     def to_array(
         tks: ParseResults,
-    ) -> np.ndarray[tuple[int] | tuple[int, int], np.dtype[np.float64 | np.float32]]:
+    ) -> np.ndarray[tuple[int] | tuple[int, int], np.dtype[np.integer | np.floating]]:
         size, s = tks
         assert isinstance(size, int)
         assert isinstance(s, str)
@@ -196,10 +178,6 @@ def _binary_field(*, nested: int | None = None) -> ParserElement:
         assert s[-1] == ")"
         s = s[1:-1]
 
-        float_size = len(s) / elsize / size
-        assert float_size in (4, 8)
-
-        dtype = np.float32 if float_size == 4 else float
         ret = np.frombuffer(s.encode("latin-1"), dtype=dtype)
 
         if nested is not None:
@@ -207,9 +185,9 @@ def _binary_field(*, nested: int | None = None) -> ParserElement:
 
         return ret  # type: ignore[return-value]
 
-    count = common.integer.copy().add_parse_action(process_count)
-
-    return (count + binary_field).add_parse_action(to_array)
+    return (
+        common.integer.copy().add_parse_action(process_count) + list_
+    ).add_parse_action(to_array)
 
 
 def _list_of(entry: ParserElement) -> ParserElement:
@@ -337,15 +315,22 @@ _FIELD = (Keyword("uniform", _IDENTBODYCHARS).suppress() + _TENSOR) | (
             Opt(
                 Literal("List") + Literal("<") + Literal("scalar") + Literal(">")
             ).suppress()
-            + (_numeric_list(force_float=True, ignore=_COMMENT) | _binary_field())
+            + (
+                _ascii_numeric_list(dtype=float, ignore=_COMMENT, empty_ok=True)
+                | _binary_numeric_list(dtype=np.float64, empty_ok=True)
+                | _binary_numeric_list(dtype=np.float32, empty_ok=True)
+            )
         )
         | (
             Opt(
                 Literal("List") + Literal("<") + Literal("vector") + Literal(">")
             ).suppress()
             + (
-                _numeric_list(nested=3, force_float=True, ignore=_COMMENT)
-                | _binary_field(nested=3)
+                _ascii_numeric_list(
+                    dtype=float, nested=3, ignore=_COMMENT, empty_ok=True
+                )
+                | _binary_numeric_list(np.float64, nested=3, empty_ok=True)
+                | _binary_numeric_list(np.float32, nested=3, empty_ok=True)
             )
         )
         | (
@@ -353,12 +338,11 @@ _FIELD = (Keyword("uniform", _IDENTBODYCHARS).suppress() + _TENSOR) | (
                 Literal("List") + Literal("<") + Literal("symmTensor") + Literal(">")
             ).suppress()
             + (
-                _numeric_list(
-                    nested=6,
-                    force_float=True,
-                    ignore=_COMMENT,
+                _ascii_numeric_list(
+                    dtype=float, nested=6, ignore=_COMMENT, empty_ok=True
                 )
-                | _binary_field(nested=6)
+                | _binary_numeric_list(np.float64, nested=6, empty_ok=True)
+                | _binary_numeric_list(np.float32, nested=6, empty_ok=True)
             )
         )
         | (
@@ -366,8 +350,11 @@ _FIELD = (Keyword("uniform", _IDENTBODYCHARS).suppress() + _TENSOR) | (
                 Literal("List") + Literal("<") + Literal("tensor") + Literal(">")
             ).suppress()
             + (
-                _numeric_list(nested=9, force_float=True, ignore=_COMMENT)
-                | _binary_field(nested=9)
+                _ascii_numeric_list(
+                    dtype=float, nested=9, ignore=_COMMENT, empty_ok=True
+                )
+                | _binary_numeric_list(np.float64, nested=9, empty_ok=True)
+                | _binary_numeric_list(np.float32, nested=9, empty_ok=True)
             )
         )
     )
@@ -380,12 +367,7 @@ _KEYWORD_ENTRY = _keyword_entry_of(_TOKEN | _list_of(_IDENTIFIER), _DATA)
 _DICT = _dict_of(_TOKEN, _DATA)
 _DATA_ENTRY = Forward()
 _LIST_ENTRY = _DICT | _KEYWORD_ENTRY | _DATA_ENTRY
-_LIST = (
-    _numeric_list(ignore=_COMMENT)
-    | _numeric_list(nested=3, ignore=_COMMENT)
-    | _numeric_list(nested=4, ignore=_COMMENT)
-    | _list_of(_LIST_ENTRY)
-)
+_LIST = _list_of(_LIST_ENTRY)
 _NUMBER = (
     common.number
     | CaselessKeyword("nan").set_parse_action(lambda: np.nan)
@@ -421,7 +403,19 @@ _LOCATED_DICTIONARY = Group(
         located=True,
     )
 )[...]
-_LOCATED_DATA = Group(Located(_DATA.copy().add_parse_action(lambda tks: ["", tks[0]])))
+_LOCATED_DATA = Group(
+    Located(
+        (
+            _ascii_numeric_list(dtype=int, ignore=_COMMENT)
+            | _binary_numeric_list(dtype=np.int64)
+            | _binary_numeric_list(dtype=np.int32)
+            | _ascii_numeric_list(dtype=float, nested=3, ignore=_COMMENT)
+            | _binary_numeric_list(dtype=np.float64, nested=3)
+            | _binary_numeric_list(dtype=np.float32, nested=3)
+            | _DATA
+        ).add_parse_action(lambda tks: ["", tks[0]])
+    )
+)
 
 _FILE = (
     Dict(_LOCATED_DICTIONARY + Opt(_LOCATED_DATA) + _LOCATED_DICTIONARY)

foamlib/_files/_types.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import sys
-from enum import Enum
 from typing import Dict, NamedTuple, Optional, Union
 
 import numpy as np
@@ -42,39 +41,6 @@ TensorLike = Union[
 ]
 
 
-class TensorKind(Enum):
-    SCALAR = ()
-    VECTOR = (3,)
-    SYMM_TENSOR = (6,)
-    TENSOR = (9,)
-
-    @property
-    def shape(self) -> tuple[()] | tuple[int]:
-        shape: tuple[()] | tuple[int] = self.value
-        return shape
-
-    @property
-    def size(self) -> int:
-        return int(np.prod(self.shape))
-
-    def __str__(self) -> str:
-        return {
-            TensorKind.SCALAR: "scalar",
-            TensorKind.VECTOR: "vector",
-            TensorKind.SYMM_TENSOR: "symmTensor",
-            TensorKind.TENSOR: "tensor",
-        }[self]
-
-    @staticmethod
-    def from_shape(shape: tuple[int, ...]) -> TensorKind:
-        for kind in TensorKind:
-            if kind.shape == shape:
-                return kind
-
-        msg = f"No tensor kind for shape {shape!r}"
-        raise ValueError(msg)
-
-
 class Dimensioned:
     def __init__(
         self,

{foamlib-0.9.0.dist-info → foamlib-0.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: foamlib
-Version: 0.9.0
+Version: 0.9.1
 Summary: A Python interface for interacting with OpenFOAM
 Project-URL: Homepage, https://github.com/gerlero/foamlib
 Project-URL: Repository, https://github.com/gerlero/foamlib

{foamlib-0.9.0.dist-info → foamlib-0.9.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-foamlib/__init__.py,sha256=gSk-v_a_STLCffHq4oHQOi00Pj2TrxcMBOThu5S7ATY,452
+foamlib/__init__.py,sha256=0HqaL6QRggvb5wLBXgC3aMmHL7gltD8K2njaeYZJezI,452
 foamlib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 foamlib/_cases/__init__.py,sha256=_A1TTHuQfS9FH2_33lSEyLtOJZGFHZBco1tWJCVOHks,358
 foamlib/_cases/_async.py,sha256=e4lGTcQBbFGwfG6SmJks5aa5LWd_0dy01kgKZWAgTGQ,11655
@@ -11,10 +11,10 @@ foamlib/_cases/_util.py,sha256=QCizfbuJdOCeF9ogU2R-y-iWX5kfaOA4U2W68t6QlOM,2544
 foamlib/_files/__init__.py,sha256=q1vkjXnjnSZvo45jPAICpWeF2LZv5V6xfzAR6S8fS5A,96
 foamlib/_files/_files.py,sha256=gSJQjvB1f7N2yJtCTx9kpivKqSSNjDj37qNMpned5CM,19505
 foamlib/_files/_io.py,sha256=BGbbm6HKxL2ka0YMCmHqZQZ1R4PPQlkvWWb4FHMAS8k,2217
-foamlib/_files/_parsing.py,sha256=VLPyK11J57C02zJu1YfiLR0Xv1qRxw0sYYNsmmluFg0,17880
+foamlib/_files/_parsing.py,sha256=Nhktc7RnF7QIydUFm1umgQKiIW0s8GoPmagWRqfvaLQ,17404
 foamlib/_files/_serialization.py,sha256=QJ-F6BKizVe0gpjnpIfPxNGTqWwalY4PQtCKdDY9D70,5502
-foamlib/_files/_types.py,sha256=PDhFW5hUzcoQsLx7M0Va1oaYV6km02jFgrvKJof0JKQ,3750
-foamlib-0.9.0.dist-info/METADATA,sha256=xyisPf6vPUB497hmKtJngw_Z2QiuX7DCSvzZI5T3gQg,12906
-foamlib-0.9.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-foamlib-0.9.0.dist-info/licenses/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
-foamlib-0.9.0.dist-info/RECORD,,
+foamlib/_files/_types.py,sha256=q5O_x680XhGfvPHCNF_3objK1imUG2kgQYNRF2Z4qJ0,2918
+foamlib-0.9.1.dist-info/METADATA,sha256=ZSdTaK1ejV7YBHJVoQX384eudRHxTIxfjRiK7kH0Bxk,12906
+foamlib-0.9.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+foamlib-0.9.1.dist-info/licenses/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
+foamlib-0.9.1.dist-info/RECORD,,