write_bdf now has a sort_cards flag to speed things up/make diffs easier

Author: SteveDoyle2

pyNastran/bdf/bdf_interface/write_mesh.py

@@ -18,7 +18,9 @@
 import numpy as np
 
 from pyNastran.utils.numpy_utils import integer_types
-from pyNastran.bdf.field_writer_8 import set_blank_if_default, print_card_8
+from pyNastran.bdf.field_writer_8 import (
+    set_blank_if_default, print_card_8, print_float_8,
+    print_int_default_8, print_float_default_8)
 from pyNastran.bdf.cards.base_card import Element
 from pyNastran.bdf.cards.nodes import GRID
 from pyNastran.bdf.bdf_interface.internal_get import coord_id
@@ -1684,9 +1686,34 @@ def repr_fields(self) -> list:
         return list_fields
 
     def write_card(self, size: int=8, is_double: bool=False) -> str:
+        # if 0:  # pragma: no cover
+        #     is_inertia = max(self.I) != 0 or min(self.I) != 0.0
+        #     if size == 8:
+        #         x, y, z = self.X
+        #         msg = 'CONM2   %8d%8d%s%s%s%s%s\n' % (
+        #             self.eid, self.Nid(),
+        #             print_int_default_8(self.Cid(), 0),
+        #             print_float_8(self.mass),
+        #             print_float_8(x),
+        #             print_float_8(y),
+        #             print_float_8(z))
+        #         if is_inertia:
+        #             ixx, ixy, iyy, ixz, iyz, izz = self.I
+        #             msg += '        %s%s%s%s%s%s\n' % (
+        #                 print_float_default_8(ixx, 0.0),
+        #                 print_float_default_8(ixy, 0.0),
+        #                 print_float_default_8(iyy, 0.0),
+        #                 print_float_default_8(ixz, 0.0),
+        #                 print_float_default_8(iyz, 0.0),
+        #                 print_float_default_8(izz, 0.0),
+        #             )
+        #         print(msg.rstrip())
+        #         return self.comment + msg
+
+        # card = self.raw_fields()
         card = self.repr_fields()
         if size == 8:
-            return self.comment + print_card_8(card)
+           return self.comment + print_card_8(card)
         return self.comment + print_card_16(card)
 
     def write_card_16(self, is_double=False):

pyNastran/bdf/cards/elements/mass.py

@@ -88,6 +88,20 @@ def print_scientific_8(value: float) -> str:
     return field
 
 
