more testing

Author: SteveDoyle2

pyNastran/bdf/bdf.py

@@ -20,7 +20,6 @@
 from io import StringIO, IOBase
 from pathlib import PurePath
 from functools import wraps
-#from functools import partial
 from collections import defaultdict
 import traceback
 
@@ -29,16 +28,14 @@
 from pickle import load, dump, dumps  # type: ignore
 
 import numpy as np  # type: ignore
-# from cpylog import get_logger2 as get_logger, CPYLOG_VERSION
-# if CPYLOG_VERSION > (1, 6, 0):
-#     from cpylog import get_logger
 
 from pyNastran.utils import PathLike, object_attributes, check_path, deprecated as _deprecated
 from .utils import parse_patran_syntax
 from .bdf_interface.utils import (
     _parse_pynastran_header, to_fields, to_fields_line0,
     parse_executive_control_deck,
     fill_dmigs, _get_card_name, _parse_dynamic_syntax,
+    _prep_comment,
 )
 from pyNastran.bdf.bdf_interface.attributes import map_version, map_update
 from pyNastran.bdf.bdf_interface.add_card import CARD_MAP
@@ -5297,16 +5294,6 @@ def read_bdf(bdf_filename: Optional[PathLike]=None, validate: bool=True,
     return model
 
 
-def _prep_comment(comment: str) -> str:
-    return comment.rstrip()
-    #print('comment = %r' % comment)
-    #comment = '  this\n  is\n  a comment\n'
-    #print(comment.rstrip('\n').split('\n'))
-    #sline = [comment[1:] if len(comment) and comment[0] == ' ' else comment
-             #for comment in comment.rstrip().split('\n')]
-    #print('sline = ', sline)
-
-
 def _check_replicated_cards(replicated_cards):
     """helper method for ``parse_cards_list``"""
     replicated_card_old = []

pyNastran/bdf/bdf_interface/utils.py

@@ -700,3 +700,14 @@ def fill_dmigs(model: BDF) -> None:
 
     # empty the _dmig_temp variable
     model._dmig_temp = defaultdict(list)
+
+
+def _prep_comment(comment: str) -> str:
+    """cleans up the comment"""
+    return comment.rstrip()
+    #print('comment = %r' % comment)
+    #comment = '  this\n  is\n  a comment\n'
+    #print(comment.rstrip('\n').split('\n'))
+    #sline = [comment[1:] if len(comment) and comment[0] == ' ' else comment
+             #for comment in comment.rstrip().split('\n')]
+    #print('sline = ', sline)

pyNastran/dev/bdf_vectorized/bdf.py

@@ -37,7 +37,7 @@
 
 from pyNastran.bdf.case_control_deck import CaseControlDeck
 
-from pyNastran.bdf.bdf_interface.utils import fill_dmigs
+from pyNastran.bdf.bdf_interface.utils import fill_dmigs, _prep_comment
 from pyNastran.bdf.bdf_interface.bdf_card import BDFCard
 from pyNastran.dev.bdf_vectorized.bdf_interface2.write_mesh import WriteMesh
 from pyNastran.dev.bdf_vectorized.bdf_interface2.get_card import GetMethods
@@ -3543,16 +3543,6 @@ def _verify_bdf(self, xref=None):
     'SETS', 'CONTACT', 'REJECTS', 'REJECT_LINES',
     'PROPERTIES_MASS', 'MASSES')
 
