working on tests

SteveDoyle2 · SteveDoyle2 · commit 43f8e89923f3 · 2025-11-15T15:15:55.000-08:00
diff --git a/pyNastran/f06/dev/flutter/gui_flutter.py b/pyNastran/f06/dev/flutter/gui_flutter.py
@@ -56,21 +56,17 @@
 from pyNastran.f06.flutter_response import FlutterResponse, Limit
 from pyNastran.f06.parse_flutter import get_flutter_units
 
-X_PLOT_TYPES = ['eas', 'tas', 'rho', 'q', 'mach', 'alt', 'kfreq', 'ikfreq', 'index']
-PLOT_TYPES = ['x-damp-freq', 'x-damp-kfreq', 'root-locus', 'modal-participation',
-              'zimmerman']
-UNITS_IN = ['english_in', 'english_kt', 'english_ft',
-            'si', 'si_mm']
-MODE_SWITCH_METHODS = ['None', 'Frequency', 'Damping']
-
-UNITS_OUT = UNITS_IN
-
 # FONT_SIZE = 12
 from pyNastran.f06.dev.flutter.utils import (
     get_point_removal_str,
     point_removal_str_to_point_removal,
-    get_plot_file, update_ylog_style, load_f06_op2,
-    get_png_filename,)
+    _float_passed_to_default, _to_str,
+    get_plot_flags, get_plot_file,
+    update_ylog_style, get_png_filename,
+    load_f06_op2,
+    X_PLOT_TYPES, PLOT_TYPES, UNITS_IN, MODE_SWITCH_METHODS,
+)
+UNITS_OUT = UNITS_IN
 
 import pyNastran
 PKG_PATH = Path(pyNastran.__path__[0])
@@ -1011,75 +1007,27 @@ def setup_widgets(self) -> None:
     def on_plot_type(self) -> None:
         x_plot_type = self.x_plot_type_pulldown.currentText()
         plot_type = self.plot_type_pulldown.currentText()
-
-        show_index_lim = False
-        show_eas_lim = False
-        show_tas_lim = False
-        show_mach_lim = False
-        show_alt_lim = False
-        show_q_lim = False
-        show_rho_lim = False
-
-        show_xlim = False
-        show_freq = False
-        show_damp = False
-        show_root_locus = False
-        show_zimmerman = False
-        show_modal_participation = False
-
-        # PLOT_TYPES = ['x-damp-freq', 'x-damp-kfreq', 'root-locus']
-        assert plot_type in PLOT_TYPES, plot_type
         self.on_units_out()
 
-        if x_plot_type == 'kfreq':
-            show_kfreq = True
-        else:
-            show_kfreq = False
+        flags = get_plot_flags(plot_type, x_plot_type)
+        show_index_lim = flags['show_index_lim']
+        show_eas_lim = flags['show_eas_lim']
+        show_tas_lim = flags['show_tas_lim']
+        show_mach_lim = flags['show_mach_lim']
+        show_alt_lim = flags['show_alt_lim']
+        show_q_lim = flags['show_q_lim']
+        show_rho_lim = flags['show_rho_lim']
+
+        show_xlim = flags['show_xlim']
+        show_freq = flags['show_freq']
+        show_damp = flags['show_damp']
+        show_kfreq = flags['show_kfreq']
+        show_ikfreq = flags['show_ikfreq']
+        show_root_locus = flags['show_root_locus']
+        show_zimmerman = flags['show_zimmerman']
+        show_modal_participation = flags['show_modal_participation']
+
 
