foamlib 0.8.4__tar.gz → 0.8.6__tar.gz

{foamlib-0.8.4 → foamlib-0.8.6}/.github/workflows/ci.yml

@@ -49,11 +49,11 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     strategy:
       matrix:
-        openfoam-version: [2406, 2006, 12, 9]
+        openfoam-version: [2412, 2006, 12, 9]
         python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
         slurm: [false]
         include:
-          - openfoam-version: 2406
+          - openfoam-version: 2412
             python-version: '3.13'
             slurm: true
           - openfoam-version: 12

{foamlib-0.8.4 → foamlib-0.8.6}/.github/workflows/docker.yml

@@ -80,7 +80,7 @@ jobs:
       packages: write
     strategy:
       matrix:
-        openfoam-version: [2406, 2312, 12, 11]
+        openfoam-version: [2412, 2406, 12, 11]
       fail-fast: false
     steps:
       - name: Set up QEMU

{foamlib-0.8.4 → foamlib-0.8.6}/Dockerfile

@@ -1,7 +1,7 @@
 
 ARG BASE=python:3.12-slim
 
-ARG OPENFOAM_VERSION=2406
+ARG OPENFOAM_VERSION=2412
 FROM microfluidica/openfoam:${OPENFOAM_VERSION} AS openfoam
 
 ARG VIRTUAL_ENV=/opt/venv

{foamlib-0.8.4 → foamlib-0.8.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: foamlib
-Version: 0.8.4
+Version: 0.8.6
 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.8.4 → foamlib-0.8.6}/foamlib/__init__.py

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

{foamlib-0.8.4 → foamlib-0.8.6}/foamlib/_files/_files.py

@@ -100,9 +100,9 @@ class FoamFile(
                 assert isinstance(ret, dict)
                 v = ret[k]
                 assert isinstance(v, dict)
-                ret = cast(File, v)
+                ret = cast("File", v)
 
-            return cast(Dict_, ret)
+            return cast("Dict_", ret)
 
     @property
     def version(self) -> float:
@@ -127,7 +127,7 @@ class FoamFile(
         if ret not in ("ascii", "binary"):
             msg = "format is not 'ascii' or 'binary'"
             raise ValueError(msg)
-        return cast(Literal["ascii", "binary"], ret)
+        return cast("Literal['ascii', 'binary']", ret)
 
     @format.setter
     def format(self, value: Literal["ascii", "binary"]) -> None:
@@ -412,7 +412,7 @@ class FoamFieldFile(FoamFile):
         ) -> Field:
             """Alias of `self["value"]`."""
             return cast(
-                Field,
+                "Field",
                 self["value"],
             )
 
@@ -461,7 +461,7 @@ class FoamFieldFile(FoamFile):
         self,
     ) -> Field:
         """Alias of `self["internalField"]`."""
