Merge branch 'develop' into origin/master

Author: leonhard-s

.github/workflows/python-publish.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9"]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/python-unittest.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9"]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
 
     steps:
       - uses: actions/checkout@v2

py2dm/__init__.py

@@ -14,6 +14,7 @@
                         Element6T, Element8Q, Element9Q, Entity, LinearElement,
                         Node, NodeString, QuadrilateralElement,
                         TriangularElement)
+from ._parser import implementation
 from ._read import Reader, ReaderBase
 from ._write import Writer
 
@@ -28,6 +29,7 @@
     'Element9Q',
     'Entity',
     'errors',
+    'implementation',
     'LinearElement',
     'Node',
     'NodeString',
@@ -36,7 +38,7 @@
     'ReaderBase',
     'TriangularElement',
     'utils',
-    'Writer'
+    'Writer',
 ]
 
-__version__ = '0.2.1'
+__version__ = '0.2.2'

py2dm/_entities.py

@@ -23,7 +23,7 @@
     'Node',
     'NodeString',
     'QuadrilateralElement',
-    'TriangularElement'
+    'TriangularElement',
 ]
 
 _Material = Union[int, float]

py2dm/_parser/__init__.py

@@ -1,20 +1,22 @@
 """Py2DM parser submodule."""
 
-import platform
-import warnings
-
 from ._pyparser import scan_metadata
 
+implementation: str = 'unknown'
+
 try:
     from ._cparser import parse_element, parse_node, parse_node_string
 except ImportError:  # pragma: no cover
     from ._pyparser import parse_element, parse_node, parse_node_string
-    if platform.python_implementation() == 'CPython':
-        warnings.warn('C parser not found, using Python implementation')
+    implementation = 'python'
+else:
+    implementation = 'c'
+
 
 __all__ = [
+    'implementation',
     'parse_element',
     'parse_node',
     'parse_node_string',
-    'scan_metadata'
+    'scan_metadata',
 ]

py2dm/_parser/_pyparser.py

@@ -6,14 +6,15 @@
 from ..errors import CardError, FormatError, ReadError
 
 _MetadataArgs = Tuple[
-    int,  # num_nodes
-    int,  # num_elements
-    int,  # num_node_strings
+    int,            # num_nodes
+    int,            # num_elements
+    int,            # num_node_strings
     Optional[str],  # name
     Optional[int],  # num_materials_per_elem
-    int,  # nodes start
-    int,  # elements start
-    int]  # node strings start
+    int,            # nodes start
+    int,            # elements start
+    int,            # node strings start
+]
 
 _ELEMENT_CARDS = [
     'E2L',
@@ -22,7 +23,7 @@
     'E4Q',
     'E6T',
     'E8Q',
-    'E9Q'
+    'E9Q',
 ]
 
 
