more tests

Author: SteveDoyle2

pyNastran/f06/dev/flutter/utils.py

@@ -2,6 +2,7 @@
 import os
 from pathlib import Path
 import shutil
+import traceback
 from typing import Optional, TYPE_CHECKING
 from matplotlib import pyplot as plt
 from pyNastran.f06.parse_flutter import make_flutter_response, get_flutter_units
@@ -145,3 +146,60 @@ def move_filename(old_filename: Path,
     if old_filename.exists():
         os.remove(old_filename)
     return
+
+
+def get_point_removal_str(point_removal: list[tuple[float, float]]):
+    """
+    >>> point_removal = [[400.0, 410.0], [450.0, 500.0]]
+    point_removal_str = get_point_removal_str(point_removal)
+    >>> point_removal_str
+    '400:410,450:500'
+
+    >>> point_removal = [[450.0, -1.0]]
+    point_removal_str = get_point_removal_str(point_removal)
+    >>> point_removal_str
+    '450:'
+
+    >>> point_removal = [[-1.0, 500.0]]
+    point_removal_str = get_point_removal_str(point_removal)
+    >>> point_removal_str
+    ':500'
+    """
+    out = []
+    for mini, maxi in point_removal:
+        if mini > 0 and maxi > 0:
+            outi = f'{mini:g}:{maxi:g}'
+        elif mini > 0:
+            outi = f'{mini:g}:'
+        elif maxi > 0:
+            outi = f'{maxi:g}:'
+        else:
+            continue
+        out.append(outi)
+    point_removal_str = ','.join(out)
+    return point_removal_str
+
+
+def point_removal_str_to_point_removal(point_removal_str: str,
+                                       log: SimpleLogger) -> list[tuple[float, float]]:
+    point_removal = []
+    point_removal_list = point_removal_str.split(',')
+
+    if point_removal_list == ['']:
+        pass
+    else:
+        try:
+            for ipoint, point in enumerate(point_removal_list):
+                sline = point.split(':')
+                assert len(sline) == 2, f'point_removal[{ipoint}]={sline}; point_removal={str(point_removal_list)}'
+                a_str = sline[0].strip()
+                b_str = sline[1].strip()
+                a = float(a_str) if a_str != '' else -1.0
+                b = float(b_str) if b_str != '' else -1.0
+                point_float = (a, b)
+                point_removal.append(point_float)
+        except Exception as e:
+            log.error(str(e))
+            # print(traceback.print_tb(e))
+            print(traceback.print_exception(e))
+    return point_removal

pyNastran/f06/f06_matrix_parser.py

@@ -346,7 +346,8 @@ def _parse_complex_row_lines(lines: list[str]) -> tuple[np.ndarray, np.ndarray]:
         line2 = line.replace('D', 'E')
         row_id_str, data_str = line2.split(')')
 
-        pairs = data_str.replace('  ', '!').split('!')
+        # split based on double spaces, but we need a character that is valid
+        pairs = data_str.replace('  ', '!').strip('!').split('!')
         #pairs = [line2[10:35], line2[35:61], line2[61:84], line2[84:110], line2[110:135]]
         row_i = int(row_id_str)
         for pair in pairs:
@@ -358,6 +359,7 @@ def _parse_complex_row_lines(lines: list[str]) -> tuple[np.ndarray, np.ndarray]:
             datai = complex(reali, complexi)
             data_list.append(datai)
             row_index_list.append(row_i)
+            # print(f'  {row_i}: {datai}')
             row_i += 1
     row_index = np.array(row_index_list, dtype='int32')
     data = np.array(data_list, dtype='complex128')
@@ -368,15 +370,6 @@ def _parse_real_row_lines(lines: list[str]) -> tuple[np.ndarray, np.ndarray]:
     """
     1)    1.1010E+01  1.3762E+00 -4.2021E+00 -5.2526E-01
     """
-    #lines = [
-        #'        1) -3.5846E+01,-1.3275E+02  -1.5510E+01, 2.3578E-01  -3.2339E+01,-4.9373E+00   6.8078E+01, 1.3428E+01   3.0262E+01, 2.4554E+01',
-        #'        6)  1.5360E-04,-1.1042E-04  -4.7606E-04, 2.3069E-04   1.0359E-03,-1.5668E-04  -1.3075E-03, 7.8472E-04   2.3471E-04,-4.8359E-04',
-    #]
-    #lines = [
-        #'        1) -3.5846E+01,-1.3275E+02',
-        #'        6)  1.5360E-04,-1.1042E-04',
-    #]
-
     row_index_list = []
     data_list = []
     for line in lines:
@@ -507,5 +500,6 @@ def main():  # pragma: no cover
             for row, col, value in zip(mat.row, mat.col, mat.data):
                 print(f'{row}, {col}, {value}')
 
+
 if __name__ == '__main__':
     main()

pyNastran/f06/test/test_f06_utils.py

@@ -40,13 +40,16 @@
 )
 from pyNastran.f06.flutter_response import _reshape_eigenvectors
 from pyNastran.f06.parse_trim import read_f06_trim
