Merge branch 'main' of https://github.com/SteveDoyle2/pyNastran

Author: SteveDoyle2

models/nx/sol401/sol401_tstep1.dat

@@ -0,0 +1,62 @@
+ID,NASTRAN,model2_sim1-solution_1
+SOL 401
+CEND
+ECHO = NONE
+RIGID = AUTO
+TEMP(INIT) = 1
+LOAD = 100
+SPC = 100
+DISPLACEMENT(PLOT,REAL) = ALL
+SPCFORCES(PLOT,REAL) = ALL
+STRESS(PLOT,REAL,VONMISES,CENTER) = ALL
+SUBCASE 1
+  LABEL = Subcase - Nonlinear Statics 1
+  TSTEP = 101
+  ANALYSIS = STATICS
+  SEQDEP = YES
+BEGIN BULK
+TSTEP1*              1011.0000000000E+00               3             YES+
+*
+PARAM     LGDISP       1
+PARAM     OIBULK     YES
+PARAM    OMACHPR     YES
+PARAM       POST      -2
+PARAM    POSTEXT     YES
+PARAM    UNITSYS   MN-MM
+GRID*                  1               00.0000000000E+000.0000000000E+00+
+*       0.0000000000E+00               0
+GRID*                  2               0-5.000000000E+010.0000000000E+00+
+*       0.0000000000E+00               0
+GRID*                  3               00.0000000000E+00-5.000000000E+01+
+*       0.0000000000E+00               0
+GRID*                  4               00.0000000000E+005.0000000000E+01+
+*       0.0000000000E+00               0
+GRID*                  5               05.0000000000E+010.0000000000E+00+
+*       0.0000000000E+00               0
+GRID*                  6               0-5.000000000E+015.0000000000E+01+
+*       0.0000000000E+00               0
+GRID*                  7               0-5.000000000E+01-5.000000000E+01+
+*       0.0000000000E+00               0
+GRID*                  8               05.0000000000E+01-5.000000000E+01+
+*       0.0000000000E+00               0
+GRID*                  9               05.0000000000E+015.0000000000E+01+
+*       0.0000000000E+00               0
+CQUAD4         1       1       9       4       1       5
+CQUAD4         2       1       4       6       2       1
+CQUAD4         3       1       1       2       7       3
+CQUAD4         4       1       5       1       3       8
+PSHELL         1       11.000000       11.000000       10.833333  0.0000
+MAT1           11.000+10        0.300000
+FORCE          2       3       05.0000+7  0.0000-1.00000  0.0000
+FORCE          2       7       02.5000+7  0.0000-1.00000  0.0000
+FORCE          2       8       02.5000+7  0.0000-1.00000  0.0000
+FORCE          3       4       05.0000+7  0.00001.000000  0.0000
+FORCE          3       6       02.5000+7  0.00001.000000  0.0000
+FORCE          3       9       02.5000+7  0.00001.000000  0.0000
+SPC            4       8     123  0.0000
+SPC            5       9      13  0.0000
+SPC            6       6       3  0.0000
+TEMPD          1 20.0000
+LOAD         1001.0000001.000000       21.000000       3
+SPCADD       100       4       5       6
+ENDDATA a015b074

models/nx/sol401/sol401_tstep1.op2

@@ -90,7 +90,7 @@
     CPLSTS3, CPLSTS4, CPLSTS6, CPLSTS8,
     SNORM,)
 
-from .cards.properties.shell import PSHELL, PCOMP, PCOMPG, PSHEAR, PLPLANE, PPLANE, PTRSHL
+from .cards.properties.shell import PSHELL, PCOMP, PCOMPG, PSHEAR, PLPLANE, PPLANE, PGPLSN, PTRSHL
 from .cards.elements.acoustic import (
     CHACAB, CAABSF, CHACBR, PACABS, PAABSF, PACBAR,
     ACMODL, PMIC, ACPLNW, AMLREG, MATPOR, MICPNT)
@@ -251,7 +251,7 @@
     PBAR | PBARL | PBEAM | PBRSECT |
     PBEAML | PBCOMP | PBMSECT |
     PBEND | PBEAM3 |
-    PSHEAR | PPLANE |
+    PSHEAR | PPLANE | PGPLSN |
     PSHELL | PCOMP | PCOMPG |
     PSOLID | PLSOLID | PCOMPS | PCOMPLS |
     PWELD