@@ -105,7 +106,7 @@ def parse_node(line: str, allow_zero_index: bool = False
     return id_, pos_x, pos_y, pos_z
 
 
-def parse_node_string(line: str,   allow_zero_index: bool = False,
+def parse_node_string(line: str, allow_zero_index: bool = False,
                       nodes: Optional[List[int]] = None
                       ) -> Tuple[List[int], bool, str]:
     """Parse a string into a node string.
@@ -162,9 +163,9 @@ def scan_metadata(file_: IO[str], filename: Union[str, pathlib.Path],
     last_node = -1
     last_element = -1
     # File seek offsets
-    nodes_start = 0
-    elements_start = 0
-    node_strings_start = 0
+    nodes_start = -1
+    elements_start = -1
+    node_strings_start = -1
 
     file_.seek(0)
     for index, line_raw in enumerate(iter(file_.readline, '')):
@@ -191,7 +192,7 @@ def scan_metadata(file_: IO[str], filename: Union[str, pathlib.Path],
                 raise FormatError('Node IDs have holes',
                                   filename, index+1)
             last_node = id_
-            if nodes_start == 0:
+            if nodes_start < 0:
                 nodes_start = file_.tell() - len(line_raw) - 1
             continue
         if line.split(maxsplit=1)[0] in _ELEMENT_CARDS:
@@ -205,14 +206,14 @@ def scan_metadata(file_: IO[str], filename: Union[str, pathlib.Path],
                 raise FormatError('Element IDs have holes',
                                   filename, index+1)
             last_element = id_
-            if elements_start == 0:
+            if elements_start < 0:
                 elements_start = file_.tell() - len(line_raw) - 1
             continue
-        if (line.startswith('NS')
-                and '-' in line.split('#', maxsplit=1)[0]):
-            num_node_strings += 1
-            if node_strings_start == 0:
+        if line.startswith('NS'):
+            if node_strings_start < 0:
                 node_strings_start = file_.tell() - len(line_raw) - 1
+            if '-' in line.split('#', maxsplit=1)[0]:
+                num_node_strings += 1
         elif line.startswith('MESHNAME') or line.startswith('GM'):
             # NOTE: This fails for meshes with double quotes in their
             # mesh name, but that is an unreasonable thing to want to
@@ -227,6 +228,13 @@ def scan_metadata(file_: IO[str], filename: Union[str, pathlib.Path],
         if isinstance(filename, pathlib.Path):
             filename = str(filename)
         raise ReadError('MESH2D tag not found', filename)
+    # Set *_start offsets to end of file if no instances were found
+    if nodes_start < 0:
+        nodes_start = file_.tell()
+    if elements_start < 0:
+        elements_start = file_.tell()
+    if node_strings_start < 0:
+        node_strings_start = file_.tell()
     return (num_nodes, num_elements, num_node_strings, name,
             num_materials_per_elem, nodes_start, elements_start,
             node_strings_start)

py2dm/_read.py

@@ -18,7 +18,7 @@
 
 __all__ = [
     'Reader',
-    'ReaderBase'
+    'ReaderBase',
 ]
 
 _ReaderT = TypeVar('_ReaderT', bound='ReaderBase')
@@ -465,15 +465,15 @@ def open(self) -> None:
                         element.materials = tuple(
                             element.materials[:self._num_materials])
                     self._cache_elements.append(element)
-                    if element.id >= self.num_elements:
+                    if element.id >= self.num_elements - self._zero_index:
                         break
             # Node strings
             file_.seek(self._metadata.pos_node_strings)
             node_string: Optional[NodeString] = None
             for line in file_:
                 if line.startswith('NS'):
                     node_string, is_done = NodeString.from_line(
-                        line, node_string)
+                        line, node_string, allow_zero_index=self._zero_index)
                     if is_done:
                         self._cache_node_strings.append(node_string)
                         node_string = None

py2dm/_typing.py

@@ -55,5 +55,5 @@ def __get__(self, *args: Any, **kwargs: Any) -> Any:
 
 __all__ = [
     'Literal',
-    'cached_property'
+    'cached_property',
 ]

py2dm/_write.py

@@ -17,7 +17,7 @@
 from ._typing import Literal
 
 __all__ = [
-    'Writer'
+    'Writer',
 ]
 
 _MeshObject = Union[Entity, NodeString]
@@ -527,9 +527,11 @@ def flush_node_strings(self, **kwargs: Any) -> None:
         if 'header' not in self._write_history:
             self.write_header()
         self._check_flush_state('node string')
-        self._file.writelines(
-            (f'{" ".join(n.to_line(**kwargs))}\n'
-             for n in cast(List[NodeString], self._cache[NodeString])))
+        # Remove whitespace around newline characters
+        for node_string in cast(List[NodeString], self._cache[NodeString]):
+            lines = ' '.join(node_string.to_line(**kwargs))
+            lines = '\n'.join(l.strip() for l in lines.split('\n'))
+            self._file.writelines((lines, '\n'))
         self._update_flush_state('node string')
         self._cache[NodeString].clear()