lsdyna-mesh-reader 0.2.0__tar.gz → 0.2.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/PKG-INFO +1 -1
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/src/deck.cpp +74 -19
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/_deck.pyi +5 -1
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/_version.py +3 -3
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/deck.py +22 -3
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/.gitattributes +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/CMakeLists.txt +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/LICENSE +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/README.md +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/docs/source/_templates/autosummary/base.rst +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/docs/source/_templates/autosummary/class.rst +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/docs/source/_templates/autosummary/module.rst +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/docs/source/_templates/custom-class-template.rst +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/docs/source/_templates/custom-module-template.rst +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/docs/source/api.rst +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/docs/source/conf.py +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/docs/source/index.md +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/pyproject.toml +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/src/array_support.h +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/__init__.py +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/examples/EXP_SC_JOINT_SCREW.key +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/examples/__init__.py +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/examples/bird.k +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/examples/birdball.k +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/examples/bracket.k +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/examples/ex_13_thick_shell_elform_2.k +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/examples/wheel.k +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/py.typed +0 -0
- {lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/tools/extract-deps.py +0 -0
|
@@ -534,7 +534,7 @@ struct ElementSolidSection : public ElementSection {
|
|
|
534
534
|
}
|
|
535
535
|
|
|
536
536
|
// convert cells, offset, and celltypes to vtk style arrays
|
|
537
|
-
nb::tuple ToVTK() {
|
|
537
|
+
nb::tuple ToVTK(const bool vtk_97_wedges) {
|
|
538
538
|
NDArray<uint8_t, 1> celltypes_arr = MakeNDArray<uint8_t, 1>({(int)n_elem});
|
|
539
539
|
NDArray<int64_t, 1> offsets_arr =
|
|
540
540
|
MakeNDArray<int64_t, 1>({(int)(n_elem + 1)});
|
|
@@ -552,33 +552,87 @@ struct ElementSolidSection : public ElementSection {
|
|
|
552
552
|
|
|
553
553
|
int c = 0;
|
|
554
554
|
offsets[0] = 0;
|
|
555
|
-
uint8_t celltype = VTK_EMPTY_CELL;
|
|
556
|
-
for (int i = 0; i < n_elem; i++) {
|
|
557
555
|
|
|
556
|
+
// Emit a VTK_WEDGE from indices ordered for VTK 9.7+ (triangle A normal
|
|
557
|
+
// pointing toward triangle B); swap the second and third vertex of each
|
|
558
|
+
// triangle for legacy VTK (< 9.7) ordering.
|
|
559
|
+
// https://docs.vtk.org/en/latest/release_details/9.7/fix-wedge-point-ordering.html
|
|
560
|
+
auto emit_wedge = [&](const int *n, int a0, int a1, int a2, int b0, int b1,
|
|
561
|
+
int b2) {
|
|
562
|
+
if (vtk_97_wedges) {
|
|
563
|
+
cells[c++] = n[a0];
|
|
564
|
+
cells[c++] = n[a1];
|
|
565
|
+
cells[c++] = n[a2];
|
|
566
|
+
cells[c++] = n[b0];
|
|
567
|
+
cells[c++] = n[b1];
|
|
568
|
+
cells[c++] = n[b2];
|
|
569
|
+
} else {
|
|
570
|
+
cells[c++] = n[a0];
|
|
571
|
+
cells[c++] = n[a2];
|
|
572
|
+
cells[c++] = n[a1];
|
|
573
|
+
cells[c++] = n[b0];
|
|
574
|
+
cells[c++] = n[b2];
|
|
575
|
+
cells[c++] = n[b1];
|
|
576
|
+
}
|
|
577
|
+
};
|
|
578
|
+
|
|
579
|
+
for (int i = 0; i < n_elem; i++) {
|
|
558
580
|
int el_sz = 0;
|
|
559
|
-
int
|
|
560
|
-
|
|
581
|
+
const int *n = node_ids_data + node_id_offsets_data[i];
|
|
582
|
+
const bool top_collapsed =
|
|
583
|
+
(n[4] == n[5]) && (n[5] == n[6]) && (n[6] == n[7]);
|
|
584
|
+
if (n[3] == n[4]) {
|
|
585
|
+
celltypes[i] = VTK_TETRA;
|
|
586
|
+
cells[c++] = n[0];
|
|
587
|
+
cells[c++] = n[1];
|
|
588
|
+
cells[c++] = n[2];
|
|
589
|
+
cells[c++] = n[3];
|
|
590
|
+
el_sz = 4;
|
|
591
|
+
} else if (top_collapsed && n[2] == n[3]) {
|
|
561
592
|
celltypes[i] = VTK_TETRA;
|
|
562
|
-
cells[c++] =
|
|
563
|
-
cells[c++] =
|
|
564
|
-
cells[c++] =
|
|
565
|
-
cells[c++] =
|
|
593
|
+
cells[c++] = n[0];
|
|
594
|
+
cells[c++] = n[1];
|
|
595
|
+
cells[c++] = n[2];
|
|
596
|
+
cells[c++] = n[4];
|
|
566
597
|
el_sz = 4;
|
|
567
|
-
} else if (
|
|
598
|
+
} else if (top_collapsed) {
|
|
599
|
+
celltypes[i] = VTK_PYRAMID;
|
|
600
|
+
cells[c++] = n[0];
|
|
601
|
+
cells[c++] = n[1];
|
|
602
|
+
cells[c++] = n[2];
|
|
603
|
+
cells[c++] = n[3];
|
|
604
|
+
cells[c++] = n[4];
|
|
605
|
+
el_sz = 5;
|
|
606
|
+
} else if (n[4] == n[5] && n[6] == n[7]) {
|
|
607
|
+
celltypes[i] = VTK_WEDGE;
|
|
608
|
+
emit_wedge(n, 0, 4, 1, 3, 6, 2);
|
|
609
|
+
el_sz = 6;
|
|
610
|
+
} else if (n[4] == n[7] && n[5] == n[6]) {
|
|
611
|
+
celltypes[i] = VTK_WEDGE;
|
|
612
|
+
emit_wedge(n, 0, 3, 4, 1, 2, 5);
|
|
613
|
+
el_sz = 6;
|
|
614
|
+
} else if ((n[2] == n[3] && n[6] == n[7]) ||
|
|
615
|
+
(n[0] == n[3] && n[4] == n[7])) {
|
|
616
|
+
celltypes[i] = VTK_WEDGE;
|
|
617
|
+
emit_wedge(n, 0, 1, 2, 4, 5, 6);
|
|
618
|
+
el_sz = 6;
|
|
619
|
+
} else if (n[1] == n[2] && n[5] == n[6]) {
|
|
620
|
+
celltypes[i] = VTK_WEDGE;
|
|
621
|
+
emit_wedge(n, 0, 1, 3, 4, 5, 7);
|
|
622
|
+
el_sz = 6;
|
|
623
|
+
} else if (n[0] == n[1] && n[4] == n[5]) {
|
|
624
|
+
celltypes[i] = VTK_WEDGE;
|
|
625
|
+
emit_wedge(n, 0, 2, 3, 4, 6, 7);
|
|
626
|
+
el_sz = 6;
|
|
627
|
+
} else if (n[5] == n[6]) {
|
|
568
628
|
celltypes[i] = VTK_WEDGE;
|
|
569
|
-
|
|
570
|
-
cells[c++] = node_ids_data[offset + 0];
|
|
571
|
-
cells[c++] = node_ids_data[offset + 1];
|
|
572
|
-
cells[c++] = node_ids_data[offset + 4];
|
|
573
|
-
cells[c++] = node_ids_data[offset + 3];
|
|
574
|
-
cells[c++] = node_ids_data[offset + 2];
|
|
575
|
-
cells[c++] = node_ids_data[offset + 5];
|
|
629
|
+
emit_wedge(n, 0, 4, 1, 3, 5, 2);
|
|
576
630
|
el_sz = 6;
|
|
577
631
|
} else {
|
|
578
632
|
celltypes[i] = VTK_HEXAHEDRON;
|
|
579
633
|
// assuming compiler is smart enough to unroll this
|
|
580
634
|
for (int j = 0; j < 8; j++) {
|
|
581
|
-
cells[c++] =
|
|
635
|
+
cells[c++] = n[j];
|
|
582
636
|
}
|
|
583
637
|
el_sz = 8;
|
|
584
638
|
} // cell type branching
|
|
@@ -985,7 +1039,8 @@ NB_MODULE(_deck, m) {
|
|
|
985
1039
|
.def(nb::init())
|
|
986
1040
|
.def("__repr__", &ElementSolidSection::ToString)
|
|
987
1041
|
.def("__len__", &ElementSolidSection::Length)
|
|
988
|
-
.def("to_vtk", &ElementSolidSection::ToVTK
|
|
1042
|
+
.def("to_vtk", &ElementSolidSection::ToVTK,
|
|
1043
|
+
nb::arg("vtk_97_wedges") = false)
|
|
989
1044
|
.def_ro("eid", &ElementSolidSection::eid, nb::rv_policy::automatic)
|
|
990
1045
|
.def_ro("pid", &ElementSolidSection::pid, nb::rv_policy::automatic)
|
|
991
1046
|
.def_ro("node_ids", &ElementSolidSection::node_ids,
|
|
@@ -38,7 +38,11 @@ class ElementSection:
|
|
|
38
38
|
def to_vtk(self) -> Tuple[LongArray1D, LongArray1D, Uint8Array1D]: ...
|
|
39
39
|
|
|
40
40
|
class ElementShellSection(ElementSection): ...
|
|
41
|
-
|
|
41
|
+
|
|
42
|
+
class ElementSolidSection(ElementSection):
|
|
43
|
+
def to_vtk(
|
|
44
|
+
self, vtk_97_wedges: bool = False
|
|
45
|
+
) -> Tuple[LongArray1D, LongArray1D, Uint8Array1D]: ...
|
|
42
46
|
|
|
43
47
|
class _Deck:
|
|
44
48
|
def __init__(self, fname: str) -> None: ...
|
|
@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
|
|
|
18
18
|
commit_id: str | None
|
|
19
19
|
__commit_id__: str | None
|
|
20
20
|
|
|
21
|
-
__version__ = version = '0.2.
|
|
22
|
-
__version_tuple__ = version_tuple = (0, 2,
|
|
21
|
+
__version__ = version = '0.2.2'
|
|
22
|
+
__version_tuple__ = version_tuple = (0, 2, 2)
|
|
23
23
|
|
|
24
|
-
__commit_id__ = commit_id = '
|
|
24
|
+
__commit_id__ = commit_id = 'gfe58aa7'
|
|
@@ -231,7 +231,12 @@ class Deck:
|
|
|
231
231
|
try:
|
|
232
232
|
import pyvista as pv
|
|
233
233
|
from pyvista import ID_TYPE, CellArray
|
|
234
|
-
from pyvista._vtk import
|
|
234
|
+
from pyvista._vtk import (
|
|
235
|
+
numpy_to_vtk,
|
|
236
|
+
vtkCellArray,
|
|
237
|
+
vtkTypeInt32Array,
|
|
238
|
+
vtkTypeInt64Array,
|
|
239
|
+
)
|
|
235
240
|
from pyvista.core.pointset import UnstructuredGrid
|
|
236
241
|
except ImportError as exc:
|
|
237
242
|
msg = "Deck.to_grid requires PyVista. Install it with: pip install pyvista"
|
|
@@ -262,8 +267,14 @@ class Deck:
|
|
|
262
267
|
celltypes: List[NDArray[np.uint8]] = []
|
|
263
268
|
cells: List[NDArray[np.integer]] = []
|
|
264
269
|
part_ids = []
|
|
270
|
+
vtk_97_wedges = pv.vtk_version_info >= (9, 7)
|
|
265
271
|
for section in element_sections:
|
|
266
|
-
|
|
272
|
+
if isinstance(section, ElementSolidSection):
|
|
273
|
+
section_cells, section_offset, section_celltypes = section.to_vtk(
|
|
274
|
+
vtk_97_wedges=vtk_97_wedges
|
|
275
|
+
)
|
|
276
|
+
else:
|
|
277
|
+
section_cells, section_offset, section_celltypes = section.to_vtk()
|
|
267
278
|
if offsets:
|
|
268
279
|
# we need to shift by the last value of the last offset
|
|
269
280
|
offsets.append(section_offset[1:] + offsets[-1][-1])
|
|
@@ -293,8 +304,16 @@ class Deck:
|
|
|
293
304
|
if width is None:
|
|
294
305
|
vtk_cells = CellArray.from_arrays(offsets_arr, cells_arr, deep=False)
|
|
295
306
|
else:
|
|
307
|
+
# Specify the exact VTK fixed-width integer array type; otherwise
|
|
308
|
+
# numpy_to_vtk maps C long (np.int32 on Windows, np.int64 on LP64)
|
|
309
|
+
# to vtkLongArray, which VTK 9.7.2 declines for fixed-size storage.
|
|
310
|
+
array_type = (
|
|
311
|
+
vtkTypeInt32Array().GetDataType()
|
|
312
|
+
if cells_arr.dtype == np.int32
|
|
313
|
+
else vtkTypeInt64Array().GetDataType()
|
|
314
|
+
)
|
|
296
315
|
vtk_cells = vtkCellArray()
|
|
297
|
-
vtk_cells.SetData(width, numpy_to_vtk(cells_arr, deep=False))
|
|
316
|
+
vtk_cells.SetData(width, numpy_to_vtk(cells_arr, deep=False, array_type=array_type))
|
|
298
317
|
|
|
299
318
|
vtk_cell_type = numpy_to_vtk(celltypes_arr, deep=False)
|
|
300
319
|
grid.SetCells(vtk_cell_type, vtk_cells)
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/docs/source/_templates/autosummary/base.rst
RENAMED
|
File without changes
|
{lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/docs/source/_templates/autosummary/class.rst
RENAMED
|
File without changes
|
{lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/docs/source/_templates/autosummary/module.rst
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/examples/__init__.py
RENAMED
|
File without changes
|
{lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/examples/bird.k
RENAMED
|
File without changes
|
{lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/examples/birdball.k
RENAMED
|
File without changes
|
{lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/examples/bracket.k
RENAMED
|
File without changes
|
|
File without changes
|
{lsdyna_mesh_reader-0.2.0 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/examples/wheel.k
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|