ONR fixes

minor warning fixes

Author: SteveDoyle2

pyNastran/bdf/bdf.py

@@ -1149,7 +1149,7 @@ def disable_cards(self, cards: Sequence[str]) -> None:
         if cards is None:
             return
         elif isinstance(cards, str):
-            disable_set = set([cards])
+            disable_set = {cards}
         else:
             disable_set = set(cards)
         self.cards_to_read = self.cards_to_read.difference(disable_set)

pyNastran/bdf/cards/aero/aero.py

@@ -1060,22 +1060,9 @@ def add_card(cls, card, comment=''):
     @property
     def aesid(self) -> int:
         return self.aesurf_id
-    @property
-    def alid1(self) -> int:
-        return self.aelist_id1
-    @property
-    def alid2(self) -> int:
-        return self.aelist_id2
-
     @aesid.setter
     def aesid(self, aesid: int) -> None:
         self.aesurf_id = aesid
-    @alid1.setter
-    def alid1(self, alid1: int) -> None:
-        self.aelist_id1 = alid1
-    @aesid.setter
-    def alid2(self, alid2: int) -> None:
-        self.aelist_id2 = alid2
 
     #@property
     #def aesid_ref(self):
@@ -1161,9 +1148,9 @@ def update(self, unused_model, maps):
         if self.cid2:
             self.cid2 = coord_map[self.cid2]
 
-        self.alid1 = aelist_map[self.alid1]
-        if self.alid2:
-            self.alid2 = aelist_map[self.alid2]
+        self.aelist_idid1 = aelist_map[self.aelist_idid1]
+        if self.aelist_id2:
+            self.aelist_id2 = aelist_map[self.alid2]
 
     def raw_fields(self):
         """

pyNastran/bdf/cards/constraints.py

@@ -1259,36 +1259,6 @@ def add_card(cls, card, comment=''):
         assert len(card) > 1, f'len(SPCOFF card) = {len(card):d}\ncard={card}'
         return SPCOFF(nodes, components, comment=comment)
 
-    @classmethod
-    def add_op2_data(cls, data, comment=''):
-        """
-        Adds a SPCOFF card from the OP2
-
-        Parameters
-        ----------
-        data : list[varies]
-            a list of fields defined in OP2 format
-        comment : str; default=''
-            a comment for the card
-
-        """
-        nodes = [data[0]]
-        components = data[1]
-        assert 0 <= components <= 123456, data
-        enforced = [data[2]]
-        assert nodes[0] > 0, data
-        components_str = str(components)
-        assert len(components_str) <= 6, data
-        components = [components_str]
-        #if components[0] == 0:
-            #components[0] = 0
-        #if components[0] == 16:
-            #components[0] = '16'
-        #else:
-            #raise RuntimeError('SPC; components=%s data=%s' % (components, data))
-        #assert 0 < components[0] > 1000, data
-        return SPCOFF(nodes, components, enforced, comment=comment)
-
     @property
     def constraints(self):
         return self.components

pyNastran/bdf/case_control_deck2.py

@@ -517,6 +517,7 @@ def _read(self, lines: list[str]) -> None:
 
         """
         isubcase = 0
+        log = self.log
         lines = _clean_lines(lines)
         self.output_lines = []
         i = 0
@@ -531,11 +532,11 @@ def _read(self, lines: list[str]) -> None:
                 lines2.append(lines[i])
                 #comment = lines[i][72:]
             (unused_j, fail_flag, key, value, options, param_type) = _parse_entry(
-                lines2, self.log, debug=self.debug)
+                lines2, log, debug=self.debug)
             i += 1
 
             if fail_flag:
-                self.log.warning(f'skipping Case Control line {i}: {line!r}')
+                log.warning(f'skipping Case Control line {i}: {line!r}')
                 continue
 
             line_upper = line.upper()

pyNastran/bdf/mesh_utils/cleanup_model.py

@@ -243,7 +243,7 @@ def remove_element_chain(model: BDF,
                          nodes_all: set[int],
                          element_types: Union[str, set[str]]) -> tuple[set[int], list[int]]:
     if isinstance(element_types, str):
-        element_types = set([element_types])
+        element_types = {element_types}
     eids_to_delete = []
     nodes_all2 = set([])
     for eid, elem in model.elements.items():

pyNastran/bdf/mesh_utils/dev/dev_utils.py

@@ -325,7 +325,7 @@ def extract_surface_patches(bdf_filename, starting_eids, theta_tols=40.):
     for starting_eid, theta_tol in zip(starting_eids, theta_tols):
         print('starting_eid = %s' % starting_eid)
         group = set()
-        check = set([starting_eid])
+        check = {starting_eid}
         while check:
             eid = next(iter(check))
             #print('  eid = %s' % eid)

pyNastran/bdf/mesh_utils/extract_bodies.py

@@ -94,7 +94,7 @@ def extract_bodies(bdf_filename, mpc_id=0):
     keys = list(nid_to_eid_map.keys())
     all_nids_to_check = set(keys)
     key0 = keys[0]
