bdf:

 - preventing SUBCASE cards
 - fixing parsing of GROUP when there are + characters
 - export_caero_mesh now supports --xref
 - test_bdf now supports skip_cards to deal with the GROUP card
 - fixed NX pressure plotting
 - switching plot_144 from docopt to argparse because error messages are bad

Author: SteveDoyle2

pyNastran/bdf/bdf.py

@@ -3069,7 +3069,7 @@ def reject_card_lines(self, card_name: str, card_lines: list[str],
             #return
 
         if card_name not in self.card_count:
-            if card_name == '#INCLUDE':
+            if card_name in ['#INCLUDE', 'SUBCASE']:
                 raise RuntimeError(card_lines)
             _check_for_spaces(card_name, card_lines, comment, self.log)
             #raise RuntimeError(card_name)

pyNastran/bdf/bdf_interface/utils.py

@@ -158,14 +158,19 @@ def _to_fields_group(card_lines: list[str]) -> list[str]:
     |       | ELEM | 30  | THRU | 40  |     |   |   |   |
     +-------+------+-----+------+-----+-----+---+---+---+
     |       | PROP | ALL |      |     |     |   |   |   |
-        +-------+------+-----+------+-----+-----+---+---+---+
+    +-------+------+-----+------+-----+-----+---+---+---+
+
+    # TODO: buggy
+    GROUP   991001  Description                                             +
+    +       GRID    291     293     301     302     303     304     305     +
+    +               306     1301    68408   68409   69144   69145   69146
     """
-    #for iline, line in enumerate(card_lines):
-        #print(f'GROUP {iline}: {line!r}')
+    # for iline, line in enumerate(card_lines):
+    #     print(f'GROUP {iline}: {line!r}')
 
     fields = _monpnt_line1_fields(card_lines[0])
     for j, line in enumerate(card_lines[1:]):
-        line_strip = line.lstrip()
+        line_strip = line.lstrip('+ ')
         line = line.rstrip()
         if line_strip.startswith('META'):
             fieldsi = [
@@ -180,10 +185,15 @@ def _to_fields_group(card_lines: list[str]) -> list[str]:
             # fieldsi = _expand_2_values_name(line)
             # #print(fieldsi)
         else:
-            raise NotImplementedError(line)
-        #print(f'GROUP fields[{j}]: fields={fieldsi}')
+            fieldsi = [
+                line[8:16], line[16:24], line[24:32], line[32:40], line[40:48],
+                line[48:56], line[56:64], line[64:72],
+            ]
+            # msg = f'line:\n{line!r}\nline_strip:\n{line_strip!r}'
+            # raise NotImplementedError(msg)
+        # print(f'GROUP fields[{j}]: fields={fieldsi}')
         fields.extend(fieldsi)
-    #print(f'GROUP: fields={fields}')
+    # print(f'GROUP: fields={fields}')
     return fields
 
 
@@ -218,36 +228,36 @@ def _to_fields_set1(card_lines: list[str], card_name: str) -> list[str]:
     for iline, line in enumerate(card_lines):
         if '\t' in line:
             line = expand_tabs(line)
-        #print(f'line = {line}')
+        # print(f'line = {line}')
         line = line.rstrip('\n\r,')
-        #print(f'line2 = {line}')
+        # print(f'line2 = {line}')
         if '*' in line:  # large field
             if ',' in line:  # csv
-                new_fields = line.split(',')  #[:5]
+                new_fields = line.split(',')  # [:5]
                 new_fields = [field.strip() for field in new_fields if field.strip()]
                 if iline > 0:
                     new_fields = [''] + new_fields
                 assert len(new_fields) <= 5, new_fields
-                #for unused_i in range(5 - len(new_fields)):
-                    #new_fields.append('')
+                # for unused_i in range(5 - len(new_fields)):
+                #     new_fields.append('')
                 assert len(new_fields) == 5, new_fields
             else:  # standard
                 new_fields = [line[0:8], line[8:24], line[24:40], line[40:56],
                               line[56:72]]
                 end = line[72:].rstrip('+ ')
                 assert len(end) == 0, line
         else:  # small field
-            length_max = 9  #if iline == 0 else 8
+            length_max = 9  # if iline == 0 else 8
             if ',' in line:  # csv
-                new_fields = line.split(',') #[:9]
+                new_fields = line.split(',')  # [:9]
                 new_fields = [field.strip() for field in new_fields if field.strip()]
                 if iline > 0:
                     new_fields = [''] + new_fields
                 if len(new_fields) >= length_max:
                     throw_length_warning = True
                 for unused_i in range(9 - len(new_fields)):
                     new_fields.append('')
-                #assert len(new_fields) == 9, f'{new_fields}; {len(new_fields)}'
+                # assert len(new_fields) == 9, f'{new_fields}; {len(new_fields)}'
             else:  # standard
                 new_fields = [line[0:8], line[8:16], line[16:24], line[24:32],
                               line[32:40], line[40:48], line[48:56], line[56:64],
@@ -557,27 +567,28 @@ def _parse_pynastran_header(line: str) -> tuple[Optional[str], Optional[str]]:
     return key, value
 
 
-#def clean_empty_lines(lines: list[str]) -> list[str]:
-    #"""
-    #Removes leading and trailing empty lines
-    #don't remove internally blank lines
-    #"""
-    #found_lines = False
-    #if len(lines) < 2:
-        #return lines
-
-    #for i, line in enumerate(lines):
-        #if not found_lines and line:
-            #found_lines = True
-            #n1 = i
-            #n2 = i + 1
-        #elif found_lines and line:
-            #n2 = i + 1
-    #lines2 = lines[n1:n2]
-    #return lines2
-
-
-def print_filename(filename: PathLike | StringIO, relpath: bool=True) -> str:
+# def clean_empty_lines(lines: list[str]) -> list[str]:
+#     """
+#     Removes leading and trailing empty lines
+#     don't remove internally blank lines
+#     """
+#     found_lines = False
+#     if len(lines) < 2:
+#         return lines
+#
+#     for i, line in enumerate(lines):
+#         if not found_lines and line:
+#             found_lines = True
+#             n1 = i
+#             n2 = i + 1
+#         elif found_lines and line:
+#             n2 = i + 1
+#     lines2 = lines[n1:n2]
+#     return lines2
+
+
+def print_filename(filename: PathLike | StringIO,
+                   relpath: bool=True) -> str:
     """
     Takes a path such as C:/work/fem.bdf and locates the file using
     relative paths.  If it's on another drive, the path is not modified.
@@ -586,13 +597,13 @@ def print_filename(filename: PathLike | StringIO, relpath: bool=True) -> str:
     ----------
     filename : str
         a filename string
+    relpath: bool; default=True
+       should the relative path be returned
 
     Returns
     -------
     filename_string : str
         a shortened representation of the filename
-    relpath: bool; default=True
-       should the relative path be returned
 
     """
     if isinstance(filename, StringIO):
@@ -705,9 +716,9 @@ def fill_dmigs(model: BDF) -> None:
 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)