-def _prep_comment(comment):
-    return comment.rstrip()
-    #print('comment = %r' % comment)
-    #comment = '  this\n  is\n  a comment\n'
-    #print(comment.rstrip('\n').split('\n'))
-    #sline = [comment[1:] if len(comment) and comment[0] == ' ' else comment
-             #for comment in comment.rstrip().split('\n')]
-    #print('sline = ', sline)
-    #asdh
-
 def _clean_comment(comment):
     """
     Removes specific pyNastran comment lines so duplicate lines aren't

pyNastran/dev/bdf_vectorized3/bdf.py

@@ -32,11 +32,12 @@
 
 from pyNastran.utils import object_attributes, check_path, PathLike
 from pyNastran.utils.numpy_utils import (
-    integer_types, float_types)
+    integer_types)
 from pyNastran.bdf.utils import parse_patran_syntax
 from pyNastran.bdf.bdf_interface.utils import (
     _parse_pynastran_header, to_fields, parse_executive_control_deck,
     fill_dmigs, _get_card_name, _parse_dynamic_syntax,
+    _prep_comment,
 )
 from pyNastran.bdf.bdf_interface.add_card import CARD_MAP
 from pyNastran.bdf.bdf_interface.replication import (
@@ -486,16 +487,9 @@
 def load_bdf_object(obj_filename:str, xref: bool=True, log=None, debug: bool=True):
     model = BDF(log=log, debug=debug)
     model.load(obj_filename=obj_filename)
-    model.cross_reference(xref=xref, xref_nodes=True, xref_elements=True,
-                          xref_nodes_with_elements=True,
-                          xref_properties=True,
-                          xref_masses=True,
-                          xref_materials=True,
-                          xref_loads=True,
-                          xref_constraints=True,
-                          xref_aero=True,
-                          xref_sets=True,
-                          xref_optimization=True)
+    model.cross_reference(
+        run_setup=True,
+        run_geom_check=False)
     return model
 
 
@@ -1367,7 +1361,8 @@ def read_bdf(self, bdf_filename: Optional[PathLike]=None,
            >>> g1 = bdf.Node(1)
            >>> print(g1.get_position())
            [10.0, 12.0, 42.0]
-           >>> bdf.write_card(bdf_filename2)
+           >>> bdf_filename_out = 'fem_out.bdf'
+           >>> bdf.write_card(bdf_filename_out)
            >>> print(bdf.card_stats())
 
            ---BDF Statistics---
@@ -1954,6 +1949,7 @@ def set_dynamic_syntax(self, dict_of_vars: dict[str, int | float | str]) -> None
            >>> dict_of_vars = {'xVar': 1.0, 'yVar', 2.0, 'zVar':3.0}
            >>> bdf = BDF()
            >>> bdf.set_dynamic_syntax(dict_of_vars)
+           >>> bdf_filename = 'fem.bdf'
            >>> bdf.read_bdf(bdf_filename, xref=True)
 
         Notes
@@ -3071,18 +3067,18 @@ def _prepare_dmiji(self, unused_card: list[str], card_obj: BDFCard,
         assert isinstance(ifile, integer_types), ifile
         return self._prepare_dmix(DMIJI, self._add_methods.add_dmiji_object, card_obj, ifile, comment=comment)
 
-    def _prepare_ringfl(self, unused_card: list[str], card_obj: BDFCard,
-                        ifile: int, comment: str='') -> None:
-        """adds a RINGFL"""
-        assert isinstance(ifile, integer_types), ifile
-        rings = [RINGFL.add_card(card_obj, icard=0, comment=comment)]
-        if card_obj.field(3):
-            rings.append(RINGFL.add_card(card_obj, icard=1, comment=comment))
-        if card_obj.field(5):
-            rings.append(RINGFL.add_card(card_obj, icard=2, comment=comment))
-        for ring in rings:
-            self._add_methods.add_ringfl_object(ring)
-        return rings
+    # def _prepare_ringfl(self, unused_card: list[str], card_obj: BDFCard,
+    #                     ifile: int, comment: str='') -> None:
+    #     """adds a RINGFL"""
+    #     assert isinstance(ifile, integer_types), ifile
+    #     rings = [RINGFL.add_card(card_obj, icard=0, comment=comment)]
+    #     if card_obj.field(3):
+    #         rings.append(RINGFL.add_card(card_obj, icard=1, comment=comment))
+    #     if card_obj.field(5):
+    #         rings.append(RINGFL.add_card(card_obj, icard=2, comment=comment))
+    #     for ring in rings:
+    #         self._add_methods.add_ringfl_object(ring)
+    #     return rings
 
     def _prepare_acmodl(self, unused_card: list[str], card_obj: BDFCard,
                         ifile: int, comment: str='') -> None:
@@ -3400,13 +3396,13 @@ def _add_card_helper_lax(self, card_obj: BDFCard, card: list[str],
             raise DisabledCardError(f'stopping on card={card_name}')
 
         if card_name in self._card_parser:
-
             card_class, add_card_function = self._card_parser[card_name]
-            if hasattr(card_class, 'add_card_lax'):
-                class_instance = card_class.add_card_lax(card_obj, comment=comment)
-            else:
-
-                class_instance = card_class.add_card(card_obj, comment=comment)
+            add_card = getattr(card_class, 'add_card_lax') if hasattr(card_class, 'add_card_lax') else getattr(card_class, 'add_card')
+            class_instance = add_card(card_obj, comment=comment)
+            # if hasattr(card_class, 'add_card_lax'):
+            #     class_instance = card_class.add_card_lax(card_obj, comment=comment)
+            # else:
+            #     class_instance = card_class.add_card(card_obj, comment=comment)
             add_card_function(class_instance)
 
         elif card_name in self._card_parser_prepare:
@@ -3449,11 +3445,16 @@ def _add_card_helper(self, card_obj: BDFCard, card: list[str],
 
         if card_name in self._card_parser:
             card_class, add_card_function = self._card_parser[card_name]
+            add_card = (
+                getattr(card_class, 'add_card_lax')
+                if not self.is_strict_card_parser and hasattr(card_class, 'add_card_lax')
+                else getattr(card_class, 'add_card'))
             try:
-                if not self.is_strict_card_parser and hasattr(card_class, 'add_card_lax'):
-                    class_instance = card_class.add_card_lax(card_obj, comment=comment)
-                else:
-                    class_instance = card_class.add_card(card_obj, comment=comment)
+                class_instance = add_card(card_obj, comment=comment)
+                # if not self.is_strict_card_parser and hasattr(card_class, 'add_card_lax'):
+                #     class_instance = card_class.add_card_lax(card_obj, comment=comment)
+                # else:
+                #     class_instance = card_class.add_card(card_obj, comment=comment)
                 card_idi = add_card_function(class_instance)
                 if card_name not in OBJ_CARDS:  # pragma: no cover
                     if not isinstance(card_idi, int):
@@ -3578,6 +3579,7 @@ def get_displacement_index_xyz_cp_cd(self, fdtype: str='float64',
         # assume GRID 1 has a CD=10, CP=0
         # assume GRID 2 has a CD=10, CP=0
         # assume GRID 5 has a CD=50, CP=0
+        >>> model = BDF()
         >>> model.point_ids
         [1, 2, 5]
         >>> out = model.get_displacement_index_xyz_cp_cd()
@@ -3690,6 +3692,7 @@ def get_xyz_in_coord_array(self, cid: int=0,
 
         Examples
         --------
+        >>> model = BDF()
         >>> out = model.get_xyz_in_coord_array(cid=0, fdtype='float64', idtype='int32')
         >>> nid_cp_cd, xyz_cid, xyz_cp, icd_transform, icp_transform = out
         """
