fixing tests

SteveDoyle2 · Jan 5, 2024 · 20402e0 · 20402e0
1 parent 778fcbb
commit 20402e0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/pyNastran/bdf/cards/coordinate_systems.py b/pyNastran/bdf/cards/coordinate_systems.py
@@ -2081,7 +2081,7 @@ def add_ijk(cls, cid: int, origin=None, i=None, j=None, k=None,
             defines the k unit vector
 
         """
-        coord_type = cls.type
+        coord_type = cls.type[-1]
         origin, e1, e2, e3 = setup_add_ijk(coord_type, origin, i, j, k)
         return cls(cid, e1, e2, e3, rid=rid, comment=comment)
 
@@ -3278,9 +3278,9 @@ def setup_add_axes(cid: int, coord_type: str, rid: int=0, origin=None,
     return origin, i, j, k
 
 def setup_add_ijk(coord_type: str,
-                  origin=None, i=None, j=None, k=None,) -> tuple[np.ndarray, np.ndarray,
-                                                                 np.ndarray, np.ndarray]:
-    assert coord_type in ['CORD2R', 'CORD2C', 'CORD2S'], coord_type
+                  origin=None, i=None, j=None, k=None,
+                  ) -> tuple[np.ndarray, np.ndarray, np.ndarray, np.ndarray]:
+    assert coord_type in ['R', 'C', 'S'], coord_type
     if origin is None:
         origin = np.array([0., 0., 0.], dtype='float64')
     else:

diff --git a/pyNastran/dev/bdf_vectorized3/cards/coord.py b/pyNastran/dev/bdf_vectorized3/cards/coord.py
@@ -195,7 +195,10 @@ def add_axes(self, cid: int, coord_type: str, rid: int=0, origin=None,
         The axes and planes are defined in the rid coordinate system
 
         """
-        origin, i, j, k = setup_add_axes()
+        origin, i, j, k = setup_add_axes(
+            cid, coord_type, rid=rid, origin=origin,
+            xaxis=xaxis, yaxis=yaxis, zaxis=zaxis,
+            xyplane=xyplane, yzplane=yzplane, xzplane=xzplane,)
         n = self.add_ijk(cid, coord_type, origin, i, j, k, rid=rid, comment=comment)
         return n