foamlib 0.1.7__tar.gz → 0.1.9__tar.gz

{foamlib-0.1.7 → foamlib-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foamlib
-Version: 0.1.7
+Version: 0.1.9
 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.1.7 → foamlib-0.1.9}/foamlib/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.7"
+__version__ = "0.1.9"
 
 from ._cases import FoamCase, AsyncFoamCase, FoamTimeDirectory, FoamCaseBase
 from ._dictionaries import (

{foamlib-0.1.7 → foamlib-0.1.9}/foamlib/_dictionaries.py

@@ -23,7 +23,19 @@ except ModuleNotFoundError:
 else:
     numpy = True
 
-from pyparsing import Group, Keyword, Opt, ZeroOrMore, Literal, Forward, common
+from pyparsing import (
+    Forward,
+    Group,
+    Keyword,
+    Literal,
+    OneOrMore,
+    Opt,
+    Word,
+    ZeroOrMore,
+    common,
+    identchars,
+    identbodychars,
+)
 
 FoamDimensionSet = namedtuple(
     "FoamDimensionSet",
@@ -64,45 +76,42 @@ FoamValue = Union[
 A value that can be stored in an OpenFOAM dictionary.
 """
 
-_yes = Keyword("yes").set_parse_action(lambda s, loc, tks: True)
-_no = Keyword("no").set_parse_action(lambda s, loc, tks: False)
-_value = Forward()
-_list = (
-    Opt(common.integer).suppress()
-    + Literal("(").suppress()
-    + Group(ZeroOrMore(_value))
-    + Literal(")").suppress()
+_YES = Keyword("yes").set_parse_action(lambda s, loc, tks: True)
+_NO = Keyword("no").set_parse_action(lambda s, loc, tks: False)
+_WORDS = OneOrMore(Word(identchars, identbodychars + "(),")).set_parse_action(
+    lambda s, loc, tks: " ".join(tks)
+)
+_VALUE = Forward()
+_LIST = Opt(
+    Literal("List") + Literal("<") + common.identifier + Literal(">")
+).suppress() + (
+    (
+        Opt(common.integer).suppress()
+        + Literal("(").suppress()
+        + Group(ZeroOrMore(_VALUE))
+        + Literal(")").suppress()
+    )
+    | (
+        common.integer + Literal("{").suppress() + _VALUE + Literal("}").suppress()
+    ).set_parse_action(lambda s, loc, tks: [tks[1]] * tks[0])
 )
-_uniform_field = Keyword("uniform").suppress() + _value
-_nonuniform_field = (
-    Keyword("nonuniform").suppress()
-    + Literal("List<").suppress()
-    + common.identifier.suppress()
-    + Literal(">").suppress()
-    + _list
+_FIELD = (Keyword("uniform").suppress() + _VALUE) | (
+    Keyword("nonuniform").suppress() + _LIST
 )
-_dimensions = (
+_DIMENSIONS = (
     Literal("[").suppress() + common.number * 7 + Literal("]").suppress()
 ).set_parse_action(lambda s, loc, tks: FoamDimensionSet(*tks))
-_dimensioned = (common.identifier + _dimensions + _value).set_parse_action(
+_DIMENSIONED = (common.identifier + _DIMENSIONS + _VALUE).set_parse_action(
     lambda s, loc, tks: FoamDimensioned(tks[0], tks[1], tks[2].as_list())
 )
 
-_value << (
-    _uniform_field
-    | _nonuniform_field
-    | _list
-    | _dimensioned
-    | _dimensions
-    | common.number
-    | _yes
-    | _no
-    | common.identifier
+_VALUE << (
+    _FIELD | _LIST | _DIMENSIONED | _DIMENSIONS | common.number | _YES | _NO | _WORDS
 )
 
 
 def _parse(value: str) -> FoamValue:
-    return cast(FoamValue, _value.parse_string(value, parse_all=True).as_list()[0])
+    return cast(FoamValue, _VALUE.parse_string(value, parse_all=True).as_list()[0])
 
 
 def _serialize_bool(value: Any) -> str:
@@ -114,22 +123,24 @@ def _serialize_bool(value: Any) -> str:
         raise TypeError(f"Not a bool: {type(value)}")
 
 
-def _serialize_list(sequence: Any) -> str:
-    if (
-        isinstance(sequence, Sequence)
-        and not isinstance(sequence, str)
+def _is_sequence(value: Any) -> bool:
+    return (
+        isinstance(value, Sequence)
+        and not isinstance(value, str)
         or numpy
-        and isinstance(sequence, np.ndarray)
-    ):
-        return f"({' '.join(_serialize(v) for v in sequence)})"
+        and isinstance(value, np.ndarray)
+    )
+
+
+def _serialize_list(value: Any) -> str:
+    if _is_sequence(value):
+        return f"({' '.join(_serialize(v) for v in value)})"
     else:
-        raise TypeError(f"Not a valid sequence: {type(sequence)}")
+        raise TypeError(f"Not a valid sequence: {type(value)}")
 
 
 def _serialize_field(value: Any) -> str:
-    if isinstance(value, (int, float)):
-        return f"uniform {value}"
-    else:
+    if _is_sequence(value):
         try:
             s = _serialize_list(value)
         except TypeError:
@@ -151,15 +162,12 @@ def _serialize_field(value: Any) -> str:
                         f"Unsupported sequence length for field: {len(value[0])}"
                     )
                 return f"nonuniform List<{kind}> {len(value)}{s}"
+    else:
+        return f"uniform {value}"
 
 
 def _serialize_dimensions(value: Any) -> str:
-    if (
-        isinstance(value, Sequence)
-        and not isinstance(value, str)
-        or numpy
-        and isinstance(value, np.ndarray)
-    ) and len(value) == 7:
+    if _is_sequence(value) and len(value) == 7:
         return f"[{' '.join(str(v) for v in value)}]"
     else:
         raise TypeError(f"Not a valid dimension set: {type(value)}")

{foamlib-0.1.7 → foamlib-0.1.9}/foamlib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foamlib
-Version: 0.1.7
+Version: 0.1.9
 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.1.7 → foamlib-0.1.9}/tests/test_dictionaries.py

@@ -137,6 +137,18 @@ def test_internal_field(pitz: FoamCase) -> None:
 
     pitz.clean()
 
+    p_arr = np.zeros(size)
+    U_arr = np.zeros((size, 3))
+
+    pitz[0]["p"].internal_field = p_arr
+    pitz[0]["U"].internal_field = U_arr
+
+    assert pitz[0]["p"].internal_field == pytest.approx(p_arr)
+    U = pitz[0]["U"].internal_field
+    assert isinstance(U, Sequence)
+    for u, u_arr in zip(U, U_arr):
+        assert u == pytest.approx(u_arr)
+
     p_arr = np.arange(size) * 1e-6
     U_arr = np.full((size, 3), [-1e-6, 1e-6, 0]) * np.arange(size)[:, np.newaxis]
 
@@ -144,9 +156,17 @@ def test_internal_field(pitz: FoamCase) -> None:
     pitz[0]["U"].internal_field = U_arr
 
     assert pitz[0]["p"].internal_field == pytest.approx(p_arr)
-    U = pitz[-1]["U"].internal_field
+    U = pitz[0]["U"].internal_field
     assert isinstance(U, Sequence)
     for u, u_arr in zip(U, U_arr):
         assert u == pytest.approx(u_arr)
 
     pitz.run()
+
+
+def test_fv_schemes(pitz: FoamCase) -> None:
+    div_schemes = pitz.fv_schemes["divSchemes"]
+    assert isinstance(div_schemes, FoamDictionary)
+    scheme = div_schemes["div(phi,U)"]
+    assert isinstance(scheme, str)
+    assert scheme == "bounded Gauss linearUpwind grad(U)"