-        if x_plot_type == 'ikfreq':
-            show_ikfreq = True
-        else:
-            show_ikfreq = False
-
-        if plot_type == 'x-damp-freq':
-            show_xlim = True
-            show_damp = True
-            show_freq = True
-        elif plot_type == 'x-damp-kfreq':
-            # kfreq-damp-kfreq not handled
-            show_xlim = True
-            show_damp = True
-            show_kfreq = True
-        elif plot_type == 'zimmerman':
-            show_zimmerman = True
-        elif plot_type == 'root-locus':
-            show_root_locus = True
-            # show_kfreq = False
-        elif plot_type == 'modal-participation':
-            show_modal_participation = True
-            # show_kfreq = False
-        else:  # pragma: no cover
-            raise RuntimeError(f'plot_type={plot_type!r}')
-
-        if show_xlim:
-            if 'index' == x_plot_type:
-                show_index_lim = True
-            elif 'eas' == x_plot_type:
-                show_eas_lim = True
-            elif 'tas' == x_plot_type:
-                show_tas_lim = True
-            elif 'mach' == x_plot_type:
-                show_mach_lim = True
-            elif 'alt' == x_plot_type:
-                show_alt_lim = True
-            elif 'q' == x_plot_type:
-                show_q_lim = True
-            elif 'rho' == x_plot_type:
-                show_rho_lim = True
-            elif 'kfreq' == x_plot_type:
-                show_kfreq_lim = True
-            elif 'ikfreq' == x_plot_type:
-                show_ikfreq_lim = True
         # print(f'x_plot_type={x_plot_type} show_damp={show_damp}; show_xlim={show_xlim}')
         # assert show_xlim is False, show_xlim
 
