foamlib 0.6.12__py3-none-any.whl → 0.6.14__py3-none-any.whl

foamlib/__init__.py

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

foamlib/_files/_files.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import os
 import sys
 from copy import deepcopy
 from typing import Any, Optional, Tuple, Union, cast
@@ -16,7 +17,7 @@ else:
 
 from ._base import FoamFileBase
 from ._io import FoamFileIO
-from ._serialization import Kind, dumps
+from ._serialization import Kind, dumps, normalize
 from ._util import is_sequence
 
 
@@ -216,12 +217,28 @@ class FoamFile(
                     or keywords[2].endswith("Gradient")
                 )
             ):
-                kind = Kind.BINARY_FIELD if self.format == "binary" else Kind.FIELD
+                if self.format == "binary":
+                    arch = self.get(("FoamFile", "arch"), default=None)
+                    assert arch is None or isinstance(arch, str)
+                    if (arch is not None and "scalar=32" in arch) or (
+                        arch is None
+                        and os.environ.get("WM_PRECISION_OPTION", default="DP") == "SP"
+                    ):
+                        kind = Kind.SINGLE_PRECISION_BINARY_FIELD
+                    else:
+                        kind = Kind.DOUBLE_PRECISION_BINARY_FIELD
+                else:
+                    kind = Kind.ASCII_FIELD
             elif keywords == ("dimensions",):
                 kind = Kind.DIMENSIONS
 
             if (
-                kind in (Kind.FIELD, Kind.BINARY_FIELD)
+                kind
+                in (
+                    Kind.ASCII_FIELD,
+                    Kind.DOUBLE_PRECISION_BINARY_FIELD,
+                    Kind.SINGLE_PRECISION_BINARY_FIELD,
+                )
             ) and self.class_ == "dictionary":
                 if isinstance(data, (int, float)):
                     self.class_ = "volScalarField"