+from pyNastran.f06.f06_matrix_parser import _parse_real_row_lines, _parse_complex_row_lines
 from pyNastran.f06.f06_to_pressure_loads import f06_to_pressure_loads
 from pyNastran.f06.dev.read_sol_200 import plot_sol_200  # read_sol_200
 from pyNastran.op2.op2 import OP2
 from pyNastran.utils import print_bad_path
 try:
     from pyNastran.f06.dev.flutter.utils import (
-        load_f06_op2, get_png_filename, get_plot_file)
+        load_f06_op2, get_png_filename, get_plot_file,
+        point_removal_str_to_point_removal,
+        get_point_removal_str)
 except ImportError:
     pass
 IS_DEV = pyNastran.DEV
@@ -61,6 +64,16 @@
 
 
 class TestF06Flutter(unittest.TestCase):
+    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
 
     def test_reshape_eigenvectors(self):
         """
@@ -941,6 +954,40 @@ def test_split_int_colon(self):
         f = split_int_colon('1,3,5')
         assert f == [1, 3, 5], f
 
+    def test_parse_real_row_lines(self):
+        lines = [
+            '        1)    1.1010E+01  1.3762E+00 -4.2021E+00 -5.2526E-01',
+        ]
+        row1, data1 = _parse_real_row_lines(lines)
+        assert np.array_equal(row1, [1, 2, 3, 4])
+        assert np.array_equal(data1, [1.1010E+01, 1.3762E+00, -4.2021E+00, -5.2526E-01])
+
+    def test_parse_complex_row_lines(self):
+        lines = [
+            '        1) -3.5846E+01,-1.3275E+02  -1.5510E+01, 2.3578E-01  -3.2339E+01,-4.9373E+00   6.8078E+01, 1.3428E+01   3.0262E+01, 2.4554E+01',
+            '        6)  1.5360E-04,-1.1042E-04  -4.7606E-04, 2.3069E-04   1.0359E-03,-1.5668E-04  -1.3075E-03, 7.8472E-04   2.3471E-04,-4.8359E-04',
+        ]
+        row1, data1 = _parse_complex_row_lines(lines)
+        assert np.array_equal(row1, [1, 2, 3, 4, 5,
+                                        6, 7, 8, 9, 10]), row1
+        reals = [
+            -3.5846E+01, -1.5510E+01, -3.2339E+01,  6.8078E+01, 3.0262E+01,
+            1.5360E-04,  -4.7606E-04,  1.0359E-03, -1.3075E-03, 2.3471E-04]
+        imags = [
+            -1.3275E+02, 2.3578E-01, -4.9373E+00, 1.3428E+01,  2.4554E+01,
+            -1.1042E-04, 2.3069E-04, -1.5668E-04, 7.8472E-04, -4.8359E-04]
+        assert np.array_equal(data1.real, reals)
+        assert np.array_equal(data1.imag, imags)
+
+        lines = [
+            '        1) -3.5846E+01,-1.3275E+02',
+            '        6)  1.5360E-04,-1.1042E-04',
+        ]
+        row2, data2 = _parse_complex_row_lines(lines)
+        assert np.array_equal(row2, [1, 6])
+        assert np.array_equal(data2.real, [-3.5846E+01, 1.5360E-04])
+        assert np.array_equal(data2.imag, [-1.3275E+02, -1.1042E-04])
+
 
 if __name__ == '__main__':  # pragma: no cover
     unittest.main()