Merge pull request #10 from git47/master

modified:   mesh2vec/mesh2vec_cae.py

Author: markus-stoll

mesh2vec/mesh2vec_cae.py

@@ -254,14 +254,15 @@ def from_d3plot_shell(
         return Mesh2VecCae(distance, mesh, element_info, calc_strategy=calc_strategy)
 
     @staticmethod
-    def from_keyfile_shell(distance: int, keyfile: Path, calc_strategy="bfs") -> "Mesh2VecCae":
+    def from_keyfile_shell(distance: int, keyfile: Path, partid="", calc_strategy="bfs") -> "Mesh2VecCae":
         """
         Read the given keyfile and use the shell elements to generate a hypergraph, using mesh
         nodes as hyperedges, and adjacent elements as hypervertices.
 
         Args:
             distance: the maximum distance for neighborhood generation and feature aggregation
             keyfile: path to keyfile
+            partid: part id to use for hypergraph generation (default empty string, use all shell parts)
             calc_strategy: choose the algorithm to calculate adjacencies
 
                 * "dfs": depth first search (defaultl fast)
@@ -275,7 +276,7 @@ def from_keyfile_shell(distance: int, keyfile: Path, calc_strategy="bfs") -> "Me
             >>> len(m2v._hyper_edges)
             6666
         """
-        mesh = CaeShellMesh.from_keyfile(keyfile)
+        mesh = CaeShellMesh.from_keyfile(keyfile, partid)
         element_info = pd.DataFrame({"element_id": mesh.element_ids})
         element_info["file_path"] = str(keyfile)
         return Mesh2VecCae(distance, mesh, element_info, calc_strategy=calc_strategy)
@@ -347,7 +348,7 @@ def add_features_from_ansa(
 
         for feature in features:
             if not feature in okay_ansa + okay_inplace:
-                if not allow_additional_ansa_features:
+                if allow_additional_ansa_features:
                     okay_ansa.append(feature)
                 else:
                     raise ValueError(

mesh2vec/mesh_features.py

@@ -237,10 +237,15 @@ def from_ansa_json(elements: List[Any], nodes: List[Any]) -> "CaeShellMesh":
         return CaeShellMesh(point_coordinates, pnt_ids, elem_ids, elem_node_idxs)
 
     @staticmethod
-    def from_keyfile(keyfile: str) -> "CaeShellMesh":
+    def from_keyfile(keyfile: str, partid: str = "") -> "CaeShellMesh":
         """
         create CaeShellMesh from keyfile
-            Example:
+
+        Args:
+            keyfile: path to LSDYNA keyfile in fixed column format
+            partid: part id to use for hypergraph generation
+
+        Example:
         >>> from mesh2vec.mesh_features import CaeShellMesh
         >>> mesh = CaeShellMesh.from_keyfile("data/hat/Hatprofile.k")
         >>> print(mesh.point_coordinates.shape)
@@ -256,33 +261,43 @@ def parse_contents(file_contents):
 
             elem_ids = []
             elem_node_ids = []
-
+            thickcard_options_set = set(["THICKNESS", "BETA", "MCID"])
             for line in lines:
                 if line.startswith("*"):
                     current_section = line.split()[0].upper()
+                    current_section_options = set(current_section.split('_')[1:])
+                    current_section_lines_per_entry = 1
+                    current_section_lineno = 0
                     continue
-                if line.startswith("$#"):  # comment
+                if line.startswith("$"):  # comment
                     continue
-
                 if current_section == "*NODE":
-                    data = line.split()
-                    if data:
-                        point_coordinates.append([float(data[1]), float(data[2]), float(data[3])])
-                        pnt_ids.append(data[0])
-
-                elif "*ELEMENT_SHELL" in current_section:
-                    data = line.split()
-                    if data:
-                        # check for floats - floats are a hint of options like THICKNESS
-                        if (
-                            not data[2].isdigit()
-                            or not data[3].isdigit()
-                            or not data[4].isdigit()
-                            or not data[5].isdigit()
-                        ):
-                            continue
-                        elem_node_ids.append([data[2], data[3], data[4], data[5]])
-                        elem_ids.append(data[0])
+                    try:
+                        point_coordinates.append([float(line[8+i*16:8+(i+1)*16]) for i in range(3)])
+                        pnt_ids.append(line[:8].strip())
+                    except:
+                        pass
+                elif current_section.startswith("*ELEMENT_SHELL"):
+                    
+
+                    if current_section_lineno % current_section_lines_per_entry == 0:
+                        if partid == "" or partid == line[8:16].strip():
+                            node_ids = [line[16+i*8:16+(i+1)*8].strip() for i in range(8)]
+                            node_ids = [node_id for node_id in node_ids if len(node_id) > 0 and node_id != "0"]
+                            # TODO: Check for unhandled options, e.g. COMPOSITE, DOF
+                            if current_section_lineno == 0:
+                                if len(current_section_options & thickcard_options_set) > 0:
+                                    current_section_lines_per_entry += 1 # skip thickness card
+                                    if len(node_ids) > 4:
+                                        current_section_lines_per_entry += 1 # skip additional thickness card for mid-side nodes
+                                if "OFFSET" in current_section_options:
+                                        current_section_lines_per_entry += 1 # skip offset card
+                            elem_node_ids.append([node_id for node_id in node_ids if len(node_id) > 0])
+                            if node_ids[0] == 1.0:
+                                print("HERE")
+                            elem_ids.append(line[:8].strip())
+                    current_section_lineno += 1
+
             pnt_idx = {pnt_id: i for i, pnt_id in enumerate(pnt_ids)}
 
             elem_node_idx = np.array(