From 3003947ddc32a6b6dd38f32ea6929e84ea32ee93 Mon Sep 17 00:00:00 2001 From: SteveDoyle2 Date: Sun, 1 Dec 2024 16:58:05 -0800 Subject: [PATCH] op2: - simpler key (no longer an np.int64 cause it's messy) - 64-bit eigenvalue table supported --- pyNastran/op2/op2.py | 1 + pyNastran/op2/tables/lama_eigenvalues/lama.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pyNastran/op2/op2.py b/pyNastran/op2/op2.py index a74b8fc7b..239212861 100644 --- 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 index 0f9f258e9..9526369c3 100644 --- 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)