reorg of f06 plot_144

Author: SteveDoyle2

pyNastran/bdf/mesh_utils/export_caero_mesh.py

@@ -8,12 +8,13 @@
 import numpy as np
 
 from pyNastran.utils import PathLike
+from pyNastran.bdf.mesh_utils.internal_utils import get_bdf_model
 from pyNastran.bdf.bdf import read_bdf, BDF, Coord, AELIST
 from pyNastran.bdf.cards.aero.aero import CAERO1, CAERO2
 from pyNastran.bdf.field_writer_8 import print_card_8
 
 
-def export_caero_mesh(model: BDF,
+def export_caero_mesh(bdf_filename: PathLike | BDF,
                       caero_bdf_filename: PathLike='caero.bdf',
                       is_aerobox_model: bool=True,
                       pid_method: str='aesurf',
@@ -22,7 +23,7 @@ def export_caero_mesh(model: BDF,
     """
     Write the CAERO cards as CQUAD4s that can be visualized
 
-    model: BDF
+    model: str | Path | BDF
         a valid geometry
     caero_bdf_filename : str
         the file to write
@@ -43,6 +44,22 @@ def export_caero_mesh(model: BDF,
         $$        1        2    0.0988    0.2500    0.0000    0.0988    0.5000    0.1234
     """
     rotate_panel_angle = np.radians(rotate_panel_angle_deg)
+
+    cards_to_include = [
+        'CAERO1', 'CAERO2', 'CAERO3', 'CAERO4', 'CAERO5',
+        'PAERO1', 'PAERO2', 'PAERO3', 'PAERO4', 'PAERO5',
+        'SET1', 'SET2', 'SET3',
+        'SPLINE1', 'SPLINE2', 'SPLINE3', 'SPLINE4', 'SPLINE5',
+        'AELIST',
+        # for aero ooord
+        'AEROS', 'AERO',
+        'CORD1R', 'CORD1S', 'CORD1C',
+        'CORD2R', 'CORD2S', 'CORD2C',
+        'GRID',
+    ]
+    model = get_bdf_model(
+        bdf_filename, cards_to_include=cards_to_include,
+        log=None, debug=False)
     if isinstance(model, PathLike):
         model = read_bdf(model)
     log = model.log

pyNastran/bdf/mesh_utils/internal_utils.py

@@ -1,6 +1,6 @@
 from io import StringIO
 from pathlib import PurePath
-from pyNastran.bdf.bdf import BDF
+from pyNastran.bdf.bdf import BDF, read_bdf
 
 #def get_model(bdf_filename):
     #if isinstance(bdf_filename, str):
@@ -17,6 +17,7 @@
 def get_bdf_model(bdf_filename: BDF_FILETYPE,
                   xref: bool=True,
                   cards_to_skip=None,
+                  cards_to_include=None,
                   validate: bool=True,
                   log=None, debug: bool=False) -> BDF:
     if isinstance(bdf_filename, (str, StringIO, PurePath)):
@@ -25,11 +26,16 @@ def get_bdf_model(bdf_filename: BDF_FILETYPE,
                         #read_cards=None,
                         #encoding=None, log=None,
                         #debug=True, mode='msc')
-        model = BDF(log=log, debug=debug)
-        model.disable_cards(cards_to_skip)
-        model.read_bdf(bdf_filename, validate=validate, xref=xref,
-                       punch=False, read_includes=True,
-                       save_file_structure=False, encoding=None)
+        model = read_bdf(
+            bdf_filename,
+            validate=validate,
+            xref=xref,
+            skip_cards=cards_to_skip,
+            read_cards=cards_to_include,
+            punch=False,
+            #read_includes=True,
+            save_file_structure=False,
+            log=log, debug=debug)
     elif isinstance(bdf_filename, BDF):
         model = bdf_filename
         if xref:

pyNastran/f06/f06_to_pressure_loads.py

@@ -105,7 +105,8 @@ def f06_to_pressure_loads(f06_filename: PathLike,
                 cpi = np.mean(cps)
                 cp_list.append(cpi)
             cps_list.append(cp_list)
-            line0 = line0.rstrip(',') + '\n'
+
+        line0 = line0.rstrip(',') + '\n'
         cp_array = np.column_stack(cps_list)
         assert cp_array.shape == (neids, nsubcases), f'actual_shape={cp_array.shape} expected=({neids},{nsubcases})'
 

pyNastran/f06/test/test_f06_utils.py

@@ -744,15 +744,31 @@ def test_f06_trim_bwb(self):
             pid_method='caero',
             write_panel_xyz=True)
 
+        # auto-generated files
         trim_results = f06_to_pressure_loads(
-            f06_filename, aerobox_caero_filename, loads_filename,
+            f06_filename, aerobox_caero_filename,
+            loads_filename,
             log=None, nlines_max=1_000_000, debug=None)
+        # set the file names?
         trim_results = f06_to_pressure_loads(
-            f06_filename, aerobox_caero_filename, loads_filename,
+            f06_filename, aerobox_caero_filename,
+            loads_filename,
             nid_csv_filename=nid_csv_filename,
             eid_csv_filename=eid_csv_filename,
             log=None, nlines_max=1_000_000, debug=None)
 
+        argv = [
+            'f06', 'plot_144', str(f06_filename),
+            '--caero', str(aerobox_caero_filename)]
+        log = get_logger(log=None, level=None, encoding='utf-8')
+        cmd_line_f06(argv=argv, # plot=IS_MATPLOTLIB,
+                     show=False, log=log)
+
+        argv = ['f06', 'plot_144', str(f06_filename)]
+        cmd_line_f06(argv=argv, # plot=IS_MATPLOTLIB,
+                     show=False, log=log)
+
+
     def test_f06_trim_freedlm(self):
         """tests read_f06_trim"""
         bdf_filename = AERO_PATH / 'freedlm' / 'freedlm.bdf'

pyNastran/f06/utils.py

@@ -4,6 +4,7 @@
 
 """
 from __future__ import annotations
+import os
 import sys
 from typing import Optional, TYPE_CHECKING
 
@@ -18,36 +19,18 @@
 #matplotlib.use(matplotlib_backend)
 #from pyNastran.gui.qt_version import qt_version
 
-PLOT_TYPES = '[--eas|--tas|--density|--mach|--alt|--q|--index]'
-AXES = '[--xlim XLIM] [--ylimdamp DAMP] [--ylimfreq FREQ]'
-EXPORTS = '[--export_csv] [--export_zona] [--export_f06]'
-USAGE_145 = (
-    'Usage:\n'
-    '  f06 plot_145 F06_FILENAME [--modes MODES] [--subcases SUB] '
-    f'{PLOT_TYPES} [--kfreq] [--rootlocus] '
-    '[--in_units IN] [--out_units OUT] [--rhoref] '
-    f'[--vd_limit VD_LIMIT] [--damping_limit DAMPING_LIMIT] {AXES} '
-    f'[--noline] [--nopoints] [--ncol NCOL] {EXPORTS} '
-    '[--modal IVEL MODE] [--freq_tol FREQ_TOL] [--freq_tol_remove FREQ_TOL_REMOVE] [--mag_tol MAG_TOL]\n'
-)
-USAGE_144 = (
-    'Usage:\n'
-    '  f06 plot_144 F06_FILENAME SUBPANEL_CAERO_FILENAME\n'
-)
-
-USAGE_200 = (
-    'Usage:\n'
-    '  f06 plot_200 F06_FILENAME\n'
-)
 if TYPE_CHECKING:  # pragma: no cover
     from cpylog import SimpleLogger
     from pyNastran.f06.flutter_response import FlutterResponse
 
 
+USAGE_144 = (
+    'Usage:\n'
+    '  f06 plot_144 F06_FILENAME [--caero AEROBOX_CAERO_FILENAME] | [--bdf BDF_FILENAME]\n'
+)
 def cmd_line_plot_trim(argv=None, plot: bool=True, show: bool=True,
                        log: Optional[SimpleLogger]=None):
     """the interface to ``f06 plot_144`` on the command line"""
-    import os
     from pyNastran.f06.parse_flutter import plot_flutter_f06, float_types
     if argv is None:  # pragma: no cover
         argv = sys.argv
@@ -69,7 +52,10 @@ def cmd_line_plot_trim(argv=None, plot: bool=True, show: bool=True,
 
         'Positional Arguments:\n'
         '  F06_FILENAME            path to input F06 file\n'
-        '  AEROBOX_CAERO_FILENAME  path to input CAERO file\n'
+        
+        'Options:\n'
+        '  --caero AEROBOX_CAERO_FILENAME  path to exported CAERO file\n'
+        '  --bdf   BDF_FILENAME            path to input BDF file containing CAEROs\n'
         '\n'
         'Info:\n'
         '  -h, --help      show this help message and exit\n'
@@ -85,14 +71,39 @@ def cmd_line_plot_trim(argv=None, plot: bool=True, show: bool=True,
     ver = str(pyNastran.__version__)
     assert docopt_version >= '0.9.0', docopt_version
     data = docopt(msg, version=ver, argv=argv[1:])
-    f06_filename = data['F06_FILENAME']
-    aerobox_caero_filename = data['AEROBOX_CAERO_FILENAME']
+    if data['--bdf'] is False:
+        data['--bdf'] = None
 
+    # print(data)
+    f06_filename = data['F06_FILENAME']
+    aerobox_caero_filename = data['--caero']
+    bdf_filename = data['--bdf']
+
+    from pyNastran.utils import print_bad_path
+    # print(aerobox_caero_filename)
+    # print(bdf_filename)
+    if bdf_filename is None:
+        base = os.path.splitext(f06_filename)[0]
+        bdf_filename = base + '.bdf'
+    assert os.path.exists(bdf_filename), print_bad_path(bdf_filename)
+
+    if aerobox_caero_filename is None:
+        from pyNastran.bdf.mesh_utils.export_caero_mesh import export_caero_mesh
+        aerobox_caero_filename = 'caero.bdf'
+        export_caero_mesh(
+            bdf_filename,
+            caero_bdf_filename=aerobox_caero_filename,
+            is_aerobox_model=True,
+            pid_method='caero',
+            write_panel_xyz=False)
+
+    assert os.path.exists(aerobox_caero_filename), print_bad_path(aerobox_caero_filename)
     dirname = os.path.dirname(f06_filename)
     loads_filename = os.path.join(dirname, 'loads.inc')
     base = os.path.splitext(f06_filename)[0]
     if f06_filename.lower().endswith(('.bdf', '.op2')):
         f06_filename = base + '.f06'
+
     from pyNastran.f06.f06_to_pressure_loads import f06_to_pressure_loads
     nid_csv_filename = os.path.join(dirname, 'nid_pyNastran.csv')
     eid_csv_filename = os.path.join(dirname, 'eid_pyNastran.csv')
@@ -107,10 +118,22 @@ def cmd_line_plot_trim(argv=None, plot: bool=True, show: bool=True,
     return loads
 
 
+PLOT_TYPES = '[--eas|--tas|--density|--mach|--alt|--q|--index]'
+AXES = '[--xlim XLIM] [--ylimdamp DAMP] [--ylimfreq FREQ]'
+EXPORTS = '[--export_csv] [--export_zona] [--export_f06]'
+USAGE_145 = (
+    'Usage:\n'
+    '  f06 plot_145 F06_FILENAME [--modes MODES] [--subcases SUB] '
+    f'{PLOT_TYPES} [--kfreq] [--rootlocus] '
+    '[--in_units IN] [--out_units OUT] [--rhoref] '
+    f'[--vd_limit VD_LIMIT] [--damping_limit DAMPING_LIMIT] {AXES} '
+    f'[--noline] [--nopoints] [--ncol NCOL] {EXPORTS} '
+    '[--modal IVEL MODE] [--freq_tol FREQ_TOL] [--freq_tol_remove FREQ_TOL_REMOVE] [--mag_tol MAG_TOL]\n'
+)
+
 def cmd_line_plot_flutter(argv=None, plot: bool=True, show: bool=True,
                           log: Optional[SimpleLogger]=None) -> dict[int, FlutterResponse]:
     """the interface to ``f06 plot_145`` on the command line"""
-    import os
     from pyNastran.f06.parse_flutter import plot_flutter_f06, float_types
     if argv is None:  # pragma: no cover
         argv = sys.argv
@@ -479,6 +502,10 @@ def split_int_colon(modes: str, nmax: int=1000,
     return modes
 
 
+USAGE_200 = (
+    'Usage:\n'
+    '  f06 plot_200 F06_FILENAME\n'
+)
 def cmd_line_plot_optimization(argv=None, plot: bool=True, show: bool=True,
                                log: Optional[SimpleLogger]=None):
     """the interface to ``f06 plot_145`` on the command line"""