@@ -2299,21 +2247,6 @@ def get_float_or_none(line_edit: QLineEdit) -> tuple[Optional[float | str], bool
     return value, is_passed
 
 
-def _to_str(value: Optional[int | float]) -> str:
-    if value is None:
-        str_value = ''
-    else:
-        str_value = str(value)
-    return str_value
-
-
-def _float_passed_to_default(value: float, is_passed: bool,
-                             default: float=-1.0) -> float:
-    if is_passed and value is None:
-        value = default
-    return value
-
-
 def main(f06_filename: str='') -> None:  # pragma: no cover
     # kills the program when you hit Cntl+C from the command line
     # doesn't save the current state as presumably there's been an error
diff --git a/pyNastran/f06/dev/flutter/test_gui_flutter.py b/pyNastran/f06/dev/flutter/test_gui_flutter.py
@@ -1,17 +1,26 @@
 from pathlib import Path
 import unittest
 
+import numpy as np
 from cpylog import SimpleLogger
 
-from pyNastran.dev.bdf_vectorized3.bdf import read_bdf
+import pyNastran
 from pyNastran.f06.dev.flutter.nastran_utils import (
     get_element_table, get_property_table, get_material_table)
 from pyNastran.f06.dev.flutter.action import Action
-from pyNastran.f06.dev.flutter.utils import load_f06_op2
+from pyNastran.f06.dev.flutter.utils import (
+    get_plot_flags,
+    load_f06_op2, get_png_filename, get_plot_file,
+    point_removal_str_to_point_removal,
+    get_point_removal_str)
+
+IS_DEV = pyNastran.DEV
+if IS_DEV:
+    from pyNastran.dev.bdf_vectorized3.bdf import read_bdf
 
-import pyNastran
 PKG_PATH = Path(pyNastran.__path__[0])
 MODEL_PATH = (PKG_PATH / '..' / 'models').absolute()
+AERO_PATH = MODEL_PATH / 'aero'
 
 
 class TestGuiFlutter(unittest.TestCase):
@@ -28,14 +37,79 @@ def test_action(self) -> None:
 
     def test_load_f06_op2(self) -> None:
         f06_filename = MODEL_PATH / 'aero' / '2_mode_flutter' / '0012_flutter.op2'
-        log = SimpleLogger(level='info')
+        log = SimpleLogger(level='warning')
         in_units = 'si'
         out_units = 'si'
         load_f06_op2(f06_filename, log, in_units, out_units, use_rhoref=False)
 
         op2_filename = MODEL_PATH / 'bwb' / 'bwb_saero.op2'
         load_f06_op2(op2_filename, log, in_units, out_units, use_rhoref=False)
 
+    @unittest.skipIf(not IS_DEV, 'no flutter-dev')
+    def test_plot_flutter_0012_dev(self):
+        """tests load_f06_op2 and get_png_filename"""
+        log = SimpleLogger(level='warning')
+        dirname = AERO_PATH / '2_mode_flutter'
+        f06_filename = dirname / '0012_flutter.f06'
+        model, responses = load_f06_op2(f06_filename, log,
+            in_units='si', out_units='si', use_rhoref=False)
+        assert model is None, model
+        assert len(responses) == 1, responses
+
+        f06_filename2 = 'cat.f06'
+        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,
+            in_units='si', out_units='si', use_rhoref=False)
+        assert model is None, model
+        assert len(responses) == 0, responses
+
+    def test_plot_file(self):
+        out = get_plot_file()
+
+        base = 'base'
+        x_plot_type = 'eas'
+        plot_type = 'Vg'
+        export_to_png = True
+        png_filename0, png_filename = get_png_filename(
+            base, x_plot_type, plot_type,
+            export_to_png)
+        assert png_filename0 == 'base_Vg.png', png_filename0
+        assert png_filename == 'base_Vg.png', png_filename
+        png_filename0, png_filename = get_png_filename(
+            base, x_plot_type, 'x-'+plot_type,
+            export_to_png)
+        assert png_filename0 == 'base_eas-Vg.png', png_filename0
+        assert png_filename == 'base_eas-Vg.png', png_filename
+
+        png_filename0, png_filename = get_png_filename(
+            base, 'x-'+x_plot_type, plot_type,
+            export_to_png=False)
+        assert png_filename0 == 'base_Vg.png', png_filename0
+        assert png_filename is None, png_filename
+
+    def test_get_plot_flags(self):
+        # X_PLOT_TYPES = ['eas', 'tas', 'rho', 'q', 'mach', 'alt', 'kfreq', 'ikfreq', 'index']
+        # PLOT_TYPES = ['x-damp-freq', 'x-damp-kfreq', 'root-locus', 'modal-participation', 'zimmerman']
+        flags = get_plot_flags('x-damp-freq', 'eas')
+        del flags
+
+    def test_point_removal(self):
+        log = SimpleLogger(level='debug')
+        msg = '400:410,450:500'
+        point_removal = [[400.0, 410.0], [450.0, 500.0]]
+        point_removal_list = point_removal_str_to_point_removal(
+            msg, log)
+        assert np.allclose(point_removal, point_removal_list), point_removal_list
+
+        out = get_point_removal_str(point_removal_list)
+        assert out == msg, out
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/pyNastran/f06/dev/flutter/utils.py b/pyNastran/f06/dev/flutter/utils.py
@@ -13,6 +13,13 @@
     from pyNastran.op2.op2 import OP2
 
 
