PyNiteFEA 2.2.0__tar.gz → 2.3.0__tar.gz

{pynitefea-2.2.0 → pynitefea-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyNiteFEA
-Version: 2.2.0
+Version: 2.3.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
@@ -121,6 +121,21 @@ Here's a list of projects that use Pynite:
 * Phaenotyp (https://github.com/bewegende-Architektur/Phaenotyp) (https://youtu.be/shloSw9HjVI)
 
 # What's New?
+v2.3.0
+* Added enveloping to member diagrams. Set `combo_name` to a list of combo tags and the member diagram will show an envelope of all the combos that have any of those tags.
+* Bug fix: Quadrilateral element displacements had corners swapped during VTK visualization. This was a relic from the old MITC4 formulation that has been corrected.
+* Bug fix: Added shear wall and mat foundation load cases to `FEModel3D.load_cases()`. The list of load cases was sometimes incomplete if these meshes had not yet been generated.
+* Added bending moment end releases to visualizations.
+* Bug fix for shear walls with flanges having an origin with their origin at Y != 0.
+* Rectangular meshes now filter out user defined control points that erroneously lie outside their boudaries.
+
+v2.2.1
+* Normalized member force diagrams across the entire model for visual clarity.
+* Made mesh auto-regeneration smarter and more efficient, targeting only meshes that have been altered since the last run.
+* Added `ShearWall` mesh auto-regeneration. Whenever a model is solved any old or outdated `ShearWall` meshes are automatically removed and replaced by a rebuild.
+* Optimized auto-calculated annotation sizing: The new automatic annotation size calculation feature now uses vectorized NumPy operations and caching for efficient rendering of large models with hundreds or thousands of elements.
+* Adjusted member diagram label offsets for clarity.
+
 v2.2.0
 * Added member diagrams feature for easy visualization of shear, moment, axial, and torsion diagrams along members.
 * Updated documentation for rendering.

{pynitefea-2.2.0 → pynitefea-2.3.0}/PyNiteFEA.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyNiteFEA
-Version: 2.2.0
+Version: 2.3.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
@@ -121,6 +121,21 @@ Here's a list of projects that use Pynite:
 * Phaenotyp (https://github.com/bewegende-Architektur/Phaenotyp) (https://youtu.be/shloSw9HjVI)
 
 # What's New?
+v2.3.0
+* Added enveloping to member diagrams. Set `combo_name` to a list of combo tags and the member diagram will show an envelope of all the combos that have any of those tags.
+* Bug fix: Quadrilateral element displacements had corners swapped during VTK visualization. This was a relic from the old MITC4 formulation that has been corrected.
+* Bug fix: Added shear wall and mat foundation load cases to `FEModel3D.load_cases()`. The list of load cases was sometimes incomplete if these meshes had not yet been generated.
+* Added bending moment end releases to visualizations.
+* Bug fix for shear walls with flanges having an origin with their origin at Y != 0.
+* Rectangular meshes now filter out user defined control points that erroneously lie outside their boudaries.
+
+v2.2.1
+* Normalized member force diagrams across the entire model for visual clarity.
+* Made mesh auto-regeneration smarter and more efficient, targeting only meshes that have been altered since the last run.
+* Added `ShearWall` mesh auto-regeneration. Whenever a model is solved any old or outdated `ShearWall` meshes are automatically removed and replaced by a rebuild.
+* Optimized auto-calculated annotation sizing: The new automatic annotation size calculation feature now uses vectorized NumPy operations and caching for efficient rendering of large models with hundreds or thousands of elements.
+* Adjusted member diagram label offsets for clarity.
+
 v2.2.0
 * Added member diagrams feature for easy visualization of shear, moment, axial, and torsion diagrams along members.
 * Updated documentation for rendering.

{pynitefea-2.2.0 → pynitefea-2.3.0}/Pynite/Analysis.py

@@ -48,19 +48,19 @@ 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 that haven't been generated yet
+    # Generate all basic meshes that haven't been generated yet or need updating
     for mesh in model.meshes.values():
-        if not mesh.is_generated:
+        if not mesh.is_generated or mesh.needs_update:
             mesh.generate()
 
-    # Generate all shear wall meshes that haven't been generated yet
+    # Generate all shear wall meshes that haven't been generated yet or need updating
     for shear_wall in model.shear_walls.values():
-        if not shear_wall.is_generated:
+        if not shear_wall.is_generated or shear_wall.needs_update:
             shear_wall.generate()
 
-    # Generate all mat foundation meshes that haven't been generated yet
+    # Generate all mat foundation meshes that haven't been generated yet or need updating
     for mat in model.mats.values():
-        if not mat.is_generated:
+        if not mat.is_generated or mat.needs_update:
             mat.generate()
 
     # Activate all springs and members for all load combinations

{pynitefea-2.2.0 → pynitefea-2.3.0}/Pynite/FEModel3D.py

@@ -194,6 +194,25 @@ class FEModel3D():
                 # Get the load case for each plate/quad pressure
                 cases.append(load[1])
 
+        # Step through each shear wall helper
+        for shear_wall in self.shear_walls.values():
+            # Step through each shear wall shear load
+            for load in shear_wall._shears:
+                # Get the load case for each shear wall shear
+                cases.append(load[2])
+
+            # Step through each shear wall axial load
+            for load in shear_wall._axials:
+                # Get the load case for each shear wall axial
+                cases.append(load[2])
+
+        # Step through each mat foundation helper
+        for mat in self.mats.values():
+            # Step through each mat point load
+            for load in mat.pt_loads:
+                # Get the load case for each mat point load
+                cases.append(load[3])
+
         # Remove duplicates and return the list (sorted ascending)
         return sorted(list(dict.fromkeys(cases)))
 
@@ -2415,7 +2434,7 @@ class FEModel3D():
                                 # The partitioned stiffness matrix originates as `coo` and is converted to `csr`
                                 # format for mathematical operations. The `@` operator performs matrix multiplication
                                 # on sparse matrices.
-                                Delta_D1 = spsolve(K11.tocsr(), np.subtract(np.subtract(Delta_P1, Delta_FER1), K12.tocsr() @ Delta_D2))
+                                Delta_D1 = spsolve(K11, np.subtract(np.subtract(Delta_P1, Delta_FER1), K12 @ Delta_D2))
                                 Delta_D1 = Delta_D1.reshape(len(Delta_D1), 1)
                             else:
                                 Delta_D1 = solve(K11, np.subtract(np.subtract(Delta_P1, Delta_FER1), np.matmul(K12, Delta_D2)))

{pynitefea-2.2.0 → pynitefea-2.3.0}/Pynite/MatFoundation.py

@@ -51,6 +51,7 @@ class MatFoundation(RectangleMesh):
         self.name = name
         self.ks = ks
         self.pt_loads = []  # [XZ_coord, direction, magnitude, case]
+        self.needs_update = False  # Flag indicating regeneration is needed due to changes
 
     def add_rect_opening(self, name, X_min, Z_min, X_max, Z_max):
         """Add a rectangular opening to the mat by corner coordinates.
@@ -67,6 +68,8 @@ class MatFoundation(RectangleMesh):
         """
 
         super().add_rect_opening(name, X_min, Z_min, X_max - X_min, Z_max - Z_min)
+        if self.is_generated:
+            self.needs_update = True
 
     def add_mat_pt_load(self, XZ_coord, direction, magnitude, case='Case 1'):
         """Register a concentrated load at an X-Z coordinate on the mat.
@@ -84,6 +87,8 @@ class MatFoundation(RectangleMesh):
         self.x_control.append(XZ_coord[0])
         self.y_control.append(XZ_coord[1])
         self.pt_loads.append([XZ_coord, direction, magnitude, case])
+        if self.is_generated:
+            self.needs_update = True
 
     def generate(self):
         """Generate the mesh, apply point loads, and define soil springs.

{pynitefea-2.2.0 → pynitefea-2.3.0}/Pynite/Member3D.py

@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING, Literal, Union, List
 from math import isclose
 
 from numpy import array, zeros, add, subtract, matmul, insert, dot, cross, divide, count_nonzero, concatenate
-from numpy import linspace, vstack, hstack, allclose, radians, sin, cos
+from numpy import linspace, vstack, hstack, allclose, radians, sin, cos, maximum, minimum
 from numpy.linalg import inv, pinv, norm
 
 import Pynite.FixedEndReactions
@@ -1292,42 +1292,62 @@ class Member3D():
         # Return 0 if no valid combos were found
         return Vmin_global if Vmin_global is not None else 0
 
-    def plot_shear(self, Direction: Literal['Fy', 'Fz'], combo_name: str = 'Combo 1', n_points: int = 20) -> None:
+    def plot_shear(self, Direction: Literal['Fy', 'Fz'], combo_name: Union[str, List[str]] = 'Combo 1', n_points: int = 20) -> None:
         """
-        Plots the shear diagram for the member
+        Plots the shear diagram for the member.
 
         Parameters
         ----------
         Direction : string
-            The direction in which to find the moment. Must be one of the following:
+            The direction in which to plot the shear force. Must be one of the following:
                 'Fy' = Shear acting on the local y-axis.
                 'Fz' = Shear acting on the local z-axis.
-        combo_name : string
-            The name of the load combination to get the results for (not the load combination itself).
+        combo_name : string or list of strings
+            A single load combination name, or a list of combo tags. When a
+            list of tags is provided, each matching combo is plotted and a
+            max/min envelope is shown.
         n_points: int
             The number of points used to generate the plot
         """
 
-        # Segment the member if necessary
-        if self._solved_combo is None or combo_name != self._solved_combo.name:
-            self._segment_member(combo_name)
-            self._solved_combo = self.model.load_combos[combo_name]
-
         # Import 'pyplot' if not already done
         if Member3D.__plt is None:
             from matplotlib import pyplot as plt
             Member3D.__plt = plt
 
+        if isinstance(combo_name, str):
+            combo_names = [combo_name]
+        else:
+            combo_names = [name for name, combo in self.model.load_combos.items()
+                           if any(tag in combo.combo_tags for tag in combo_name)]
+
         fig, ax = Member3D.__plt.subplots()
         ax.axhline(0, color='black', lw=1)
         ax.grid()
 
-        x, V = self.shear_array(Direction, n_points, combo_name)
-
-        Member3D.__plt.plot(x, V)
-        Member3D.__plt.ylabel('Shear')
-        Member3D.__plt.xlabel('Location')
-        Member3D.__plt.title('Member ' + self.name + '\n' + combo_name)
+        if len(combo_names) == 1:
+            # Segment the member if necessary
+            if self._solved_combo is None or combo_names[0] != self._solved_combo.name:
+                self._segment_member(combo_names[0])
+                self._solved_combo = self.model.load_combos[combo_names[0]]
+            x, V = self.shear_array(Direction, n_points, combo_names[0])
+            ax.plot(x, V)
+            ax.set_title('Member ' + self.name + '\n' + combo_names[0])
+        else:
+            env_max = None
+            env_min = None
+            for name in combo_names:
+                x, V = self.shear_array(Direction, n_points, name)
+                ax.plot(x, V, label=name)
+                env_max = V if env_max is None else maximum(env_max, V)
+                env_min = V if env_min is None else minimum(env_min, V)
+            ax.plot(x, env_max, color='green', alpha=0.4, lw=3, label='Max Envelope')
+            ax.plot(x, env_min, color='red', alpha=0.4, lw=3, label='Min Envelope')
+            ax.legend(fontsize='small')
+            ax.set_title('Member ' + self.name + '\nEnvelope')
+
+        ax.set_ylabel('Shear')
+        ax.set_xlabel('Location')
         Member3D.__plt.show()
 
     def shear_array(self, Direction: Literal['Fy', 'Fz'], n_points: int, combo_name='Combo 1', x_array=None) -> NDArray[float64]:
@@ -1581,9 +1601,9 @@ class Member3D():
         return Mmin_global if Mmin_global is not None else 0
 
 
-    def plot_moment(self, Direction: Literal['My', 'Mz'], combo_name: str = 'Combo 1', n_points: int = 20) -> None:
+    def plot_moment(self, Direction: Literal['My', 'Mz'], combo_name: Union[str, List[str]] = 'Combo 1', n_points: int = 20) -> None:
         """
-        Plots the moment diagram for the member
+        Plots the moment diagram for the member.
 
         Parameters
         ----------
@@ -1591,33 +1611,52 @@ class Member3D():
             The direction in which to plot the moment. Must be one of the following:
                 'My' = Moment about the local y-axis.
                 'Mz' = moment about the local z-axis.
-        combo_name : string
-            The name of the load combination to get the results for (not the combination itself).
+        combo_name : string or list of strings
+            A single load combination name, or a list of combo tags. When a
+            list of tags is provided, each matching combo is plotted and a
+            max/min envelope is shown.
         n_points: int
             The number of points used to generate the plot
         """
 
-        # Segment the member if necessary
-        if self._solved_combo is None or combo_name != self._solved_combo.name:
-            self._segment_member(combo_name)
-            self._solved_combo = self.model.load_combos[combo_name]
-
         # Import 'pyplot' if not already done
         if Member3D.__plt is None:
             from matplotlib import pyplot as plt
             Member3D.__plt = plt
 
+        if isinstance(combo_name, str):
+            combo_names = [combo_name]
+        else:
+            combo_names = [name for name, combo in self.model.load_combos.items()
+                           if any(tag in combo.combo_tags for tag in combo_name)]
+
         fig, ax = Member3D.__plt.subplots()
         ax.axhline(0, color='black', lw=1)
         ax.grid()
 
-        # Generate the moment diagram coordinates
-        x, M = self.moment_array(Direction, n_points, combo_name)
-
-        Member3D.__plt.plot(x, M)
-        Member3D.__plt.ylabel('Moment')
-        Member3D.__plt.xlabel('Location')
-        Member3D.__plt.title('Member ' + self.name + '\n' + combo_name)
+        if len(combo_names) == 1:
+            # Segment the member if necessary
+            if self._solved_combo is None or combo_names[0] != self._solved_combo.name:
+                self._segment_member(combo_names[0])
+                self._solved_combo = self.model.load_combos[combo_names[0]]
+            x, M = self.moment_array(Direction, n_points, combo_names[0])
+            ax.plot(x, M)
+            ax.set_title('Member ' + self.name + '\n' + combo_names[0])
+        else:
+            env_max = None
+            env_min = None
+            for name in combo_names:
+                x, M = self.moment_array(Direction, n_points, name)
+                ax.plot(x, M, label=name)
+                env_max = M if env_max is None else maximum(env_max, M)
+                env_min = M if env_min is None else minimum(env_min, M)
+            ax.plot(x, env_max, color='green', alpha=0.4, lw=3, label='Max Envelope')
+            ax.plot(x, env_min, color='red', alpha=0.4, lw=3, label='Min Envelope')
+            ax.legend(fontsize='small')
+            ax.set_title('Member ' + self.name + '\nEnvelope')
+
+        ax.set_ylabel('Moment')
+        ax.set_xlabel('Location')
         Member3D.__plt.show()
 
     def moment_array(self, Direction: Literal['My', 'Mz'], n_points: int, combo_name: str = 'Combo 1', x_array: Optional[NDArray[float64]] = None) -> NDArray[float64]:
@@ -1825,38 +1864,58 @@ class Member3D():
         # Return global minimum or 0 if nothing found
         return Tmin_global if Tmin_global is not None else 0
 
-    def plot_torque(self, combo_name='Combo 1', n_points=20):
+    def plot_torque(self, combo_name: Union[str, List[str]] = 'Combo 1', n_points: int = 20) -> None:
         """
         Plots the torque diagram for the member.
 
-        Paramters
-        ---------
-        combo_name : string
-            The name of the load combination to get the results for (not the load combination itself).
+        Parameters
+        ----------
+        combo_name : string or list of strings
+            A single load combination name, or a list of combo tags. When a
+            list of tags is provided, each matching combo is plotted and a
+            max/min envelope is shown.
         n_points: int
             The number of points used to generate the plot
         """
 
-        # Segment the member if necessary
-        if self._solved_combo is None or combo_name != self._solved_combo.name:
-            self._segment_member(combo_name)
-            self._solved_combo = self.model.load_combos[combo_name]
-
         # Import 'pyplot' if not already done
         if Member3D.__plt is None:
             from matplotlib import pyplot as plt
             Member3D.__plt = plt
 
+        if isinstance(combo_name, str):
+            combo_names = [combo_name]
+        else:
+            combo_names = [name for name, combo in self.model.load_combos.items()
+                           if any(tag in combo.combo_tags for tag in combo_name)]
+
         fig, ax = Member3D.__plt.subplots()
         ax.axhline(0, color='black', lw=1)
         ax.grid()
 
-        x, T = self.torque_array(n_points, combo_name)
-
-        Member3D.__plt.plot(x, T)
-        Member3D.__plt.ylabel('Torsional Moment (Warping Torsion Not Included)') # Torsion results are for pure torsion. Torsional warping has not been considered
-        Member3D.__plt.xlabel('Location')
-        Member3D.__plt.title('Member ' + self.name + '\n' + combo_name)
+        if len(combo_names) == 1:
+            # Segment the member if necessary
+            if self._solved_combo is None or combo_names[0] != self._solved_combo.name:
+                self._segment_member(combo_names[0])
+                self._solved_combo = self.model.load_combos[combo_names[0]]
+            x, T = self.torque_array(n_points, combo_names[0])
+            ax.plot(x, T)
+            ax.set_title('Member ' + self.name + '\n' + combo_names[0])
+        else:
+            env_max = None
+            env_min = None
+            for name in combo_names:
+                x, T = self.torque_array(n_points, name)
+                ax.plot(x, T, label=name)
+                env_max = T if env_max is None else maximum(env_max, T)
+                env_min = T if env_min is None else minimum(env_min, T)
+            ax.plot(x, env_max, color='green', alpha=0.4, lw=3, label='Max Envelope')
+            ax.plot(x, env_min, color='red', alpha=0.4, lw=3, label='Min Envelope')
+            ax.legend(fontsize='small')
+            ax.set_title('Member ' + self.name + '\nEnvelope')
+
+        ax.set_ylabel('Torsional Moment (Warping Torsion Not Included)')
+        ax.set_xlabel('Location')
         Member3D.__plt.show()
 
     def torque_array(self, n_points, combo_name='Combo 1', x_array = None) -> NDArray[float64]:
@@ -2039,38 +2098,58 @@ class Member3D():
         # Return the global minimum, or 0 if nothing was found
         return Pmin_global if Pmin_global is not None else 0
 
-    def plot_axial(self, combo_name: str = 'Combo 1', n_points=20) -> None:
+    def plot_axial(self, combo_name: Union[str, List[str]] = 'Combo 1', n_points: int = 20) -> None:
         """
         Plots the axial force diagram for the member.
 
         Parameters
         ----------
-        combo_name : string
-            The name of the load combination to get the results for (not the load combination itself).
+        combo_name : string or list of strings
+            A single load combination name, or a list of combo tags. When a
+            list of tags is provided, each matching combo is plotted and a
+            max/min envelope is shown.
         n_points: int
             The number of points used to generate the plot
         """
 
-        # Segment the member if necessary
-        if self._solved_combo is None or combo_name != self._solved_combo.name:
-            self._segment_member(combo_name)
-            self._solved_combo = self.model.load_combos[combo_name]
-
         # Import 'pyplot' if not already done
         if Member3D.__plt is None:
             from matplotlib import pyplot as plt
             Member3D.__plt = plt
 
+        if isinstance(combo_name, str):
+            combo_names = [combo_name]
+        else:
+            combo_names = [name for name, combo in self.model.load_combos.items()
+                           if any(tag in combo.combo_tags for tag in combo_name)]
+
         fig, ax = Member3D.__plt.subplots()
         ax.axhline(0, color='black', lw=1)
         ax.grid()
 
-        x, P = self.axial_array(n_points, combo_name)
-
-        Member3D.__plt.plot(x, P)
-        Member3D.__plt.ylabel('Axial Force')
-        Member3D.__plt.xlabel('Location')
-        Member3D.__plt.title('Member ' + self.name + '\n' + combo_name)
+        if len(combo_names) == 1:
+            # Segment the member if necessary
+            if self._solved_combo is None or combo_names[0] != self._solved_combo.name:
+                self._segment_member(combo_names[0])
+                self._solved_combo = self.model.load_combos[combo_names[0]]
+            x, P = self.axial_array(n_points, combo_names[0])
+            ax.plot(x, P)
+            ax.set_title('Member ' + self.name + '\n' + combo_names[0])
+        else:
+            env_max = None
+            env_min = None
+            for name in combo_names:
+                x, P = self.axial_array(n_points, name)
+                ax.plot(x, P, label=name)
+                env_max = P if env_max is None else maximum(env_max, P)
+                env_min = P if env_min is None else minimum(env_min, P)
+            ax.plot(x, env_max, color='green', alpha=0.4, lw=3, label='Max Envelope')
+            ax.plot(x, env_min, color='red', alpha=0.4, lw=3, label='Min Envelope')
+            ax.legend(fontsize='small')
+            ax.set_title('Member ' + self.name + '\nEnvelope')
+
+        ax.set_ylabel('Axial Force')
+        ax.set_xlabel('Location')
         Member3D.__plt.show()
 
     def axial_array(self, n_points: int, combo_name: str = 'Combo 1', x_array: Optional[NDArray[float64]] = None) -> NDArray[float64]:
@@ -2309,43 +2388,63 @@ class Member3D():
         # Return global minimum or 0 if nothing found
         return dmin_global if dmin_global is not None else 0
 
-    def plot_deflection(self, Direction: Literal['dx', 'dy', 'dz'], combo_name: str = 'Combo 1', n_points: int = 20) -> None:
+    def plot_deflection(self, Direction: Literal['dx', 'dy', 'dz'], combo_name: Union[str, List[str]] = 'Combo 1', n_points: int = 20) -> None:
         """
-        Plots the deflection diagram for the member
+        Plots the deflection diagram for the member.
 
         Parameters
         ----------
         Direction : string
-            The direction in which to find the deflection. Must be one of the following:
+            The direction in which to plot the deflection. Must be one of the following:
                 'dx' = Deflection in the local x-axis.
                 'dy' = Deflection in the local y-axis.
                 'dz' = Deflection in the local z-axis.
-        combo_name : string
-            The name of the load combination to get the results for (not the load combination itself).
+        combo_name : string or list of strings
+            A single load combination name, or a list of combo tags. When a
+            list of tags is provided, each matching combo is plotted and a
+            max/min envelope is shown.
         n_points: int
             The number of points used to generate the plot
         """
 
-        # Segment the member if necessary
-        if self._solved_combo is None or combo_name != self._solved_combo.name:
-            self._segment_member(combo_name)
-            self._solved_combo = self.model.load_combos[combo_name]
-
         # Import 'pyplot' if not already done
         if Member3D.__plt is None:
             from matplotlib import pyplot as plt
             Member3D.__plt = plt
 
+        if isinstance(combo_name, str):
+            combo_names = [combo_name]
+        else:
+            combo_names = [name for name, combo in self.model.load_combos.items()
+                           if any(tag in combo.combo_tags for tag in combo_name)]
+
         fig, ax = Member3D.__plt.subplots()
         ax.axhline(0, color='black', lw=1)
         ax.grid()
 
-        x, d = self.deflection_array(Direction, n_points, combo_name)
-
-        Member3D.__plt.plot(x, d)
-        Member3D.__plt.ylabel('Deflection')
-        Member3D.__plt.xlabel('Location')
-        Member3D.__plt.title('Member ' + self.name + '\n' + combo_name)
+        if len(combo_names) == 1:
+            # Segment the member if necessary
+            if self._solved_combo is None or combo_names[0] != self._solved_combo.name:
+                self._segment_member(combo_names[0])
+                self._solved_combo = self.model.load_combos[combo_names[0]]
+            x, d = self.deflection_array(Direction, n_points, combo_names[0])
+            ax.plot(x, d)
+            ax.set_title('Member ' + self.name + '\n' + combo_names[0])
+        else:
+            env_max = None
+            env_min = None
+            for name in combo_names:
+                x, d = self.deflection_array(Direction, n_points, name)
+                ax.plot(x, d, label=name)
+                env_max = d if env_max is None else maximum(env_max, d)
+                env_min = d if env_min is None else minimum(env_min, d)
+            ax.plot(x, env_max, color='green', alpha=0.4, lw=3, label='Max Envelope')
+            ax.plot(x, env_min, color='red', alpha=0.4, lw=3, label='Min Envelope')
+            ax.legend(fontsize='small')
+            ax.set_title('Member ' + self.name + '\nEnvelope')
+
+        ax.set_ylabel('Deflection')
+        ax.set_xlabel('Location')
         Member3D.__plt.show()
 
     def deflection_array(self, Direction: Literal['dx', 'dy', 'dz'], n_points: int, combo_name: str = 'Combo 1', x_array: Optional[NDArray[float64]] = None) -> NDArray[float64]:

{pynitefea-2.2.0 → pynitefea-2.3.0}/Pynite/Mesh.py

@@ -48,6 +48,7 @@ class Mesh():
         self.elements: Dict[str, Union[Quad3D, Plate3D]] = {}  # A dictionary containing the elements in the mesh
         self.element_type = 'Quad'          # The type of element used in the mesh
         self.is_generated = False          # A flag indicating whether the mesh has been generated
+        self.needs_update = False          # A flag indicating whether the mesh needs regeneration due to changes
 
     def _remove_from_model(self) -> None:
         """Removes the mesh's nodes and elements from the model in preparation for regeneration.
@@ -815,6 +816,11 @@ class RectangleMesh(Mesh):
                 unique_list.append(y_control[i])
         unique_list.append(y_control[-1])
         y_control = unique_list
+
+        # Remove any control points that fall outside the mesh boundaries
+        # Control points outside [0, width] or [0, height] would create elements outside the intended mesh
+        x_control = [val for val in x_control if val >= -1e-10 and val <= width + 1e-10]
+        y_control = [val for val in y_control if val >= -1e-10 and val <= height + 1e-10]
     
         # Each node number will be increased by the offset calculated below
         node_offset = int(self.start_node[1:]) - 1
@@ -1033,6 +1039,7 @@ class RectangleMesh(Mesh):
 
         # Flag the mesh as generated
         self.is_generated = True
+        self.needs_update = False
 
     def node_local_coords(self, node: Node3D) -> tuple[float, float]:
         """Calculates a node's position in the mesh's local x/y coordinate system.
@@ -1078,8 +1085,9 @@ class RectangleMesh(Mesh):
         self.x_control.append(x_left + width)
         self.y_control.append(y_bott + height)
 
-        # Flag the mesh as not generated yet
-        self.is_generated = False
+        # Flag that regeneration is needed if already generated
+        if self.is_generated:
+            self.needs_update = True
 
 
 class RectOpening():
@@ -1233,6 +1241,7 @@ class AnnulusMesh(Mesh):
         
         # Flag the mesh as generated
         self.is_generated = True
+        self.needs_update = False
 
 #%%
 class AnnulusRingMesh(Mesh):
@@ -1390,6 +1399,7 @@ class AnnulusRingMesh(Mesh):
         
         # Flag the mesh as generated
         self.is_generated = True
+        self.needs_update = False
 
 
 class AnnulusTransRingMesh(Mesh):
@@ -1589,6 +1599,7 @@ class AnnulusTransRingMesh(Mesh):
         
         # Flag the mesh as generated
         self.is_generated = True
+        self.needs_update = False
 
 
 class FrustrumMesh(AnnulusMesh):
@@ -1806,6 +1817,7 @@ class CylinderMesh(Mesh):
         
         # Flag the mesh as generated
         self.is_generated = True
+        self.needs_update = False
 
 #%%
 class CylinderRingMesh(Mesh):
@@ -1994,6 +2006,7 @@ class CylinderRingMesh(Mesh):
             
         # Flag the mesh as generated
         self.is_generated = True
+        self.needs_update = False
         
 def check_mesh_integrity(mesh: Mesh, console_log: bool = True) -> Union[str, List[str], None]:
     """Runs basic integrity checks to ensure the mesh is in sync with its model. Usually you don't