-        return cast(Field, self["internalField"])
+        return cast("Field", self["internalField"])
 
     @internal_field.setter
     def internal_field(

{foamlib-0.8.4 → foamlib-0.8.6}/foamlib/_files/_parsing.py

@@ -16,6 +16,7 @@ else:
 
 import numpy as np
 from pyparsing import (
+    CaselessKeyword,
     Combine,
     Dict,
     Forward,
@@ -157,6 +158,7 @@ def _dict_of(
     data: ParserElement,
     *,
     directive: ParserElement | None = None,
+    data_entry: ParserElement | None = None,
     located: bool = False,
 ) -> ParserElement:
     dict_ = Forward()
@@ -164,7 +166,8 @@ def _dict_of(
     keyword_entry = keyword + (dict_ | (data + Literal(";").suppress()))
 
     if directive is not None:
-        keyword_entry |= directive + data + LineEnd().suppress()  # type: ignore [no-untyped-call]
+        assert data_entry is not None
+        keyword_entry |= directive + data_entry + LineEnd().suppress()  # type: ignore [no-untyped-call]
 
     if located:
         keyword_entry = Located(keyword_entry)
@@ -183,15 +186,19 @@ def _keyword_entry_of(
     data: ParserElement,
     *,
     directive: ParserElement | None = None,
+    data_entry: ParserElement | None = None,
     located: bool = False,
 ) -> ParserElement:
     keyword_entry = keyword + (
-        _dict_of(keyword, data, directive=directive, located=located)
+        _dict_of(
+            keyword, data, directive=directive, data_entry=data_entry, located=located
+        )
         | (data + Literal(";").suppress())
     )
 
     if directive is not None:
-        keyword_entry |= directive + data + LineEnd().suppress()  # type: ignore [no-untyped-call]
+        assert data_entry is not None
+        keyword_entry |= directive + data_entry + LineEnd().suppress()  # type: ignore [no-untyped-call]
 
     if located:
         keyword_entry = Located(keyword_entry)
@@ -235,11 +242,12 @@ _TENSOR = (
     | _tensor(TensorKind.SYMM_TENSOR)
     | _tensor(TensorKind.TENSOR)
 )
-_IDENTIFIER = Forward()
-_IDENTIFIER <<= Combine(
-    Word(_IDENTCHARS, _IDENTBODYCHARS, exclude_chars="()")
-    + Opt(Literal("(") + _IDENTIFIER + Literal(")"))
+_PARENTHESIZED = Forward()
+_IDENTIFIER = Combine(
+    Word(_IDENTCHARS, _IDENTBODYCHARS, exclude_chars="()") + Opt(_PARENTHESIZED)
 )
+_PARENTHESIZED <<= Combine(Literal("(") + (_PARENTHESIZED | _IDENTIFIER) + Literal(")"))
+
 _DIMENSIONED = (Opt(_IDENTIFIER) + _DIMENSIONS + _TENSOR).set_parse_action(
     lambda tks: Dimensioned(*reversed(tks.as_list()))
 )
@@ -260,7 +268,16 @@ _DICT = _dict_of(_TOKEN, _DATA)
 _DATA_ENTRY = Forward()
 _LIST_ENTRY = _DICT | _KEYWORD_ENTRY | _DATA_ENTRY
 _LIST = _list_of(_LIST_ENTRY)
-_NUMBER = common.signed_integer ^ common.ieee_float
+_NUMBER = (
+    common.number
+    | CaselessKeyword("nan").set_parse_action(lambda: np.nan)
+    | (CaselessKeyword("inf") | CaselessKeyword("infinity")).set_parse_action(
+        lambda: np.inf
+    )
+    | (CaselessKeyword("-inf") | CaselessKeyword("-infinity")).set_parse_action(
+        lambda: -np.inf
+    )
+)
 _DATA_ENTRY <<= _FIELD | _LIST | _DIMENSIONED | _DIMENSIONS | _NUMBER | _SWITCH | _TOKEN
 
 _DATA <<= (
@@ -274,12 +291,16 @@ _DATA <<= (
 def parse_data(s: str) -> Data:
     if not s.strip():
         return ""
-    return cast(Data, _DATA.parse_string(s, parse_all=True)[0])
+    return cast("Data", _DATA.parse_string(s, parse_all=True)[0])
 
 
 _LOCATED_DICTIONARY = Group(
     _keyword_entry_of(
-        _TOKEN, Opt(_DATA, default=""), directive=_DIRECTIVE, located=True
+        _TOKEN,
+        Opt(_DATA, default=""),
+        directive=_DIRECTIVE,
+        data_entry=_DATA_ENTRY,
+        located=True,
     )
 )[...]
 _LOCATED_DATA = Group(Located(_DATA.copy().add_parse_action(lambda tks: ["", tks[0]])))
@@ -420,7 +441,7 @@ class Parsed(Mapping[Tuple[str, ...], Union[Data, EllipsisType]]):
             for k in keywords[:-1]:
                 v = r[k]
                 assert isinstance(v, dict)
-                r = cast(File, v)
+                r = cast("File", v)
 
             assert isinstance(r, dict)
             if keywords:

{foamlib-0.8.4 → foamlib-0.8.6}/tests/test_files/test_files.py

@@ -163,7 +163,7 @@ def test_internal_field(cavity: FoamCase) -> None:
     p_arr = np.zeros(size)
     U_arr = np.zeros((size, 3))
 
-    cavity[0]["p"].internal_field = p_arr  # type: ignore [assignment]
+    cavity[0]["p"].internal_field = p_arr
     cavity[0]["U"].internal_field = U_arr  # type: ignore [assignment]
 
     assert cavity[0]["p"].internal_field == pytest.approx(p_arr)
@@ -174,7 +174,7 @@ def test_internal_field(cavity: FoamCase) -> None:
     p_arr = np.arange(size) * 1e-6  # type: ignore [assignment]
     U_arr = np.full((size, 3), [-1e-6, 1e-6, 0]) * np.arange(size)[:, np.newaxis]
 
-    cavity[0]["p"].internal_field = p_arr  # type: ignore [assignment]
+    cavity[0]["p"].internal_field = p_arr
     cavity[0]["U"].internal_field = U_arr  # type: ignore [assignment]
 
     assert cavity[0]["p"].internal_field == pytest.approx(p_arr)

{foamlib-0.8.4 → foamlib-0.8.6}/tests/test_files/test_parsing.py

@@ -10,6 +10,7 @@ def test_parse_value() -> None:
     assert Parsed(b"yes")[()] is True
     assert Parsed(b"no")[()] is False
     assert Parsed(b"word")[()] == "word"
+    assert Parsed(b"inference")[()] == "inference"
     assert Parsed(b"word word")[()] == ("word", "word")
     assert Parsed(b'"a string"')[()] == '"a string"'
     assert Parsed(b"uniform 1")[()] == 1
@@ -93,6 +94,7 @@ def test_parse_value() -> None:
     assert Parsed(b"(water oil mercury air)")[()] == ["water", "oil", "mercury", "air"]
     assert Parsed(b"div(phi,U)")[()] == "div(phi,U)"
     assert Parsed(b"div(nuEff*dev(T(grad(U))))")[()] == "div(nuEff*dev(T(grad(U))))"
+    assert Parsed(b"div((nuEff*dev(T(grad(U)))))")[()] == "div((nuEff*dev(T(grad(U)))))"
     assert Parsed(b"((air and water) { type constant; sigma 0.07; })")[()] == [
         (["air", "and", "water"], {"type": "constant", "sigma": 0.07})
     ]
@@ -103,6 +105,8 @@ def test_parse_value() -> None:
 def test_parse_directive() -> None:
     assert Parsed(b'#include "filename"')[("#include",)] == '"filename"'
     assert (
-        Parsed(b"functions\n{\n#includeFunc funcName\n}")[("functions", "#includeFunc")]
+        Parsed(b"functions\n{\n#includeFunc funcName\nsubdict{}}")[
+            ("functions", "#includeFunc")
+        ]
         == "funcName"
     )