@@ -3740,6 +3743,8 @@ def transform_xyzcp_to_xyz_cid(self, xyz_cp: np.ndarray,
         # assume GRID 1 has a CD=10, CP=0
         # assume GRID 2 has a CD=10, CP=0
         # assume GRID 5 has a CD=50, CP=1
+
+        >>> model = BDF()
         >>> model.point_ids
         [1, 2, 5]
         >>> out = model.get_displacement_index_xyz_cp_cd()
@@ -3910,6 +3915,8 @@ def get_displacement_index(self) -> tuple[Any, Any, dict[int, Any]]:
         # assume GRID 1 has a CD=10
         # assume GRID 2 has a CD=10
         # assume GRID 5 has a CD=50
+
+        >>> model = BDF()
         >>> model.point_ids
         [1, 2, 5]
         >>> icd_transform = model.get_displacement_index()
@@ -3948,8 +3955,10 @@ def increase_card_count(self, card_name: str, count_num: int=1) -> None:
         count_num : int, optional
             the amount to increment by (default=1)
 
-        >>> bdf.read_bdf(bdf_filename)
-        >>> bdf.card_count['GRID']
+        >>> model = BDF()
+        >>> bdf_filename = 'fem.bdf'
+        >>> model.read_bdf(bdf_filename)
+        >>> model.card_count['GRID']
         50
 
         """
@@ -4437,7 +4446,8 @@ def _read_bdf_cards(self, bdf_filename: Optional[str]=None,
            >>> g1 = bdf.Node(1)
            >>> print(g1.get_position())
            [10.0, 12.0, 42.0]
-           >>> bdf.write_card(bdf_filename2)
+           >>> bdf_filename_out = 'fem_out.bdf'
+           >>> bdf.write_card(bdf_filename_out)
            >>> print(bdf.card_stats())
 
            ---BDF Statistics---
@@ -4801,7 +4811,8 @@ def read_bdf(bdf_filename: Optional[PathLike]=None, validate: bool=True, xref: b
        >>> g1 = bdf.Node(1)
        >>> print(g1.get_position())
        [10.0, 12.0, 42.0]
-       >>> bdf.write_card(bdf_filename2)
+       >>> bdf_filename_out = 'fem_out.bdf'
+       >>> bdf.write_card(bdf_filename_out)
        >>> print(bdf.card_stats())
 
        ---BDF Statistics---
@@ -4817,7 +4828,7 @@ def read_bdf(bdf_filename: Optional[PathLike]=None, validate: bool=True, xref: b
     """
     model = BDF(log=log, debug=debug, mode=mode)
     if read_cards and skip_cards:
-        msg = 'read_cards=%s skip_cards=%s cannot be used at the same time'
+        msg = f'read_cards={read_cards} skip_cards={skip_cards} cannot be used at the same time'
         raise NotImplementedError(msg)
     if skip_cards:
         model.disable_cards(skip_cards)
@@ -4831,53 +4842,9 @@ def read_bdf(bdf_filename: Optional[PathLike]=None, validate: bool=True, xref: b
                    xref=xref, punch=punch, read_includes=True,
                    save_file_structure=save_file_structure,
                    encoding=encoding)
-
-    #if 0:
-        ### TODO: remove all the extra methods
-
-        #keys_to_suppress = []
-        #method_names = model.object_methods(keys_to_skip=keys_to_suppress)
-
-        #methods_to_remove = [
-            #'_process_card', 'read_bdf', 'disable_cards', 'set_dynamic_syntax',
-            #'create_card_object', 'create_card_object_fields', 'create_card_object_list',
-
-            #'add_NLPARM', 'add_NLPCI',
-            #'add_PARAM',',
-
-            #'add_card', 'add_card_fields', 'add_card_lines', 'add_cmethod', 'add_constraint',
-            #'add_convection_property', 'add_creep_material',
-            #'add_material_dependence', 'add_method',
-            #'add_random_table',
-            #'add_table', 'add_table_sdamping', 'add_thermal_BC', 'add_thermal_element',
-
-            #'set_as_msc',
-            #'set_as_nx',
-
-            #'pop_parse_errors',
-            #'set_error_storage',
-            #'is_reject',
-        #]
-        #for method_name in method_names:
-            #if method_name not in methods_to_remove + keys_to_suppress:
-                ##print(method_name)
-                #pass
-            #else:
-                ### TODO: doesn't work...
-                ##delattr(model, method_name)
-                #pass
-        #model.get_bdf_stats()
     return model
 
-def _prep_comment(comment):
-    return comment.rstrip()
-    #print('comment = %r' % comment)
-    #comment = '  this\n  is\n  a comment\n'
-    #print(comment.rstrip('\n').split('\n'))
-    #sline = [comment[1:] if len(comment) and comment[0] == ' ' else comment
-             #for comment in comment.rstrip().split('\n')]
-    #print('sline = ', sline)
-def _check_replicated_cards(replicated_cards):
+def _check_replicated_cards(replicated_cards) -> None:
     """helper method for ``parse_cards_list``"""
     replicated_card_old = []
     try:

pyNastran/dev/bdf_vectorized3/cards/test/test_vector_aero.py

@@ -130,6 +130,14 @@ def test_freedlm(self):
         ]
         assert np.array_equal(spline_nodes, expected_spline_nodes), spline_nodes.tolist()
 
