PyNiteFEA 2.0.2__tar.gz → 2.1.0__tar.gz

{pynitefea-2.0.2/PyNiteFEA.egg-info → pynitefea-2.1.0}/PKG-INFO

@@ -1,17 +1,20 @@
 Metadata-Version: 2.4
 Name: PyNiteFEA
-Version: 2.0.2
+Version: 2.1.0
 Summary: A simple elastic 3D structural finite element library for Python.
 Home-page: https://github.com/JWock82/Pynite.git
 Author: D. Craig Brinck, PE, SE
 Author-email: Building.Code@outlook.com
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy
+Requires-Dist: numpy>=2.4.0
 Requires-Dist: PrettyTable
 Requires-Dist: scipy
 Requires-Dist: matplotlib
@@ -56,6 +59,7 @@ Dynamic: summary
 
 ![Build Status](https://github.com/JWock82/Pynite/actions/workflows/build-and-test.yml/badge.svg)
 [![codecov](https://codecov.io/gh/JWock82/Pynite/branch/main/graph/badge.svg?token=ZH18US3A7P)](https://codecov.io/gh/JWock82/Pynite)
+![PyPI - Python Version](https://img.shields.io/pypi/pyversions/PyniteFEA)
 ![PyPI - Downloads](https://img.shields.io/pypi/dm/PyNiteFEA?cacheSeconds=86400)
 <img alt="GitHub code size in bytes" src="https://img.shields.io/github/languages/code-size/JWock82/Pynite">
 ![GitHub last commit](https://img.shields.io/github/last-commit/JWock82/Pynite)
@@ -117,10 +121,25 @@ Here's a list of projects that use Pynite:
 * Phaenotyp (https://github.com/bewegende-Architektur/Phaenotyp) (https://youtu.be/shloSw9HjVI)
 
 # What's New?
+v2.1.0
+* Major speed boost and leaner memory usage: the global stiffness/mass assembly plus the nodal load and fixed-end reaction builders now use block-based vectorized writes instead of Python loops, which keeps data in contiguous NumPy buffers rather than thousands of temporary Python objects. The dense solver sees ~15-25% faster `K`/`M` builds in our targeted benchmarks, while sparse solver runs see ~30% faster stiffness assembly in our benchmarks.
+* Meshes can now be regenerated with the `FEModel3D.meshes[mesh_name].generate()` command. This command removes the old mesh and replaces it with an updated one. The mesh will not remove nodes needed by other elements outside the mesh. Note that any loads applied to the old mesh will be lost when its elements and nodes are deleted. This makes meshes truly parametric.
+* Added `FEModel3D.delete_mesh()` to help deleting old meshes properly.
+* Renderers now automatically set the annotation size as 5% of the minimum distance between nodes. You still have the option of overiding this by setting the annotation size manually.
+* Added load case/combo identification to VTK rendering.
+* Dropped support for Python version 3.10, which is not compatible with Numpy 2.4.
+* Removed unecessary checks for Scipy. Scipy has been a required dependency for some time now.
+* Cleaned up whitespace to conform to PEP8 style guide.
+
+v2.0.3
+* Numpy >= 2.4 is now a requirement. This ensures the VTK renderer will handle plate results arrays properly.
+* `pip` now installs dependencies during build testing. Pynite's testing suite now runs against the correct version of each dependency.
+
 v2.0.2
 * Added docstrings to the VTK `Renderer` class to help the user.
 * Enforced use of properties instead of attributes in the VTK `Renderer` and added docstrings to properties help the user make decisions.
 * Removed the VTK `Renderer`'s properties that began with "set_". These were redundant and caused confusion. The prefix "set_" is no longer used to access or set any of the `Renderer`'s properties.
+* Made the VTK `Renderer` compatible with the latest version of `numpy`.
 
 v2.0.1
 * Pynite no longer struggles rendering load cases and combinations when no loads are present. This is especially helpful for rendering modal load combinations, which don't have loads (only masses).

pynitefea-2.0.2/README.md → pynitefea-2.1.0/PyNiteFEA.egg-info/PKG-INFO

@@ -1,3 +1,56 @@
+Metadata-Version: 2.4
+Name: PyNiteFEA
+Version: 2.1.0
+Summary: A simple elastic 3D structural finite element library for Python.
+Home-page: https://github.com/JWock82/Pynite.git
+Author: D. Craig Brinck, PE, SE
+Author-email: Building.Code@outlook.com
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.11
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: numpy>=2.4.0
+Requires-Dist: PrettyTable
+Requires-Dist: scipy
+Requires-Dist: matplotlib
+Provides-Extra: all
+Requires-Dist: Ipython; extra == "all"
+Requires-Dist: vtk>=9.3.0; extra == "all"
+Requires-Dist: pyvista[all,trame]>=0.43.4; extra == "all"
+Requires-Dist: trame_jupyter_extension; extra == "all"
+Requires-Dist: ipywidgets; extra == "all"
+Requires-Dist: pdfkit; extra == "all"
+Requires-Dist: Jinja2; extra == "all"
+Provides-Extra: vtk
+Requires-Dist: IPython; extra == "vtk"
+Requires-Dist: vtk>=9.3.0; extra == "vtk"
+Provides-Extra: pyvista
+Requires-Dist: pyvista[all,trame]>=0.43.4; extra == "pyvista"
+Requires-Dist: trame_jupyter_extension; extra == "pyvista"
+Requires-Dist: ipywidgets; extra == "pyvista"
+Provides-Extra: reporting
+Requires-Dist: pdfkit; extra == "reporting"
+Requires-Dist: Jinja2; extra == "reporting"
+Provides-Extra: derivations
+Requires-Dist: jupyterlab; extra == "derivations"
+Requires-Dist: sympy; extra == "derivations"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
 <div align="center">
   <img src="https://github.com/JWock82/Pynite/raw/main/Resources/Full Logo No Buffer.png" width=40% align="center"/>
   <br>
@@ -6,6 +59,7 @@
 
 ![Build Status](https://github.com/JWock82/Pynite/actions/workflows/build-and-test.yml/badge.svg)
 [![codecov](https://codecov.io/gh/JWock82/Pynite/branch/main/graph/badge.svg?token=ZH18US3A7P)](https://codecov.io/gh/JWock82/Pynite)
+![PyPI - Python Version](https://img.shields.io/pypi/pyversions/PyniteFEA)
 ![PyPI - Downloads](https://img.shields.io/pypi/dm/PyNiteFEA?cacheSeconds=86400)
 <img alt="GitHub code size in bytes" src="https://img.shields.io/github/languages/code-size/JWock82/Pynite">
 ![GitHub last commit](https://img.shields.io/github/last-commit/JWock82/Pynite)
@@ -67,10 +121,25 @@ Here's a list of projects that use Pynite:
 * Phaenotyp (https://github.com/bewegende-Architektur/Phaenotyp) (https://youtu.be/shloSw9HjVI)
 
 # What's New?
+v2.1.0
+* Major speed boost and leaner memory usage: the global stiffness/mass assembly plus the nodal load and fixed-end reaction builders now use block-based vectorized writes instead of Python loops, which keeps data in contiguous NumPy buffers rather than thousands of temporary Python objects. The dense solver sees ~15-25% faster `K`/`M` builds in our targeted benchmarks, while sparse solver runs see ~30% faster stiffness assembly in our benchmarks.
+* Meshes can now be regenerated with the `FEModel3D.meshes[mesh_name].generate()` command. This command removes the old mesh and replaces it with an updated one. The mesh will not remove nodes needed by other elements outside the mesh. Note that any loads applied to the old mesh will be lost when its elements and nodes are deleted. This makes meshes truly parametric.
+* Added `FEModel3D.delete_mesh()` to help deleting old meshes properly.
+* Renderers now automatically set the annotation size as 5% of the minimum distance between nodes. You still have the option of overiding this by setting the annotation size manually.
+* Added load case/combo identification to VTK rendering.
+* Dropped support for Python version 3.10, which is not compatible with Numpy 2.4.
+* Removed unecessary checks for Scipy. Scipy has been a required dependency for some time now.
+* Cleaned up whitespace to conform to PEP8 style guide.
+
+v2.0.3
+* Numpy >= 2.4 is now a requirement. This ensures the VTK renderer will handle plate results arrays properly.
+* `pip` now installs dependencies during build testing. Pynite's testing suite now runs against the correct version of each dependency.
+
 v2.0.2
 * Added docstrings to the VTK `Renderer` class to help the user.
 * Enforced use of properties instead of attributes in the VTK `Renderer` and added docstrings to properties help the user make decisions.
 * Removed the VTK `Renderer`'s properties that began with "set_". These were redundant and caused confusion. The prefix "set_" is no longer used to access or set any of the `Renderer`'s properties.
+* Made the VTK `Renderer` compatible with the latest version of `numpy`.
 
 v2.0.1
 * Pynite no longer struggles rendering load cases and combinations when no loads are present. This is especially helpful for rendering modal load combinations, which don't have loads (only masses).

{pynitefea-2.0.2 → pynitefea-2.1.0}/PyNiteFEA.egg-info/requires.txt

@@ -1,4 +1,4 @@
-numpy
+numpy>=2.4.0
 PrettyTable
 scipy
 matplotlib

{pynitefea-2.0.2 → pynitefea-2.1.0}/Pynite/Analysis.py

@@ -48,18 +48,20 @@ def _prepare_model(model: FEModel3D, n_modes: int = 0) -> None:
     for i in range(n_modes):
         model.add_load_combo(f'Mode {i + 1}', {}, ['modal'])
 
-    # Generate all basic meshes
+    # Generate all basic meshes that haven't been generated yet
     for mesh in model.meshes.values():
-        if mesh.is_generated == False:
+        if not mesh.is_generated:
             mesh.generate()
 
-    # Generate all shear wall meshes
+    # Generate all shear wall meshes that haven't been generated yet
     for shear_wall in model.shear_walls.values():
-        shear_wall.generate()
+        if not shear_wall.is_generated:
+            shear_wall.generate()
 
-    # Generate all mat foundation meshes
+    # Generate all mat foundation meshes that haven't been generated yet
     for mat in model.mats.values():
-        mat.generate()
+        if not mat.is_generated:
+            mat.generate()
 
     # Activate all springs and members for all load combinations
     for spring in model.springs.values():
@@ -217,9 +219,9 @@ def _PDelta(model: FEModel3D, combo_name: str, P1: NDArray[float64], FER1: NDArr
                     # Calculate the partitioned initial stiffness matrices. These matrices must be recalculated on each T/C iteration due to tension/compression-only members deactivating or reactivating.
                     if log:
                         print('- Calculating initial stiffness matrix')
-                    K11, K12, K21, K22 = _partition(model, model.K(combo_name, log, check_stability, sparse).tolil(), D1_indices, D2_indices)
+                    K11, K12, K21, K22 = _partition(model, model.K(combo_name, log, check_stability, sparse), D1_indices, D2_indices)
 
-                    # The initial stiffness matrices are currently `lil` format which is great for memory, but slow for mathematical operations. They will be converted to `csr` format.
+                    # The initial stiffness matrices are in `coo` format from construction. They will be converted to `csr` format for efficient mathematical operations.
                     K11 = K11.tocsr()
                     K12 = K12.tocsr()
                     K21 = K21.tocsr()
@@ -232,7 +234,7 @@ def _PDelta(model: FEModel3D, combo_name: str, P1: NDArray[float64], FER1: NDArr
                     if log: print('- Calculating geometric stiffness matrix')
                     Kg11, Kg12, Kg21, Kg22 = _partition(model, model.Kg(combo_name, log, sparse, False), D1_indices, D2_indices)
 
-                    # The Kg stiffness matrices are currently `lil` format which is great for memory, but slow for mathematical operations. They will be converted to `csr` format. Note that the `+` operator performs matrix addition on `csr` matrices.
+                    # The Kg stiffness matrices are in `coo` format from construction. They will be converted to `csr` format for efficient addition. Note that the `+` operator performs matrix addition on `csr` matrices.
                     if log: print('- Summing initial & geometric stiffness matrices')
                     K11 = K11 + Kg11.tocsr()
                     K12 = K12 + Kg12.tocsr()
@@ -325,21 +327,20 @@ def _pushover_step(model: FEModel3D, combo_name: str, push_combo: str, step_num:
 
             # Calculate the initial stiffness matrix
             if log: print('- Calculating elastic stiffness matrix [Ke]')
-            K11, K12, K21, K22 = _partition(model, model.K(combo_name, log, check_stability, sparse).tolil(), D1_indices, D2_indices)
+            K11, K12, K21, K22 = _partition(model, model.K(combo_name, log, check_stability, sparse), D1_indices, D2_indices)
 
             # Calculate the geometric stiffness matrix
             # The `combo_name` variable in the code below is not the name of the pushover load combination. Rather it is the name of the primary combination that the pushover load will be added to. Axial loads used to develop Kg are calculated from the displacements stored in `combo_name`.
             if log: print('- Calculating geometric stiffness matrix [Kg]')
-            Kg11, Kg12, Kg21, Kg22 = _partition(model, model.Kg(combo_name, log, sparse, False).tolil(), D1_indices, D2_indices)
+            Kg11, Kg12, Kg21, Kg22 = _partition(model, model.Kg(combo_name, log, sparse, False), D1_indices, D2_indices)
 
             # Calculate the stiffness reduction matrix
             if log: print('- Calculating plastic reduction matrix [Km]')
-            Km11, Km12, Km21, Km22 = _partition(model, model.Km(combo_name, push_combo, step_num, log, sparse).tolil(), D1_indices, D2_indices)
+            Km11, Km12, Km21, Km22 = _partition(model, model.Km(combo_name, push_combo, step_num, log, sparse), D1_indices, D2_indices)
 
-            # The stiffness matrices are currently `lil` format which is great for
-            # memory, but slow for mathematical operations. They will be converted to
-            # `csr` format. The `+` operator performs matrix addition on `csr`
-            # matrices.
+            # The stiffness matrices are in `coo` format from construction. They will be
+            # converted to `csr` format for efficient operations. The `+` operator
+            # performs matrix addition on `csr` matrices.
             K11 = K11.tocsr() + Kg11.tocsr() + Km11.tocsr()
             K12 = K12.tocsr() + Kg12.tocsr() + Km12.tocsr()
             K21 = K21.tocsr() + Kg21.tocsr() + Km21.tocsr()
@@ -718,7 +719,7 @@ def _calc_reactions(model: FEModel3D, log: bool = False, combo_tags: List[str] |
             node.RxnMZ[combo.name] = 0.0
 
             # Determine if the node has any supports
-            if (node.support_DX or node.support_DY or node.support_DZ 
+            if (node.support_DX or node.support_DY or node.support_DZ
             or  node.support_RX or node.support_RY or node.support_RZ):
 
                 # Sum the spring end forces at the node
@@ -727,7 +728,7 @@ def _calc_reactions(model: FEModel3D, log: bool = False, combo_tags: List[str] |
                     if spring.i_node == node and spring.active[combo.name] == True:
 
                         # Get the spring's global force matrix
-                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed                    
+                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed
                         spring_F = spring.F(combo.name)
 
                         if node.support_DX: node.RxnFX[combo.name] += spring_F[0, 0]
@@ -740,7 +741,7 @@ def _calc_reactions(model: FEModel3D, log: bool = False, combo_tags: List[str] |
                     elif spring.j_node == node and spring.active[combo.name] == True:
 
                         # Get the spring's global force matrix
-                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed                    
+                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed
                         spring_F = spring.F(combo.name)
 
                         if node.support_DX: node.RxnFX[combo.name] += spring_F[6, 0]
@@ -759,7 +760,7 @@ def _calc_reactions(model: FEModel3D, log: bool = False, combo_tags: List[str] |
                         if member.i_node == node and phys_member.active[combo.name] == True:
 
                             # Get the member's global force matrix
-                            # Storing it as a local variable eliminates the need to rebuild it every time a term is needed                    
+                            # Storing it as a local variable eliminates the need to rebuild it every time a term is needed
                             member_F = member.F(combo.name)
 
                             if node.support_DX: node.RxnFX[combo.name] += member_F[0, 0]
@@ -772,7 +773,7 @@ def _calc_reactions(model: FEModel3D, log: bool = False, combo_tags: List[str] |
                         elif member.j_node == node and phys_member.active[combo.name] == True:
 
                             # Get the member's global force matrix
-                            # Storing it as a local variable eliminates the need to rebuild it every time a term is needed                    
+                            # Storing it as a local variable eliminates the need to rebuild it every time a term is needed
                             member_F = member.F(combo.name)
 
                             if node.support_DX: node.RxnFX[combo.name] += member_F[6, 0]
@@ -788,7 +789,7 @@ def _calc_reactions(model: FEModel3D, log: bool = False, combo_tags: List[str] |
                     if plate.i_node == node:
 
                         # Get the plate's global force matrix
-                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed                    
+                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed
                         plate_F = plate.F(combo.name)
 
                         if node.support_DX: node.RxnFX[combo.name] += plate_F[0, 0]
@@ -801,7 +802,7 @@ def _calc_reactions(model: FEModel3D, log: bool = False, combo_tags: List[str] |
                     elif plate.j_node == node:
 
                         # Get the plate's global force matrix
-                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed                    
+                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed
                         plate_F = plate.F(combo.name)
 
                         if node.support_DX: node.RxnFX[combo.name] += plate_F[6, 0]
@@ -814,7 +815,7 @@ def _calc_reactions(model: FEModel3D, log: bool = False, combo_tags: List[str] |
                     elif plate.m_node == node:
 
                         # Get the plate's global force matrix
-                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed                    
+                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed
                         plate_F = plate.F(combo.name)
 
                         if node.support_DX: node.RxnFX[combo.name] += plate_F[12, 0]
@@ -827,7 +828,7 @@ def _calc_reactions(model: FEModel3D, log: bool = False, combo_tags: List[str] |
                     elif plate.n_node == node:
 
                         # Get the plate's global force matrix
-                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed                    
+                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed
                         plate_F = plate.F(combo.name)
 
                         if node.support_DX: node.RxnFX[combo.name] += plate_F[18, 0]
@@ -843,7 +844,7 @@ def _calc_reactions(model: FEModel3D, log: bool = False, combo_tags: List[str] |
                     if quad.i_node == node:
 
                         # Get the quad's global force matrix
-                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed                    
+                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed
                         quad_F = quad.F(combo.name)
 
                         if node.support_DX: node.RxnFX[combo.name] += quad_F[0, 0]
@@ -856,7 +857,7 @@ def _calc_reactions(model: FEModel3D, log: bool = False, combo_tags: List[str] |
                     elif quad.j_node == node:
 
                         # Get the quad's global force matrix
-                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed                    
+                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed
                         quad_F = quad.F(combo.name)
 
                         if node.support_DX: node.RxnFX[combo.name] += quad_F[6, 0]
@@ -869,7 +870,7 @@ def _calc_reactions(model: FEModel3D, log: bool = False, combo_tags: List[str] |
                     elif quad.m_node == node:
 
                         # Get the quad's global force matrix
-                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed                    
+                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed
                         quad_F = quad.F(combo.name)
 
                         if node.support_DX: node.RxnFX[combo.name] += quad_F[12, 0]
@@ -882,7 +883,7 @@ def _calc_reactions(model: FEModel3D, log: bool = False, combo_tags: List[str] |
                     elif quad.n_node == node:
 
                         # Get the quad's global force matrix
-                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed                    
+                        # Storing it as a local variable eliminates the need to rebuild it every time a term is needed
                         quad_F = quad.F(combo.name)
 
                         if node.support_DX: node.RxnFX[combo.name] += quad_F[18, 0]
@@ -1020,7 +1021,7 @@ def _check_statics(model: FEModel3D, combo_tags: List[str] | None = None) -> Non
             SumRFZ += RFZ
             SumRMX += RMX - RFY*Z + RFZ*Y
             SumRMY += RMY + RFX*Z - RFZ*X
-            SumRMZ += RMZ - RFX*Y + RFY*X 
+            SumRMZ += RMZ - RFX*Y + RFY*X
 
         # Add the results to the table
         statics_table.add_row([combo.name, '{:.3g}'.format(SumFX), '{:.3g}'.format(SumRFX),
@@ -1120,10 +1121,10 @@ def _partition_D(model: FEModel3D) -> Tuple[List[int], List[int], NDArray[float6
         else:
             D2_indices.append(node.ID*6 + 5)
             D2.append(0.0)
-    
+
     # Legacy code on the next line. I will leave it here until the line that follows has been proven over time.
     # D2 = atleast_2d(D2)
-    
+
     # Convert D2 from a list to a matrix
     D2 = array(D2, ndmin=2).T
 
@@ -1144,6 +1145,10 @@ def _partition(model: FEModel3D, unp_matrix: NDArray[float64] | lil_matrix, D1_i
     :rtype: array, array, array, array
     """
 
+    # Convert sparse matrices to CSR so they support efficient slicing
+    if hasattr(unp_matrix, 'tocsr'):
+        unp_matrix = unp_matrix.tocsr()
+
     # Determine if this is a 1D vector or a 2D matrix
 
     # 1D vectors
@@ -1167,11 +1172,11 @@ def _renumber(model: FEModel3D) -> None:
     Assigns node and element ID numbers to be used internally by the program. Numbers are
     assigned according to the order in which they occur in each dictionary.
     """
-    
+
     # Number each node in the model
     for id, node in enumerate(model.nodes.values()):
         node.ID = id
-    
+
     # Number each spring in the model
     for id, spring in enumerate(model.springs.values()):
         spring.ID = id
@@ -1183,11 +1188,11 @@ def _renumber(model: FEModel3D) -> None:
         for member in phys_member.sub_members.values():
             member.ID = id
             id += 1
-    
+
     # Number each plate in the model
     for id, plate in enumerate(model.plates.values()):
         plate.ID = id
-    
+
     # Number each quadrilateral in the model
     for id, quad in enumerate(model.quads.values()):
         quad.ID = id