+    # 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/bdf/mesh_utils/cmd_line/export_caero_mesh.py

@@ -4,6 +4,7 @@
 import pyNastran
 from .utils import filter_no_args
 
+
 def cmd_line_export_caero_mesh(argv=None, quiet=False):
     """command line interface to export_caero_mesh"""
     if argv is None:  # pragma: no cover
@@ -13,7 +14,8 @@ def cmd_line_export_caero_mesh(argv=None, quiet=False):
     import pyNastran
     msg = (
         'Usage:\n'
-        '  bdf export_caero_mesh IN_BDF_FILENAME [-o OUT_BDF_FILENAME] [--punch] [--aerobox] [--pid PID]\n'
+        '  bdf export_caero_mesh IN_BDF_FILENAME [-o OUT_BDF_FILENAME] [--punch] [--xref]'
+        ' [--aerobox] [--pid PID]\n'
         '  bdf export_caero_mesh -h | --help\n'
         '  bdf export_caero_mesh -v | --version\n'
         '\n'
@@ -25,6 +27,7 @@ def cmd_line_export_caero_mesh(argv=None, quiet=False):
         'Options:\n'
         '  -o OUT, --output  OUT_CAERO_BDF_FILENAME  path to output BDF file\n'
         '  --punch                                   flag to identify a *.pch/*.inc file\n'
+        '  -x, --xref                                flag to disable xref (default=False)\n'
         '  --aerobox                                 write the aeroboxes (default=False)\n'
         '  --pid PID                                 sets the pid; {aesurf, caero, paero} [default: aesurf]\n'
         '\n'
@@ -36,19 +39,20 @@ def cmd_line_export_caero_mesh(argv=None, quiet=False):
     filter_no_args(msg, argv, quiet=quiet)
 
     ver = str(pyNastran.__version__)
-    #type_defaults = {
+    # type_defaults = {
     #    '--nerrors' : [int, 100],
-    #}
-    #try:
+    # }
+    # try:
     data = docopt(msg, version=ver, argv=argv[1:])
-    #except:
-        #raise SystemError(msg)
+    # except:
+    #     raise SystemError(msg)
 
     if not quiet:  # pragma: no cover
         print(data)
     #size = 16
     bdf_filename = data['IN_BDF_FILENAME']
     punch = data['--punch']
+    xref = not data['--xref']
     caero_bdf_filename = data['--output']
     base = os.path.splitext(bdf_filename)[0]
     if caero_bdf_filename is None:
@@ -89,6 +93,9 @@ def cmd_line_export_caero_mesh(argv=None, quiet=False):
     ]
     level = 'debug' if not quiet else 'warning'
     log = SimpleLogger(level=level, encoding='utf-8')