-    nids_to_check = set([key0])
+    nids_to_check = {key0}
     if debug:  # pragma: no cover
         print('all_nids_to_check= ', all_nids_to_check)
     body_eids = {ibody : set()}

pyNastran/bdf/mesh_utils/get_oml.py

@@ -47,7 +47,7 @@ def get_oml_eids(bdf_filename: str | BDF | PurePath | StringIO,
     #2818 # close
 
     #eids_oml = np.array([eid_start])
-    eids_oml = set([eid_start])
+    eids_oml = {eid_start}
     #---------------------------------
     theta_tol = np.radians(theta_tol)
 
@@ -75,7 +75,7 @@ def get_oml_eids(bdf_filename: str | BDF | PurePath | StringIO,
             etypes_skipped.add(elem.type)
 
     #eid_starts = eids_oml.tolist()
-    eids_next = set([eid_start])
+    eids_next = {eid_start}
     while eids_next:
         eid_starts = deepcopy(eids_next)
         eids_oml_start = deepcopy(eids_oml)

pyNastran/gui/dev/qt_groups.py

@@ -106,9 +106,9 @@ def _check_add(self, res_format, name, element_id=None, property_id=None, coord_
 
 def _add_coord_id(self, name, coord_id):
     if coord_id is None:
-        coord_id = set([0])
+        coord_id = {0}
     elif isinstance(coord_id, int):
-        coord_id = set([coord_id])
+        coord_id = {coord_id}
     else:
         for cid in coord_id:
             assert isinstance(cid, int), type(cid)

pyNastran/op2/tables/oee_energy/onr.py

@@ -24,6 +24,7 @@
     'TRIA3FD' : 'ctria3_strain_energy',
     'TRIA6' : 'ctria6_strain_energy',
     'TRIAX6' : 'ctriax6_strain_energy',
+    'CTRIA6N' : 'ctria6_strain_energy', # per JG
     'TRIAR' : 'ctriar_strain_energy',
     'TRIAX3FD' : 'ctriax_strain_energy',
     'TRIAXFD' : 'ctriax_strain_energy',
@@ -32,6 +33,7 @@
     'QUADFD' : 'cquad4_strain_energy',
     'QUAD4FD' : 'cquad4_strain_energy',
     'QUAD8' : 'cquad8_strain_energy',
+    'CQUAD8N' : 'cquad8_strain_energy', # guessed per JG
     # TODO: this will probably be a problem someday...cquad8_nonlinear_strain_energy
     'QUAD8N' : 'cquad8_strain_energy',
 
@@ -442,7 +444,7 @@ def _read_onr2_3(self, data: bytes, ndata: int):
         op2._read_title(data)
         op2._write_debug_bits()
 
-    def _read_onr1_4(self, data: bytes, ndata: int):
+    def _read_onr1_4(self, data: bytes, ndata: int) -> int:
         """
         reads ONRGY1 subtable 4
         """
@@ -456,7 +458,7 @@ def _read_onr1_4(self, data: bytes, ndata: int):
             raise NotImplementedError(op2.table_code)
         return n
 
-    def _read_element_strain_energy(self, data: bytes, ndata: int):
+    def _read_element_strain_energy(self, data: bytes, ndata: int) -> int:
         """
         table_code = 19
         """
@@ -663,7 +665,7 @@ def _read_element_strain_energy(self, data: bytes, ndata: int):
                     #print "%s" %(self.get_element_type(self.element_type)), data_in
                     #eid = op2.obj.add_new_eid_sort1(out)
                     if op2.is_debug_file:
-                        op2.binary_debug.write('  eid=%i; %s\n' % (eid, str(out)))
+                        op2.binary_debug.write('  eid=%s; %s\n' % (eid, str(out)))
                     obj.add_sort1(dt, word, energy, percent, density)
                     n += ntotal
         elif op2.format_code in [2, 3] and op2.num_wide == 4:
@@ -705,8 +707,9 @@ def _read_element_strain_energy(self, data: bytes, ndata: int):
         return n
 
 
-def complex_strain_energy_5(op2, data, sort_method,
-                            size, n, ntotal, nelements, dt) -> int:
+def complex_strain_energy_5(op2: OP2, data: bytes, sort_method: int,
+                            size: int, n: int,
+                            ntotal: int, nelements: int, dt) -> int:
     obj: RealStrainEnergyArray = op2.obj
 
     #fmt = mapfmt(op2._endian + op2._analysis_code_fmt + b'3f', size)
@@ -807,8 +810,9 @@ def real_strain_energy_4(op2: OP2,
             n += ntotal
     return n
 
-def complex_strain_energy_4(op2, data, sort_method,
-                            size, n, ntotal, nnodes, dt):
+def complex_strain_energy_4(op2: OP2, data: bytes, sort_method: int,
+                            size: int, n: int,
+                            ntotal: int, nnodes: int, dt) -> int:
     obj: ComplexStrainEnergyArray = op2.obj
     s = Struct(op2._endian + b'8s3f')
     for unused_i in range(nnodes):