adding dirname to default caero path

Author: SteveDoyle2

pyNastran/f06/test/test_f06_utils.py

@@ -220,7 +220,8 @@ def test_plot_flutter_0012(self):
 
         has issues with writing the subcase...
         """
-        f06_filename = AERO_PATH / '2_mode_flutter' / '0012_flutter.f06'
+        dirname = AERO_PATH / '2_mode_flutter'
+        f06_filename = dirname / '0012_flutter.f06'
         #log = get_logger(log=None, level=None, encoding='utf-8')
         log = get_logger(log=None, level=False, encoding='utf-8')
 
@@ -240,10 +241,10 @@ def test_plot_flutter_0012(self):
             f06_units='si', out_units=None,
             plot_vg=True, plot_vg_vf=True, plot_root_locus=True,
             plot_kfreq_damping=True,
-            export_csv_filename='nastran.csv',
-            export_f06_filename='nastran.f06',
-            export_veas_filename='nastran.veas',
-            export_zona_filename='zona.f06',
+            export_csv_filename=dirname/'nastran.csv',
+            export_f06_filename=dirname/'nastran.f06',
+            export_veas_filename=dirname/'nastran.veas',
+            export_zona_filename=dirname/'zona.f06',
             vg_filename='vg_subcase_%i.png',
             vg_vf_filename='vg_vf_subcase_%i.png',
             kfreq_damping_filename='kfreq_damping_subcase_%i.png',
@@ -267,10 +268,10 @@ def test_plot_flutter_0012(self):
             os.remove('kfreq_damping_subcase_1.png')
             os.remove('root_locus_subcase_1.png')
 
-            os.remove('nastran.csv')
-            os.remove('nastran.f06')
-            os.remove('nastran.veas')
-            os.remove('zona.f06')
+            os.remove(dirname/'nastran.csv')
+            os.remove(dirname/'nastran.f06')
+            os.remove(dirname/'nastran.veas')
+            os.remove(dirname/'zona.f06')
 
         with self.assertRaises(NotImplementedError):
             plot_flutter_f06(
@@ -723,6 +724,7 @@ def test_opt_mdb200(self):
                      show=True)
 
     def test_f06_trim_bwb(self):
+        """tests f06_to_pressure_loads"""
         bdf_filename = MODEL_PATH / 'bwb' / 'bwb_saero_trim.bdf'
         aerobox_caero_filename = MODEL_PATH / 'bwb' / 'bwb_saero_trim.caero.bdf'
         f06_filename = MODEL_PATH / 'bwb' / 'bwb_saero_trim.f06'
@@ -761,14 +763,13 @@ def test_f06_trim_bwb(self):
             '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,
+        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,
+        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

@@ -1,6 +1,8 @@
 """
 defines:
  - cmd_line_plot_flutter()
+ - cmd_line_plot_trim()
+ - cmd_line_plot_optimization()
 
 """
 from __future__ import annotations
@@ -31,19 +33,9 @@
 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"""
-    from pyNastran.f06.parse_flutter import plot_flutter_f06, float_types
     if argv is None:  # pragma: no cover
         argv = sys.argv
 
-    # is_gui = '--gui' in argv
-    # if is_gui:
-    #     argv.remove('--gui')
-    #     from pyNastran.f06.dev.flutter.gui_flutter import main as gui_flutter
-    #
-    # if len(argv) == 2 and is_gui:
-    #     gui_flutter()
-    #     return
-
     msg = (
         USAGE_144 +
         '  f06 plot_144 -h | --help\n'
@@ -78,18 +70,17 @@ def cmd_line_plot_trim(argv=None, plot: bool=True, show: bool=True,
     f06_filename = data['F06_FILENAME']
     aerobox_caero_filename = data['--caero']
     bdf_filename = data['--bdf']
+    dirname = os.path.dirname(f06_filename)
+    base = os.path.splitext(f06_filename)[0]
 
     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:
+        if bdf_filename is None:
+            bdf_filename = base + '.bdf'
+        assert os.path.exists(bdf_filename), print_bad_path(bdf_filename)
+
         from pyNastran.bdf.mesh_utils.export_caero_mesh import export_caero_mesh
-        aerobox_caero_filename = 'caero.bdf'
+        aerobox_caero_filename = os.path.join(dirname, 'caero.bdf')
         export_caero_mesh(
             bdf_filename,
             caero_bdf_filename=aerobox_caero_filename,
@@ -98,7 +89,6 @@ def cmd_line_plot_trim(argv=None, plot: bool=True, show: bool=True,
             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')):
@@ -273,7 +263,7 @@ def cmd_line_plot_flutter(argv=None, plot: bool=True, show: bool=True,
         else:
             in_units = data['--in_units']
     in_units = in_units.lower()
-    assert in_units in {'si', 'si_mm', 'english_in', 'english_ft', 'english_kt'}, 'in_units=%r' % in_units
+    assert in_units in {'si', 'si_mm', 'english_in', 'english_ft', 'english_kt'}, f'in_units={in_units!r}'
 
     # The default used to be SI, but it's really weird when I'm working in
     # English units and my output is in SI