-    model = read_bdf(bdf_filename, punch=punch, log=log, skip_cards=skip_cards)
+    model = read_bdf(bdf_filename, punch=punch, xref=xref,
+                     log=log, skip_cards=skip_cards)
     export_caero_mesh(model, caero_bdf_filename,
-                      is_aerobox_model=is_aerobox_model, pid_method=pid_method)
+                      is_aerobox_model=is_aerobox_model,
+                      pid_method=pid_method,
+                      xref=xref)

pyNastran/bdf/mesh_utils/export_caero_mesh.py

@@ -4,7 +4,7 @@
 
 """
 import math
-from typing import TextIO, TYPE_CHECKING
+from typing import TextIO
 import numpy as np
 
 from pyNastran.utils import PathLike
@@ -19,7 +19,8 @@ def export_caero_mesh(bdf_filename: PathLike | BDF,
                       is_aerobox_model: bool=True,
                       pid_method: str='aesurf',
                       rotate_panel_angle_deg: float=0.0,
-                      write_panel_xyz: bool=True) -> None:
+                      write_panel_xyz: bool=True,
+                      xref: bool=True) -> None:
     """
     Write the CAERO cards as CQUAD4s that can be visualized
 
@@ -50,15 +51,16 @@ def export_caero_mesh(bdf_filename: PathLike | BDF,
         'PAERO1', 'PAERO2', 'PAERO3', 'PAERO4', 'PAERO5',
         'SET1', 'SET2', 'SET3',
         'SPLINE1', 'SPLINE2', 'SPLINE3', 'SPLINE4', 'SPLINE5',
-        'AELIST',
+        'AELIST', 'AESURF',
         # for aero ooord
         'AEROS', 'AERO',
         'CORD1R', 'CORD1S', 'CORD1C',
         'CORD2R', 'CORD2S', 'CORD2C',
         'GRID',
     ]
     model = get_bdf_model(
-        bdf_filename, cards_to_include=cards_to_include,
+        bdf_filename, xref=xref,
+        cards_to_include=cards_to_include,
         log=None, debug=False)
     if isinstance(model, PathLike):
         model = read_bdf(model)
@@ -449,30 +451,30 @@ def _write_subcases_loads(model: BDF,
                 )
             isubcase += 2
 
-            ## TODO: assume first column is forces & second column is moments...verify
-            #loads += f'$ {name} - FORCE\n'
-            #loads += '$ PLOAD2 SID P EID1\n'
-            #for ieid, value in enumerate(data[:, 0].ravel()):
-                #eid = aero_eid_map[ieid]
-                #loads += f'PLOAD2,{isubcase},{value},{eid}\n'
-            #isubcase += 1
-
-            #subcases += (
-                #f'SUBCASE {isubcase}\n'
-                #f'  SUBTITLE = DMI {name} - MOMENT\n'
-                #f'  LOAD = {isubcase}\n')
-            #loads += f'$ {name} - MOMENT\n'
-            #loads += '$ PLOAD2 SID P EID1\n'
-            #for irow, value in enumerate(data[:, 1].ravel()):
-                #row = rows[irow]
-                #eid = row[0]
-                #loads += f'PLOAD2,{isubcase},{value},{eid}\n'
+            # TODO: assume first column is forces & second column is moments...verify
+            # loads += f'$ {name} - FORCE\n'
+            # loads += '$ PLOAD2 SID P EID1\n'
+            # for ieid, value in enumerate(data[:, 0].ravel()):
+            #     eid = aero_eid_map[ieid]
+            #     loads += f'PLOAD2,{isubcase},{value},{eid}\n'
+            # isubcase += 1
+            #
+            # subcases += (
+            #     f'SUBCASE {isubcase}\n'
+            #     f'  SUBTITLE = DMI {name} - MOMENT\n'
+            #     f'  LOAD = {isubcase}\n')
+            # loads += f'$ {name} - MOMENT\n'
+            # loads += '$ PLOAD2 SID P EID1\n'
+            # for irow, value in enumerate(data[:, 1].ravel()):
+            #     row = rows[irow]
+            #     eid = row[0]
+            #     loads += f'PLOAD2,{isubcase},{value},{eid}\n'
         else:
             raise NotImplementedError(msg)
 
     if not is_aerobox_model:
         # we put this here to test
-        #model.log.warning('cannot export "loads" because not an aerobox model')
+        model.log.warning('cannot export "loads" because not an aerobox model')
         subcases = ''
         loads = ''
     return subcases, loads