op2:

- simpler key (no longer an np.int64 cause it's messy) - 64-bit eigenvalue table supported
SteveDoyle2 · Dec 2, 2024 · 3003947 · 3003947
1 parent b3a2d5b
commit 3003947
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pyNastran/op2/op2.py b/pyNastran/op2/op2.py
@@ -878,6 +878,7 @@ def combine_results(self, combine: bool=True) -> None:
                             value = (analysis_codei, sort_methodi, counti,
                                      isuperelmemnt_adaptivity_index, pval_step, ogs)
 
+                    isubcasei = int(isubcasei)
                     if value not in self.subcase_key[isubcasei]:
                         #print('isubcase=%s value=%s' % (isubcasei, value))
                         self.subcase_key[isubcasei].append(value)

diff --git a/pyNastran/op2/tables/lama_eigenvalues/lama.py b/pyNastran/op2/tables/lama_eigenvalues/lama.py
@@ -199,7 +199,7 @@ def _read_real_eigenvalue_4(self, data: bytes, ndata: int):
         #assert self.title not in slot, f'{result_name}: table={self.table_name_str} title={self.title!r} optimization_count={self._count}'
         slot[op2.title] = lama
 
-        structi = Struct(op2._endian + b'ii5f')
+        structi = Struct(op2._endian + mapfmt(b'ii5f', op2.size))
         for i in range(nmodes):
             edata = data[n:n+ntotal]
             out = structi.unpack(edata)