+X_PLOT_TYPES = ['eas', 'tas', 'rho', 'q', 'mach', 'alt', 'kfreq', 'ikfreq', 'index']
+PLOT_TYPES = ['x-damp-freq', 'x-damp-kfreq', 'root-locus', 'modal-participation',
+              'zimmerman']
+UNITS_IN = ['english_in', 'english_kt', 'english_ft',
+            'si', 'si_mm']
+MODE_SWITCH_METHODS = ['None', 'Frequency', 'Damping']
+
 def load_f06_op2(f06_filename: str, log: SimpleLogger,
                  in_units: str,
                  out_units: str,
@@ -203,3 +210,110 @@ def point_removal_str_to_point_removal(point_removal_str: str,
             # print(traceback.print_tb(e))
             print(traceback.print_exception(e))
     return point_removal
+
+
+
+
+def _to_str(value: Optional[int | float]) -> str:
+    if value is None:
+        str_value = ''
+    else:
+        str_value = str(value)
+    return str_value
+
+
+def _float_passed_to_default(value: float, is_passed: bool,
+                             default: float=-1.0) -> float:
+    if is_passed and value is None:
+        value = default
+    return value
+
+
+def get_plot_flags(plot_type: str,
+                   x_plot_type: str) -> dict[str, bool]:
+    show_index_lim = False
+    show_eas_lim = False
+    show_tas_lim = False
+    show_mach_lim = False
+    show_alt_lim = False
+    show_q_lim = False
+    show_rho_lim = False
+
+    show_xlim = False
+    show_freq = False
+    show_damp = False
+    show_root_locus = False
+    show_zimmerman = False
+    show_modal_participation = False
+
+    # PLOT_TYPES = ['x-damp-freq', 'x-damp-kfreq', 'root-locus']
+    assert plot_type in PLOT_TYPES, plot_type
+
+    if x_plot_type == 'kfreq':
+        show_kfreq = True
+    else:
+        show_kfreq = False
+
+    if x_plot_type == 'ikfreq':
+        show_ikfreq = True
+    else:
+        show_ikfreq = False
+
+    if plot_type == 'x-damp-freq':
+        show_xlim = True
+        show_damp = True
+        show_freq = True
+    elif plot_type == 'x-damp-kfreq':
+        # kfreq-damp-kfreq not handled
+        show_xlim = True
+        show_damp = True
+        show_kfreq = True
+    elif plot_type == 'zimmerman':
+        show_zimmerman = True
+    elif plot_type == 'root-locus':
+        show_root_locus = True
+        # show_kfreq = False
+    elif plot_type == 'modal-participation':
+        show_modal_participation = True
+        # show_kfreq = False
+    else:  # pragma: no cover
+        raise RuntimeError(f'plot_type={plot_type!r}')
+
+    if show_xlim:
+        if 'index' == x_plot_type:
+            show_index_lim = True
+        elif 'eas' == x_plot_type:
+            show_eas_lim = True
+        elif 'tas' == x_plot_type:
+            show_tas_lim = True
+        elif 'mach' == x_plot_type:
+            show_mach_lim = True
+        elif 'alt' == x_plot_type:
+            show_alt_lim = True
+        elif 'q' == x_plot_type:
+            show_q_lim = True
+        elif 'rho' == x_plot_type:
+            show_rho_lim = True
+        elif 'kfreq' == x_plot_type:
+            show_kfreq_lim = True
+        elif 'ikfreq' == x_plot_type:
+            show_ikfreq_lim = True
+    flags = {
+        'show_index_lim': show_index_lim,
+        'show_eas_lim': show_eas_lim,
+        'show_tas_lim': show_tas_lim,
+        'show_mach_lim': show_mach_lim,
+        'show_alt_lim': show_alt_lim,
+        'show_q_lim': show_q_lim,
+        'show_rho_lim': show_rho_lim,
+
+        'show_xlim': show_xlim,
+        'show_freq': show_freq,
+        'show_damp': show_damp,
+        'show_kfreq': show_kfreq,
+        'show_ikfreq': show_ikfreq,
+        'show_root_locus': show_root_locus,
+        'show_modal_participation': show_modal_participation,
+        'show_zimmerman': show_zimmerman,
+    }
+    return flags
diff --git a/pyNastran/f06/f06_to_pressure_loads.py b/pyNastran/f06/f06_to_pressure_loads.py
@@ -14,8 +14,8 @@ def f06_to_pressure_loads(f06_filename: PathLike,
                           loads_filename: PathLike,
                           nid_csv_filename: PathLike='',
                           eid_csv_filename: PathLike='',
-                          log: Optional[SimpleLogger]=None,
                           nlines_max: int=1_000_000,
+                          log: Optional[SimpleLogger]=None,
                           debug: bool=False) -> dict:
     caero_model = read_bdf(aerobox_caero_filename, log=log,
                            xref=False, validate=False, debug=debug)
diff --git a/pyNastran/f06/test/test_f06_utils.py b/pyNastran/f06/test/test_f06_utils.py
