From 20402e04854740b9bb1d630e16afe9e5d3c4468e Mon Sep 17 00:00:00 2001 From: SteveDoyle2 Date: Fri, 5 Jan 2024 13:18:51 -0800 Subject: [PATCH] fixing tests --- pyNastran/bdf/cards/coordinate_systems.py | 8 ++++---- pyNastran/dev/bdf_vectorized3/cards/coord.py | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pyNastran/bdf/cards/coordinate_systems.py b/pyNastran/bdf/cards/coordinate_systems.py index 2d3688a9b..6979f9f13 100644 --- 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 index af398e3c2..38aca5910 100644 --- 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