+def print_int_default_8(value: int, default: int) -> str:
+    """combine set_blank_if_default and print_field"""
+    if value == default:
+        return '        '
+    return '%8d' % value
+
+
+def print_float_default_8(value: float, default: float) -> str:
+    """combine set_blank_if_default and print_float_8"""
+    if value == default:
+        return '        '
+    return print_float_8(value)
+
+
 def print_float_8(value: float) -> str:
     """
     Prints a float in nastran 8-character width syntax using the

pyNastran/bdf/field_writer_8.py

@@ -1681,6 +1681,10 @@ def _add_parser_arguments(parser, args: list[str]) -> None:
             parser.add_argument('--punch', action='store_true', help='assume a punch file')
         elif arg == '--lax':
             parser.add_argument('--lax', action='store_true', help='lax card parser')
+        elif arg == '--nosort':
+            parser.add_argument(
+                '--nosort', action='store_false',
+                help='Dont sort the nodes, elements, ... (default=False -> sort)')
         elif arg == '--allow_dup':
             parser.add_argument('--allow_dup', help='allow duplicate cards -> "GRID,CONM2"')
         else:

pyNastran/bdf/mesh_utils/utils.py

@@ -41,6 +41,7 @@ def run(regenerate: bool=True, run_nastran: bool=False, debug: bool=False,
         run_skin_solids: bool=True,
         run_export_caero: bool=True,
         allow_similar_eid: bool=True,
+        sort_cards: bool=True,
         xref: bool=True, is_lax_parser: bool=False,
         crash_cards=None):
     """Runs the full BDF test suite"""
@@ -120,6 +121,7 @@ def run(regenerate: bool=True, run_nastran: bool=False, debug: bool=False,
         run_export_caero=run_export_caero,
         run_skin_solids=run_skin_solids,
         allow_similar_eid=allow_similar_eid,
+        sort_cards=sort_cards,
         encoding='latin1', crash_cards=crash_cards,
         dev=True, run_pickle=True)
     ntotal = len(files)
@@ -141,7 +143,7 @@ def main():
     #is_release = False
     skips = '[--skip_loads] [--skip_mass] [--skip_mcid] [--skip_aero] [--skip_skin] [--no_similar_eid]'
     msg = (
-        f'Usage:  bdf_test [-r] [-n] [-s S...] [-e E] [-x] [-c C] [--safe] [--lax] {skips}\n'
+        f'Usage:  bdf_test [-r] [-n] [-s S...] [-e E] [-x] [-c C] [--safe] [--lax] [--nosort] {skips}\n'
         '        bdf_test -h | --help\n'
         '        bdf_test -v | --version\n'
         '\n'
@@ -163,6 +165,7 @@ def main():
         '  --skip_skin          Disables solid skinning\n'
         '  --no_similar_eid     No duplicate eids among elements, rigids, and masses\n'
         '  --lax                Use the lax card parser (default=False)\n'
+        '  --nosort             Dont sort the nodes, elements, ... (default=False -> nosort)\n'
     )
     if len(sys.argv) == 0:
         sys.exit(msg)
@@ -178,6 +181,7 @@ def main():
     run_export_caero = not data['--skip_aero']
     allow_similar_eid = not data['--no_similar_eid']
     xref = not data['--xref']
+    sort_cards = not data['--nosort']
     is_lax_parser = data['--lax']
 
     crash_cards = []
@@ -190,6 +194,7 @@ def main():
         run_export_caero=run_export_caero,
         run_skin_solids=run_skin_solids,
         is_lax_parser=is_lax_parser,
+        sort_cards=sort_cards,
         xref=xref, crash_cards=crash_cards)
 
 

pyNastran/bdf/test/bdf_test.py

@@ -90,6 +90,7 @@ def run_lots_of_files(filenames: list[str], folder: str='',
                       run_export_caero: bool=True,
                       run_skin_solids: bool=True,
                       allow_similar_eid: bool=True,
+                      sort_cards: bool=True,
                       dev: bool=True,
                       crash_cards: Optional[list[str]]=None,
                       run_pickle: bool=True, quiet: bool=False) -> list[str]:
@@ -214,6 +215,7 @@ def run_lots_of_files(filenames: list[str], folder: str='',
                         run_export_caero=run_export_caero,
                         run_skin_solids=run_skin_solids,
                         allow_similar_eid=allow_similar_eid,
+                        sort_cards=sort_cards,
 
                         dev=dev,
                         crash_cards=crash_cards,
@@ -291,6 +293,7 @@ def run_bdf(folder: str, bdf_filename: PathLike,
             is_lax_parser: bool=False,
             allow_duplicates: bool=False,
             allow_similar_eid: bool=True,
+            sort_cards: bool=True,
             stop: bool=False, nastran: str='', post: int=-1,
             dynamic_vars=None,
             quiet: bool=False, dumplines: bool=False, dictsort: bool=False,
@@ -400,6 +403,7 @@ def run_bdf(folder: str, bdf_filename: PathLike,
         sum_load=sum_load, size=size, is_double=is_double,
         is_lax_parser=is_lax_parser,
         allow_similar_eid=allow_similar_eid,
+        sort_cards=sort_cards,
         allow_tabs=allow_tabs,
         allow_duplicates=allow_duplicates,
         stop=stop, nastran=nastran, post=post, hdf5=hdf5,
@@ -444,6 +448,7 @@ def run_and_compare_fems(
         allow_tabs: bool=True,
         allow_duplicates: bool=False,
         allow_similar_eid: bool=True,
+        sort_cards: bool=True,
         stop: bool=False,
         nastran: str='',
         post: int=-1,
@@ -520,6 +525,7 @@ def run_and_compare_fems(
             save_file_structure=save_file_structure,
             hdf5=hdf5,
             encoding=encoding, crash_cards=crash_cards, safe_xref=safe_xref,
+            sort_cards=sort_cards,
             limit_mesh_opt=limit_mesh_opt,
             run_pickle=run_pickle, stop=stop, name=name)
 
@@ -700,6 +706,7 @@ def run_fem1(fem1: BDF, bdf_filename: str, out_model: str, mesh_form: str,
              encoding: Optional[str]=None,
              crash_cards: Optional[list[str]]=None,
              limit_mesh_opt: bool=False,
+             sort_cards: bool=True,
              safe_xref: bool=True, run_pickle: bool=False, stop: bool=False,
              name: str='') -> BDF:
     """