+    def test_bwb_lax(self):
+        bdf_filename = MODEL_PATH / 'bwb' / 'bwb_saero.bdf'
+        model = BDF(log=None, debug=False)
+        model.is_strict_card_parser = True
+        model.read_bdf(bdf_filename, save_file_structure=False)
+        icd_transform, icp_transform, xyz_cp, nid_cp_cd = model.get_displacement_index_xyz_cp_cd()
+        model.get_xyz_in_coord_array(cid=0)
+
     def test_bwb(self):
         bdf_filename = MODEL_PATH / 'bwb' / 'bwb_saero.bdf'
         model = read_bdf(bdf_filename)

pyNastran/f06/dev/flutter/test_gui_flutter.py

@@ -25,6 +25,7 @@ def test_nastran_utils(self) -> None:
     def test_action(self) -> None:
         act = Action('cat', 'dog', show=True)
         str(act)
+
     def test_load_f06_op2(self) -> None:
         f06_filename = MODEL_PATH / 'aero' / '2_mode_flutter' / '0012_flutter.op2'
         log = SimpleLogger(level='debug')

pyNastran/f06/test/test_f06_utils.py

@@ -244,12 +244,16 @@ def test_plot_flutter_0012_dev(self):
         assert len(responses) == 1, responses
 
         f06_filename2 = 'cat.f06'
-        model, responses = load_f06_op2(f06_filename2, log)
+        model, responses = load_f06_op2(
+            f06_filename2, log,
+            in_units='si', out_units='si', use_rhoref=False)
         assert model is None, model
         assert len(responses) == 0, responses
 
         f06_filename2 = 'cat.op2'
-        model, responses = load_f06_op2(f06_filename2, log)
+        model, responses = load_f06_op2(
+            f06_filename2, log,
+            in_units='si', out_units='si', use_rhoref=False)
         assert model is None, model
         assert len(responses) == 0, responses