cleanup

Author: SteveDoyle2

pyNastran/bdf/bdf_interface/add_card.py

@@ -3807,7 +3807,7 @@ def add_mathp(self, mid: int,
         return mat
 
     def add_mats1(self, mid: int, nl_type: str,
-                  h, hr, yf, limit1, limit2, strmeas: str | None = None,
+                  h, hr, yf, limit1, limit2, strmeas: str | None=None,
                   tid: int=0, comment: str='') -> MATS1:
         """Creates a MATS1 card"""
         mat = MATS1(mid, nl_type, h, hr, yf, limit1, limit2, strmeas,
@@ -7197,11 +7197,10 @@ def add_pplane(self, pid: int, mid: int, t: float=0.0, nsm: float=0.0,
         return prop
 
     def add_pgplsn(self, pid: int, mid: int, cgid: int, t: float,
-                   kn: float | int = 0., kr1: float | int = 0., kr2: float | int = 0.,
+                   kn: float | int=0., kr1: float | int=0., kr2: float | int=0.,
                    comment: str='') -> PGPLSN:
         """Creates a PGPLSN card"""
         prop = PGPLSN(pid, mid, cgid=cgid, t=t, kn=kn, kr1=kr1, kr2=kr2, comment=comment)
-
         self._add_methods.add_property_object(prop)
         return prop
 

pyNastran/bdf/cards/material_deps.py

@@ -102,7 +102,7 @@ class MATS1(MaterialDependence):
     def __init__(self, mid: int, nl_type: Optional[str],
                  h: float, hr: float, yf: float,
                  limit1: Optional[float], limit2: Optional[float],
-                 strmeas: Optional[str] = None,
+                 strmeas: Optional[str]=None,
                  tid: int=0, comment: str=''):
         MaterialDependence.__init__(self)
         if comment:
@@ -215,10 +215,7 @@ def add_card(cls, card: BDFCard, comment: str=''):
                 #limit2 = blank(card, 8, 'limit2')
                 limit2 = None
 
-        if len(card) > 9:
-            strmeas = string_or_blank(card, 9, 'strmeas')
-        else:
-            strmeas = None
+        strmeas = string_or_blank(card, 9, 'strmeas')
 
         assert len(card) <= 10, f'len(MATS1 card) = {len(card):d}\ncard={card}'
         return MATS1(mid, nl_type, h, hr, yf, limit1, limit2, strmeas, tid=tid, comment=comment)
@@ -261,7 +258,7 @@ def add_op2_data(cls, data, comment: str=''):
             raise RuntimeError(f'Invalid Type:  mid={mid}; Type={nl_type_int}; must be 1=NLELAST, '
                                '2=PLASTIC, or 3=PLSTRN')
 
-        return MATS1(mid, nl_type, h, hr, yf, limit1, limit2, strmeas, tid=tid, comment=comment)
+        return MATS1(mid, nl_type, h, hr, yf, limit1, limit2, strmeas=strmeas, tid=tid, comment=comment)
 
     def Yf(self) -> str:
         d = {1: 'VonMises', 2: 'Tresca', 3: 'MohrCoulomb', 4: 'Drucker-Prager'}

pyNastran/op2/writer/mpt_writer.py

@@ -470,7 +470,7 @@ def write_mats1(model: BDF, name, mids, nmaterials,
     """writes the MATS1"""
 
     # check if strmeas entry should be written
-    # strategy: check random MATS1 card. if STRMEAS field is blank, do not write it for backwards compatibility
+    # strategy: check first MATS1 card. if STRMEAS field is blank, do not write it for backwards compatibility
     test_mat = model.MATS1[mids[0]]
     write_strmeas = False if test_mat.strmeas is None else True