foamlib 0.1.12__tar.gz → 0.1.13__tar.gz

{foamlib-0.1.12 → foamlib-0.1.13}/PKG-INFO

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

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

{foamlib-0.1.12 → foamlib-0.1.13}/foamlib/_dictionaries.py

@@ -29,8 +29,10 @@ from pyparsing import (
     Keyword,
     Literal,
     Opt,
-    ParseException,
+    QuotedString,
+    Word,
     common,
+    identbodychars,
 )
 
 FoamDimensionSet = namedtuple(
@@ -50,17 +52,13 @@ FoamDimensionSet = namedtuple(
 
 @dataclass
 class FoamDimensioned:
-    name: Optional[str] = None
+    value: Union[int, float, Sequence[Union[int, float]]] = 0
     dimensions: Union[FoamDimensionSet, Sequence[Union[int, float]]] = (
         FoamDimensionSet()
     )
-    value: Union[int, float, Sequence[Union[int, float]]] = 0
+    name: Optional[str] = None
 
     def __post_init__(self) -> None:
-        if self.name is not None and not isinstance(self.name, str) and self.value == 0:
-            self.value = self.name
-            self.name = None
-
         if not isinstance(self.dimensions, FoamDimensionSet):
             self.dimensions = FoamDimensionSet(*self.dimensions)
 
@@ -74,38 +72,43 @@ 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()
+_DIMENSIONS = (
+    Literal("[").suppress() + common.number * 7 + Literal("]").suppress()
+).set_parse_action(lambda s, loc, tks: FoamDimensionSet(*tks))
+_TOKEN = common.identifier | QuotedString('"', unquote_results=False)
+_ITEM = Forward()
 _LIST = Opt(
     Literal("List") + Literal("<") + common.identifier + Literal(">")
 ).suppress() + (
     (
         Opt(common.integer).suppress()
         + Literal("(").suppress()
-        + Group(_VALUE[...])
+        + Group(_ITEM[...])
         + Literal(")").suppress()
     )
     | (
-        common.integer + Literal("{").suppress() + _VALUE + Literal("}").suppress()
+        common.integer + Literal("{").suppress() + _ITEM + Literal("}").suppress()
     ).set_parse_action(lambda s, loc, tks: [tks[1]] * tks[0])
 )
-_FIELD = (Keyword("uniform").suppress() + _VALUE) | (
+_FIELD = (Keyword("uniform").suppress() + _ITEM) | (
     Keyword("nonuniform").suppress() + _LIST
 )
-_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(
-    lambda s, loc, tks: FoamDimensioned(tks[0], tks[1], tks[2].as_list())
+_DIMENSIONED = (Opt(common.identifier) + _DIMENSIONS + _ITEM).set_parse_action(
+    lambda s, loc, tks: FoamDimensioned(*reversed(tks.as_list()))
+)
+_ITEM <<= (
+    _FIELD | _LIST | _DIMENSIONED | _DIMENSIONS | common.number | _YES | _NO | _TOKEN
 )
 
-_VALUE << (_FIELD | _LIST | _DIMENSIONED | _DIMENSIONS | common.number | _YES | _NO)
+_TOKENS = (Word(identbodychars + "(),") | QuotedString('"', unquote_results=False))[
+    1, ...
+].set_parse_action(lambda s, loc, tks: " ".join(tks))
+
+_VALUE = _ITEM ^ _TOKENS
 
 
 def _parse(value: str) -> FoamValue:
-    try:
-        return cast(FoamValue, _VALUE.parse_string(value, parse_all=True).as_list()[0])
-    except ParseException:
-        return value
+    return cast(FoamValue, _VALUE.parse_string(value, parse_all=True).as_list()[0])
 
 
 def _serialize_bool(value: Any) -> str:
@@ -169,7 +172,12 @@ def _serialize_dimensions(value: Any) -> str:
 
 def _serialize_dimensioned(value: Any) -> str:
     if isinstance(value, FoamDimensioned):
-        return f"{value.name or 'unnamed'} {_serialize_dimensions(value.dimensions)} {_serialize(value.value)}"
+        if value.name is not None:
+            return f"{value.name} {_serialize_dimensions(value.dimensions)} {_serialize(value.value)}"
+        else:
+            return (
+                f"{_serialize_dimensions(value.dimensions)} {_serialize(value.value)}"
+            )
     else:
         raise TypeError(f"Not a valid dimensioned value: {type(value)}")
 

{foamlib-0.1.12 → foamlib-0.1.13}/foamlib.egg-info/PKG-INFO

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

@@ -32,7 +32,12 @@ def test_parse() -> None:
     ]
     assert _parse("[1 1 -2 0 0 0 0]") == FoamDimensionSet(mass=1, length=1, time=-2)
     assert _parse("g [1 1 -2 0 0 0 0] (0 0 -9.81)") == FoamDimensioned(
-        "g", FoamDimensionSet(mass=1, length=1, time=-2), [0, 0, -9.81]
+        name="g",
+        dimensions=FoamDimensionSet(mass=1, length=1, time=-2),
+        value=[0, 0, -9.81],
+    )
+    assert _parse("[1 1 -2 0 0 0 0] 9.81") == FoamDimensioned(
+        dimensions=FoamDimensionSet(mass=1, length=1, time=-2), value=9.81
     )
     assert (
         _parse("hex (0 1 2 3 4 5 6 7) (1 1 1) simpleGrading (1 1 1)")
@@ -88,9 +93,13 @@ def test_write_read(tmp_path: Path) -> None:
     sd["nestedList"] = [[1, 2, 3], [4, 5, 6], [7, 8, 9]]
     assert sd["nestedList"] == [[1, 2, 3], [4, 5, 6], [7, 8, 9]]
 
-    sd["g"] = FoamDimensioned("g", [1, 1, -2, 0, 0, 0, 0], [0, 0, -9.81])
+    sd["g"] = FoamDimensioned(
+        name="g", dimensions=[1, 1, -2, 0, 0, 0, 0], value=[0, 0, -9.81]
+    )
     assert sd["g"] == FoamDimensioned(
-        "g", FoamDimensionSet(mass=1, length=1, time=-2), [0, 0, -9.81]
+        name="g",
+        dimensions=FoamDimensionSet(mass=1, length=1, time=-2),
+        value=[0, 0, -9.81],
     )