move TSTEP1 cards from tstepnls to tsteps dictionary

Author: benvb-97

pyNastran/bdf/bdf.py

@@ -2852,7 +2852,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_interface/attributes.py

@@ -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/mesh_utils/remove_unused.py

@@ -79,7 +79,7 @@ def remove_unused(bdf_filename: PathLike,
     unreferenced_types_case_control = {
         'EIGR', 'EIGRL', 'EIGB', 'EIGP', 'EIGC',
         'FREQ', 'FREQ1', 'FREQ2',
-        'TSTEP', 'TSTEPNL',
+        'TSTEP', 'TSTEP1', 'TSTEPNL',
         'NLPCI', 'NLPARM',
 
         # aero

pyNastran/bdf/test/test_bdf.py

@@ -1787,28 +1787,15 @@ def _check_case_parameters(subcase: Subcase,
                            stop_on_failure: bool=True) -> int:
     """helper method for ``check_case``"""
     log = fem.log
-    if fem.sol in {401, 402}:
-        # TSTEP references a TSTEP1, but not a TSTEP
-        # TSTEP1s are stored in tstepnls
-        if any(subcase.has_parameter('TIME', 'TSTEP')):
-            if 'TSTEP' in subcase:
-                tstep_id: int = subcase.get_int_parameter('TSTEP')
-            else:  # pragma: no cover
-                raise NotImplementedError(subcase)
-            if tstep_id not in fem.tstepnls:
-                raise RuntimeError(_tstep_msg(fem, subcase, tstep_id))
-        else:
-            raise RuntimeError(f'missing TSTEP in case control deck\n{subcase}')
-    else:
-        if any(subcase.has_parameter('TIME', 'TSTEP')):
-            if 'TIME' in subcase:
-                tstep_id: int = subcase.get_int_parameter('TIME')
-            elif 'TSTEP' in subcase:
-                tstep_id: int = subcase.get_int_parameter('TSTEP')
-            else:  # pragma: no cover
-                raise NotImplementedError(subcase)
-            if tstep_id not in fem.tsteps:
-                raise RuntimeError(_tstep_msg(fem, subcase, tstep_id))
+    if any(subcase.has_parameter('TIME', 'TSTEP')):
+        if 'TIME' in subcase:
+            tstep_id: int = subcase.get_int_parameter('TIME')
+        elif 'TSTEP' in subcase:
+            tstep_id: int = subcase.get_int_parameter('TSTEP')
+        else:  # pragma: no cover
+            raise NotImplementedError(subcase)
+        if tstep_id not in fem.tsteps:
+            raise RuntimeError(_tstep_msg(fem, subcase, tstep_id))
 
     check_subcase_dmig_matrices(fem, subcase)
     if 'TSTEPNL' in subcase:

pyNastran/dev/bdf_vectorized3/bdf.py

@@ -2272,7 +2272,7 @@ def add_card(cls, card, comment=''):
             '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),
 
             # nx_opt