foamlib 0.1.8__tar.gz → 0.1.10__tar.gz

{foamlib-0.1.8 → foamlib-0.1.10}/PKG-INFO

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

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

{foamlib-0.1.8 → foamlib-0.1.10}/foamlib/_dictionaries.py

@@ -23,7 +23,18 @@ except ModuleNotFoundError:
 else:
     numpy = True
 
-from pyparsing import Group, Keyword, Opt, ZeroOrMore, Literal, Forward, common
+from pyparsing import (
+    Forward,
+    Group,
+    Keyword,
+    Literal,
+    Opt,
+    QuotedString,
+    Word,
+    common,
+    identchars,
+    identbodychars,
+)
 
 FoamDimensionSet = namedtuple(
     "FoamDimensionSet",
@@ -66,6 +77,10 @@ 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)
+_WORDS = Word(identchars, identbodychars + "(),")[1, ...].set_parse_action(
+    lambda s, loc, tks: " ".join(tks)
+)
+_STRING = QuotedString('"', unquote_results=False)
 _VALUE = Forward()
 _LIST = Opt(
     Literal("List") + Literal("<") + common.identifier + Literal(">")
@@ -73,7 +88,7 @@ _LIST = Opt(
     (
         Opt(common.integer).suppress()
         + Literal("(").suppress()
-        + Group(ZeroOrMore(_VALUE))
+        + Group(_VALUE[...])
         + Literal(")").suppress()
     )
     | (
@@ -98,7 +113,8 @@ _VALUE << (
     | common.number
     | _YES
     | _NO
-    | common.identifier
+    | _WORDS
+    | _STRING
 )
 
 

{foamlib-0.1.8 → foamlib-0.1.10}/foamlib.egg-info/PKG-INFO

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

@@ -16,6 +16,9 @@ def test_parse() -> None:
     assert _parse("1.0e-3") == 1.0e-3
     assert _parse("yes") is True
     assert _parse("no") is False
+    assert _parse("word") == "word"
+    assert _parse("word word") == "word word"
+    assert _parse('"a string"') == '"a string"'
     assert _parse("uniform 1") == 1
     assert _parse("uniform 1.0") == 1.0
     assert _parse("uniform 1.0e-3") == 1.0e-3
@@ -162,3 +165,11 @@ def test_internal_field(pitz: FoamCase) -> None:
         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)"