@@ -832,12 +839,17 @@ def run_fem1(fem1: BDF, bdf_filename: str, out_model: str, mesh_form: str,
         hdf5_filename = f'{out_model}{name}.h5'
         _test_hdf5(fem1, hdf5_filename)
 
+    args = {
+        'size': size,
+        'is_double': is_double,
+        'sort_cards': sort_cards,
+    }
     if mesh_form is None:
         pass
     elif mesh_form == 'combined':
-        fem1.write_bdf(out_model, interspersed=True, size=size, is_double=is_double)
+        fem1.write_bdf(out_model, interspersed=True, **args)
     elif mesh_form == 'separate':
-        fem1.write_bdf(out_model, interspersed=False, size=size, is_double=is_double)
+        fem1.write_bdf(out_model, interspersed=False, **args)
     else:
         msg = "mesh_form=%r; allowed_mesh_forms=['combined','separate']" % mesh_form
         raise NotImplementedError(msg)
@@ -2270,6 +2282,10 @@ def test_bdf_argparse(argv=None):
 
     parent_parser.add_argument('--lax', action='store_true',
                                help='use the lax card parser (default=False)')
+    parent_parser.add_argument(
+        '--nosort', action='store_false',
+        help='Dont sort the nodes, elements, ... (default=False -> sort)')
+
     parent_parser.add_argument('--duplicate', action='store_true',
                                help='overwrite duplicates; takes the later card (default=False)')
     parent_parser.add_argument('-q', '--quiet', action='store_true',
@@ -2375,7 +2391,7 @@ def get_test_bdf_usage_args_examples(encoding):
     options = (
         '\n  [options] = [-e E] [--encoding ENCODE] [-q] [--dumplines] [--dictsort]\n'
         f'              [--ignore I] [--crash C] [--pickle] [--profile] [--hdf5] [{formats}] [--filter]\n'
-        '              [--skip_loads] [--skip_mass] [--lax] [--duplicate]\n'
+        '              [--skip_loads] [--skip_mass] [--lax] [--nosort] [--duplicate]\n'
     )
     usage = (
         "Usage:\n"
@@ -2406,6 +2422,7 @@ def get_test_bdf_usage_args_examples(encoding):
         '                 every element/property to test them.  May fails if a \n'
         '                 card is fully not supported (default=False)\n'
         '  --lax          dont be strict on float parsing\n'
+        '  --nosort       Dont sort the nodes, elements, ... (default=False -> nosort)\n'
         '  --duplicate    overwrite duplicate GRIDs\n'
         '  -l, --large    writes the BDF in large field, single precision format (default=False)\n'
         '  -d, --double   writes the BDF in large field, double precision format (default=False)\n'

pyNastran/bdf/test/test_bdf.py

@@ -123,7 +123,7 @@ def write_geom2(op2_file: BinaryIO, op2_ascii,
             #continue
 
         cards_written[name] = nelements
-        log.warning(f'GEOM2: {name}')
+        # log.warning(f'GEOM2: {name}')
         if name in GEOM2_MAP:
             func = GEOM2_MAP[name]
             assert name not in geom2_key_mapper, name