@@ -722,7 +722,7 @@ def __init__(self, debug: str | bool | None=True,
 
             ## properties
             'PMASS',
-            'PELAS', 'PGAP', 'PFAST', 'PWELD', 'PLPLANE', 'PPLANE',
+            'PELAS', 'PGAP', 'PFAST', 'PWELD', 'PLPLANE', 'PPLANE', 'PGPLSN',
             'PBUSH', 'PBUSH1D', 'PBUSH2D',
             'PDAMP', 'PDAMP5',
             'PROD', 'PBAR', 'PBARL', 'PBEAM', 'PTUBE', 'PBCOMP', 'PBRSECT', 'PBEND',
@@ -2601,6 +2601,7 @@ def add_card(cls, card: BDFCard, comment: str=''):
             'CPLSTS6': (CPLSTS6, add_methods.add_element_object),
             'CPLSTS8': (CPLSTS8, add_methods.add_element_object),
             'PPLANE': (PPLANE, add_methods.add_property_object),
+            'PGPLSN': (PGPLSN, add_methods.add_property_object),
 
             'CSHEAR': (CSHEAR, add_methods.add_element_object),
             'PSHEAR': (PSHEAR, add_methods.add_property_object),
@@ -2852,7 +2853,7 @@ def add_card(cls, card: BDFCard, comment: str=''):
             'NLPARM': (NLPARM, add_methods.add_nlparm_object),
             'NLPCI': (NLPCI, add_methods.add_nlpci_object),
             'TSTEP': (TSTEP, add_methods.add_tstep_object),
-            'TSTEP1': (TSTEP1, add_methods.add_tstepnl_object),
+            'TSTEP1': (TSTEP1, add_methods.add_tstep_object),
             'TSTEPNL': (TSTEPNL, add_methods.add_tstepnl_object),
 
             'TF': (TF, add_methods.add_tf_object),

pyNastran/bdf/bdf.py

@@ -55,7 +55,7 @@
 from pyNastran.bdf.cards.elements.acoustic import (
     CHACAB, CAABSF, CHACBR, PACABS, PAABSF, PACBAR,
     ACMODL, ACPLNW, AMLREG, PMIC, MICPNT, MATPOR)
-from pyNastran.bdf.cards.properties.shell import PSHELL, PCOMP, PCOMPG, PSHEAR, PLPLANE, PPLANE
+from pyNastran.bdf.cards.properties.shell import PSHELL, PCOMP, PCOMPG, PSHEAR, PLPLANE, PPLANE, PGPLSN
 from pyNastran.bdf.cards.elements.bush import CBUSH, CBUSH1D, CBUSH2D
 from pyNastran.bdf.cards.properties.bush import (
     PBUSH, PBUSH1D, PBUSHT, PBUSH2D, PBUSH_OPTISTRUCT)
@@ -338,6 +338,8 @@
     'CPLSTS8': CPLSTS8,
     'PPLANE': PPLANE,
 
+    'PGPLSN': PGPLSN,
+
     'CSHEAR': CSHEAR,
     'PSHEAR': PSHEAR,
 
@@ -3805,10 +3807,10 @@ def add_mathp(self, mid: int,
         return mat
 
     def add_mats1(self, mid: int, nl_type: str,
-                  h, hr, yf, limit1, limit2,
+                  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,
+        mat = MATS1(mid, nl_type, h, hr, yf, limit1, limit2, strmeas,
                     tid=tid, comment=comment)
         self._add_methods.add_material_dependence_object(mat)
         return mat
@@ -7194,6 +7196,15 @@ def add_pplane(self, pid: int, mid: int, t: float=0.0, nsm: float=0.0,
         self._add_methods.add_property_object(prop)
         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.,
+                   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
+
     def add_cplstn3(self, eid, pid, nids, theta=0.0, comment='') -> CPLSTN3:
         """Creates a CPLSTN4 card"""
         elem = CPLSTN3(eid, pid, nids, theta=theta, comment=comment)

pyNastran/bdf/bdf_interface/add_card.py

@@ -199,7 +199,7 @@
         'PBEAM3',
 
         # 2d
-        'PLPLANE', 'PPLANE',
+        'PLPLANE', 'PPLANE', 'PGPLSN',
         'PSHELL', 'PCOMP', 'PCOMPG', 'PSHEAR',
         'PSOLID', 'PLSOLID', 'PVISC', 'PRAC2D', 'PRAC3D',
         'PCOMPS', 'PCOMPLS',
@@ -333,8 +333,8 @@
     'dphases': ['DPHASE'],
     'nlparms': ['NLPARM'],
     'nlpcis': ['NLPCI'],
-    'tsteps': ['TSTEP'],
-    'tstepnls': ['TSTEPNL', 'TSTEP1'],
+    'tsteps': ['TSTEP', 'TSTEP1'],
+    'tstepnls': ['TSTEPNL'],
     'transfer_functions': ['TF'],
     'delays': ['DELAY'],
     'rotors': ['ROTORG', 'ROTORD'],

pyNastran/bdf/bdf_interface/attributes.py

@@ -22,7 +22,7 @@
 from pyNastran.bdf.cards.base_card import BaseCard
 from pyNastran.bdf.bdf_interface.internal_get import material_id, table_id
 from pyNastran.bdf.bdf_interface.assign_type import (
-    integer, integer_or_blank, double, double_or_blank, string)
+    integer, integer_or_blank, double, double_or_blank, string, string_or_blank)
 from pyNastran.bdf.field_writer_8 import print_card_8
 from pyNastran.bdf.field_writer_16 import print_card_16
 if TYPE_CHECKING:  # pragma: no cover
@@ -87,12 +87,22 @@ class MATS1(MaterialDependence):
     entry is specified with the same MID in a nonlinear solution sequence
     (SOLs 106 and 129).
 
+    Format (NX Nastran):
+    +--------+---------+-------+-------+------+-----+-----+--------+--------+
+    |   1    |   2     |    3  |  4    |  5   |  6  |  7  |  8     |  9     |
+    +========+=========+=======+=======+======+=====+=====+========+========+
+    | MATS1  |  MID    | TID   | TYPE  |  H   | YF  | HR  | LIMIT1 | LIMIT2 |
+    +--------+---------+-------+-------+------+-----+-----+--------+--------+
+    |        | STRMEAS |       |       |      |     |     |        |        |
+    +--------+---------+-------+-------+------+-----+-----+--------+--------+
+
     """
     type = 'MATS1'
 
     def __init__(self, mid: int, nl_type: Optional[str],
                  h: float, hr: float, yf: float,
-                 limit1: float, limit2: float,
+                 limit1: Optional[float], limit2: Optional[float],
+                 strmeas: Optional[str] = None,
                  tid: int=0, comment: str=''):
         MaterialDependence.__init__(self)
         if comment:
@@ -136,6 +146,11 @@ def __init__(self, mid: int, nl_type: Optional[str],
         #: Internal friction angle, measured in degrees, for the
         #: Mohr-Coulomb and Drucker-Prager yield criteria
         self.limit2 = limit2
+
+        #: Stress/strain measure of the TABLES1 or TABLEST data referenced by the TID field.
+        #: Valid for NX Nastran SOL 401 and SOL 402 only.
+        self.strmeas = strmeas
+
         self.tid_ref = None
         self.mid_ref = None
         assert tid is not None
@@ -150,7 +165,8 @@ def _init_from_empty(cls):
         yf = None
         limit1 = None
         limit2 = None
-        return MATS1(mid, nl_type, h, hr, yf, limit1, limit2, tid=tid, comment='')
+        strmeas = None
+        return MATS1(mid, nl_type, h, hr, yf, limit1, limit2, strmeas, tid=tid, comment='')
 
     def validate(self) -> None:
         if self.nl_type not in ['NLELAST', 'PLASTIC', 'PLSTRN']:
@@ -191,15 +207,21 @@ def add_card(cls, card: BDFCard, comment: str=''):
             h = double_or_blank(card, 4, 'H')
             yf = integer_or_blank(card, 5, 'yf', default=1)
             hr = integer_or_blank(card, 6, 'hr', default=1)
-            limit1 = double(card, 7, 'limit1')
+            limit1 = double_or_blank(card, 7, 'limit1')
 
             if yf in [3, 4]:
                 limit2 = double(card, 8, 'limit2')
             else:
                 #limit2 = blank(card, 8, 'limit2')
                 limit2 = None
-        assert len(card) <= 9, f'len(MATS1 card) = {len(card):d}\ncard={card}'
-        return MATS1(mid, nl_type, h, hr, yf, limit1, limit2, tid=tid, comment=comment)
+
+        if len(card) > 9:
+            strmeas = string_or_blank(card, 9, 'strmeas')
+        else:
+            strmeas = None
+
+        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)
 
     @classmethod
     def add_op2_data(cls, data, comment: str=''):
@@ -214,7 +236,21 @@ def add_op2_data(cls, data, comment: str=''):
             a comment for the card
 
         """
-        (mid, tid, nl_type_int, h, yf, hr, limit1, limit2) = data
+
+        if len(data) < 9:
+            (mid, tid, nl_type_int, h, yf, hr, limit1, limit2) = data
+            strmeas = None
+        else:
+            (mid, tid, nl_type_int, h, yf, hr, limit1, limit2, strmeas_int) = data
+            strmeas_map = {
+                0: None,  # NULL
+                1: 'UNDEF',
+                2: 'ENG',
+                3: 'TRUE',
+                4: 'CAUCHY',
+            }
+            strmeas = strmeas_map[strmeas_int]
+
         if nl_type_int == 1:
             nl_type = 'NLELAST'
         elif nl_type_int == 2:
@@ -224,7 +260,8 @@ def add_op2_data(cls, data, comment: str=''):
         else:  # pragma: no cover
             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, tid=tid, comment=comment)
+
+        return MATS1(mid, nl_type, h, hr, yf, limit1, limit2, strmeas, tid=tid, comment=comment)
 
     def Yf(self) -> str:
         d = {1: 'VonMises', 2: 'Tresca', 3: 'MohrCoulomb', 4: 'Drucker-Prager'}
@@ -298,7 +335,7 @@ def Tid(self) -> int:
 
     def raw_fields(self) -> list:
         list_fields = ['MATS1', self.Mid(), self.Tid(), self.nl_type,
-                       self.h, self.yf, self.hr, self.limit1, self.limit2]
+                       self.h, self.yf, self.hr, self.limit1, self.limit2, self.strmeas]
         return list_fields
 
     def repr_fields(self) -> list: