Merge branch 'main' into release/0.52

Author: akaszynski

.github/workflows/testing-and-deployment.yml

@@ -154,7 +154,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Build wheels
-        uses: pypa/[email protected].0
+        uses: pypa/[email protected].1
         with:
             python-version: 3.8 - 3.11
 

.pre-commit-config.yaml

@@ -20,7 +20,7 @@ repos:
   - id: flake8
 
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.2.4
+  rev: v2.2.5
   hooks:
   - id: codespell
 
@@ -33,7 +33,7 @@ repos:
 #     exclude: "tests/"
 
 - repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: v14.0.6
+  rev: v16.0.6
   hooks:
   - id: clang-format
     files: |
@@ -50,6 +50,6 @@ repos:
     exclude: '.*\.(cdb|rst|dat)$'
 
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.23.1
+  rev: 0.23.2
   hooks:
     - id: check-github-workflows

ansys/mapdl/reader/archive.py

@@ -7,19 +7,7 @@
 
 import numpy as np
 import pyvista as pv
-from pyvista import _vtk as vtk
-from pyvista._vtk import (
-    VTK_HEXAHEDRON,
-    VTK_PYRAMID,
-    VTK_QUAD,
-    VTK_QUADRATIC_HEXAHEDRON,
-    VTK_QUADRATIC_PYRAMID,
-    VTK_QUADRATIC_TETRA,
-    VTK_QUADRATIC_WEDGE,
-    VTK_TETRA,
-    VTK_TRIANGLE,
-    VTK_WEDGE,
-)
+from pyvista import CellType
 
 VTK_VOXEL = 11
 
@@ -217,7 +205,7 @@ def __repr__(self):
 
     @property
     def grid(self):
-        """``vtk.UnstructuredGrid`` of the archive file.
+        """Return a ``pyvista.UnstructuredGrid`` of the archive file.
 
         Examples
         --------
@@ -258,7 +246,7 @@ def quality(self):
         """
         if self._grid is None:  # pragma: no cover
             raise AttributeError(
-                "Archive must be parsed as a vtk grid.\n" "Set `parse_vtk=True`"
+                "Archive must be parsed as a vtk grid.\nSet `parse_vtk=True`"
             )
         return quality(self._grid)
 
@@ -388,27 +376,29 @@ def save_as_archive(
     if hasattr(grid, "cast_to_unstructured_grid"):
         grid = grid.cast_to_unstructured_grid()
 
-    if not isinstance(grid, vtk.vtkUnstructuredGrid):
-        raise TypeError("``grid`` argument must be an UnstructuredGrid")
+    if not isinstance(grid, pv.UnstructuredGrid):
+        raise TypeError(
+            f"``grid`` argument must be an UnstructuredGrid, not {type(grid)}"
+        )
 
     allowable = []
     if include_solid_elements:
         allowable.extend(
             [
-                VTK_VOXEL,
-                VTK_TETRA,
-                VTK_QUADRATIC_TETRA,
-                VTK_PYRAMID,
-                VTK_QUADRATIC_PYRAMID,
-                VTK_WEDGE,
-                VTK_QUADRATIC_WEDGE,
-                VTK_HEXAHEDRON,
-                VTK_QUADRATIC_HEXAHEDRON,
+                CellType.VOXEL,
+                CellType.TETRA,
+                CellType.QUADRATIC_TETRA,
+                CellType.PYRAMID,
+                CellType.QUADRATIC_PYRAMID,
+                CellType.WEDGE,
+                CellType.QUADRATIC_WEDGE,
+                CellType.HEXAHEDRON,
+                CellType.QUADRATIC_HEXAHEDRON,
             ]
         )
 
     if include_surface_elements:
-        allowable.extend([VTK_TRIANGLE, VTK_QUAD])
+        allowable.extend([CellType.TRIANGLE, CellType.QUAD])
         # VTK_QUADRATIC_TRIANGLE,
         # VTK_QUADRATIC_QUAD
 
@@ -432,7 +422,7 @@ def save_as_archive(
         nodenum = grid.point_data["ansys_node_num"]
     else:
         log.info("No ANSYS node numbers set in input. Adding default range")
-        nodenum = np.arange(1, grid.number_of_points + 1, dtype=np.int32)
+        nodenum = np.arange(1, grid.n_points + 1, dtype=np.int32)
 
     missing_mask = nodenum == -1
     if np.any(missing_mask):
@@ -457,12 +447,12 @@ def save_as_archive(
             nodenum[missing_mask] = np.arange(start_num, end_num, dtype=np.int32)
 
     # element block
-    ncells = grid.number_of_cells
+    ncells = grid.n_cells
     if "ansys_elem_num" in grid.cell_data:
         enum = grid.cell_data["ansys_elem_num"]
     else:
         if not allow_missing:
-            raise Exception('Missing node numbers.  Exiting due "allow_missing=False"')
+            raise Exception('Missing node numbers. Exiting due "allow_missing=False"')
         log.info(
             "No ANSYS element numbers set in input. "
             "Adding default range starting from %d",
@@ -483,7 +473,7 @@ def save_as_archive(
         nadd = np.sum(enum == -1)
         end_num = start_num + nadd
         log.info(
-            "FEM missing some cell numbers.  Adding numbering " "from %d to %d",
+            "FEM missing some cell numbers.  Adding numbering from %d to %d",
             start_num,
             end_num,
         )
@@ -555,37 +545,50 @@ def save_as_archive(
             + "Adding default range starting from %d" % etype_start
         )
 
-        etype = np.empty(grid.number_of_cells, np.int32)
-        etype_185 = etype_start + 2
-        etype[grid.celltypes == VTK_VOXEL] = etype_185
-        etype[grid.celltypes == VTK_TETRA] = etype_185
-        etype[grid.celltypes == VTK_HEXAHEDRON] = etype_185
-        etype[grid.celltypes == VTK_WEDGE] = etype_185
-        etype[grid.celltypes == VTK_PYRAMID] = etype_185
+        etype = np.empty(grid.n_cells, np.int32)
 
+        # VTK to SOLID186 mapping
+        # TETRA delegated to SOLID187
         etype_186 = etype_start
-        etype[grid.celltypes == VTK_QUADRATIC_HEXAHEDRON] = etype_186
-        etype[grid.celltypes == VTK_QUADRATIC_WEDGE] = etype_186
-        etype[grid.celltypes == VTK_QUADRATIC_PYRAMID] = etype_186
+        etype_186_types = [
+            CellType.QUADRATIC_HEXAHEDRON,
+            CellType.QUADRATIC_WEDGE,
+            CellType.QUADRATIC_PYRAMID,
+        ]
+        etype[np.isin(grid.celltypes, etype_186_types)] = etype_186
 
         etype_187 = etype_start + 1
-        etype[grid.celltypes == VTK_QUADRATIC_TETRA] = etype_187
+        etype[grid.celltypes == CellType.QUADRATIC_TETRA] = etype_187
+
+        # VTK to SOLID185 mapping
+        etype_185 = etype_start + 2
+        etype_185_types = [
+            CellType.VOXEL,
+            CellType.TETRA,
+            CellType.HEXAHEDRON,
+            CellType.WEDGE,
+            CellType.PYRAMID,
+        ]
+        etype[np.isin(grid.celltypes, etype_185_types)] = etype_185
 
         # Surface elements
         etype_181 = etype_start + 3
-        etype[grid.celltypes == VTK_TRIANGLE] = etype_181
-        etype[grid.celltypes == VTK_QUAD] = etype_181
+        etype_181_types = [
+            CellType.TRIANGLE,
+            CellType.QUAD,
+        ]
+        etype[np.isin(grid.celltypes, etype_181_types)] = etype_181
 
         typenum = np.empty_like(etype)
         typenum[etype == etype_185] = 185
         typenum[etype == etype_186] = 186
         typenum[etype == etype_187] = 187
         typenum[etype == etype_181] = 181
 
-        header += "ET, %d, 185\n" % etype_185
-        header += "ET, %d, 186\n" % etype_186
-        header += "ET, %d, 187\n" % etype_187
-        header += "ET, %d, 181\n" % etype_181
+        header += f"ET,{etype_185},185\n"
+        header += f"ET,{etype_186},186\n"
+        header += f"ET,{etype_187},187\n"
+        header += f"ET,{etype_181},181\n"
 
     # number of nodes written per element
     elem_nnodes = np.empty(etype.size, np.int32)
@@ -623,7 +626,7 @@ def save_as_archive(
         write_nblock(filename, nodenum, grid.points, mode="a")
 
     # write remainder of eblock
-    cells, offset = vtk_cell_info(grid, shift_offset=False)
+    cells, offset = vtk_cell_info(grid, force_int64=False, shift_offset=False)
     _write_eblock(
         filename,
         enum,
@@ -798,26 +801,16 @@ def _write_eblock(
 ):
     """Write EBLOCK to disk"""
     # perform type checking here
-    if elem_id.dtype != np.int32:
-        elem_id = elem_id.astype(np.int32)
-    if etype.dtype != np.int32:
-        etype = etype.astype(np.int32)
-    if mtype.dtype != np.int32:
-        mtype = mtype.astype(np.int32)
-    if rcon.dtype != np.int32:
-        rcon = rcon.astype(np.int32)
-    if elem_nnodes.dtype != np.int32:
-        elem_nnodes = elem_nnodes.astype(np.int32)
-    if cells.dtype != np.int64:
-        cells = cells.astype(np.int64)
-    if offset.dtype != np.int64:
-        offset = offset.astype(np.int64)
-    if celltypes.dtype != np.uint8:
-        celltypes = celltypes.astype(np.uint8)
-    if typenum.dtype != np.int32:
-        typenum = typenum.astype(np.int32)
-    if nodenum.dtype != np.int32:
-        nodenum = nodenum.astype(np.int32)
+    elem_id = elem_id.astype(np.int32, copy=False)
+    etype = etype.astype(np.int32, copy=False)
+    mtype = mtype.astype(np.int32, copy=False)
+    rcon = rcon.astype(np.int32, copy=False)
+    elem_nnodes = elem_nnodes.astype(np.int32, copy=False)
+    cells = cells.astype(np.int32, copy=False)
+    offset = offset.astype(np.int32, copy=False)
+    celltypes = celltypes.astype(np.uint8, copy=False)
+    typenum = typenum.astype(np.int32, copy=False)
+    nodenum = nodenum.astype(np.int32, copy=False)
 
     _archive.py_write_eblock(
         filename,

ansys/mapdl/reader/cyclic_reader.py

@@ -3,7 +3,9 @@
 
 import numpy as np
 import pyvista as pv
-from pyvista._vtk import vtkAppendFilter, vtkMatrix4x4, vtkTransform
+from vtkmodules.vtkCommonMath import vtkMatrix4x4
+from vtkmodules.vtkCommonTransforms import vtkTransform
+from vtkmodules.vtkFiltersCore import vtkAppendFilter
 
 from ansys.mapdl.reader import _binary_reader
 from ansys.mapdl.reader.common import (

ansys/mapdl/reader/cython/_archive.pyx

@@ -14,17 +14,15 @@ import numpy as np
 cimport numpy as np
 
 ctypedef unsigned char uint8_t
-from libc.stdint cimport int64_t
-
 
 cdef extern from 'archive.h' nogil:
     int write_nblock(FILE*, const int, const int, const int*, const double*,
                      const double*, int)
     int write_nblock_float(FILE*, const int, const int, const int*, const float*,
                            const float*, int)
     int write_eblock(FILE*, const int, const int*, const int*, const int*,
-                     const int*, const int*, const uint8_t*, const int64_t*,
-                     const int64_t*, const int*, const int*);
+                     const int*, const int*, const uint8_t*, const int*,
+                     const int*, const int*, const int*);
 
 
 cdef extern from "stdio.h":
@@ -100,31 +98,34 @@ def py_write_nblock_float(filename, const int [::1] node_id, int max_node_id,
     fclose(cfile)
 
 
-def py_write_eblock(filename,
-                    const int [::1] elem_id,
-                    const int [::1] etype,
-                    const int [::1] mtype,
-                    const int [::1] rcon,
-                    const int [::1] elem_nnodes,
-                    const int64_t [::1] cells,
-                    const int64_t [::1] offset,
-                    const uint8_t [::1] celltypes,
-                    const int [::1] typenum,
-                    const int [::1] nodenum,
-                    mode='w'):
+def py_write_eblock(
+    filename,
+    const int [::1] elem_id,
+    const int [::1] etype,
+    const int [::1] mtype,
+    const int [::1] rcon,
+    const int [::1] elem_nnodes,
+    const int [::1] cells,
+    const int [::1] offset,
+    const uint8_t [::1] celltypes,
+    const int [::1] typenum,
+    const int [::1] nodenum,
+    mode='w'):
     cdef FILE* cfile = fopen(filename.encode(), mode.encode())
-    write_eblock(cfile,
-                 celltypes.size,
-                 &elem_id[0],
-                 &etype[0],
-                 &mtype[0],
-                 &rcon[0],
-                 &elem_nnodes[0],
-                 &celltypes[0],
-                 &offset[0],
-                 &cells[0],
-                 &typenum[0],
-                 &nodenum[0])
+    write_eblock(
+        cfile,
+        celltypes.size,
+        &elem_id[0],
+        &etype[0],
+        &mtype[0],
+        &rcon[0],
+        &elem_nnodes[0],
+        &celltypes[0],
+        &offset[0],
+        &cells[0],
+        &typenum[0],
+        &nodenum[0]
+    )
     fclose(cfile)
 
 

ansys/mapdl/reader/cython/archive.c

@@ -91,8 +91,8 @@ int write_eblock(
     const int *rcon,          // real constant ID array
     const int *elem_nnodes,   // number of nodes per element
     const uint8_t *celltypes, // VTK celltypes array
-    const int64_t *offset,    // VTK offset array
-    const int64_t *cells,     // VTK cells array
+    const int *offset,        // VTK offset array
+    const int *cells,         // VTK cell connectivity array
     const int *typenum,       // ANSYS type number (e.g. 187 for SOLID187)
     const int *nodenum) {     // ANSYS node numbering
 
@@ -102,7 +102,6 @@ int write_eblock(
 
   int c; // position within offset array
   for (int i = 0; i < n_elem; i++) {
-    // Position within offset array
     c = offset[i];
 
     // Write cell info
@@ -124,12 +123,18 @@ int write_eblock(
     case VTK_QUADRATIC_TETRA:
       if (typenum[i] == 187) {
         fprintf(file, "%8d%8d%8d%8d%8d%8d%8d%8d\n%8d%8d\n",
-                nodenum[cells[c + 0]], nodenum[cells[c + 1]],
-                nodenum[cells[c + 2]], nodenum[cells[c + 3]],
-                nodenum[cells[c + 4]], nodenum[cells[c + 5]],
-                nodenum[cells[c + 6]], nodenum[cells[c + 7]],
-                nodenum[cells[c + 8]], nodenum[cells[c + 9]]);
+                nodenum[cells[c + 0]],  // 0, I
+                nodenum[cells[c + 1]],  // 1, J
+                nodenum[cells[c + 2]],  // 2, K
+                nodenum[cells[c + 3]],  // 3, L
+                nodenum[cells[c + 4]],  // 4, M
+                nodenum[cells[c + 5]],  // 5, N
+                nodenum[cells[c + 6]],  // 6, O
+                nodenum[cells[c + 7]],  // 7, P
+                nodenum[cells[c + 8]],  // 8, Q
+                nodenum[cells[c + 9]]); // 9, R
       } else {
+        // Using SOLID186-like format
         fprintf(
             file,
             "%8d%8d%8d%8d%8d%8d%8d%8d\n%8d%8d%8d%8d%8d%8d%8d%8d%8d%8d%8d%8d\n",