From 1d0f9fcb1f430765cdec3fd6fe10d2f4388b55f1 Mon Sep 17 00:00:00 2001
From: Jeffrey Cochran <jeffrey-cochran@users.noreply.github.com>
Date: Tue, 10 Oct 2023 17:14:26 -0400
Subject: [PATCH] Modified abaqus parser to enable inp files with multiple NODE
 blocks

---
 src/meshio/abaqus/_abaqus.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/meshio/abaqus/_abaqus.py b/src/meshio/abaqus/_abaqus.py
index b0594297b..8e7482dfc 100644
--- a/src/meshio/abaqus/_abaqus.py
+++ b/src/meshio/abaqus/_abaqus.py
@@ -109,7 +109,7 @@ def read(filename):
 
 def read_buffer(f):
     # Initialize the optional data fields
-    points = []
+    points = None
     cells = []
     cell_ids = []
     point_sets = {}
@@ -121,6 +121,9 @@ def read_buffer(f):
     point_data = {}
     point_ids = None
 
+    # MODIFIED jeffrey-cochran: Keep track of point id through multiple node blocks
+    counter = 0
+
     line = f.readline()
     while True:
         if not line:  # EOF
@@ -133,7 +136,15 @@ def read_buffer(f):
 
         keyword = line.partition(",")[0].strip().replace("*", "").upper()
         if keyword == "NODE":
-            points, point_ids, line = _read_nodes(f)
+            # MODIFIED jeffrey-cochran: persist counter
+            tmp_points, tmp_point_ids, line, counter = _read_nodes(f, counter=counter)
+
+            # MODIFIED jeffrey-cochran: persist points
+            points = tmp_points if points is None else np.concatenate((points, tmp_points), axis=0)
+
+            # MODIFIED jeffrey-cochran: persist point_ids
+            point_ids = tmp_point_ids if point_ids is None else {**point_ids, **tmp_point_ids}
+
         elif keyword == "ELEMENT":
             if point_ids is None:
                 raise ReadError("Expected NODE before ELEMENT")
@@ -228,10 +239,9 @@ def read_buffer(f):
     )
 
 
-def _read_nodes(f):
+def _read_nodes(f, counter=None):
     points = []
     point_ids = {}
-    counter = 0
     while True:
         line = f.readline()
         if not line or line.startswith("*"):
@@ -245,7 +255,7 @@ def _read_nodes(f):
         points.append([float(x) for x in coords])
         counter += 1
 
-    return np.array(points, dtype=float), point_ids, line
+    return np.array(points, dtype=float), point_ids, line, counter
 
 
 def _read_cells(f, params_map, point_ids):