more matrix tests

Author: SteveDoyle2

pyNastran/bdf/test/test_utils.py

@@ -8,12 +8,46 @@
     parse_patran_syntax, parse_patran_syntax_dict, parse_patran_syntax_dict_map,
     write_patran_syntax_dict, split_eids_along_nids,
     parse_femap_syntax,
-    get_femap_property_comments_dict, get_femap_material_comments_dict)
+    split_comment_to_femap_comment,
+    get_femap_property_comments_dict,
+    get_femap_material_comments_dict)
 PKG_PATH = Path(pyNastran.__path__[0])
 MODEL_PATH = PKG_PATH / '..' / 'models'
 
 
 class TestBdfUtils(unittest.TestCase):
+    def test_split_comment_to_femap_comment(self):
+        in1 = '$ Femap Region 12345 : Wing NSM'
+        is_passed, error_msg, (word, idi, name) = split_comment_to_femap_comment(in1)
+        assert is_passed, is_passed
+        assert error_msg == '', error_msg
+        assert word == 'Region', word
+        assert idi == 12345, idi
+        assert name == 'Wing NSM', name
+
+        in2 = '$ Femap Property 100 : Wing Skin 20 Plies\n$\n$ Femap Layup 101 : 20 Ply\n'
+        is_passed, error_msg, (word, idi, name) = split_comment_to_femap_comment(in2)
+        assert not is_passed, is_passed
+        # assert error_msg == '', error_msg
+        # assert word == 'Property', word
+        # assert idi == 100, idi
+        # assert name == 'Wing Skin 20 Plies', name
+
+        in3 = '$$ Femap Material 202 : Steel:42\n'
+        is_passed, error_msg, (word, idi, name) = split_comment_to_femap_comment(in2)
+        assert not is_passed, is_passed
+        # assert error_msg == '', error_msg
+        # assert word == 'Material', word
+        # assert idi == 202, idi
+        # assert name == 'Steel:42', name
+
+        in4 = (
+            '$ Femap Property 8000007 : Aileron, Steel Pin dia=.375\n'
+            '$ Femap PropShape 8000007 : 5,0,0.1875,0.,0.,0.,0.,0.\n'
+            '$ Femap PropMethod 8000007 : 5,0,1,0.\n'
+            '$ Femap PropOrient 8000007 : 5,0,0.,1.,2.,3.,4.,-1.,0.,0.')
+        split_comment_to_femap_comment(in4)
+
     def test_get_femap_comments_dict(self):
         """tests:
           - ``get_femap_property_comments_dict``

pyNastran/bdf/utils.py

@@ -25,7 +25,7 @@
 
 def split_comment_to_femap_comment(comment: str) -> tuple[bool, str, tuple[str, int, str]]:
     """
-    [$ Femap Region 12345 : Wing NSM']
+    ['$ Femap Region 12345 : Wing NSM']
     ['$ Femap Property 100 : Wing Skin 20 Plies\n$\n$ Femap Layup 101 : 20 Ply\n']
     ['$$ Femap Material 202 : Steel:42\n']
     ['$ Femap Property 8000007 : Aileron, Steel Pin dia=.375', '$ Femap PropShape 8000007 : 5,0,0.1875,0.,0.,0.,0.,0.', '$ Femap PropMethod 8000007 : 5,0,1,0.', '$ Femap PropOrient 8000007 : 5,0,0.,1.,2.,3.,4.,-1.,0.,0.']

pyNastran/femutils/matrix3d.py

@@ -75,7 +75,7 @@ def dot_33_n33(A: np.ndarray, B: np.ndarray,
             #print(D[i, :, :])
             #print('------------------------')
         assert np.all(np.allclose(C, D))
-    return D
+    return C
 
 
 def dot_n33_33(A: np.ndarray, B: np.ndarray,

pyNastran/femutils/test/test_utils.py

@@ -12,7 +12,10 @@
 
 import pyNastran
 from pyNastran.femutils.io import loadtxt_nice, savetxt_nice
-from pyNastran.femutils.matrix3d import dot_n33_n33, transpose3d, triple_n33_n33, triple_n33_33
+from pyNastran.femutils.matrix3d import (
+    dot_33_n33, dot_n33_33, dot_n33_n33,
+    transpose3d,
+    triple_n33_n33,  triple_n33_33)
 from pyNastran.femutils.utils import (
     augmented_identity, perpendicular_vector,
     perpendicular_vector2d, vstack_lists,
@@ -24,9 +27,50 @@
 PKG_PATH = pyNastran.__path__[0]
 
 
-#class TestNan(unittest.TestCase):
 class TestMatrix3d(unittest.TestCase):
     """tests functions in femutils.matrix3d"""
+    def test_dot_33_n33(self):
+        """tests dot_33_n33"""
+    A = np.array([
+        [[1., 0., 0.],
+         [0., 1., 0.],
+         [0., 0., 1.], ],
+
+        [[1., 0., 0.],
+         [0., 1., 0.],
+         [0., 0., 1.], ],
+
+        [[1., 0., 0.],
+         [0., 1., 0.],
+         [0., 0., 1.], ],
+    ])
+    theta = np.radians([12.])
+    B = cylindrical_rotation_matrix(theta, dtype='float64')
+    assert B.shape == (1, 3, 3), B.shape
+    C = dot_33_n33(B[0, :, :], A)
+    D = dot_33_n33(B[0, :, :], A, debug=True)
+
+    def test_dot_n33_33(self):
+        """tests dot_n33_33"""
+    A = np.array([
+        [[1., 0., 0.],
+         [0., 1., 0.],
+         [0., 0., 1.], ],
+
+        [[1., 0., 0.],
+         [0., 1., 0.],
+         [0., 0., 1.], ],
+
+        [[1., 0., 0.],
+         [0., 1., 0.],
+         [0., 0., 1.], ],
+    ])
+    theta = np.radians([12.])
+    B = cylindrical_rotation_matrix(theta, dtype='float64')
+    assert B.shape == (1, 3, 3), B.shape
+    C = dot_n33_33(A, B[0, :, :])
+    D = dot_n33_33(A, B[0, :, :], debug=True)
+
     def test_dot_n33_n33(self):
         """tests dot_n33_n33"""
         A = np.array([