@@ -291,7 +308,7 @@ class FoamFile(
             elif keywords:
                 parsed.put(
                     keywords,
-                    deepcopy(data),
+                    normalize(data, kind=kind),
                     before
                     + indentation
                     + dumps(keywords[-1])
@@ -302,7 +319,11 @@ class FoamFile(
                 )
 
             else:
-                parsed.put((), deepcopy(data), before + dumps(data, kind=kind) + after)
+                parsed.put(
+                    (),
+                    normalize(data, kind=kind),
+                    before + dumps(data, kind=kind) + after,
+                )
 
     def __delitem__(self, keywords: str | tuple[str, ...] | None) -> None:
         if not keywords:

foamlib/_files/_parsing.py

@@ -29,7 +29,6 @@ from pyparsing import (
     ParseResults,
     QuotedString,
     Word,
-    c_style_comment,
     common,
     counted_array,
     cpp_style_comment,
@@ -41,9 +40,7 @@ from ._base import FoamFileBase
 
 
 def _list_of(entry: ParserElement) -> ParserElement:
-    return Opt(
-        Literal("List") + Literal("<") + common.identifier + Literal(">")
-    ).suppress() + (
+    return (
         (
             counted_array(entry, common.integer + Literal("(").suppress())
             + Literal(")").suppress()
@@ -82,10 +79,12 @@ def _keyword_entry_of(
 
 def _unpack_binary_field(
     tks: ParseResults,
+    *,
+    elsize: int = 1,
 ) -> Sequence[Sequence[float] | Sequence[Sequence[float]]]:
-    elsize = len(tks[0]) // 8
+    float_size = len(tks[0]) // elsize
 
-    arr = array.array("d", "".join(tks).encode("latin-1"))
+    arr = array.array("f" if float_size == 4 else "d", "".join(tks).encode("latin-1"))
 
     values: Sequence[float] | Sequence[Sequence[float]]
 
@@ -122,7 +121,13 @@ _SWITCH = (
 _DIMENSIONS = (
     Literal("[").suppress() + common.number[0, 7] + Literal("]").suppress()
 ).set_parse_action(lambda tks: FoamFileBase.DimensionSet(*tks))
-_TENSOR = _list_of(common.number) | common.number
+_TENSOR = common.ieee_float | (
+    Literal("(").suppress()
+    + Group(
+        common.ieee_float[9] | common.ieee_float[6] | common.ieee_float[3], aslist=True
+    )
+    + Literal(")").suppress()
+)
 _IDENTIFIER = Combine(
     Word(_IDENTCHARS, _IDENTBODYCHARS, exclude_chars="()")
     + Opt(Literal("(") + Word(_IDENTBODYCHARS, exclude_chars="()") + Literal(")"))
@@ -130,45 +135,121 @@ _IDENTIFIER = Combine(
 _DIMENSIONED = (Opt(_IDENTIFIER) + _DIMENSIONS + _TENSOR).set_parse_action(
     lambda tks: FoamFileBase.Dimensioned(*reversed(tks.as_list()))
 )
-_FIELD = (Keyword("uniform").suppress() + _TENSOR) | (
-    Keyword("nonuniform").suppress()
+_FIELD = (Keyword("uniform", _IDENTBODYCHARS).suppress() + _TENSOR) | (
+    Keyword("nonuniform", _IDENTBODYCHARS).suppress()
     + (
-        _list_of(_TENSOR)
-        | (
-            Literal("List").suppress()
-            + Literal("<").suppress()
-            + (
-                counted_array(
-                    CharsNotIn(exact=8),
-                    Literal("scalar").suppress()
-                    + Literal(">").suppress()
-                    + common.integer
-                    + Literal("(").suppress(),
+        Literal("List").suppress()
+        + Literal("<").suppress()
+        + (
+            (
+                Literal("scalar").suppress()
+                + Literal(">").suppress()
+                + (
+                    _list_of(common.ieee_float)
+                    | (
+                        (
+                            (
+                                counted_array(
+                                    CharsNotIn(exact=8),
+                                    common.integer + Literal("(").suppress(),
+                                )
+                            )
+                            | (
+                                counted_array(
+                                    CharsNotIn(exact=4),
+                                    common.integer + Literal("(").suppress(),
+                                )
+                            )
+                        )
+                        + Literal(")").suppress()
+                    ).set_parse_action(_unpack_binary_field)
                 )
-                | counted_array(
-                    CharsNotIn(exact=8 * 3),
-                    Literal("vector").suppress()
-                    + Literal(">").suppress()
-                    + common.integer
-                    + Literal("(").suppress(),
+            )
+            | (
+                Literal("vector").suppress()
+                + Literal(">").suppress()
+                + (
+                    _list_of(
+                        Literal("(").suppress()
+                        + Group(common.ieee_float[3], aslist=True)
+                        + Literal(")").suppress()
+                    )
+                    | (
+                        (
+                            (
+                                counted_array(
+                                    CharsNotIn(exact=8 * 3),
+                                    common.integer + Literal("(").suppress(),
+                                )
+                            )
+                            | (
+                                counted_array(
+                                    CharsNotIn(exact=4 * 3),
+                                    common.integer + Literal("(").suppress(),
+                                )
+                            )
+                        )
+                        + Literal(")").suppress()
+                    ).set_parse_action(lambda tks: _unpack_binary_field(tks, elsize=3))
                 )
-                | counted_array(
-                    CharsNotIn(exact=8 * 6),
-                    Literal("symmTensor").suppress()
-                    + Literal(">").suppress()
-                    + common.integer
-                    + Literal("(").suppress(),
+            )
+            | (
+                Literal("vector").suppress()
+                + Literal(">").suppress()
+                + (
+                    _list_of(
+                        Literal("(").suppress()
+                        + Group(common.ieee_float[6], aslist=True)
+                        + Literal(")").suppress()
+                    )
+                    | (
+                        (
+                            (
+                                counted_array(
+                                    CharsNotIn(exact=8 * 6),
+                                    common.integer + Literal("(").suppress(),
+                                )
+                            )
+                            | (
+                                counted_array(
+                                    CharsNotIn(exact=4 * 6),
+                                    common.integer + Literal("(").suppress(),
+                                )
+                            )
+                        )
+                        + Literal(")").suppress()
+                    ).set_parse_action(lambda tks: _unpack_binary_field(tks, elsize=6))
                 )
-                | counted_array(
-                    CharsNotIn(exact=8 * 9),
-                    Literal("tensor").suppress()
-                    + Literal(">").suppress()
-                    + common.integer
-                    + Literal("(").suppress(),
+            )
+            | (
+                Literal("tensor").suppress()
+                + Literal(">").suppress()
+                + (
+                    _list_of(
+                        Literal("(").suppress()
+                        + Group(common.ieee_float[9], aslist=True)
+                        + Literal(")").suppress()
+                    )
+                    | (
+                        (
+                            (
+                                counted_array(
+                                    CharsNotIn(exact=8 * 9),
+                                    common.integer + Literal("(").suppress(),
+                                )
+                            )
+                            | (
+                                counted_array(
+                                    CharsNotIn(exact=4 * 9),
+                                    common.integer + Literal("(").suppress(),
+                                )
+                            )
+                        )
+                        + Literal(")").suppress()
+                    ).set_parse_action(lambda tks: _unpack_binary_field(tks, elsize=9))
                 )
             )
-            + Literal(")").suppress()
-        ).set_parse_action(_unpack_binary_field)
+        )
     )
 )
 _TOKEN = QuotedString('"', unquote_results=False) | _IDENTIFIER
@@ -180,9 +261,8 @@ _KEYWORD_ENTRY = Dict(Group(_keyword_entry_of(_KEYWORD, _DATA)), asdict=True)
 _DATA_ENTRY = Forward()
 _LIST_ENTRY = _KEYWORD_ENTRY | _DATA_ENTRY
 _LIST = _list_of(_LIST_ENTRY)
-_DATA_ENTRY <<= (
-    _FIELD | _LIST | _DIMENSIONED | _DIMENSIONS | common.number | _SWITCH | _TOKEN
-)
+_NUMBER = common.signed_integer ^ common.ieee_float
+_DATA_ENTRY <<= _FIELD | _LIST | _DIMENSIONED | _DIMENSIONS | _NUMBER | _SWITCH | _TOKEN
 
 _DATA <<= _DATA_ENTRY[1, ...].set_parse_action(
     lambda tks: tuple(tks) if len(tks) > 1 else [tks[0]]
@@ -202,7 +282,6 @@ _FILE = (
         )
         + Group(_keyword_entry_of(_KEYWORD, Opt(_DATA, default=""), located=True))[...]
     )
-    .ignore(c_style_comment)
     .ignore(cpp_style_comment)
     .ignore(Literal("#include") + ... + LineEnd())  # type: ignore [no-untyped-call]
     .parse_with_tabs()

foamlib/_files/_serialization.py

@@ -1,10 +1,12 @@
 from __future__ import annotations
 
 import array
+import contextlib
 import itertools
+import re
 import sys
 from enum import Enum, auto
-from typing import cast
+from typing import cast, overload
 
 if sys.version_info >= (3, 9):
     from collections.abc import Mapping, Sequence
@@ -25,38 +27,111 @@ except ModuleNotFoundError:
 class Kind(Enum):
     DEFAULT = auto()
     SINGLE_ENTRY = auto()
-    FIELD = auto()
-    BINARY_FIELD = auto()
+    ASCII_FIELD = auto()
+    DOUBLE_PRECISION_BINARY_FIELD = auto()
+    SINGLE_PRECISION_BINARY_FIELD = auto()
     DIMENSIONS = auto()
 
 
+_TOKENS = re.compile(r'(?:[^\s"]|"(?:[^"])*")+')
+
+
+@overload
+def normalize(
+    data: FoamFileBase._DataEntry, *, kind: Kind = Kind.DEFAULT
+) -> FoamFileBase._DataEntry: ...
+
+
+@overload
+def normalize(
+    data: FoamFileBase.Data, *, kind: Kind = Kind.DEFAULT
+) -> FoamFileBase.Data: ...
+
+
+def normalize(
+    data: FoamFileBase.Data, *, kind: Kind = Kind.DEFAULT
+) -> FoamFileBase.Data:
+    if numpy and isinstance(data, np.ndarray):
+        ret = data.tolist()
+        assert isinstance(ret, list)
+        return ret
+
+    if kind == Kind.SINGLE_ENTRY and isinstance(data, tuple):
+        ret = normalize(list(data))
+        assert isinstance(ret, list)
+        return ret
+
+    if isinstance(data, Mapping):
+        return {k: normalize(v, kind=kind) for k, v in data.items()}
+
+    if (
+        kind == Kind.DIMENSIONS
+        and is_sequence(data)
+        and len(data) <= 7
+        and all(isinstance(d, (int, float)) for d in data)
+    ):
+        data = cast(Sequence[float], data)
+        return FoamFileBase.DimensionSet(*data)
+
+    if is_sequence(data) and not isinstance(data, tuple):
+        return [normalize(d, kind=Kind.SINGLE_ENTRY) for d in data]
+
+    if isinstance(data, str):
+        with contextlib.suppress(ValueError):
+            return int(data)
+
+        with contextlib.suppress(ValueError):
+            return float(data)
+
+        tokens: list[str] = re.findall(_TOKENS, data)
+
+        if len(tokens) == 1:
+            return tokens[0]
+
+        return tuple(tokens) if kind != Kind.SINGLE_ENTRY else " ".join(tokens)
+
+    if isinstance(data, FoamFileBase.Dimensioned):
+        value = normalize(data.value, kind=Kind.SINGLE_ENTRY)
+        assert isinstance(value, (int, float, list))
+        return FoamFileBase.Dimensioned(value, data.dimensions, data.name)
+
+    if isinstance(
+        data,
+        (int, float, bool, tuple, FoamFileBase.DimensionSet),
+    ):
+        return data
+
+    msg = f"Unsupported data type: {type(data)}"
+    raise TypeError(msg)
+
+
 def dumps(
     data: FoamFileBase.Data,
     *,
     kind: Kind = Kind.DEFAULT,
 ) -> bytes:
-    if numpy and isinstance(data, np.ndarray):
-        return dumps(data.tolist(), kind=kind)
+    data = normalize(data, kind=kind)
 
     if isinstance(data, Mapping):
         entries = []
         for k, v in data.items():
-            b = dumps(v, kind=kind)
             if isinstance(v, Mapping):
-                entries.append(dumps(k) + b" {" + b + b"}")
-            elif not b:
+                entries.append(dumps(k) + b" {" + dumps(v) + b"}")
+            elif not v:
                 entries.append(dumps(k) + b";")
             else:
-                entries.append(dumps(k) + b" " + b + b";")
+                entries.append(dumps(k) + b" " + dumps(v) + b";")
 
         return b" ".join(entries)
 
-    if isinstance(data, FoamFileBase.DimensionSet) or (
-        kind == Kind.DIMENSIONS and is_sequence(data) and len(data) == 7
-    ):
+    if isinstance(data, FoamFileBase.DimensionSet):
         return b"[" + b" ".join(dumps(v) for v in data) + b"]"
 
-    if kind in (Kind.FIELD, Kind.BINARY_FIELD) and (
+    if kind in (
+        Kind.ASCII_FIELD,
+        Kind.DOUBLE_PRECISION_BINARY_FIELD,
+        Kind.SINGLE_PRECISION_BINARY_FIELD,
+    ) and (
         isinstance(data, (int, float))
         or is_sequence(data)
         and data
@@ -65,7 +140,11 @@ def dumps(
     ):
         return b"uniform " + dumps(data, kind=Kind.SINGLE_ENTRY)
 
-    if kind in (Kind.FIELD, Kind.BINARY_FIELD) and is_sequence(data):
+    if kind in (
+        Kind.ASCII_FIELD,
+        Kind.DOUBLE_PRECISION_BINARY_FIELD,
+        Kind.SINGLE_PRECISION_BINARY_FIELD,
+    ) and is_sequence(data):
         if data and isinstance(data[0], (int, float)):
             tensor_kind = b"scalar"
         elif is_sequence(data[0]) and data[0] and isinstance(data[0][0], (int, float)):
@@ -80,15 +159,21 @@ def dumps(
         else:
             return dumps(data)
 
-        if kind == Kind.BINARY_FIELD:
+        if kind in (
+            Kind.DOUBLE_PRECISION_BINARY_FIELD,
+            Kind.SINGLE_PRECISION_BINARY_FIELD,
+        ):
+            typecode = "f" if kind == Kind.SINGLE_PRECISION_BINARY_FIELD else "d"
             if tensor_kind == b"scalar":
                 data = cast(Sequence[float], data)
-                contents = b"(" + array.array("d", data).tobytes() + b")"
+                contents = b"(" + array.array(typecode, data).tobytes() + b")"
             else:
                 data = cast(Sequence[Sequence[float]], data)
                 contents = (
                     b"("
-                    + array.array("d", itertools.chain.from_iterable(data)).tobytes()
+                    + array.array(
+                        typecode, itertools.chain.from_iterable(data)
+                    ).tobytes()
                     + b")"
                 )
         else:
@@ -96,9 +181,6 @@ def dumps(
 
         return b"nonuniform List<" + tensor_kind + b"> " + dumps(len(data)) + contents
 
-    if kind != Kind.SINGLE_ENTRY and isinstance(data, tuple):
-        return b" ".join(dumps(v) for v in data)
-
     if isinstance(data, FoamFileBase.Dimensioned):
         if data.name is not None:
             return (
@@ -114,6 +196,9 @@ def dumps(
             + dumps(data.value, kind=Kind.SINGLE_ENTRY)
         )
 
+    if isinstance(data, tuple):
+        return b" ".join(dumps(v) for v in data)
+
     if is_sequence(data):
         return b"(" + b" ".join(dumps(v, kind=Kind.SINGLE_ENTRY) for v in data) + b")"
 

{foamlib-0.6.12.dist-info → foamlib-0.6.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foamlib
-Version: 0.6.12
+Version: 0.6.14
 Summary: A Python interface for interacting with OpenFOAM
 Author-email: "Gabriel S. Gerlero" <ggerlero@cimec.unl.edu.ar>
 Project-URL: Homepage, https://github.com/gerlero/foamlib

{foamlib-0.6.12.dist-info → foamlib-0.6.14.dist-info}/RECORD

@@ -1,4 +1,4 @@
-foamlib/__init__.py,sha256=fzKDNF8_CX5rU1KVBoVQZHdjJ_nEiRbLv_sfj6-CHAY,487
+foamlib/__init__.py,sha256=2TB7NPVimWOf7GSEz5g_Gbguf3RJvD-eOWA0ykCCwLM,487
 foamlib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 foamlib/_cases/__init__.py,sha256=wTUHcUgU1CBgpu0cUMtksQ5VKG6B8CFu9xc3dWwsQuo,358
 foamlib/_cases/_async.py,sha256=i6g4EBHqvI-1PkdrxsRto2ynW7sxsOga2bSYk1XVG1U,7795
@@ -10,13 +10,13 @@ foamlib/_cases/_sync.py,sha256=2BJXB7Nzldb4OgPukqupgYqdceUGkI2mYhhtGPWEBrc,5901
 foamlib/_cases/_util.py,sha256=lhVca3ERY0zwYjDam6W2QMROt0yX5vAF-9_DS5RuMbM,1547
 foamlib/_files/__init__.py,sha256=-UqB9YTH6mrJfXCX00kPTAAY20XG64u1MGPw_1ewLVs,148
 foamlib/_files/_base.py,sha256=ZY_6Zxr3LZHVzJEex6SUTi9Pgo7Oi7i3Jo-wre9G3yE,1968
-foamlib/_files/_files.py,sha256=WF_FWiDhnkA4dtZ6zR1A0iGrv76eI3SetlQu6Zl6HY8,14949
+foamlib/_files/_files.py,sha256=oYRlMfCUH9oNeu-yf2HAPmLxLHteIe7gHhsWXdn7wU0,15767
 foamlib/_files/_io.py,sha256=IQLqoqnA1TpHf21NbUho2wsYWevyqC6MKo-wfpaObUU,2226
-foamlib/_files/_parsing.py,sha256=qLZx_VZMNEoyfmrkC_r85QBuABa26-6Y0fHnxCq74Q8,10880
-foamlib/_files/_serialization.py,sha256=HN9XCDbZ0I-b_UdpEYgDVNX6U4tPd6u-uYBKOoX3uqg,3681
+foamlib/_files/_parsing.py,sha256=sJ7XadWFqmJTaL9TEYyaYEu3r-CQweruwPUNWIZt4i0,14165
+foamlib/_files/_serialization.py,sha256=p2yRpyyOAOKP7P6T7BLEgRVvORuzQEcv_P6dEsOZ9_8,5981
 foamlib/_files/_util.py,sha256=VXUTD0B3NbnlaE_KCqWzrFcWvBz_2JfnIWpNp3snX3Y,526
-foamlib-0.6.12.dist-info/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
-foamlib-0.6.12.dist-info/METADATA,sha256=fN1pEtQzMHd-yuzMkugYgTtpVwZwV-U0CPxU6rRTnzA,7742
-foamlib-0.6.12.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-foamlib-0.6.12.dist-info/top_level.txt,sha256=ZdVYtetXGwPwyfL-WhlhbTFQGAwKX5P_gXxtH9JYFPI,8
-foamlib-0.6.12.dist-info/RECORD,,
+foamlib-0.6.14.dist-info/LICENSE.txt,sha256=5Dte9TUnLZzPRs4NQzl-Jc2-Ljd-t_v0ZR5Ng5r0UsY,35131
+foamlib-0.6.14.dist-info/METADATA,sha256=Um-3D8v1EnQPeX-pAySWkM-SWVBgTPIiLgKd4Ewq3RY,7742
+foamlib-0.6.14.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+foamlib-0.6.14.dist-info/top_level.txt,sha256=ZdVYtetXGwPwyfL-WhlhbTFQGAwKX5P_gXxtH9JYFPI,8
+foamlib-0.6.14.dist-info/RECORD,,