lsdyna-mesh-reader 0.2.1__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.
Files changed (29) hide show
  1. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/PKG-INFO +1 -1
  2. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/src/deck.cpp +71 -19
  3. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/_version.py +3 -3
  4. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/deck.py +15 -2
  5. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/.gitattributes +0 -0
  6. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/CMakeLists.txt +0 -0
  7. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/LICENSE +0 -0
  8. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/README.md +0 -0
  9. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/docs/source/_templates/autosummary/base.rst +0 -0
  10. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/docs/source/_templates/autosummary/class.rst +0 -0
  11. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/docs/source/_templates/autosummary/module.rst +0 -0
  12. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/docs/source/_templates/custom-class-template.rst +0 -0
  13. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/docs/source/_templates/custom-module-template.rst +0 -0
  14. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/docs/source/api.rst +0 -0
  15. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/docs/source/conf.py +0 -0
  16. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/docs/source/index.md +0 -0
  17. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/pyproject.toml +0 -0
  18. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/src/array_support.h +0 -0
  19. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/__init__.py +0 -0
  20. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/_deck.pyi +0 -0
  21. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/examples/EXP_SC_JOINT_SCREW.key +0 -0
  22. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/examples/__init__.py +0 -0
  23. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/examples/bird.k +0 -0
  24. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/examples/birdball.k +0 -0
  25. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/examples/bracket.k +0 -0
  26. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/examples/ex_13_thick_shell_elform_2.k +0 -0
  27. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/examples/wheel.k +0 -0
  28. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/src/lsdyna_mesh_reader/py.typed +0 -0
  29. {lsdyna_mesh_reader-0.2.1 → lsdyna_mesh_reader-0.2.2}/tools/extract-deps.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: lsdyna-mesh-reader
3
- Version: 0.2.1
3
+ Version: 0.2.2
4
4
  Summary: Read nodes and elements from LS-DYNA decks.
5
5
  Author-Email: Alex Kaszynski <akascap@gmail.com>
6
6
  Classifier: Development Status :: 4 - Beta
@@ -535,12 +535,6 @@ struct ElementSolidSection : public ElementSection {
535
535
 
536
536
  // convert cells, offset, and celltypes to vtk style arrays
537
537
  nb::tuple ToVTK(const bool vtk_97_wedges) {
538
- // Select the LS-DYNA-to-VTK node mapping once, before assembling cells.
539
- // https://docs.vtk.org/en/latest/release_details/9.7/fix-wedge-point-ordering.html
540
- static constexpr int legacy_wedge_nodes[6] = {0, 1, 4, 3, 2, 5};
541
- static constexpr int vtk_97_wedge_nodes[6] = {0, 4, 1, 3, 5, 2};
542
- const int *wedge_nodes =
543
- vtk_97_wedges ? vtk_97_wedge_nodes : legacy_wedge_nodes;
544
538
  NDArray<uint8_t, 1> celltypes_arr = MakeNDArray<uint8_t, 1>({(int)n_elem});
545
539
  NDArray<int64_t, 1> offsets_arr =
546
540
  MakeNDArray<int64_t, 1>({(int)(n_elem + 1)});
@@ -558,29 +552,87 @@ struct ElementSolidSection : public ElementSection {
558
552
 
559
553
  int c = 0;
560
554
  offsets[0] = 0;
561
- uint8_t celltype = VTK_EMPTY_CELL;
562
- for (int i = 0; i < n_elem; i++) {
563
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++) {
564
580
  int el_sz = 0;
565
- int offset = node_id_offsets_data[i];
566
- if (node_ids_data[offset + 3] == node_ids_data[offset + 4]) {
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]) {
567
592
  celltypes[i] = VTK_TETRA;
568
- cells[c++] = node_ids_data[offset + 0];
569
- cells[c++] = node_ids_data[offset + 1];
570
- cells[c++] = node_ids_data[offset + 2];
571
- cells[c++] = node_ids_data[offset + 3];
593
+ cells[c++] = n[0];
594
+ cells[c++] = n[1];
595
+ cells[c++] = n[2];
596
+ cells[c++] = n[4];
572
597
  el_sz = 4;
573
- } else if (node_ids_data[offset + 5] == node_ids_data[offset + 6]) {
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]) {
574
607
  celltypes[i] = VTK_WEDGE;
575
- for (int j = 0; j < 6; ++j) {
576
- cells[c++] = node_ids_data[offset + wedge_nodes[j]];
577
- }
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]) {
628
+ celltypes[i] = VTK_WEDGE;
629
+ emit_wedge(n, 0, 4, 1, 3, 5, 2);
578
630
  el_sz = 6;
579
631
  } else {
580
632
  celltypes[i] = VTK_HEXAHEDRON;
581
633
  // assuming compiler is smart enough to unroll this
582
634
  for (int j = 0; j < 8; j++) {
583
- cells[c++] = node_ids_data[offset + j];
635
+ cells[c++] = n[j];
584
636
  }
585
637
  el_sz = 8;
586
638
  } // cell type branching
@@ -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.1'
22
- __version_tuple__ = version_tuple = (0, 2, 1)
21
+ __version__ = version = '0.2.2'
22
+ __version_tuple__ = version_tuple = (0, 2, 2)
23
23
 
24
- __commit_id__ = commit_id = 'g9f6cabd'
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 numpy_to_vtk, vtkCellArray
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"
@@ -299,8 +304,16 @@ class Deck:
299
304
  if width is None:
300
305
  vtk_cells = CellArray.from_arrays(offsets_arr, cells_arr, deep=False)
301
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
+ )
302
315
  vtk_cells = vtkCellArray()
303
- 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))
304
317
 
305
318
  vtk_cell_type = numpy_to_vtk(celltypes_arr, deep=False)
306
319
  grid.SetCells(vtk_cell_type, vtk_cells)